From 291b62b396e9a66f8e0f7323a7a3146ba714b1d3 Mon Sep 17 00:00:00 2001 From: Marcin Owsiany Date: Thu, 26 Mar 2026 09:41:17 +0100 Subject: [PATCH] bump: `nix flake update` and go -> 1.26 --- README.md | 2 +- flake.lock | 152 +++++++++++++++++++---------------------------------- flake.nix | 4 +- 3 files changed, 56 insertions(+), 102 deletions(-) diff --git a/README.md b/README.md index 560d8b9..a70ba51 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Isolated and reproducible development environment for the Stackrox stack using N Compilers / runtimes: * `gcc` -* `golang 1.22.x` +* `golang 1.26.x` * `openjdk 11` * `python 3.11` diff --git a/flake.lock b/flake.lock index 4283006..806715b 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": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "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": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -55,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727266098, - "narHash": "sha256-AHTKbJ9ffR7Nx+XcR2XP0AYLI4OlUh2IGh4SAkdG5Ig=", + "lastModified": 1774273680, + "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f31540079322e6013930b5b2563fd10f96917f0", + "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", "type": "github" }, "original": { @@ -69,61 +34,45 @@ "type": "github" } }, - "nixpkgs-1_0": { - "locked": { - "lastModified": 1699291058, - "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", - "type": "github" - } - }, - "nixpkgs-1_6": { + "nixpkgs-23_05": { "locked": { - "lastModified": 1712757991, - "narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-23.05-small", "repo": "nixpkgs", - "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", "type": "github" } }, - "nixpkgs-1_9": { + "nixpkgs-24_05": { "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": 1774273680, + "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f31540079322e6013930b5b2563fd10f96917f0", + "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", "type": "github" }, "original": { @@ -135,35 +84,26 @@ }, "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": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "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": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { @@ -175,19 +115,17 @@ }, "nixpkgs-terraform": { "inputs": { - "config": "config", - "flake-parts": "flake-parts_2", - "nixpkgs-1_0": "nixpkgs-1_0", - "nixpkgs-1_6": "nixpkgs-1_6", - "nixpkgs-1_9": "nixpkgs-1_9", + "nixpkgs": "nixpkgs_2", + "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-24_05": "nixpkgs-24_05", "systems": "systems" }, "locked": { - "lastModified": 1727128911, - "narHash": "sha256-J/I0FSPrPA7aUkvCOZLUO7RZdfbSu1tBT7ZgJNcuU0k=", + "lastModified": 1772561659, + "narHash": "sha256-TtRBfOIDs1Gx1AlgV3lUZN3nzaWF1nUEFkHpnsdHttM=", "owner": "stackbuilders", "repo": "nixpkgs-terraform", - "rev": "827484cdffdbcc494190f67998aa2c228173bb8e", + "rev": "7d0b31b317c882328d65c82cd06a205d88ad9f6c", "type": "github" }, "original": { @@ -196,6 +134,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1763934636, + "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", diff --git a/flake.nix b/flake.nix index 6636a06..1f9fa3d 100644 --- a/flake.nix +++ b/flake.nix @@ -41,9 +41,9 @@ 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_26; stable = import inputs.nixpkgs-stable { inherit system; }; - terraform = inputs.nixpkgs-terraform.packages.${system}."1.5.7"; + terraform = inputs.nixpkgs-terraform.packages.${system}."terraform-1.5.7"; # Add Darwin packages here. darwin-pkgs =