From c2924f977e872c3e8e50b3271f3c024836976594 Mon Sep 17 00:00:00 2001 From: Techassi Date: Fri, 31 Oct 2025 13:49:31 +0100 Subject: [PATCH 1/2] fix(nix): Update default.nix field names Recent nix versions renamed two fields used in our default.nix file: - buildPlatform has been renamed/moved to stdenv.buildPlatform - hostPlatform has been renamed/moved to stdenv.hostPlatform This came up during the testing of https://github.com/stackabletech/operator-rs/pull/1116 in the secret-operator. --- template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/default.nix b/template/default.nix index 071adcb2..e467de8e 100644 --- a/template/default.nix +++ b/template/default.nix @@ -5,7 +5,7 @@ # on Darwin (macOS), but doesn't seem to actually be necessary beyond # production hardening. fakeroot = - if self.buildPlatform.isDarwin then + if self.stdenv.buildPlatform.isDarwin then self.writeScriptBin "fakeroot" ''exec "$@"'' else super.fakeroot; @@ -14,7 +14,7 @@ # (non-Nix build tools like Tilt, as well as the container composition scripts) , pkgsLocal ? import nixpkgs { inherit overlays; } # Default to building for the local CPU architecture -, targetArch ? pkgsLocal.hostPlatform.linuxArch +, targetArch ? pkgsLocal.stdenv.hostPlatform.linuxArch , targetSystem ? "${targetArch}-unknown-linux-gnu" , pkgsTarget ? import nixpkgs { inherit overlays; From f783d8504c867f462298a0abe6978ae57dc493ad Mon Sep 17 00:00:00 2001 From: Techassi Date: Fri, 31 Oct 2025 14:28:13 +0100 Subject: [PATCH 2/2] chore(nix): Update packages --- 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 1b5af204..f79c2cf0 100644 --- a/template/nix/sources.json +++ b/template/nix/sources.json @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", - "sha256": "1pxnwzrwcgasascapd6f0l8ricv6dgads3rgz2m45hyny80720cs", + "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "sha256": "0h3gvjbrlkvxhbxpy01n603ixv0pjy19n9kf73rdkchdvqcn70j2", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/9b008d60392981ad674e04016d25619281550a9d.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/a7fc11be66bdfb5cdde611ee5ce381c183da8386.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }