about summary refs log tree commit diff
path: root/nixos/modules/services/misc/nix-daemon.nix
diff options
context:
space:
mode:
authorNaïm Favier <n@monade.li>2022-11-29 14:09:41 +0100
committerNaïm Favier <n@monade.li>2022-11-29 14:18:04 +0100
commitbcb5f0decca13c2bd666ee0a2b306b162117bd71 (patch)
treeeed4ac65c715e9eb084cb532a45d90c2bb031de7 /nixos/modules/services/misc/nix-daemon.nix
parent0d9eed3128a1d1e24ad28be9295b1397e21f2c48 (diff)
nixos/nix-daemon: allow registry paths to be... paths
Currently paths are handled by `types.package`, whose semantics are a
bit of a mess. In particular, it converts path values to derivations
using `toDerivation`, which will lead to problems when flake `outPath`s
become paths in https://github.com/NixOS/nix/pull/6530.

This change makes the "incompatible changes" section in the above PR
obsolete: `nix.registry.nixpkgs.flake = nixpkgs;` works as expected (the
flake is copied to the store).
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 26e7cbfca733f..8eb1ed53d0c7c 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -414,6 +414,7 @@ in
               str
               int
               bool
+              path
               package
             ]);
           in