diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-01-20 09:05:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 09:05:29 +0000 |
| commit | 6428287fcbeb0bde1389ea3f7710946ac1dc9272 (patch) | |
| tree | a90ea4bafee731b63a5a5b6c13e56a7ff3b2367b | |
| parent | 6d52bbb0dc0822bbb596305c7a01774e7d32a336 (diff) | |
| parent | 81a386326a0727d6c0c5d2603bd710902c37a12a (diff) | |
| download | nixlib-6428287fcbeb0bde1389ea3f7710946ac1dc9272.tar nixlib-6428287fcbeb0bde1389ea3f7710946ac1dc9272.tar.gz nixlib-6428287fcbeb0bde1389ea3f7710946ac1dc9272.tar.bz2 nixlib-6428287fcbeb0bde1389ea3f7710946ac1dc9272.tar.lz nixlib-6428287fcbeb0bde1389ea3f7710946ac1dc9272.tar.xz nixlib-6428287fcbeb0bde1389ea3f7710946ac1dc9272.tar.zst nixlib-6428287fcbeb0bde1389ea3f7710946ac1dc9272.zip | |
Merge pull request #34071 from KaiHa/lbdb-0.46
lbdb: 0.45.3 -> 0.46
| -rw-r--r-- | pkgs/tools/misc/lbdb/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 10eca3d70024..1f52d83f1201 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -3,18 +3,19 @@ , 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 ] @@ -22,12 +23,14 @@ stdenv.mkDerivation { ++ 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 index 00f8d4014820..1bb89e9b67c7 100644 --- 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 { }; |