fix #97 : install nix config correctly for single-user- mode

Merge pull request #108 from cachix/enable-experimental-features-by-default
enable flakes & nix-command features by default
2021-11-08 10:36:25 -06:00 · 2021-11-05 15:47:08 -06:00 · 2021-11-05 15:32:10 -06:00 · 2021-11-05 15:29:06 -06:00 · 2021-11-03 06:03:26 -06:00 · 2021-11-03 00:02:18 +00:00
4 changed files with 33 additions and 19 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -12,7 +12,7 @@ jobs:
        os: [ubuntu-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
    - run: yarn install --frozen-lockfile
    - run: yarn build
    - name: Install Nix
@ -31,7 +31,7 @@ jobs:
        os: [ubuntu-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
    - run: yarn install --frozen-lockfile
    - run: yarn build
    - name: Install Nix
@ -47,7 +47,7 @@ jobs:
        os: [ubuntu-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
    - run: yarn install --frozen-lockfile
    - run: yarn build
    - name: Install Nix
@ -65,7 +65,7 @@ jobs:
        os: [ubuntu-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
    - run: yarn install --frozen-lockfile
    - run: yarn build
    - name: Install Nix
@ -74,7 +74,6 @@ jobs:
        install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
        install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
        extra_nix_config: |
-          experimental-features = nix-command flakes
          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
    - run: nix flake show github:NixOS/nixpkgs

@ -84,7 +83,7 @@ jobs:
        os: [ubuntu-latest, macos-latest]
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.4.0
    - run: yarn install --frozen-lockfile
    - run: yarn build
    - name: Install Nix
@ -94,3 +93,19 @@ jobs:
        install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
        install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
    - run: nix-build test.nix
+
+  oldest-supported-installer:
+    strategy:
+        matrix:
+          os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2.3.5
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+    - name: Install Nix
+      uses: ./
+      with:
+        nix_path: nixpkgs=channel:nixos-21.05
+        install_url: https://releases.nixos.org/nix/nix-2.3.5/install
+    - run: nix-build test.nix
--- a/README.md
+++ b/README.md
@ -14,10 +14,11 @@ or [pin nixpkgs yourself](https://nix.dev/reference/pinning-nixpkgs.html)
 - Quick installation (~4s on Linux, ~20s on macOS)
 - Multi-User installation (with sandboxing enabled only on Linux)
 - [Self-hosted github runner](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners) support
- Allows specifying Nix installation URL via `install_url`
+- Allows specifying Nix installation URL via `install_url` (the oldest supported Nix version is 2.3.5)
 - Allows specifying extra Nix configration options via `extra_nix_config`
 - Allows specifying `$NIX_PATH` and channels via `nix_path`
 - Share `/nix/store` between builds using [cachix-action](https://github.com/cachix/cachix-action) for simple binary cache setup to speed up your builds and share binaries with your team
+- Enables `flakes` and `nix-command` experimental features by default (to disable, set ``experimental-features` via `extra_nix_config`) 

 ## Usage

@ -33,7 +34,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2.3.4
-    - uses: cachix/install-nix-action@v13
+    - uses: cachix/install-nix-action@v14.1
      with:
        nix_path: nixpkgs=channel:nixos-unstable
    - run: nix-build
@ -52,12 +53,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2.3.4
-    - uses: cachix/install-nix-action@v13
+    - uses: cachix/install-nix-action@v14.1
      with:
-        install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
+        install_url: https://nixos-nix-install-tests.cachix.org/serve/vij683ly7sl95nnhb67bdjjfabclr85m/install
        install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
        extra_nix_config: |
-          experimental-features = nix-command flakes
          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
    - run: nix build
    - run: nix flake check
--- a/lib/install-nix.sh
+++ b/lib/install-nix.sh
@ -18,6 +18,9 @@ add_config "trusted-users = root $USER"
 if [[ $INPUT_EXTRA_NIX_CONFIG != "" ]]; then
  add_config "$INPUT_EXTRA_NIX_CONFIG"
 fi
+if [[ ! $INPUT_EXTRA_NIX_CONFIG =~ "experimental-features" ]]; then  
+  add_config "experimental-features = nix-command flakes"
+fi

 # Nix installer flags
 installer_options=(
@ -35,8 +38,7 @@ if [[ $OSTYPE =~ darwin || -e /run/systemd/system ]]; then
 else
  # "fix" the following error when running nix*
  # error: the group 'nixbld' specified in 'build-users-group' does not exist
-  mkdir -m 0755 /etc/nix
-  echo "build-users-group =" > /etc/nix/nix.conf
+  add_config "build-users-group ="
 fi

 if [[ $INPUT_INSTALL_OPTIONS != "" ]]; then
@ -48,9 +50,6 @@ echo "installer options: ${installer_options[@]}"
 sh <(curl --retry 5 --retry-connrefused -L "${INPUT_INSTALL_URL:-https://nixos.org/nix/install}") "${installer_options[@]}"

 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 "NIX_SSL_CERT_FILE=$cert_file" >> "$GITHUB_ENV"
--- a/yarn.lock
+++ b/yarn.lock
@ -3307,9 +3307,9 @@ throat@^4.0.0:
  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=

 tmpl@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==

 to-fast-properties@^2.0.0:
  version "2.0.0"
Author	SHA1	Message	Date
Domen Kožar	c664ef3126	fix #97 : install nix config correctly for single-user- mode	2021-11-08 10:36:25 -06:00
Domen Kožar	74ef8ad2cf	Merge pull request #108 from cachix/enable-experimental-features-by-default enable flakes & nix-command features by default	2021-11-05 15:47:08 -06:00
Domen Kožar	53fb0300a7	enable flakes & nix-command features by default	2021-11-05 15:32:10 -06:00
Domen Kožar	e776d8288c	Merge pull request #107 from cachix/dependabot/github_actions/actions/checkout-2.4.0 chore(deps): bump actions/checkout from 2.3.5 to 2.4.0	2021-11-05 15:29:06 -06:00
Domen Kožar	98f3210e45	v14.1	2021-11-03 06:03:26 -06:00
dependabot[bot]	8026a8b63f	chore(deps): bump actions/checkout from 2.3.5 to 2.4.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2021-11-03 00:02:18 +00:00
Domen Kožar	825ca3e533	Merge pull request #101 from cachix/dependabot/github_actions/actions/checkout-2.3.5 chore(deps): bump actions/checkout from 2.3.4 to 2.3.5	2021-10-18 17:15:46 -05:00
dependabot[bot]	fe464fe88d	chore(deps): bump actions/checkout from 2.3.4 to 2.3.5 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.4...v2.3.5) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-10-18 00:04:56 +00:00
Domen Kožar	896dc80fef	fix #99 : specify oldest supported Nix version	2021-10-15 17:22:21 -05:00
Domen Kožar	3e0e991ad2	github actions disable Spotlight by default now https://github.com/actions/virtual-environments/pull/1683	2021-10-07 16:34:05 -05:00
Domen Kožar	d04e8d60ba	Merge pull request #95 from cachix/dependabot/npm_and_yarn/tmpl-1.0.5 Bump tmpl from 1.0.4 to 1.0.5	2021-09-24 18:45:24 +02:00
Domen Kožar	791347c66b	v14 and updated Nix to fix macOS 11	2021-09-24 15:48:55 +02:00
dependabot[bot]	3e073d0e89	Bump tmpl from 1.0.4 to 1.0.5 Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/daaku/nodejs-tmpl/releases) - [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5) --- updated-dependencies: - dependency-name: tmpl dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-21 13:34:04 +00:00