diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
| commit | 5b0352a6a43fdd924a53cde4b81c15b755fa0a27 (patch) | |
| tree | cf0fcc2be2f6d08c970f0322a63ff0a31d5d5dee /pkgs/applications/networking/p2p | |
| parent | 2f0fe05543ce594eacf0310966914d6e19a42f88 (diff) | |
| parent | 146784f835a6cadc65812c5adf76533c18e5be61 (diff) | |
| download | nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.gz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.bz2 nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.lz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.xz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.zst nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.zip | |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/applications/networking/p2p')
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix index e7be81def616..6b1a1fc94540 100644 --- a/pkgs/applications/networking/p2p/firestr/default.nix +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "Grass computing platform"; homepage = http://firestr.com/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 5f7ad92f7cc6..b1181960f41a 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = http://dev.yorhel.nl/ncdc; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; # arbitrary - maintainers = [ stdenv.lib.maintainers.emery ]; + maintainers = [ stdenv.lib.maintainers.ehmry ]; }; } diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 5d76b295dda3..dc80d7d34dec 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { { description = "GTK remote control for the Transmission BitTorrent client"; homepage = https://github.com/ajf8/transmission-remote-gtk; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index a96d0f9cc673..b2a578ddc1de 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pythonPackages.twisted pythonPackages.gmpy pythonPackages.netifaces - pythonPackages.pil + pythonPackages.pillow pythonPackages.pycrypto pythonPackages.pyasn1 pythonPackages.requests |