Merge pull request #34071 from KaiHa/lbdb-0.46

lbdb: 0.45.3 -> 0.46
NixOS · Jan 20, 2018 · 6428287 · 6428287
2 parents 6d52bbb + 81a3863
commit 6428287
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
@@ -3,31 +3,34 @@
 , gnupg ? null
 , goobook ? null
 , khard ? null
+, mu ? null
 }:
 
 let
-  version = "0.45.3";
+  version = "0.46";
 in
 with stdenv.lib;
 with perlPackages;
 stdenv.mkDerivation {
   name = "lbdb-${version}";
   src = fetchurl {
-    url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz";
-    sha256 = "01lx1nb5nlhwz663v35gg7crd36c78hnipq4z0dqyb9wjigwwg9k";
+    url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz";
+    sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi";
   };
 
   buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ]
     ++ optional (!stdenv.isDarwin) finger_bsd
     ++ optional   (abook != null) abook
     ++ optional   (gnupg != null) gnupg
     ++ optional (goobook != null) goobook
-    ++ optional   (khard != null) khard;
+    ++ optional   (khard != null) khard
+    ++ optional      (mu != null) mu;
   configureFlags = [ ]
     ++ optional   (abook != null) "--with-abook"
     ++ optional   (gnupg != null) "--with-gpg"
     ++ optional (goobook != null) "--with-goobook"
-    ++ optional   (khard != null) "--with-khard";
+    ++ optional   (khard != null) "--with-khard"
+    ++ optional      (mu != null) "--with-mu";
 
   patches = [ ./add-methods-to-rc.patch ];
   postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : "

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -15850,7 +15850,7 @@ with pkgs;
 
   lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { };
 
-  lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; };
+  lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; };
 
   lbzip2 = callPackage ../tools/compression/lbzip2 { };