Skip to content

Commit 67ae71f

Browse files
committed
stop using pkgs.path
pkgs.path is an expensive copy operation that slow down evaluation by a lot.
1 parent 4030816 commit 67ae71f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
nixosTests = lib.optionalAttrs pkgs.stdenv.hostPlatform.isx86_64 (
6363
import ./tests {
6464
inherit pkgs;
65-
makeTest = import (pkgs.path + "/nixos/tests/make-test-python.nix");
66-
eval-config = import (pkgs.path + "/nixos/lib/eval-config.nix");
67-
qemu-common = import (pkgs.path + "/nixos/lib/qemu-common.nix");
65+
makeTest = import (nixpkgs + "/nixos/tests/make-test-python.nix");
66+
eval-config = import (nixpkgs + "/nixos/lib/eval-config.nix");
67+
qemu-common = import (nixpkgs + "/nixos/lib/qemu-common.nix");
6868
}
6969
);
7070

module.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
pkgs,
55
extendModules,
66
diskoLib,
7+
modulesPath,
78
...
89
}:
910
let
@@ -245,8 +246,9 @@ in
245246
_module.args.diskoLib = import ./lib {
246247
inherit lib;
247248
rootMountPoint = config.disko.rootMountPoint;
248-
makeTest = import (pkgs.path + "/nixos/tests/make-test-python.nix");
249-
eval-config = import (pkgs.path + "/nixos/lib/eval-config.nix");
249+
makeTest = import "${modulesPath}/../tests/make-test-python.nix";
250+
eval-config = import "${modulesPath}/../nixos/lib/eval-config.nix";
251+
qemu-common = import "${modulesPath}/../nixos/lib/qemu-common.nix";
250252
};
251253

252254
system.build =

0 commit comments

Comments
 (0)