Merge pull request #34071 from KaiHa/lbdb-0.46

lbdb: 0.45.3 -> 0.46
This commit is contained in:
Jörg Thalheim 2018-01-20 09:05:29 +00:00 committed by GitHub
commit 6428287fcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions

View file

@ -3,18 +3,19 @@
, gnupg ? null , gnupg ? null
, goobook ? null , goobook ? null
, khard ? null , khard ? null
, mu ? null
}: }:
let let
version = "0.45.3"; version = "0.46";
in in
with stdenv.lib; with stdenv.lib;
with perlPackages; with perlPackages;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lbdb-${version}"; name = "lbdb-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz";
sha256 = "01lx1nb5nlhwz663v35gg7crd36c78hnipq4z0dqyb9wjigwwg9k"; sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi";
}; };
buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ] buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ]
@ -22,12 +23,14 @@ stdenv.mkDerivation {
++ optional (abook != null) abook ++ optional (abook != null) abook
++ optional (gnupg != null) gnupg ++ optional (gnupg != null) gnupg
++ optional (goobook != null) goobook ++ optional (goobook != null) goobook
++ optional (khard != null) khard; ++ optional (khard != null) khard
++ optional (mu != null) mu;
configureFlags = [ ] configureFlags = [ ]
++ optional (abook != null) "--with-abook" ++ optional (abook != null) "--with-abook"
++ optional (gnupg != null) "--with-gpg" ++ optional (gnupg != null) "--with-gpg"
++ optional (goobook != null) "--with-goobook" ++ 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 ]; patches = [ ./add-methods-to-rc.patch ];
postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : "

View file

@ -15850,7 +15850,7 @@ with pkgs;
lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; 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 { }; lbzip2 = callPackage ../tools/compression/lbzip2 { };