bitlbee: 3.2 -> 3.2.2

This commit is contained in:
William A. Kennington III 2014-09-06 18:47:44 -07:00
parent fb9d919fe4
commit cc5d2cf55a
2 changed files with 13 additions and 12 deletions

View File

@ -1,19 +1,23 @@
{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }: { fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bitlbee-3.2"; name = "bitlbee-3.2.2";
src = fetchurl { src = fetchurl {
url = "mirror://bitlbee/src/${name}.tar.gz"; url = "mirror://bitlbee/src/${name}.tar.gz";
sha256 = "1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030"; sha256 = "13jmcxxgli82wb2n4hs091159xk8rgh7nb02f478lgpjh6996f5s";
}; };
buildInputs = [ gnutls glib pkgconfig libotr ] buildInputs = [ gnutls glib pkgconfig libotr ]
++ stdenv.lib.optional doCheck check; ++ optional doCheck check;
configureFlags = [ "--otr=1" ]; configureFlaags = [
"--gcov=1"
"--otr=1"
"--ssl=gnutls"
];
preCheck = "mkdir tests/.depend";
doCheck = true; doCheck = true;
meta = { meta = {
@ -31,9 +35,9 @@ stdenv.mkDerivation rec {
''; '';
homepage = http://www.bitlbee.org/; homepage = http://www.bitlbee.org/;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = with maintainers; [ ludo wkennington ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice platforms = platforms.gnu; # arbitrary choice
}; };
} }

View File

@ -8423,10 +8423,7 @@ let
(callPackage ../applications/misc/bitcoin/dogecoin.nix {}) (callPackage ../applications/misc/bitcoin/dogecoin.nix {})
); );
bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
gnutls = gnutls;
libotr = libotr_3_2;
};
blender = callPackage ../applications/misc/blender { blender = callPackage ../applications/misc/blender {
python = python34; python = python34;