picnoir/nix-gh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix evaluation of binaryTarball.aarch64-linux

Browse source
This commit is contained in:
Eelco Dolstra 2018-02-20 12:33:32 +01:00
parent 056d28a601
commit cea4fb3a31
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
release.nix
View file

@ -1,5 +1,5 @@
{ nix ? builtins.fetchGit ./. { nix ? builtins.fetchGit ./.
, nixpkgs ? fetchTarball channel:nixos-17.09 , nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs.git; ref = "nix-2.0"; }
, officialRelease ? false , officialRelease ? false
, systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] , systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
}: }:
@ -127,7 +127,6 @@ let
binaryTarball = pkgs.lib.genAttrs systems (system: binaryTarball = pkgs.lib.genAttrs systems (system:
# FIXME: temporarily use a different branch for the Darwin build.
with import nixpkgs { inherit system; }; with import nixpkgs { inherit system; };
let let
@ -137,7 +136,7 @@ let
runCommand "nix-binary-tarball-${version}" runCommand "nix-binary-tarball-${version}"
{ exportReferencesGraph = [ "closure1" toplevel "closure2" cacert ]; { exportReferencesGraph = [ "closure1" toplevel "closure2" cacert ];
buildInputs = [ perl shellcheck ]; buildInputs = [ perl ] ++ lib.optional (system != "aarch64-linux") shellcheck;
meta.description = "Distribution-independent Nix bootstrap binaries for ${system}"; meta.description = "Distribution-independent Nix bootstrap binaries for ${system}";
} }
'' ''
@ -150,8 +149,10 @@ let
--subst-var-by nix ${toplevel} \ --subst-var-by nix ${toplevel} \
--subst-var-by cacert ${cacert} --subst-var-by cacert ${cacert}
shellcheck -e SC1090 $TMPDIR/install if type -p shellcheck; then
shellcheck -e SC1091,SC2002 $TMPDIR/install-darwin-multi-user shellcheck -e SC1090 $TMPDIR/install
shellcheck -e SC1091,SC2002 $TMPDIR/install-darwin-multi-user
fi
chmod +x $TMPDIR/install chmod +x $TMPDIR/install
chmod +x $TMPDIR/install-darwin-multi-user chmod +x $TMPDIR/install-darwin-multi-user