git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commit3182fbdeaae38dd20c1420a23a2c5f99566f280f authorEelco Dolstra <edolstra@gmail.com> dateWed 12 Feb 2020, 22:43 (7 years ago) parentaf7b000
1 file changed+7−7
nixos/release.nix+7−7
nixos/release.nix+7−7
@@ -20,7 +20,7 @@ let
2020 allTestsForSystem = system:
2121 import ./tests/all-tests.nix {
2222 inherit system;
23− pkgs = import nixpkgs { inherit system; };
23+ pkgs = import ./.. { inherit system; };
2424 callTest = t: {
2525 ${system} = hydraJob t.test;
2626 };
@@ -28,7 +28,7 @@ let
2828 allTests =
2929 foldAttrs recursiveUpdate {} (map allTestsForSystem supportedSystems);
3030
31− pkgs = import nixpkgs { system = "x86_64-linux"; };
31+ pkgs = import ./.. { system = "x86_64-linux"; };
3232
3333
3434 versionModule =
@@ -41,7 +41,7 @@ let
4141 makeIso =
4242 { module, type, system, ... }:
4343
44− with import nixpkgs { inherit system; };
44+ with import ./.. { inherit system; };
4545
4646 hydraJob ((import lib/eval-config.nix {
4747 inherit system;
@@ -54,7 +54,7 @@ let
5454 makeSdImage =
5555 { module, system, ... }:
5656
57− with import nixpkgs { inherit system; };
57+ with import ./.. { inherit system; };
5858
5959 hydraJob ((import lib/eval-config.nix {
6060 inherit system;
@@ -65,7 +65,7 @@ let
6565 makeSystemTarball =
6666 { module, maintainers ? ["viric"], system }:
6767
68− with import nixpkgs { inherit system; };
68+ with import ./.. { inherit system; };
6969
7070 let
7171
@@ -188,7 +188,7 @@ in rec {
188188 # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
189189 ova = forMatchingSystems [ "x86_64-linux" ] (system:
190190
191− with import nixpkgs { inherit system; };
191+ with import ./.. { inherit system; };
192192
193193 hydraJob ((import lib/eval-config.nix {
194194 inherit system;
@@ -204,7 +204,7 @@ in rec {
204204 # A disk image that can be imported to Amazon EC2 and registered as an AMI
205205 amazonImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system:
206206
207− with import nixpkgs { inherit system; };
207+ with import ./.. { inherit system; };
208208
209209 hydraJob ((import lib/eval-config.nix {
210210 inherit system;