From 05d45defcaa83d11ac740004901c6d087e3a5f88 Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Wed, 15 Oct 2025 18:55:16 +0200 Subject: [PATCH 1/2] Update to nixpkgs 25.05. Bump Golang to 1.24. Causes two build failures, which I were able to fix by: 1. Taking bats from stable. 2. Taking bitwarden-cli from pkgs. --- flake.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 64a8a03..9f0b85a 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-golang.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-terraform.url = "github:stackbuilders/nixpkgs-terraform"; flake-parts.url = "github:hercules-ci/flake-parts"; }; @@ -41,7 +41,7 @@ let # Pinned packages. custom = import ./pkgs { inherit pkgs; }; - golang = (import inputs.nixpkgs-golang { inherit system; }).go_1_22; + golang = (import inputs.nixpkgs-golang { inherit system; }).go_1_24; stable = import inputs.nixpkgs-stable { inherit system; }; terraform = inputs.nixpkgs-terraform.packages.${system}."1.5.7"; @@ -67,9 +67,10 @@ packages = { # stackrox/stackrox + inherit (stable) + bats; inherit (pkgs) - bats gettext# Needed for `envsubst` gradle jdk11 @@ -127,7 +128,7 @@ prometheus wget ; - inherit (stable) bitwarden-cli; + inherit (pkgs) bitwarden-cli; go = golang; helm = pkgs.kubernetes-helm; jsonnet = pkgs.go-jsonnet; From 23c9e7ad739b30e80f37de1891d60e019e4175bd Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Wed, 15 Oct 2025 18:58:25 +0200 Subject: [PATCH 2/2] Update flake.lock --- flake.lock | 146 ++++++++++++++++++----------------------------------- 1 file changed, 50 insertions(+), 96 deletions(-) diff --git a/flake.lock b/flake.lock index 4283006..67df2b4 100644 --- a/flake.lock +++ b/flake.lock @@ -1,50 +1,15 @@ { "nodes": { - "config": { - "locked": { - "dir": "templates/config", - "lastModified": 1719931926, - "narHash": "sha256-B8j9lHX0LqWlZkm8JxZRN6919RQjJEu/1J1SR8pU/ww=", - "owner": "stackbuilders", - "repo": "nixpkgs-terraform", - "rev": "034287ee462c87dadc14a94d4b53a48ed66c7b3d", - "type": "github" - }, - "original": { - "dir": "templates/config", - "owner": "stackbuilders", - "repo": "nixpkgs-terraform", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -55,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727266098, - "narHash": "sha256-AHTKbJ9ffR7Nx+XcR2XP0AYLI4OlUh2IGh4SAkdG5Ig=", + "lastModified": 1760504863, + "narHash": "sha256-h13YFQMi91nXkkRoJMIfezorz5SbD6849jw5L0fjK4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f31540079322e6013930b5b2563fd10f96917f0", + "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", "type": "github" }, "original": { @@ -71,59 +36,43 @@ }, "nixpkgs-1_0": { "locked": { - "lastModified": 1699291058, - "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-23.05-small", "repo": "nixpkgs", - "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", "type": "github" } }, "nixpkgs-1_6": { "locked": { - "lastModified": 1712757991, - "narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", - "type": "github" - } - }, - "nixpkgs-1_9": { - "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "lastModified": 1735651292, + "narHash": "sha256-YLbzcBtYo1/FEzFsB3AnM16qFc6fWPMIoOuSoDwvg9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "rev": "0da3c44a9460a26d2025ec3ed2ec60a895eb1114", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-24.05-small", "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", "type": "github" } }, "nixpkgs-golang": { "locked": { - "lastModified": 1727266098, - "narHash": "sha256-AHTKbJ9ffR7Nx+XcR2XP0AYLI4OlUh2IGh4SAkdG5Ig=", + "lastModified": 1760504863, + "narHash": "sha256-h13YFQMi91nXkkRoJMIfezorz5SbD6849jw5L0fjK4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f31540079322e6013930b5b2563fd10f96917f0", + "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", "type": "github" }, "original": { @@ -135,59 +84,48 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - } - }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1760423683, + "narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-terraform": { "inputs": { - "config": "config", - "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", "nixpkgs-1_0": "nixpkgs-1_0", "nixpkgs-1_6": "nixpkgs-1_6", - "nixpkgs-1_9": "nixpkgs-1_9", "systems": "systems" }, "locked": { - "lastModified": 1727128911, - "narHash": "sha256-J/I0FSPrPA7aUkvCOZLUO7RZdfbSu1tBT7ZgJNcuU0k=", + "lastModified": 1759625489, + "narHash": "sha256-boC2swm7FEnfeupmCEtwQivzzMO3K2ZbMv/skrM20T0=", "owner": "stackbuilders", "repo": "nixpkgs-terraform", - "rev": "827484cdffdbcc494190f67998aa2c228173bb8e", + "rev": "b35e3dfe82bb8a80d414f20b44345b1158a167aa", "type": "github" }, "original": { @@ -196,6 +134,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1756381814, + "narHash": "sha256-tzo7YvAsGlzo4WiIHT0ooR59VHu+aKRQdHk7sIyoia4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "aca2499b79170038df0dbaec8bf2f689b506ad32", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts",