diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-11-06 20:54:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-06 20:54:51 +0100 |
commit | e734ecb1e81224b0fe8b12cb16bed25b2d23f034 (patch) | |
tree | b7b3aed12149e69cc54b8e23351fa26610fde2f1 /pkgs/applications/networking/instant-messengers | |
parent | 4fc2fd6d26cadd9695bd2c5fec809ef31992dc0c (diff) | |
parent | 98024e2d85ba94eab44db8ee326aa7631ab93861 (diff) | |
download | nixlib-e734ecb1e81224b0fe8b12cb16bed25b2d23f034.tar nixlib-e734ecb1e81224b0fe8b12cb16bed25b2d23f034.tar.gz nixlib-e734ecb1e81224b0fe8b12cb16bed25b2d23f034.tar.bz2 nixlib-e734ecb1e81224b0fe8b12cb16bed25b2d23f034.tar.lz nixlib-e734ecb1e81224b0fe8b12cb16bed25b2d23f034.tar.xz nixlib-e734ecb1e81224b0fe8b12cb16bed25b2d23f034.tar.zst nixlib-e734ecb1e81224b0fe8b12cb16bed25b2d23f034.zip |
Merge pull request #30919 from adisbladis/pythonPackages-cleanup
WIP: Python packages cleanup
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix | 20 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix | 67 |
2 files changed, 81 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 4f360c831a25..9ff1799ddd2d 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -1,7 +1,12 @@ -{stdenv, fetchurl, python27Packages, file }: +{ stdenv, fetchurl, python27Packages, file }: let inherit (python27Packages) python; + requirements = (import ./requirements.nix { + inherit stdenv fetchurl; + pythonPackages = python27Packages; + }); + in stdenv.mkDerivation rec { name = "salut-a-toi"; @@ -13,12 +18,15 @@ in sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d"; }; - buildInputs = with python27Packages; + buildInputs = with python27Packages; [ python twisted urwid wxPython pygobject2 - wokkel dbus-python pyfeed wrapPython setuptools file + dbus-python wrapPython setuptools file pycrypto pyxdg - ]; + ] ++ (with requirements; [ + pyfeed + wokkel + ]); configurePhase = '' sed -i "/use_setuptools/d" setup.py @@ -26,7 +34,7 @@ in sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh - echo 'import wokkel.muc' | python + echo 'import wokkel.muc' | python ''; buildPhase = '' @@ -39,7 +47,7 @@ in for i in "$out/bin"/*; do head -n 1 "$i" | grep -E '[/ ]python( |$)' && { wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}" - } || true + } || true done ''; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix new file mode 100644 index 000000000000..1a6811182453 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -0,0 +1,67 @@ +{ fetchurl +, stdenv +, pythonPackages +}: + +let + buildPythonPackage = pythonPackages.buildPythonPackage; + + xe = buildPythonPackage rec { + url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + homepage = "http://home.blarg.net/~steveha/xe.html"; + description = "XML elements"; + }; + }; + +in { + + pyfeed = (buildPythonPackage rec { + url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; + + name = stdenv.lib.nameFromURL url ".tar"; + + src = fetchurl { + inherit url; + sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; + }; + + propagatedBuildInputs = [ xe ]; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = "http://home.blarg.net/~steveha/pyfeed.html"; + description = "Tools for syndication feeds"; + }; + + }); + + wokkel = buildPythonPackage (rec { + url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; + }; + + propagatedBuildInputs = with pythonPackages; [twisted dateutil]; + + meta = with stdenv.lib; { + description = "Some (mainly XMPP-related) additions to twisted"; + homepage = "http://wokkel.ik.nu/"; + license = licenses.mit; + }; + }); + +} |