From 897f516feca20d3f5669b97f88ff653bd1dc6e55 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 4 Nov 2026 21:19:21 +0100 Subject: inputs.nix: Add depuplication rules for nearly all possible ways to fetch nixpkgs --- inputs.nix | 150 ++++++++++++++++++++++++++++--------------------------------- 1 file changed, 69 insertions(+), 81 deletions(-) diff --git a/inputs.nix b/inputs.nix index 132e4df2..f19865c6 100644 --- a/inputs.nix +++ b/inputs.nix @@ -3,6 +3,25 @@ let lanzabooteVersion = "v1.2.0"; + nixpkgs_override = from_version: to_version: [ + { + when = w_nixpkgs "nixos-${from_version}"; + set = w_tarball to_version; + } + { + when = w_nixpkgs "nixos-${from_version}-small"; + set = w_tarball to_version; + } + { + when = w_nixpkgs "nixpkgs-${from_version}"; + set = w_tarball to_version; + } + { + when = w_nixpkgs "nixpkgs-${from_version}-small"; + set = w_tarball to_version; + } + ]; + w_nixpkgs = ref: { type = "github"; owner = "nixos"; @@ -21,92 +40,61 @@ let nixos_stable = "https://channels.nixos.org/nixos-${nixosVersion}-small/nixexprs.tar.zst"; nixos_unstable = "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.zst"; in { - _unflake.dedupRules = [ - { - when = w_nixpkgs "nixos-unstable"; - set = w_tarball nixos_unstable; - } - { - when = w_nixpkgs "nixpkgs-unstable"; - set = w_tarball nixos_unstable; - } - { - when = w_nixpkgs "nixos-unstable-small"; - set = w_tarball nixos_unstable; - } - { - when = w_nixpkgs "nixos-25.05"; - set = w_tarball nixos_stable; - } - { - when = w_nixpkgs "nixos-25.05-small"; - set = w_tarball nixos_stable; - } - { - when = w_nixpkgs "nixos-25.11"; - set = w_tarball nixos_stable; - } - { - when = w_nixpkgs "nixos-25.11-small"; - set = w_tarball nixos_stable; - } - { - when = w_nixpkgs "nixos-26.05"; - set = w_tarball nixos_stable; - } - { - when = w_nixpkgs "nixos-26.05-small"; - set = w_tarball nixos_stable; - } - { - when = {url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst";}; - set = w_tarball nixos_unstable; - } + _unflake.dedupRules = + (nixpkgs_override "25.05" nixos_stable) + ++ (nixpkgs_override "25.11" nixos_stable) + ++ (nixpkgs_override "26.05" nixos_stable) + ++ (nixpkgs_override "unstable" nixos_unstable) + ++ [ + { + when = {url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst";}; + set = w_tarball nixos_unstable; + } - # { - # when = {url = "https://git.foss-syndicate.org/vhack.eu/nix-library";}; - # set = {url = "file:///home/nixos/s/nix-library";}; - # } + # { + # when = {url = "https://git.foss-syndicate.org/vhack.eu/nix-library";}; + # set = {url = "file:///home/nixos/s/nix-library";}; + # } - { - when = w_github "nix-community" "home-manager"; - set = {ref = "master";}; - } + { + when = w_github "nix-community" "home-manager"; + set = {ref = "master";}; + } - { - when = w_github "edolstra" "flake-compat"; - set = { - type = "git"; - url = "https://git.lix.systems/lix-project/flake-compat"; - ref = "main"; - }; - } - { - when = w_github "nixos" "flake-compat"; - set = { - type = "git"; - url = "https://git.lix.systems/lix-project/flake-compat"; - ref = "main"; - }; - } + { + when = w_github "edolstra" "flake-compat"; + set = { + type = "git"; + url = "https://git.lix.systems/lix-project/flake-compat"; + ref = "main"; + }; + } + { + when = w_github "nixos" "flake-compat"; + set = { + type = "git"; + url = "https://git.lix.systems/lix-project/flake-compat"; + ref = "main"; + }; + } - { - when = w_github "nix-systems" "default"; - set = {ref = "main";}; - } - { - when = w_github "nix-systems" "x86_64-linux"; - set = { - repo = "default"; - ref = "main"; - }; - } + { + when = w_github "nix-systems" "default"; + set = {ref = "main";}; + } + { + when = w_github "nix-systems" "x86_64-linux"; + set = { + repo = "default"; + ref = "main"; + }; + } - { - when = w_github "numtide" "treefmt-nix"; - set = {ref = "main";}; - } - ]; + { + when = w_github "numtide" "treefmt-nix"; + set = {ref = "main";}; + } + ]; # Actual inputs agenix.url = "github:ryantm/agenix/main"; -- cgit v1.3.1