From 4251583d6a5954de644bd5097bb52d7790a831aa Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 6 Jun 2025 02:11:51 +0200 Subject: [PATCH] bolle 2505 --- flake.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index eda4dac..bf7d750 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,8 @@ inputs = { # https://github.com/nixos/nixpkgs nixpkgs-test.url = "github:NixOS/nixpkgs/refs/pull/379645/merge"; # for testing - nixpkgs-edge.url = "https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz"; + nixpkgs-edge.url = "https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz"; # len("edge") == 4 + nixpkgs-2505.url = "https://nixos.org/channels/nixos-25.05/nixexprs.tar.xz"; nixpkgs-2411.url = "https://nixos.org/channels/nixos-24.11/nixexprs.tar.xz"; nixpkgs-2405.url = "https://nixos.org/channels/nixos-24.05/nixexprs.tar.xz"; # for old docs nixpkgs-2311.url = "https://nixos.org/channels/nixos-23.11/nixexprs.tar.xz"; # for old docs @@ -24,6 +25,8 @@ # https://github.com/nix-community/home-manager home-manager-edge.url = "github:nix-community/home-manager/master"; home-manager-edge.inputs.nixpkgs.follows = "nixpkgs-edge"; + home-manager-2505.url = "github:nix-community/home-manager/release-25.05"; + home-manager-2505.inputs.nixpkgs.follows = "nixpkgs-2405"; home-manager-2411.url = "github:nix-community/home-manager/release-24.11"; home-manager-2411.inputs.nixpkgs.follows = "nixpkgs-2405"; home-manager-2405.url = "github:nix-community/home-manager/release-24.05"; @@ -67,6 +70,8 @@ # https://github.com/Mic92/sops-nix sops-nix-edge.url = "github:Mic92/sops-nix"; sops-nix-edge.inputs.nixpkgs.follows = "nixpkgs-edge"; + sops-nix-2505.url = "github:Mic92/sops-nix"; + sops-nix-2505.inputs.nixpkgs.follows = "nixpkgs-2505"; sops-nix-2411.url = "github:Mic92/sops-nix"; sops-nix-2411.inputs.nixpkgs.follows = "nixpkgs-2411"; sops-nix-2405.url = "github:Mic92/sops-nix"; @@ -128,9 +133,15 @@ home-manager = inputs'.home-manager-edge; sops-nix = inputs'.sops-nix-edge; }; + inputs-2505 = inputs' // { + nixpkgs = inputs'.nixpkgs-2505; + unstable = inputs'.nixpkgs-edge; + home-manager = inputs'.home-manager-2505; + sops-nix = inputs'.sops-nix-2505; + }; inputs-2411 = inputs' // { nixpkgs = inputs'.nixpkgs-2411; - unstable = inputs'.nixpkgs-edge; + unstable = inputs'.nixpkgs-2505; home-manager = inputs'.home-manager-2411; sops-nix = inputs'.sops-nix-2411; }; @@ -160,7 +171,8 @@ inputs-2003 = inputs-2305 // { nixpkgs = inputs'.nixpkgs-2003; }; inputs-1909 = inputs-2305 // { nixpkgs = inputs'.nixpkgs-1909; }; inputs-test = inputs-edge // { nixpkgs = inputs'.nixpkgs-test; unstable = inputs'.nixpkgs-test; }; - inputs-241T = inputs-2411 // { unstable = inputs'.nixpkgs-test; }; + inputs-250T = inputs-2505 // { unstable = inputs'.nixpkgs-test; }; + inputs-241T = inputs-2411 // { unstable = inputs'.nixpkgs-test; }; # TODO: remove forSystems = systems: f: inputs-edge.nixpkgs.lib.genAttrs systems (system: f rec { inherit system; @@ -267,7 +279,7 @@ nord = mk "pbsds.net" "x86_64-linux" inputs-2411 "24.11" [ au ts1 intel-novga hw.common-gpu-intel-sandy-bridge rocm hidpi ]; sopp = mk "pbsds.net" "x86_64-linux" inputs-edge "24.11" [ au ts1 nixld intel cuda p1005 ]; bjarte = mk "pbsds.net" "x86_64-linux" inputs-edge "24.11" [ ts1 nixld intel hw.lenovo-thinkpad-x1-7th-gen ]; - bolle = mk "pbsds.net" "x86_64-linux" inputs-2411 "24.11" [ au ts2 intel ]; + bolle = mk "pbsds.net" "x86_64-linux" inputs-2505 "24.11" [ au ts2 intel ]; eple = mk "pbsds.net" "x86_64-linux" inputs-2411 "24.11" [ au ts1 tse dns64 intel rocm ]; garp = mk "pbsds.net" "x86_64-linux" inputs-edge "24.11" [ au ts2 intel-novga cuda ]; hasselknippe= mk "pbsds.net" "aarch64-linux" inputs-2405 "24.05" [ ts1 hw.pine64-pinebook-pro ];