From f2f2d3010a5e2dcb13321344ec604f9bc3d88d2d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 22 Dec 2021 03:46:50 +0100
Subject: gnu: ndctl: Update to 72.

* gnu/packages/disk.scm (ndctl): Update to 72.
[arguments]: Add a new 'fix-include phase.
Don't explicitly return #t from phases.
[inputs]: Add iniparser.
---
 gnu/packages/disk.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 3ab65e60d4..2d7c6797a1 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -811,7 +811,7 @@ (define-public volume-key
 (define-public ndctl
   (package
     (name "ndctl")
-    (version "71.1")
+    (version "72")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -820,7 +820,7 @@ (define-public ndctl
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1vi61bm9wyawklswh9mj9zdp28ar7r97qckwnhgiyila73fb3jx2"))))
+                "1m9kmzqqy395p2zmcaspw2q5ailagi1xy47hkvjp3lfp48zcrpbi"))))
     (build-system gnu-build-system)
     (native-inputs
      (list asciidoc
@@ -835,7 +835,11 @@ (define-public ndctl
            ;; Required for offline docbook generation.
            which))
     (inputs
-     (list eudev json-c keyutils kmod
+     (list eudev
+           iniparser
+           json-c
+           keyutils
+           kmod
            `(,util-linux "lib")))
     (arguments
      `(#:configure-flags
@@ -843,13 +847,16 @@ (define-public ndctl
              "--without-systemd")
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-include
+           (lambda _
+             (substitute* "util/parse-configs.c"
+               (("iniparser/") ""))))
          (add-after 'unpack 'patch-FHS-file-names
            (lambda _
              (substitute* "git-version-gen"
                (("/bin/sh") (which "sh")))
              (substitute* "git-version"
-               (("/bin/bash") (which "bash")))
-             #t)))
+               (("/bin/bash") (which "bash"))))))
        #:make-flags
        (let ((out (assoc-ref %outputs "out")))
          (list (string-append "BASH_COMPLETION_DIR=" out
-- 
cgit v1.2.3