From 66e2ed3fa5e3dd25e94434a023cd7993ea314b6d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 12 Apr 2026 21:50:58 +0200 Subject: [PATCH 1/3] drbd: enable strictDeps --- pkgs/os-specific/linux/drbd/utils.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/os-specific/linux/drbd/utils.nix index 7d16146e4244..e547c659afb8 100644 --- a/pkgs/os-specific/linux/drbd/utils.nix +++ b/pkgs/os-specific/linux/drbd/utils.nix @@ -42,14 +42,16 @@ stdenv.mkDerivation rec { keyutils udevCheckHook gettext + perl + perlPackages.Po4a ]; buildInputs = [ - perl - perlPackages.Po4a gettext ]; + strictDeps = true; + configureFlags = [ "--libdir=${placeholder "out"}/lib" "--sbindir=${placeholder "out"}/bin" From 4a94259658a18abc31f6e44db9f388fc1c9cc895 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 12 Apr 2026 21:52:03 +0200 Subject: [PATCH 2/3] drbd: use finalAttrs --- pkgs/os-specific/linux/drbd/utils.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/os-specific/linux/drbd/utils.nix index e547c659afb8..623ffe0fa5f8 100644 --- a/pkgs/os-specific/linux/drbd/utils.nix +++ b/pkgs/os-specific/linux/drbd/utils.nix @@ -25,12 +25,12 @@ ocf-resource-agents, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "drbd"; version = "9.33.0"; src = fetchurl { - url = "https://pkg.linbit.com/downloads/drbd/utils/${pname}-utils-${version}.tar.gz"; + url = "https://pkg.linbit.com/downloads/drbd/utils/drbd-utils-${finalAttrs.version}.tar.gz"; hash = "sha256-Ij/gfQtkbpkbM7qepBRo+aZvkDVi59p2bdD8a06jPbk="; }; @@ -133,4 +133,4 @@ stdenv.mkDerivation rec { mirroring the content of block devices (hard disks, partitions, logical volumes etc.) between hosts. ''; }; -} +}) From 33dad69b011831972719e1f18088efec40b1c78d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 12 Apr 2026 21:54:05 +0200 Subject: [PATCH 3/3] drbd: add versionCheckHook --- pkgs/os-specific/linux/drbd/utils.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/os-specific/linux/drbd/utils.nix index 623ffe0fa5f8..6f365c9e3a59 100644 --- a/pkgs/os-specific/linux/drbd/utils.nix +++ b/pkgs/os-specific/linux/drbd/utils.nix @@ -16,6 +16,7 @@ keyutils, udevCheckHook, gettext, + versionCheckHook, # drbd-utils are compiled twice, once with forOCF = true to extract # its OCF definitions for use in the ocf-resource-agents derivation, @@ -115,6 +116,9 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = [ "${placeholder "out"}/bin/drbdadm" ]; + versionCheckProgramArg = "--version"; passthru.tests.drbd = nixosTests.drbd;