remove unused file

Add NIX_PATH action input

.github/workflows/test.yml

@@ -2,23 +2,53 @@ name: "install-nix-action test"
 on:
   pull_request:
   push:
+
 jobs:
-  tests:
+  simple-build:
     strategy:
       matrix:
-        os: [ubuntu-18.04, macos-latest]
+        os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - run: yarn install --frozen-lockfile
     - run: yarn build
-    # TODO: just commit it using github
-    - run: git diff --exit-code
-    - run: yarn test
     - name: Install Nix
       uses: ./
-    - run: nix-env -iA cachix -f https://github.com/NixOS/nixpkgs/tarball/ab5863afada3c1b50fc43bf774b75ea71b287cde
+    - run: nix-env -iA cachix -f https://cachix.org/api/v1/install
     - 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
+
+  no-channel:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+    - name: Install Nix
+      uses: ./
+      with:
+        skip_adding_nixpkgs_channel: true
+    - run: nix-build test.nix && exit 1 || echo "OK"
+    - run: NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/tarball/ab5863afada3c1b50fc43bf774b75ea71b287cde nix-build test.nix
+
+  custom-nix-path:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+    - name: Install Nix
+      uses: ./
+      with:
+        nix_path: nixpkgs=channel:nixos-20.03
+    - run: test $NIX_PATH == "nixpkgs=channel:nixos-20.03"
+    - run: nix-build test.nix

README.md

@@ -17,18 +17,25 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v3
+    - uses: cachix/install-nix-action@v9
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
     - run: nix-build
 ```
 
-
-See [action.yml](action.yml) for all options.
-
 See also [cachix-action](https://github.com/cachix/cachix-action) for
 simple binary cache setup to speed up your builds and share binaries
 with developers.
 
+## Options `with: ...`
+
+- `install_url`: specify URL to install Nix from (mostly useful for testing non-stable releases)
+
+- `nix_path`: set `NIX_PATH` environment variable (if set `skip_adding_nixpkgs_channel` will be implicitly enabled)
+
+- `skip_adding_nixpkgs_channel`: set to `true` to skip adding nixpkgs-unstable channel (and save ~5s for each job build)
+
 ---
 
 ## Hacking

action.yml

@@ -1,6 +1,13 @@
 name: 'Install Nix'
 description: 'Installs Nix on GitHub Actions for the supported platforms: Linux and macOS.'
 author: 'Domen Kožar'
+inputs:
+  install_url:
+    description: 'Installation URL that will contain a script to install Nix'
+  nix_path:
+    description: 'Set NIX_PATH environment variable. If set "skip_adding_nixpkgs_channel" will be implicitly enabled'
+  skip_adding_nixpkgs_channel:
+    description: 'Skip adding nixpkgs-unstable channel'
 branding:
   color: 'blue'
   icon: 'sun'

lib/install-nix.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Set jobs to number of cores
+sudo sh -c 'echo max-jobs = auto >> /tmp/nix.conf'
+# Allow binary caches for runner user
+sudo sh -c 'echo trusted-users = root runner >> /tmp/nix.conf'
+
+if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL = "true" || $INPUT_NIX_PATH != "" ]]; then
+  extra_cmd=--no-channel-add
+else
+  extra_cmd=
+  INPUT_NIX_PATH="/nix/var/nix/profiles/per-user/root/channels"
+fi
+
+sh <(curl -L ${INPUT_INSTALL_URL:-https://nixos.org/nix/install}) \
+  --daemon --daemon-user-count 4 --nix-extra-conf-file /tmp/nix.conf --darwin-use-unencrypted-nix-store-volume $extra_cmd
+
+if [[ $OSTYPE =~ darwin ]]; then
+  # Disable spotlight indexing of /nix to speed up performance
+  sudo mdutil -i off /nix
+
+  # macOS needs certificates hints
+  cert_file=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
+  echo "::set-env name=NIX_SSL_CERT_FILE::$cert_file"
+  export NIX_SSL_CERT_FILE=$cert_file
+  sudo launchctl setenv NIX_SSL_CERT_FILE "$cert_file"
+fi
+
+# Set paths
+echo "::add-path::/nix/var/nix/profiles/per-user/runner/profile/bin"
+echo "::add-path::/nix/var/nix/profiles/default/bin"
+
+if [[ $INPUT_NIX_PATH != "" ]]; then
+  echo "::set-env name=NIX_PATH::${INPUT_NIX_PATH}"
+fi

lib/main.js

@@ -1,77 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const core = __importStar(require("@actions/core"));
+const child_process_1 = require("child_process");
-const exec = __importStar(require("@actions/exec"));
+child_process_1.execFileSync(`${__dirname}/install-nix.sh`, { stdio: 'inherit' });
-const tc = __importStar(require("@actions/tool-cache"));
-const os_1 = require("os");
-function nixConf() {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Workaround a segfault: https://github.com/NixOS/nix/issues/2733
-        yield exec.exec("sudo", ["mkdir", "-p", "/etc/nix"]);
-        yield exec.exec("sudo", ["sh", "-c", "echo http2 = false >> /etc/nix/nix.conf"]);
-        // Set jobs to number of cores
-        yield exec.exec("sudo", ["sh", "-c", "echo max-jobs = auto >> /etc/nix/nix.conf"]);
-        // Allow binary caches for runner user
-        yield exec.exec("sudo", ["sh", "-c", "echo trusted-users = root runner >> /etc/nix/nix.conf"]);
-    });
-}
-function run() {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const PATH = process.env.PATH;
-            const INSTALL_PATH = '/opt/nix';
-            yield nixConf();
-            // Catalina workaround https://github.com/NixOS/nix/issues/2925
-            if (os_1.type() == "Darwin") {
-                yield exec.exec("sudo", ["sh", "-c", `echo \"nix\t${INSTALL_PATH}\"  >> /etc/synthetic.conf`]);
-                yield exec.exec("sudo", ["sh", "-c", `mkdir -m 0755 ${INSTALL_PATH} && chown runner ${INSTALL_PATH}`]);
-                yield exec.exec("/System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util", ["-B"]);
-                // Needed for sudo to pass NIX_IGNORE_SYMLINK_STORE
-                yield exec.exec("sudo", ["sh", "-c", "echo 'Defaults env_keep += NIX_IGNORE_SYMLINK_STORE'  >> /etc/sudoers"]);
-                core.exportVariable('NIX_IGNORE_SYMLINK_STORE', "1");
-                // Needed for nix-daemon installation
-                yield exec.exec("sudo", ["launchctl", "setenv", "NIX_IGNORE_SYMLINK_STORE", "1"]);
-            }
-            // Needed due to multi-user being too defensive
-            core.exportVariable('ALLOW_PREEXISTING_INSTALLATION', "1");
-            // TODO: retry due to all the things that go wrong
-            const nixInstall = yield tc.downloadTool('https://nixos.org/nix/install');
-            yield exec.exec("sh", [nixInstall, "--daemon"]);
-            // write nix.conf again as installation overwrites it, reload the daemon to pick up changes
-            yield nixConf();
-            yield 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`);
-            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');
-                // TODO: nc doesn't work correctly on macOS :(
-                //await exec.exec("sh", ["-c", "while ! nc -zU /nix/var/nix/daemon-socket/socket; do sleep 0.5; done"]);
-                // macOS needs time to reload the daemon :(
-                yield exec.exec("sleep", ["10"]);
-            }
-        }
-        catch (error) {
-            core.setFailed(`Action failed with error: ${error}`);
-            throw (error);
-        }
-    });
-}
-run();

lib/utils.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function extrasperse(elem, array) {
-    const init = [];
-    return array.reduce((r, a) => r.concat(elem, a), init);
-}
-exports.extrasperse = extrasperse;
-;

src/main.ts

@@ -1,68 +1,3 @@
-import * as core from '@actions/core';
+import { execFileSync } from 'child_process';
-import * as exec from '@actions/exec';
-import * as tc from '@actions/tool-cache';
-import {type} from 'os';
 
-async function nixConf() {
+execFileSync(`${__dirname}/install-nix.sh`, { stdio: 'inherit' });
-    // Workaround a segfault: https://github.com/NixOS/nix/issues/2733
-    await exec.exec("sudo", ["mkdir", "-p", "/etc/nix"]);
-    await exec.exec("sudo", ["sh", "-c", "echo http2 = false >> /etc/nix/nix.conf"]);
-
-    // Set jobs to number of cores
-    await exec.exec("sudo", ["sh", "-c", "echo max-jobs = auto >> /etc/nix/nix.conf"]);
-
-    // Allow binary caches for runner user
-    await exec.exec("sudo", ["sh", "-c", "echo trusted-users = root runner >> /etc/nix/nix.conf"]);
-}
-
-async function run() {
-  try {
-    const PATH = process.env.PATH;  
-    const INSTALL_PATH = '/opt/nix';
- 
-    await nixConf();
-
-    // Catalina workaround https://github.com/NixOS/nix/issues/2925
-    if (type() == "Darwin") {
-      await exec.exec("sudo", ["sh", "-c", `echo \"nix\t${INSTALL_PATH}\"  >> /etc/synthetic.conf`]);
-      await exec.exec("sudo", ["sh", "-c", `mkdir -m 0755 ${INSTALL_PATH} && chown runner ${INSTALL_PATH}`]);
-      await exec.exec("/System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util", ["-B"]);
-
-      // Needed for sudo to pass NIX_IGNORE_SYMLINK_STORE
-      await exec.exec("sudo", ["sh", "-c", "echo 'Defaults env_keep += NIX_IGNORE_SYMLINK_STORE'  >> /etc/sudoers"]);
-      core.exportVariable('NIX_IGNORE_SYMLINK_STORE', "1");
-      // Needed for nix-daemon installation
-      await exec.exec("sudo", ["launchctl", "setenv", "NIX_IGNORE_SYMLINK_STORE", "1"]);
-    }
-
-    // Needed due to multi-user being too defensive
-    core.exportVariable('ALLOW_PREEXISTING_INSTALLATION', "1"); 
-
-    // TODO: retry due to all the things that go wrong
-    const nixInstall = await tc.downloadTool('https://nixos.org/nix/install');
-    await exec.exec("sh", [nixInstall, "--daemon"]);
-
-    // write nix.conf again as installation overwrites it, reload the daemon to pick up changes
-    await nixConf();
-    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`)
-    if (type() == "Darwin") {
-      // macOS needs certificates hints
-      core.exportVariable('NIX_SSL_CERT_FILE', '/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt');
-
-      // TODO: nc doesn't work correctly on macOS :(
-      //await exec.exec("sh", ["-c", "while ! nc -zU /nix/var/nix/daemon-socket/socket; do sleep 0.5; done"]);
-      // macOS needs time to reload the daemon :(
-      await exec.exec("sleep", ["10"]);
-    }
-
-  } catch (error) {
-    core.setFailed(`Action failed with error: ${error}`);
-    throw(error);
-  } 
-}
-
-run();

yarn.lock

@@ -424,9 +424,9 @@ acorn-walk@^6.0.1:
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
 acorn@^5.5.3:
-  version "5.7.3"
+  version "5.7.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
 acorn@^6.0.1:
   version "6.3.0"