From 50e9abd4d5edb178ad89cac1936a488a8301d16e Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 20 May 2026 18:20:17 +0700 Subject: [PATCH 1/2] fwts: link against zlib (cherry picked from commit e78b4e7f91aef76f92f9d431a1af770523983e3f) --- pkgs/os-specific/linux/fwts/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 13560cd6a965..413833c51755 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -14,6 +14,7 @@ dmidecode, acpica-tools, libbsd, + zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { dmidecode acpica-tools libbsd + zlib ]; postPatch = '' @@ -55,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/lib/src/fwts_devicetree.c \ src/devicetree/dt_base/dt_base.c \ --replace-fail "dtc -I" "${dtc}/bin/dtc -I" + + # libfwts uses gzopen/gzclose/gzgets but does not link zlib. + substituteInPlace src/lib/src/Makefile.am \ + --replace-fail "-lm -lpthread -lbsd" "-lm -lpthread -lbsd -lz" ''; enableParallelBuilding = true; From 11169ea95f6f0389fe8b33e71572708d10164950 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 May 2026 19:00:50 +0000 Subject: [PATCH 2/2] fluxcd-operator-mcp: 0.48.0 -> 0.50.0 (cherry picked from commit eadab7eb4ed8aeb24e59bf12e2bc07d32a68ee80) --- pkgs/by-name/fl/fluxcd-operator-mcp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix index a1634e6ec18e..2cfcd09beb1d 100644 --- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator-mcp"; - version = "0.48.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "fluxcd-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ggx38aF9o7dMFcQxYbx5hSXCE2oRRTgvUvXCAJJN6V8="; + hash = "sha256-4FIsad3/57KtyTVQE0T4jhQGEvuEw9/ZFWsriLyc6Ok="; }; - vendorHash = "sha256-xG4mJQfww/pMIg9zK2XpDw7XGCLHvJPXLvBspdSRAcg="; + vendorHash = "sha256-DxXTepwTjgc+Xy3MAIFcYZ/XZZ3zGgyStmXN2/BqM74="; ldflags = [ "-s"