debian_devscripts: 2.15.4 -> 2.15.8

Also:
- add some previously missing dependencies and patch /usr paths
- fix fetching of https:// URIs with perlPackages.LWPProtocolHttps
- remove the bash completion work-around (no longer needed)
- add newly required make flags
- change licence from string to attribute (still unspecified)

CC maintainer @raskin.

1 files changed, 35 insertions, 14 deletions

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index f8925d26bea..b6158ab6445 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -1,30 +1,50 @@
 {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile
 , FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper
-, perlPackages
+, perlPackages, curl, gnupg, diffutils
+, sendmailPath ? "/var/setuid-wrappers/sendmail"
 }:
+
 stdenv.mkDerivation rec {
-  version = "2.15.4";
+  version = "2.15.8";
   name = "debian-devscripts-${version}";
+
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72";
+    sha256 = "1zw7phaigncblxb3jp4m8pk165hylk1f088k51nhj9d7z5iz6bbx";
   };
+
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 
     FileDesktopEntry libxslt python3 setuptools makeWrapper
-    perlPackages.ParseDebControl ];
+    perlPackages.ParseDebControl perlPackages.LWPProtocolHttps
+    curl gnupg diffutils ];
+
   preConfigure = ''
     export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";
-    sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
-    sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile
     tgtpy="$out/lib/${python3.libPrefix}/site-packages"
     mkdir -p "$tgtpy"
     export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
-    sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile*
-    sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
-
-    # Completion currently spams every shell startup with an error. Disable for now:
-    sed "/\/bash_completion\.d/d" -i scripts/Makefile
+    find po4a scripts -type f -exec sed -r \
+      -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \
+      -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \
+      -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \
+      -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \
+      -e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \
+      -i {} +
+    sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
+    sed -r \
+      -e "s@/usr( |$|/)@$out\\1@g" \
+      -e "s@/etc( |$|/)@$out/etc\\1@g" \
+      -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' \
+      -i Makefile* */Makefile*
   '';
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+    "COMPL_DIR=/share/bash-completion/completions"
+    "PERLMOD_DIR=/share/devscripts"
+  ];
+
   postInstall = ''
     sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/*
     for i in "$out/bin"/*; do
@@ -34,9 +54,10 @@ stdenv.mkDerivation rec {
         --prefix PYTHONPATH : "$out/lib/python3.4/site-packages"
     done
   '';
-  meta = {
+
+  meta = with stdenv.lib; {
     description = ''Debian package maintenance scripts'';
-    license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
-    maintainers = with stdenv.lib.maintainers; [raskin];
+    license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
+    maintainers = with maintainers; [raskin];
   };
 }