From d34f68b7ce2f6bfa6215cf3000d76d74f4ec2484 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 9 Apr 2025 07:06:25 +0200 Subject: [PATCH 1/4] chore(template): Update nixpkgs --- template/nix/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/nix/sources.json b/template/nix/sources.json index 9a26de8f..a8107827 100644 --- a/template/nix/sources.json +++ b/template/nix/sources.json @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa6ae0afa6adeb5c202a168e51eda1d3da571117", - "sha256": "1kbg6limdl7f21vr36g7qlrimm8lxr97b6kvxkz91yfdffn942p9", + "rev": "b0b4b5f8f621bfe213b8b21694bab52ecfcbf30b", + "sha256": "1y8kwbb5b0r1m88nk871ai56qi2drygvibjgc2swp48jfyp5ya99", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/aa6ae0afa6adeb5c202a168e51eda1d3da571117.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/b0b4b5f8f621bfe213b8b21694bab52ecfcbf30b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } From 7c7f1137e2fff1ec425477330065baf145fefe39 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 9 Apr 2025 07:07:32 +0200 Subject: [PATCH 2/4] chore(template): Update crate2nix --- template/nix/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/nix/sources.json b/template/nix/sources.json index a8107827..f09f8ae8 100644 --- a/template/nix/sources.json +++ b/template/nix/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "kolloch", "repo": "crate2nix", - "rev": "236f6addfd452a48be805819e3216af79e988fd5", - "sha256": "1cnq84c1bhhbn3blm31scrqsxw2bl1w67v6gpav01m0s2509klf5", + "rev": "be31feae9a82c225c0fd1bdf978565dc452a483a", + "sha256": "14d0ymlrwk7dynv35qcw4xn0dylfpwjmf6f8znflbk2l6fk23l12", "type": "tarball", - "url": "https://github.com/kolloch/crate2nix/archive/236f6addfd452a48be805819e3216af79e988fd5.tar.gz", + "url": "https://github.com/kolloch/crate2nix/archive/be31feae9a82c225c0fd1bdf978565dc452a483a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { From a34da190df583f026bd32184b49f85c0849ee61b Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 9 Apr 2025 08:27:25 +0200 Subject: [PATCH 3/4] chore(template): Update beku.py --- template/nix/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/nix/sources.json b/template/nix/sources.json index f09f8ae8..78d7121b 100644 --- a/template/nix/sources.json +++ b/template/nix/sources.json @@ -1,14 +1,14 @@ { "beku.py": { - "branch": "main", + "branch": "0.0.10", "description": "Test suite expander for Stackable Kuttl tests.", "homepage": null, "owner": "stackabletech", "repo": "beku.py", - "rev": "1ebc9e7b70fb8ee11dfb569ae45b3bcd63666d0e", - "sha256": "1zg24h5wdis7cysa08r8vvbw2rpyx6fgv148i1lg54dwd3sa0h0d", + "rev": "fc75202a38529a4ac6776dd8a5dfee278d927f58", + "sha256": "152yary0p11h87yabv74jnwkghsal7lx16az0qlzrzdrs6n5v8id", "type": "tarball", - "url": "https://github.com/stackabletech/beku.py/archive/1ebc9e7b70fb8ee11dfb569ae45b3bcd63666d0e.tar.gz", + "url": "https://github.com/stackabletech/beku.py/archive/fc75202a38529a4ac6776dd8a5dfee278d927f58.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "crate2nix": { From 68d09f8681109c6941a700052a77b9adf81b4195 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 9 Apr 2025 08:56:51 +0200 Subject: [PATCH 4/4] docs(template): Add nix dependency upgrade docs --- template/nix/README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 template/nix/README.md diff --git a/template/nix/README.md b/template/nix/README.md new file mode 100644 index 00000000..d3245031 --- /dev/null +++ b/template/nix/README.md @@ -0,0 +1,27 @@ + + +# Updating nix dependencies + +## Run the following for an operator + +> [!NOTE] +> We track the `master` branch of crate2nix as that is relatively up to date, but the releases are infrequent. + +```shell +niv update crate2nix +niv update nixpkgs +niv update beky.py -b X.Y.Z # Using the release tag +``` + +### Test + +- Run make `regenerate-nix` to ensure crate2nix works +- Run a smoke test to ensure beku.py works. +- Run `make run-dev` to ensure nixpkgs are fine. + +## Update operator-templating + +Do the same as above, but from `template/`