From 35e16bd907627b41b212e33a809aff85b81229bf Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 7 Feb 2024 10:31:59 +0000 Subject: [PATCH 1/2] ocf-resource-agents: fix `pos` attribute to define source location Without the change commands like $ nix edit -f. ocf-resource-agents do not point to a file. --- pkgs/os-specific/linux/ocf-resource-agents/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/os-specific/linux/ocf-resource-agents/default.nix index 11f094f72c9d..36a536cf2063 100644 --- a/pkgs/os-specific/linux/ocf-resource-agents/default.nix +++ b/pkgs/os-specific/linux/ocf-resource-agents/default.nix @@ -60,7 +60,12 @@ in # This combines together OCF definitions from other derivations. # https://github.com/ClusterLabs/resource-agents/blob/master/doc/dev-guides/ra-dev-guide.asc -runCommand "ocf-resource-agents" {} '' +runCommand "ocf-resource-agents" { + # Fix derivation location so things like + # $ nix edit -f. ocf-resource-agents + # just work. + pos = builtins.unsafeGetAttrPos "version" resource-agentsForOCF; +} '' mkdir -p $out/usr/lib/ocf ${lndir}/bin/lndir -silent "${resource-agentsForOCF}/lib/ocf/" $out/usr/lib/ocf ${lndir}/bin/lndir -silent "${drbdForOCF}/usr/lib/ocf/" $out/usr/lib/ocf From 4ebe4721a6220a6f6365787089e2149589b9de27 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 7 Feb 2024 16:33:14 +0000 Subject: [PATCH 2/2] ocf-resource-agents: expose it's inputs as attributes With individual attributes exposed it's easier to interrogate and upgrade constituents in `nixpkgs`. --- pkgs/os-specific/linux/ocf-resource-agents/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/os-specific/linux/ocf-resource-agents/default.nix index 36a536cf2063..e61e21514f22 100644 --- a/pkgs/os-specific/linux/ocf-resource-agents/default.nix +++ b/pkgs/os-specific/linux/ocf-resource-agents/default.nix @@ -65,6 +65,11 @@ runCommand "ocf-resource-agents" { # $ nix edit -f. ocf-resource-agents # just work. pos = builtins.unsafeGetAttrPos "version" resource-agentsForOCF; + + # Useful to build and undate inputs individually: + passthru.inputs = { + inherit resource-agentsForOCF drbdForOCF pacemakerForOCF; + }; } '' mkdir -p $out/usr/lib/ocf ${lndir}/bin/lndir -silent "${resource-agentsForOCF}/lib/ocf/" $out/usr/lib/ocf