libndctl: 61.2 -> 63

This also adds me as the maintainer (as it lacked one previously),
and simplifies the expression quite a bit.

Signed-off-by: Austin Seipp <aseipp@pobox.com>

1 files changed, 28 insertions, 31 deletions

diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index b53920f60b8b..0a36b9bb2ddb 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -1,52 +1,49 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux
+{ stdenv, fetchFromGitHub, autoreconfHook
+, asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
+, json_c, kmod, which, file, utillinux, systemd
 }:
 
-let
-  version = "61.2";
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "libndctl-${version}";
+  version = "63";
 
   src = fetchFromGitHub {
-    owner = "pmem";
-    repo = "ndctl";
-    rev = "v${version}";
-    sha256 = "0vid78jzhmzh505bpwn8mvlamfhcvl6rlfjc29y4yn7zslpydxl7";
+    owner  = "pmem";
+    repo   = "ndctl";
+    rev    = "v${version}";
+    sha256 = "060nsza8xic769bxj3pvl70a9885bwrc0myw16l095i3z6w7yzwq";
   };
 
-  outputs = [ "out" "man" "dev" ];
+  outputs = [ "out" "lib" "man" "dev" ];
 
-  nativeBuildInputs = [
-    autoreconfHook asciidoc pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt
-  ];
+  nativeBuildInputs =
+    [ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+    ];
 
-  buildInputs = [
-    json_c kmod systemd utillinux
-  ];
+  buildInputs =
+    [ json_c kmod utillinux systemd
+    ];
 
-  patches = [
-    (fetchpatch {
-      name = "add-missing-include-for-ssize_t.patch";
-      url = "https://github.com/pmem/ndctl/commit/8f1798d14dda367c659b87362edb312739830ddf.patch";
-      sha256 = "1jr5kh087938msl22hgjngbf025n9iplz0czmybfp7lavl73m0pm";
-    })
-  ];
+  configureFlags =
+    [ "--without-bash"
+      "--without-systemd"
+    ];
 
-  postPatch = ''
+  patchPhase = ''
     patchShebangs test
-  '';
-
-  preAutoreconf = ''
     substituteInPlace configure.ac --replace "which" "${which}/bin/which"
+
     substituteInPlace git-version --replace /bin/bash ${stdenv.shell}
     substituteInPlace git-version-gen --replace /bin/sh ${stdenv.shell}
+
     echo "m4_define([GIT_VERSION], [${version}])" > version.m4;
   '';
 
   meta = with stdenv.lib; {
-    description = "Utility library for managing the libnvdimm (non-volatile memory device) sub-system in the Linux kernel";
-    homepage = https://github.com/pmem/ndctl;
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [];
-    platforms = platforms.linux;
+    description = "Tools for managing the Linux Non-Volatile Memory Device sub-system";
+    homepage    = https://github.com/pmem/ndctl;
+    license     = licenses.lgpl21;
+    maintainers = with maintainers; [ thoughtpolice ];
+    platforms   = platforms.linux;
   };
 }