diff options
author | Robert Hensing <robert@roberthensing.nl> | 2023-07-05 13:50:09 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2023-07-05 14:54:28 +0200 |
commit | 1c772cd857b40f86105c99297d7e41d823428c95 (patch) | |
tree | c98d6cb41809922b9b519d181e839a2794d222a2 /nixos/modules/services/misc/nix-daemon.nix | |
parent | d6a68f05428c3ed7d76565917e9baca68c610164 (diff) | |
download | nixpkgs-1c772cd857b40f86105c99297d7e41d823428c95.tar nixpkgs-1c772cd857b40f86105c99297d7e41d823428c95.tar.gz nixpkgs-1c772cd857b40f86105c99297d7e41d823428c95.tar.bz2 nixpkgs-1c772cd857b40f86105c99297d7e41d823428c95.tar.lz nixpkgs-1c772cd857b40f86105c99297d7e41d823428c95.tar.xz nixpkgs-1c772cd857b40f86105c99297d7e41d823428c95.tar.zst nixpkgs-1c772cd857b40f86105c99297d7e41d823428c95.zip |
nixos/config/flakes: Factor out
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
-rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4368cdd63eb..94798dfb539 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -159,67 +159,6 @@ in (e.g. `<nixpkgs>`). ''; }; - - registry = mkOption { - type = types.attrsOf (types.submodule ( - let - referenceAttrs = with types; attrsOf (oneOf [ - str - int - bool - path - package - ]); - in - { config, name, ... }: - { - options = { - from = mkOption { - type = referenceAttrs; - example = { type = "indirect"; id = "nixpkgs"; }; - description = lib.mdDoc "The flake reference to be rewritten."; - }; - to = mkOption { - type = referenceAttrs; - example = { type = "github"; owner = "my-org"; repo = "my-nixpkgs"; }; - description = lib.mdDoc "The flake reference {option}`from` is rewritten to."; - }; - flake = mkOption { - type = types.nullOr types.attrs; - default = null; - example = literalExpression "nixpkgs"; - description = lib.mdDoc '' - The flake input {option}`from` is rewritten to. - ''; - }; - exact = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether the {option}`from` reference needs to match exactly. If set, - a {option}`from` reference like `nixpkgs` does not - match with a reference like `nixpkgs/nixos-20.03`. - ''; - }; - }; - config = { - from = mkDefault { type = "indirect"; id = name; }; - to = mkIf (config.flake != null) (mkDefault ( - { - type = "path"; - path = config.flake.outPath; - } // filterAttrs - (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") - config.flake - )); - }; - } - )); - default = { }; - description = lib.mdDoc '' - A system-wide flake registry. - ''; - }; }; }; @@ -234,11 +173,6 @@ in ] ++ optional (config.programs.bash.enableCompletion) pkgs.nix-bash-completions; - environment.etc."nix/registry.json".text = builtins.toJSON { - version = 2; - flakes = mapAttrsToList (n: v: { inherit (v) from to exact; }) cfg.registry; - }; - systemd.packages = [ nixPackage ]; # Will only work once https://github.com/NixOS/nix/pull/6285 is merged |