From 34cb27edea913897b512d9fa3760613a11c60b2e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 12 Apr 2026 12:58:09 +0200 Subject: [PATCH 1/2] ocf-resource-agents: enable strictDeps We need a shell in buildInputs to allow the shebangs of many scripts to be patched. --- pkgs/by-name/oc/ocf-resource-agents/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/oc/ocf-resource-agents/package.nix b/pkgs/by-name/oc/ocf-resource-agents/package.nix index 9ff4ced6d42e..cd14babe8bf7 100644 --- a/pkgs/by-name/oc/ocf-resource-agents/package.nix +++ b/pkgs/by-name/oc/ocf-resource-agents/package.nix @@ -8,6 +8,7 @@ fetchFromGitHub, fetchpatch, autoreconfHook, + bashNonInteractive, pkg-config, python3, glib, @@ -47,13 +48,16 @@ let nativeBuildInputs = [ autoreconfHook pkg-config + python3 ]; buildInputs = [ + bashNonInteractive glib - python3 ]; + strictDeps = true; + env.NIX_CFLAGS_COMPILE = toString ( lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ # Needed with GCC 12 but breaks on darwin (with clang) or older gcc From 327fd39fabecd7a18140b644f6d78199045b0c18 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 12 Apr 2026 12:59:33 +0200 Subject: [PATCH 2/2] ocf-resource-agents: modernize --- pkgs/by-name/oc/ocf-resource-agents/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/oc/ocf-resource-agents/package.nix b/pkgs/by-name/oc/ocf-resource-agents/package.nix index cd14babe8bf7..0807b266aafb 100644 --- a/pkgs/by-name/oc/ocf-resource-agents/package.nix +++ b/pkgs/by-name/oc/ocf-resource-agents/package.nix @@ -24,15 +24,15 @@ let forOCF = true; }; - resource-agentsForOCF = stdenv.mkDerivation rec { + resource-agentsForOCF = stdenv.mkDerivation (finalAttrs: { pname = "resource-agents"; version = "4.10.0"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = "resource-agents"; - rev = "v${version}"; - sha256 = "0haryi3yrszdfpqnkfnppxj1yiy6ipah6m80snvayc7v0ss0wnir"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OVoOtAb7MK+21QBVA9WNxkcfZL/Xumnxde3r7Ef0WUE="; }; patches = [ @@ -75,7 +75,7 @@ let astro ]; }; - }; + }); in