From bb9653657e59fb664d3f6f0807f8227f353843c7 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:43:15 +0200 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9b5ac7ad45298d58640540d0323ca217f32a6762' (2025-05-17) → 'github:nixos/nixpkgs/78add7b7abb61689e34fc23070a8f55e1d26185b' (2025-05-28) • Added input 'nixpkgs-25-05': 'github:nixos/nixpkgs/a59eb7800787c926045d51b70982ae285faa2346' (2025-05-31) --- flake.lock | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 57a29de..c3f607b 100644 --- a/flake.lock +++ b/flake.lock @@ -64,13 +64,29 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-25-05": { "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1748421225, + "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", "type": "github" }, "original": { @@ -85,6 +101,7 @@ "authorizedKeysRepo": "authorizedKeysRepo", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_2", + "nixpkgs-25-05": "nixpkgs-25-05", "sops-nix": "sops-nix" } }, From 8440b4e1ea3b8a1f6b2292e74c410ca1c5411bba Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:45:08 +0200 Subject: [PATCH 2/2] woodpecker nixos25.05 --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index a95ee8e..728fb5e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,8 @@ # https://github.com/NixOS/nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-25-05.url = "github:nixos/nixpkgs/nixos-25.05"; + # Add nixos-generators as an input. # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake nixos-generators = { @@ -27,7 +29,7 @@ }; }; - outputs = { self, nixpkgs, nixos-generators, sops-nix, authorizedKeysRepo, ... }: + outputs = { self, nixpkgs, nixpkgs-25-05, nixos-generators, sops-nix, authorizedKeysRepo, ... }: let specialArgs = { inherit authorizedKeysRepo; @@ -160,7 +162,7 @@ ]; }; - woodpecker = nixpkgs.lib.nixosSystem { + woodpecker = nixpkgs-25-05.lib.nixosSystem { inherit system specialArgs; modules = [ self.nixosModules.common