nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 08:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-26.05 into staging-next-26.05

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-05-26 01:32:47 +00:00
committed by GitHub
parent e17f94aba2 07be792e52
commit 7b59fc2eba
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
View File

@@ -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"

6
pkgs/os-specific/linux/fwts/default.nix
View File

@@ -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;