nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-15 23:12:44 +01:00
Code Activity

release.nix: respect top-level nixpkgs input

Browse source
This commit is contained in:
Domen Kožar 2017-07-12 16:37:17 +02:00
parent 555f283064
commit af10cd93a5
No known key found for this signature in database
GPG key ID: C2FFBCAFD2C24246
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
release.nix
View file

@ -5,7 +5,7 @@
let let
pkgs = import <nixpkgs> {}; pkgs = import nixpkgs {};
systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
@ -14,7 +14,7 @@ let
tarball = pkgs.lib.genAttrs systems (system: tarball = pkgs.lib.genAttrs systems (system:
with import <nixpkgs> { inherit system; }; with import nixpkgs { inherit system; };
releaseTools.sourceTarball { releaseTools.sourceTarball {
name = "nix-tarball"; name = "nix-tarball";
@ -65,7 +65,7 @@ let
build = pkgs.lib.genAttrs systems (system: build = pkgs.lib.genAttrs systems (system:
with import <nixpkgs> { inherit system; }; with import nixpkgs { inherit system; };
with import ./release-common.nix { inherit pkgs; }; with import ./release-common.nix { inherit pkgs; };
@ -105,7 +105,7 @@ let
perlBindings = pkgs.lib.genAttrs systems (system: perlBindings = pkgs.lib.genAttrs systems (system:
let pkgs = import <nixpkgs> { inherit system; }; in with pkgs; let pkgs = import nixpkgs { inherit system; }; in with pkgs;
releaseTools.nixBuild { releaseTools.nixBuild {
name = "nix-perl"; name = "nix-perl";
@ -131,7 +131,7 @@ let
binaryTarball = pkgs.lib.genAttrs systems (system: binaryTarball = pkgs.lib.genAttrs systems (system:
# FIXME: temporarily use a different branch for the Darwin build. # FIXME: temporarily use a different branch for the Darwin build.
with import <nixpkgs> { inherit system; }; with import nixpkgs { inherit system; };
let let
toplevel = builtins.getAttr system jobs.build; toplevel = builtins.getAttr system jobs.build;
@ -166,7 +166,7 @@ let
coverage = coverage =
with import <nixpkgs> { system = "x86_64-linux"; }; with import nixpkgs { system = "x86_64-linux"; };
releaseTools.coverageAnalysis { releaseTools.coverageAnalysis {
name = "nix-build"; name = "nix-build";
@ -225,7 +225,7 @@ let
}); });
tests.binaryTarball = tests.binaryTarball =
with import <nixpkgs> { system = "x86_64-linux"; }; with import nixpkgs { system = "x86_64-linux"; };
vmTools.runInLinuxImage (runCommand "nix-binary-tarball-test" vmTools.runInLinuxImage (runCommand "nix-binary-tarball-test"
{ diskImage = vmTools.diskImages.ubuntu1204x86_64; { diskImage = vmTools.diskImages.ubuntu1204x86_64;
} }
@ -298,7 +298,7 @@ let
makeRPM = makeRPM =
system: diskImageFun: extraPackages: system: diskImageFun: extraPackages:
with import <nixpkgs> { inherit system; }; with import nixpkgs { inherit system; };
releaseTools.rpmBuild rec { releaseTools.rpmBuild rec {
name = "nix-rpm"; name = "nix-rpm";
@ -320,7 +320,7 @@ let
makeDeb = makeDeb =
system: diskImageFun: extraPackages: extraDebPackages: system: diskImageFun: extraPackages: extraDebPackages:
with import <nixpkgs> { inherit system; }; with import nixpkgs { inherit system; };
releaseTools.debBuild { releaseTools.debBuild {
name = "nix-deb"; name = "nix-deb";