diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/p2p')
11 files changed, 110 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 39ab0ee0efa..d38e9dc7336 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.8.4"; + version = "6.8.5"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "1qs0r5621ihb9sj4sqpmxj9smwf8a8k3n1qx2i0sz65qhjfc90zz"; + sha256 = "1zdas93w1yqg9yx8wlk7pxpdmwvg4ykg54ai7iyq9ir1zha8fyif"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix index 5abee0108ec..618ca074912 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib -, libpulseaudio, libopus, libogg, jansson }: +, libpulseaudio, libopus, libogg, jansson, libsodium }: stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.12.1"; + version = "0.13.2"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "0zhz3dd4mr6k7wlcxw2xclq8p8l4ia5nlg78dylyz6lbz96h2lsm"; + sha256 = "0b4a6bxwhpmj274d281vhny7i5rwydrdmab76xk6ji8vf0p705dn"; }; enableParallelBuilding = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool makeWrapper ]; buildInputs = [ adns curl gmp gnutls libextractor libgcrypt libgnurl libidn - libmicrohttpd libunistring libxml2 ncurses gettext + libmicrohttpd libunistring libxml2 ncurses gettext libsodium sqlite zlib libpulseaudio libopus libogg jansson ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { homepage = "https://gnunet.org/"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ pstn vrthra ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix b/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix new file mode 100644 index 00000000000..4090814b3da --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl +, gnome3 +, gnunet +, gnutls +, gtk3 +, libextractor +, libgcrypt +, libxml2 +, pkg-config +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnunet-gtk"; + version = "0.13.1"; + + src = fetchurl { + url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; + sha256 = "1zdzgq16h77w6ybwg3lqjsjr965np6iqvncqvkbj07glqd4wss0j"; + }; + + nativeBuildInputs= [ + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.glade + gnunet + gnutls + gtk3 + libextractor + libgcrypt + libxml2 + ]; + + patchPhase = "patchShebangs pixmaps/icon-theme-installer"; + + meta = gnunet.meta // { + description = "GNUnet GTK User Interface"; + homepage = "https://git.gnunet.org/gnunet-gtk.git"; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix b/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix index 1dcf42b7ece..b8c1991c88f 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix @@ -18,7 +18,6 @@ buildGoModule rec { make magneticow magneticod ''; - doCheck = true; checkPhase = '' make test ''; @@ -30,4 +29,4 @@ buildGoModule rec { badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; -}
\ No newline at end of file +} diff --git a/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix b/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix index ce6d3958c9b..a6a0ab27287 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg +, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools - protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg + protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 ]; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix b/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix index 6b1a7ace902..276cabfa2aa 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.10.1a"; + version = "0.11.2a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "076rlial6h1nhwdxf1mx5nf2zld5ci43cadj9wf8xms7zn8s6c8v"; + sha256 = "05dn6mr86ly65gdqarl16a2jk1bwiw5xa6r4kyag3s6lqsv66iw8"; }; # urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged @@ -34,7 +34,6 @@ python3Packages.buildPythonApplication rec { pyxdg blinker natsort - maxminddb setproctitle ]; @@ -53,6 +52,8 @@ python3Packages.buildPythonApplication rec { "tests" # test_string__month_day_hour_minute_second fails on darwin "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" + # TestScrollBarWithScrollable.test_wrapping_bug fails + "--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix b/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix index 80d90789440..e2847d88f8a 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://synapse-bt.org/"; license = licenses.isc; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix index 2e14bd0eb0f..f8a70d322f0 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.73"; + version = "2.74"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "1ncrfc4wgf02la2h3zpdcz07b980n9232lg5f62q7ab79fjrcrfr"; + sha256 = "1slsrqv97hnj1vxx3hw32dhqckbr05w622samjbrimh4dv8yrd29"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix b/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix index e432818bec7..d62e3b3b5a3 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , cmake , pkgconfig , vala_0_40 @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index d59cdff34fd..ab4fc0908ba 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -72,9 +72,6 @@ in stdenv.mkDerivation { NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; - # Reduce the risk of collisions - postInstall = "rm -r $out/share/doc"; - meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix new file mode 100644 index 00000000000..37f2a3584ee --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, python3Packages +, x11Support ? !stdenv.isDarwin +, xclip ? null +, pbcopy ? null +, useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat +}: +let + wrapperPath = with stdenv.lib; makeBinPath ( + optional x11Support xclip ++ + optional stdenv.isDarwin pbcopy + ); +in +python3Packages.buildPythonPackage rec { + version = "0.9.1"; + pname = "tremc"; + + src = fetchFromGitHub { + owner = "tremc"; + repo = pname; + rev = "0.9.1"; + sha256 = "1yhwvlcyv1s830p5a7q5x3mkb3mbvr5cn5nh7y62l5b6iyyynlvm"; + }; + + buildInputs = with python3Packages; [ + python + wrapPython + ]; + + pythonPath = with python3Packages; [ + ipy + pyperclip + ] ++ + stdenv.lib.optional useGeoIP GeoIP; + + phases = [ "unpackPhase" "installPhase" ]; + + makeWrapperArgs = ["--prefix PATH : ${wrapperPath}"]; + + installPhase = '' + make DESTDIR=$out install + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Curses interface for transmission"; + homepage = "https://github.com/tremc/tremc"; + license = licenses.gpl3; + }; +} |