public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/release.nix: Import './..' instead of nixpkgs 

'nixpkgs' is a result of a call to cleanSource, which is very
expensive and fails in --dry-run mode.
This commit is contained in:
Eelco Dolstra 2020-02-12 22:43:35 +01:00
parent af7b000928
commit 3182fbdeaa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/release.nix
View File

@ -20,7 +20,7 @@ let
allTestsForSystem = system: allTestsForSystem = system:
import ./tests/all-tests.nix { import ./tests/all-tests.nix {
inherit system; inherit system;
pkgs = import nixpkgs { inherit system; }; pkgs = import ./.. { inherit system; };
callTest = t: { callTest = t: {
${system} = hydraJob t.test; ${system} = hydraJob t.test;
}; };
@ -28,7 +28,7 @@ let
allTests = allTests =
foldAttrs recursiveUpdate {} (map allTestsForSystem supportedSystems); foldAttrs recursiveUpdate {} (map allTestsForSystem supportedSystems);
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import ./.. { system = "x86_64-linux"; };
versionModule = versionModule =
@ -41,7 +41,7 @@ let
makeIso = makeIso =
{ module, type, system, ... }: { module, type, system, ... }:
with import nixpkgs { inherit system; }; with import ./.. { inherit system; };
hydraJob ((import lib/eval-config.nix { hydraJob ((import lib/eval-config.nix {
inherit system; inherit system;
@ -54,7 +54,7 @@ let
makeSdImage = makeSdImage =
{ module, system, ... }: { module, system, ... }:
with import nixpkgs { inherit system; }; with import ./.. { inherit system; };
hydraJob ((import lib/eval-config.nix { hydraJob ((import lib/eval-config.nix {
inherit system; inherit system;
@ -65,7 +65,7 @@ let
makeSystemTarball = makeSystemTarball =
{ module, maintainers ? ["viric"], system }: { module, maintainers ? ["viric"], system }:
with import nixpkgs { inherit system; }; with import ./.. { inherit system; };
let let
@ -188,7 +188,7 @@ in rec {
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
ova = forMatchingSystems [ "x86_64-linux" ] (system: ova = forMatchingSystems [ "x86_64-linux" ] (system:
with import nixpkgs { inherit system; }; with import ./.. { inherit system; };
hydraJob ((import lib/eval-config.nix { hydraJob ((import lib/eval-config.nix {
inherit system; inherit system;
@ -204,7 +204,7 @@ in rec {
# A disk image that can be imported to Amazon EC2 and registered as an AMI # A disk image that can be imported to Amazon EC2 and registered as an AMI
amazonImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: amazonImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system:
with import nixpkgs { inherit system; }; with import ./.. { inherit system; };
hydraJob ((import lib/eval-config.nix { hydraJob ((import lib/eval-config.nix {
inherit system; inherit system;