Skip to content

Commit

Permalink
installer: allow nar-serve installations
Browse files Browse the repository at this point in the history
The goal is to allow the installation and testing of arbitrary Nix
versions. Extend the base installer to accept a `--nar-serve <url>` to
change where Nix is getting installed from.

Once this is merged it should allow to:
1. Pick an evaluation at https://hydra.nixos.org/jobset/nix/master that
   looks healthy
2. Select the installedScript build and find the store path.

Now equipped with all of this, use an instance of nar-serve to fetch the
install script and release tarballs:

    curl -sfL https://nar-serve.numtide.com/nix/store/rkv4yh7pym941bhj0849zqdkg2546bdv-installer-script/install \
      | sh --nar-serve https://nar-serve.numtide.com

Fixes NixOS#4047
  • Loading branch information
zimbatm committed Nov 17, 2020
1 parent ae31916 commit 9a8d6b5
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 9 deletions.
7 changes: 6 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,12 @@
substitute ${./scripts/install.in} $out/install \
${pkgs.lib.concatMapStrings
(system: "--replace '@binaryTarball_${system}@' $(nix --experimental-features nix-command hash-file --base16 --type sha256 ${self.hydraJobs.binaryTarball.${system}}/*.tar.xz) ")
(system:
'' \
--replace '@tarballHash_${system}@' $(nix --experimental-features nix-command hash-file --base16 --type sha256 ${self.hydraJobs.binaryTarball.${system}}/*.tar.xz) \
--replace '@tarballPath_${system}@' ${self.hydraJobs.binaryTarball.${system}}/*.tar.xz \
''
)
[ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
} \
--replace '@nixVersion@' ${version}
Expand Down
42 changes: 34 additions & 8 deletions scripts/install.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,44 @@ require_util() {
}

case "$(uname -s).$(uname -m)" in
Linux.x86_64) system=x86_64-linux; hash=@binaryTarball_x86_64-linux@;;
Linux.i?86) system=i686-linux; hash=@binaryTarball_i686-linux@;;
Linux.aarch64) system=aarch64-linux; hash=@binaryTarball_aarch64-linux@;;
Darwin.x86_64) system=x86_64-darwin; hash=@binaryTarball_x86_64-darwin@;;
# eventually maybe: system=arm64-darwin; hash=@binaryTarball_arm64-darwin@;;
Darwin.arm64) system=x86_64-darwin; hash=@binaryTarball_x86_64-darwin@;;
Linux.x86_64)
hash=@tarballHash_x86_64-linux@
store_path=@tarballPath_x86_64-linux@
system=x86_64-linux
;;
Linux.i?86)
hash=@tarballHash_i686-linux@
store_path=@tarballPath_i686-linux@
system=i686-linux
;;
Linux.aarch64)
hash=@tarballHash_aarch64-linux@
store_path=@tarballPath_aarch64-linux@
system=aarch64-linux
;;
Darwin.x86_64)
hash=@tarballHash_x86_64-darwin@
store_path=@tarballPath_x86_64-darwin@
system=x86_64-darwin
;;
Darwin.arm64)
# eventually maybe: system=arm64-darwin
system=x86_64-darwin
store_path=@tarballPath_x86_64-darwin@
hash=@binaryTarball_x86_64-darwin@
;;
*) oops "sorry, there is no binary distribution of Nix for your platform";;
esac

url="https://releases.nixos.org/nix/nix-@nixVersion@/nix-@nixVersion@-$system.tar.xz"
# Use this command-line option to fetch the tarballs using nar-serve.
if "${1:---nar-serve}"; then
url=${2}${store_path}
shift 2
else
url=https://releases.nixos.org/nix/nix-@nixVersion@/nix-@nixVersion@-$system.tar.xz
fi

tarball="$tmpDir/$(basename "$tmpDir/nix-@nixVersion@-$system.tar.xz")"
tarball=$tmpDir/nix-@nixVersion@-$system.tar.xz

require_util curl "download the binary tarball"
require_util tar "unpack the binary tarball"
Expand Down

0 comments on commit 9a8d6b5

Please sign in to comment.