public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22740 from Mic92/libasyncns

Browse Source 
gajim: use libasyncns as resolver
This commit is contained in:
Franz Pletz 2017-02-13 15:08:16 +01:00 committed by GitHub
commit 04f72ca64c
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -2,7 +2,7 @@
, ldns, pythonPackages , ldns, pythonPackages
# Test requirements # Test requirements
, xvfb_run, dnsutils , xvfb_run
, enableJingle ? true, farstream ? null, gst_plugins_bad ? null , enableJingle ? true, farstream ? null, gst_plugins_bad ? null
, libnice ? null , libnice ? null
@ -63,9 +63,8 @@ stdenv.mkDerivation rec {
}$GST_PLUGIN_PATH"'" }$GST_PLUGIN_PATH"'"
}' scripts/gajim.in }' scripts/gajim.in
sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \ # requires network access
src/features_window.py echo "" > test/integration/test_resolver.py
sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py
# We want to run tests in installCheckPhase rather than checkPhase to test # We want to run tests in installCheckPhase rather than checkPhase to test
# whether the *installed* version of Gajim works rather than just whether it # whether the *installed* version of Gajim works rather than just whether it
@ -83,19 +82,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook pythonPackages.wrapPython intltool pkgconfig autoreconfHook pythonPackages.wrapPython intltool pkgconfig
# Test dependencies # Test dependencies
xvfb_run dnsutils xvfb_run
]; ];
autoreconfPhase = '' autoreconfPhase = ''
sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = with pythonPackages; [
pythonPackages.pygobject2 pythonPackages.pyGtkGlade libasyncns
pythonPackages.pyasn1 pygobject2 pyGtkGlade
pythonPackages.pyxdg pyasn1
pythonPackages.nbxmpp pyxdg
pythonPackages.pyopenssl pythonPackages.dbus-python nbxmpp
pyopenssl dbus-python
] ++ optional enableE2E pythonPackages.pycrypto ] ++ optional enableE2E pythonPackages.pycrypto
++ optional enableRST pythonPackages.docutils ++ optional enableRST pythonPackages.docutils
++ optional enableNotifications pythonPackages.notify ++ optional enableNotifications pythonPackages.notify

23
pkgs/development/python-modules/libasyncns.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, buildPythonPackage, fetchurl
, libasyncns, pkgconfig }:
buildPythonPackage rec {
name = "libasyncns-python-${version}";
version = "0.7.1";
src = fetchurl {
url = "https://launchpad.net/libasyncns-python/trunk/${version}/+download/libasyncns-python-${version}.tar.bz2";
sha256 = "1q4l71b2h9q756x4pjynp6kczr2d8c1jvbdp982hf7xzv7w5gxqg";
};
buildInputs = [ libasyncns ];
nativeBuildInputs = [ pkgconfig ];
doCheck = false; # requires network access
meta = with stdenv.lib; {
description = "libasyncns-python is a python binding for the asynchronous name service query library";
license = licenses.lgpl21;
maintainers = [ maintainers.mic92 ];
homepage = https://launchpad.net/libasyncns-python;
};
}

4
pkgs/top-level/python-packages.nix
View File

@ -28117,6 +28117,10 @@ EOF
buildInputs = with self; [ pytest pkgs.glibcLocales ]; buildInputs = with self; [ pytest pkgs.glibcLocales ];
}; };
libasyncns = callPackage ../development/python-modules/libasyncns.nix {
inherit (pkgs) libasyncns pkgconfig;
};
pybrowserid = buildPythonPackage rec { pybrowserid = buildPythonPackage rec {
name = "PyBrowserID-${version}"; name = "PyBrowserID-${version}";
version = "0.9.2"; version = "0.9.2";