Add NIX_PATH action input

cachix · Feb 19, 2020 · 1659319 · 1659319
1 parent af5929c
commit 1659319
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,12 +2,20 @@ name: "install-nix-action test"
 on:
   pull_request:
   push:
+
 jobs:
   tests:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-18.04, macos-latest]
+        nixPath:
+          -
+          - nixpkgs=channel:nixos-unstable
+          - nixpkgs=https://github.com/NixOS/nixpkgs/archive/master.tar.gz
+
     runs-on: ${{ matrix.os }}
+
     steps:
     - uses: actions/checkout@v1
     - run: yarn install --frozen-lockfile
@@ -17,8 +25,10 @@ jobs:
     - run: yarn test
     - name: Install Nix
       uses: ./
+      with:
+        NIX_PATH: ${{ matrix.nixPath }}
     - run: nix-env -iA cachix -f https://github.com/NixOS/nixpkgs/tarball/ab5863afada3c1b50fc43bf774b75ea71b287cde
     - run: cat /etc/nix/nix.conf
     # cachix should be available and be able to configure a cache
     - run: cachix use cachix
-    - run: nix-build test.nix
+    - run: nix-build test.nix
diff --git a/README.md b/README.md
@@ -19,6 +19,8 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - uses: cachix/install-nix-action@v6
+      with:
+        NIX_PATH: nixpkgs=channel:nixos-unstable
     - run: nix-build
 ```
 

diff --git a/action.yml b/action.yml
@@ -1,6 +1,10 @@
 name: 'Install Nix'
 description: 'Installs Nix on GitHub Actions for the supported platforms: Linux and macOS.'
 author: 'Domen Kožar'
+inputs:
+  NIX_PATH:
+    description: 'Set NIX_PATH environment variable'
+    required: false
 branding:
   color: 'blue'
   icon: 'sun'

diff --git a/lib/main.js b/lib/main.js
@@ -57,8 +57,12 @@ function run() {
             yield nixConf();
             yield exec.exec("sudo", ["pkill", "-HUP", "nix-daemon"]);
             // setup env
+            let nixPath = core.getInput('NIX_PATH');
+            if (typeof nixPath === "undefined" || nixPath === "") {
+                nixPath = '/nix/var/nix/profiles/per-user/root/channels';
+            }
             core.exportVariable('PATH', `${PATH}:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/per-user/runner/profile/bin`);
-            core.exportVariable('NIX_PATH', `/nix/var/nix/profiles/per-user/root/channels`);
+            core.exportVariable('NIX_PATH', nixPath);
             if (os_1.type() == "Darwin") {
                 // macOS needs certificates hints
                 core.exportVariable('NIX_SSL_CERT_FILE', '/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt');

diff --git a/src/main.ts b/src/main.ts
@@ -47,8 +47,14 @@ async function run() {
     await exec.exec("sudo", ["pkill", "-HUP", "nix-daemon"]);
 
     // setup env
-    core.exportVariable('PATH', `${PATH}:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/per-user/runner/profile/bin`)
-    core.exportVariable('NIX_PATH', `/nix/var/nix/profiles/per-user/root/channels`)
+    let nixPath: string | undefined = core.getInput('NIX_PATH');
+    if (typeof nixPath === "undefined" || nixPath === "") {
+      nixPath = '/nix/var/nix/profiles/per-user/root/channels';
+    }
+
+    core.exportVariable('PATH', `${PATH}:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/per-user/runner/profile/bin`);
+    core.exportVariable('NIX_PATH', nixPath);
+
     if (type() == "Darwin") {
       // macOS needs certificates hints
       core.exportVariable('NIX_SSL_CERT_FILE', '/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt');
@@ -58,7 +64,6 @@ async function run() {
       // macOS needs time to reload the daemon :(
       await exec.exec("sleep", ["10"]);
     }
-
   } catch (error) {
     core.setFailed(`Action failed with error: ${error}`);
     throw error;