diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking')
39 files changed, 373 insertions, 267 deletions
diff --git a/nixpkgs/pkgs/tools/networking/airfield/node.nix b/nixpkgs/pkgs/tools/networking/airfield/node.nix index 0983d3e127be..8fe405e1b3e9 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/networking/amass/default.nix b/nixpkgs/pkgs/tools/networking/amass/default.nix index bd9cae162244..73f54f7dbff7 100644 --- a/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "2.9.11"; + version = "3.0.25"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; - rev = version; - sha256 = "1mbxxj7cjypxdn80svgmq9yvzaj2x0y1lcbglzzmlqj3r0j265mr"; + rev = "v${version}"; + sha256 = "04vsahqmbs9rysdwyjq0zgwcn6dgdvkyz8lsp1g1p9d3amrgbqjy"; }; - modSha256 = "028ln760xaxlsk074x1i5fqi1334rw2bpz7fg520q6m13d9w86hw"; + modSha256 = "0kwi4pys08kszrh5kz64gs68k20y00v2zqh5hyrgpy9nivqrlj62"; outputs = [ "out" "wordlists" ]; @@ -37,9 +37,8 @@ buildGoModule rec { Amass ships with a set of wordlist (to be used with the amass -w flag) that are found under the wordlists output. ''; - homepage = https://www.owasp.org/index.php/OWASP_Amass_Project; + homepage = "https://www.owasp.org/index.php/OWASP_Amass_Project"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/tools/networking/axel/default.nix b/nixpkgs/pkgs/tools/networking/axel/default.nix index fa435b6c66ad..6aa357dacb64 100644 --- a/nixpkgs/pkgs/tools/networking/axel/default.nix +++ b/nixpkgs/pkgs/tools/networking/axel/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, gettext, libssl }: +{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive +, pkgconfig, gettext, libssl }: stdenv.mkDerivation rec { - name = "axel-${version}"; - version = "2.17.1"; + pname = "axel"; + version = "2.17.3"; - src = fetchurl { - url = "https://github.com/axel-download-accelerator/axel/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1mwyps6yvrjxp7mpzc0a2hwr2pw050c63fc9aqjzdzjjw123dfrn"; + src = fetchFromGitHub { + owner = "axel-download-accelerator"; + repo = pname; + rev = "v${version}"; + sha256 = "0kdd2y92plv240ba2j3xrm0f8xygvm1ijghnric4whsnxvmgym7h"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive ]; buildInputs = [ gettext libssl ]; diff --git a/nixpkgs/pkgs/tools/networking/babeld/default.nix b/nixpkgs/pkgs/tools/networking/babeld/default.nix index 7dfc8e9d7ad8..ce372f6b7524 100644 --- a/nixpkgs/pkgs/tools/networking/babeld/default.nix +++ b/nixpkgs/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.4"; + name = "babeld-1.8.5"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "11wbs1x17lr7jk2578zwy3cdwc6zhxwv97nnp13z14613320s1wq"; + sha256 = "1i2v7npl9aykq8d6zhkinqnbdpqx5x910dqkrv30fib0fp19jb90"; }; preBuild = '' diff --git a/nixpkgs/pkgs/tools/networking/croc/default.nix b/nixpkgs/pkgs/tools/networking/croc/default.nix new file mode 100644 index 000000000000..160b5840cf53 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "croc"; + version = "6.1.1"; + + goPackagePath = "github.com/schollz/croc"; + + src = fetchFromGitHub { + owner = "schollz"; + repo = pname; + rev = "v${version}"; + sha256 = "08gkwllk3m5hpkr1iwabvs739rvl6rzdnra2v040dzdj6zgyd12r"; + }; + + modSha256 = "026m3hc2imna7bf4jpqm7yq6mr4l5is2crsx1vxdpr4h0n6z0v3i"; + subPackages = [ "." ]; + + meta = with stdenv.lib; { + description = "Easily and securely send things from one computer to another"; + homepage = https://github.com/schollz/croc; + license = licenses.mit; + maintainers = with maintainers; [ hugoreeves ]; + + longDescription = '' + Croc is a command line tool written in Go that allows any two computers to + simply and securely transfer files and folders. + + Croc does all of the following: + - Allows any two computers to transfer data (using a relay) + - Provides end-to-end encryption (using PAKE) + - Enables easy cross-platform transfers (Windows, Linux, Mac) + - Allows multiple file transfers + - Allows resuming transfers that are interrupted + - Does not require a server or port-forwarding + ''; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/curl/default.nix b/nixpkgs/pkgs/tools/networking/curl/default.nix index bd502ee34c66..652bcdba8748 100644 --- a/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { - name = "curl-7.65.0"; + name = "curl-7.65.3"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${name}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" ]; - sha256 = "0p6z77iv6wlxq7skbnxn61rn8rangrp4g4spr09y920fcf7w0iza"; + sha256 = "02g5zj4rq5sr15jzjqk70xk4k92i2pdmpq00xb4pnba8ps1mx18a"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/nixpkgs/pkgs/tools/networking/davix/default.nix b/nixpkgs/pkgs/tools/networking/davix/default.nix index e69e012f644a..4b16eb406e32 100644 --- a/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: stdenv.mkDerivation rec { - version = "0.7.3"; + version = "0.7.4"; name = "davix-${version}"; nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; - # using the url below since the 0.7.3 release did carry a broken CMake file, + # using the url below since the 0.7.4 release did carry a broken CMake file, # supposedly fixed in the next release # https://github.com/cern-fts/davix/issues/40 src = fetchurl { url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz"; - sha256 = "12ij7p1ahgvicqmccrvpd0iw1909qmpbc3nk58gdm866f9p2find"; + sha256 = "1k407ckvsw1w212k3lp2867i0sscnrbigsx79l1sp5ymj3n62aih"; }; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index fbf7efb69339..d2ae24c8a710 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -3,6 +3,7 @@ let # keep this in sync with github.com/DataDog/agent-payload dependency payloadVersion = "4.7.1"; + python = pythonPackages.python; in buildGoPackage rec { name = "datadog-agent-${version}"; @@ -26,8 +27,6 @@ in buildGoPackage rec { goDeps = ./datadog-agent-deps.nix; goPackagePath = "github.com/${owner}/${repo}"; - # Explicitly set this here to allow it to be overridden. - python = pythonPackages.python; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ systemd ]; diff --git a/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix index afe00d7a3547..ed46b49d8c7e 100644 --- a/nixpkgs/pkgs/tools/networking/dnsperf/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig , bind, zlib, openssl, libcap }: stdenv.mkDerivation rec { name = "dnsperf-${version}"; - version = "2.2.0"; + version = "2.3.1"; # The same as the initial commit of the new GitHub repo (only readme changed). src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "1acbpgk1d7hjs48j3w6xkmyf9xlxhqskjy50a16f9dvjwvvxp84b"; + sha256 = "0yxwm5xi9ry154ayzn2h27bnwwc202bsna8h6i4a65pn76nrn81w"; }; outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ bind zlib openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap.lib ]; diff --git a/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/nixpkgs/pkgs/tools/networking/driftnet/default.nix index bf0a43ce5153..fd932617c936 100644 --- a/nixpkgs/pkgs/tools/networking/driftnet/default.nix +++ b/nixpkgs/pkgs/tools/networking/driftnet/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, libpcap, libjpeg , libungif, libpng -, giflib, glib, gtk2, cairo, pango, gdk_pixbuf, atk +, giflib, glib, gtk2, cairo, pango, gdk-pixbuf, atk , pkgconfig, autoreconfHook }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpcap libjpeg libungif libpng giflib - glib gtk2 glib cairo pango gdk_pixbuf atk autoreconfHook + glib gtk2 glib cairo pango gdk-pixbuf atk autoreconfHook ]; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/nixpkgs/pkgs/tools/networking/grpcui/default.nix new file mode 100644 index 000000000000..b256b5b37d93 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "grpcui"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "fullstorydev"; + repo = pname; + rev = "v${version}"; + sha256 = "0h4xpyd6phj3svjzxh6nd98ym81x4a2v6jxcnqj4psjinwd4p3md"; + }; + + modSha256 = "1hsq2gfhscl4wvld346xrp018sb1g3xvga3d8chlbgw93rmhhszb"; + + meta = with lib; { + description = "An interactive web UI for gRPC, along the lines of postman"; + homepage = "https://github.com/fullstorydev/grpcui"; + license = licenses.mit; + maintainers = with maintainers; [ pradyuman ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix b/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix new file mode 100644 index 000000000000..a5e8dc10d341 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix @@ -0,0 +1,44 @@ +{ buildGoPackage +, fetchFromGitHub +, lib +, autossh +, makeWrapper +}: + +buildGoPackage rec { + pname = "guardian-agent"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "StanfordSNR"; + repo = pname; + rev = "v${version}-beta"; + sha256 = "05269y944hcabn6dqa66387rdhx81vcqcyjv6m1hdbz5ba8j7mqn"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + goPackagePath = "github.com/StanfordSNR/guardian-agent"; + + goDeps = ./deps.nix; + + postInstall = '' + mkdir -p $bin/bin $out/share/doc/${pname} + cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $bin/bin/ + cp -vr ./go/src/github.com/StanfordSNR/${pname}/{AUTHORS,doc,LICENSE,README.md} $out/share/doc/guardian-agent + ''; + + postFixup = '' + wrapProgram $bin/bin/sga-guard \ + --prefix PATH : "$bin/bin" \ + --prefix PATH : "${autossh}/bin" + ''; + + meta = with lib; { + description = "Secure ssh-agent forwarding for Mosh and SSH"; + homepage = "https://github.com/StanfordSNR/guardian-agent"; + license = licenses.bsd3; + maintainers = with maintainers; [ mmahut ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/guardian-agent/deps.nix b/nixpkgs/pkgs/tools/networking/guardian-agent/deps.nix new file mode 100644 index 000000000000..950a346ce8be --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/guardian-agent/deps.nix @@ -0,0 +1,58 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/hashicorp/yamux"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/yamux"; + rev = "2f1d1f20f75d5404f53b9edf6b53ed5505508675"; + sha256 = "1fga3p6j2g24ip9qjfwn3nqjr00m4nnjz92app7ms3sz7vgq2a7s"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/sternhenri/interact"; + fetch = { + type = "git"; + url = "https://github.com/sternhenri/interact"; + rev = "dfeb9ef2030483f98cee2c86f5775fe6c729f10b"; + sha256 = "00b09fyy9zhv11mbzm18ngg765g0gyb23bmr4fc83i09w912if7j"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "04f50cda93cbb67f2afa353c52f342100e80e625"; + sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://github.com/StanfordSNR/crypto"; + rev = "e451cabda2acd7a416728ee89b75975b8b0c90d7"; + sha256 = "0aj6fc0i1dm6rdgr1mlv2pl4s0i6sj821k2p4gig45h5mn06mhpz"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "c0795c8afcf41dd1d786bebce68636c199b3bb45"; + sha256 = "0xsmr17mrpm9kx34zfzzirwy0n459h975x49p41fs2f6ly6lk9vp"; + }; + } + +] diff --git a/nixpkgs/pkgs/tools/networking/htpdate/default.nix b/nixpkgs/pkgs/tools/networking/htpdate/default.nix index c8e14ad7f697..a4c6e517a753 100644 --- a/nixpkgs/pkgs/tools/networking/htpdate/default.nix +++ b/nixpkgs/pkgs/tools/networking/htpdate/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.2.1"; name = "htpdate-${version}"; src = fetchurl { url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz"; - sha256 = "00xwppq3aj951m0srjvxmr17kiaaflyjmbfkvpnfs3jvqhzczci2"; + sha256 = "1gqw3lg4wwkn8snf4pf21s3qidhb4h791f2ci7i7i0d6kd86jv0q"; }; makeFlags = [ diff --git a/nixpkgs/pkgs/tools/networking/hue-cli/default.nix b/nixpkgs/pkgs/tools/networking/hue-cli/default.nix index ae51bb69bda1..b9b4a8eac9d2 100644 --- a/nixpkgs/pkgs/tools/networking/hue-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/hue-cli/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "hue-cli"; gemdir = ./.; exes = [ "hue" ]; + passthru.updateScript = bundlerUpdateScript "hue-cli"; + meta = with lib; { description = "Command line interface for controlling Philips Hue system's lights and bridge"; homepage = https://github.com/birkirb/hue-cli; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ manveru ]; + maintainers = with maintainers; [ manveru nicknovitski ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/i2p/default.nix b/nixpkgs/pkgs/tools/networking/i2p/default.nix index 2745c8c1d84d..7d709df75b60 100644 --- a/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.39"; + name = "i2p-0.9.41"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "0d6g0ffv2b0ghjjp3ndal8n9maw5y0n36vqrylhh5zr1hffvxx9i"; + sha256 = "0adrj56i3pcc9ainj22akjrrvy73carz5jk29qa1h2b9q03di73b"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/nixpkgs/pkgs/tools/networking/infiniband-diags/default.nix b/nixpkgs/pkgs/tools/networking/infiniband-diags/default.nix deleted file mode 100644 index 81a43d672fdc..000000000000 --- a/nixpkgs/pkgs/tools/networking/infiniband-diags/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core -, opensm, perl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "infiniband-diags-${version}"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "linux-rdma"; - repo = "infiniband-diags"; - rev = version; - sha256 = "0dhidwscvv8rffgjl6ygrz7daf61wbgabzhb6v8wh5kccml90mxi"; - }; - - nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; - - buildInputs = [ rdma-core opensm perl ]; - - preConfigure = '' - export CFLAGS="-I${opensm}/include/infiniband" - ./autogen.sh - ''; - - configureFlags = [ "--with-perl-installdir=\${out}/${perl.libPrefix}" "--sbindir=\${out}/bin" ]; - - postInstall = '' - rmdir $out/var/run $out/var - ''; - - postFixup = '' - for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do - echo "wrapping $pls" - wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}" - done - ''; - - meta = with stdenv.lib; { - description = "Utilities designed to help configure, debug, and maintain infiniband fabrics"; - homepage = http://linux-rdma.org/; - license = licenses.bsd2; # Or GPL 2 - maintainers = [ maintainers.aij ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch b/nixpkgs/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch deleted file mode 100644 index 270ef2c02e1e..000000000000 --- a/nixpkgs/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py -index 6f207b6..161619c 100644 ---- a/linkcheck/checker/httpurl.py -+++ b/linkcheck/checker/httpurl.py -@@ -75,7 +75,7 @@ def allows_robots (self, url): - @return: True if access is granted, otherwise False - @rtype: bool - """ -- return self.aggregate.robots_txt.allows_url(self) -+ return not self.aggregate.config['robotstxt'] or self.aggregate.robots_txt.allows_url(self) - - def content_allows_robots (self): - """ -diff --git a/linkcheck/configuration/__init__.py b/linkcheck/configuration/__init__.py -index fc2c148..234fa05 100644 ---- a/linkcheck/configuration/__init__.py -+++ b/linkcheck/configuration/__init__.py -@@ -163,6 +163,7 @@ def __init__ (self): - ## checking options - self["allowedschemes"] = [] - self['cookiefile'] = None -+ self['robotstxt'] = True - self["debugmemory"] = False - self["localwebroot"] = None - self["maxfilesizeparse"] = 1*1024*1024 -diff --git a/linkcheck/configuration/confparse.py b/linkcheck/configuration/confparse.py -index 67751ed..845fa95 100644 ---- a/linkcheck/configuration/confparse.py -+++ b/linkcheck/configuration/confparse.py -@@ -149,6 +149,7 @@ def read_checking_config (self): - self.get(section, 'allowedschemes').split(',')] - self.read_boolean_option(section, "debugmemory") - self.read_string_option(section, "cookiefile") -+ self.read_boolean_option(section, "robotstxt") - self.read_string_option(section, "localwebroot") - try: - self.read_boolean_option(section, "sslverify") -diff --git a/linkchecker b/linkchecker -index 199532c..9e91fa5 100755 ---- a/linkchecker -+++ b/linkchecker -@@ -321,6 +321,9 @@ group.add_argument("--cookiefile", dest="cookiefile", metavar="FILENAME", - help=_( - """Read a file with initial cookie data. The cookie data format is - explained below.""")) -+# const because store_false doesn't detect absent flags -+group.add_argument("--no-robots", action="store_const", const=False, -+ dest="norobotstxt", help=_("Disable robots.txt checks")) - group.add_argument("--check-extern", action="store_true", - dest="checkextern", help=_("""Check external URLs.""")) - group.add_argument("--ignore-url", action="append", metavar="REGEX", -@@ -431,6 +434,8 @@ if options.externstrict: - if options.extern: - pats = [linkcheck.get_link_pat(arg) for arg in options.extern] - config["externlinks"].extend(pats) -+if options.norobotstxt is not None: -+ config['robotstxt'] = options.norobotstxt - if options.checkextern: - config["checkextern"] = True - elif not config["checkextern"]: diff --git a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix index acc6893d0cd5..3c361fe48baf 100644 --- a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix +++ b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix @@ -1,64 +1,49 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, python2, gettext }: -let - # pin requests version until next release. - # see: https://github.com/linkcheck/linkchecker/issues/76 - python2Packages = (python2.override { - packageOverrides = self: super: { - requests = super.requests.overridePythonAttrs(oldAttrs: rec { - version = "2.14.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0lyi82a0ijs1m7k9w1mqwbmq1qjsac35fazx7xqyh8ws76xanx52"; - }; - }); - }; - }).pkgs; -in -python2Packages.buildPythonApplication rec { - pname = "LinkChecker"; - version = "9.3.1"; - - nativeBuildInputs = [ gettext ]; - pythonPath = (with python2Packages; [ - requests - ]) ++ [ gettext ]; +{ stdenv, lib, fetchFromGitHub, python2Packages, gettext }: - checkInputs = with python2Packages; [ pytest ]; +python2Packages.buildPythonApplication rec { + pname = "linkchecker"; + version = "9.4.0"; - # the original repository is abandoned, development is now happening here: src = fetchFromGitHub { - owner = "linkcheck"; - repo = "linkchecker"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "080mv4iwvlsfnm7l9basd6i8p4q8990mdhkwick9s6javrbf1r1d"; + sha256 = "1vbwl2vb8dyzki27z3sl5yf9dhdd2cpkg10vbgaz868dhpqlshgs"; }; - # 1. upstream refuses to support ignoring robots.txt - # 2. fix build: https://github.com/linkcheck/linkchecker/issues/10 - patches = - let - fix-setup-py = fetchpatch { - name = "fix-setup-py.patch"; - url = https://github.com/linkcheck/linkchecker/commit/e62e630.patch; - sha256 = "046q1whg715w2yv33xx6rkj7fspvvz60cl978ax92lnf8j101czx"; - }; - in [ - ./add-no-robots-flag.patch - fix-setup-py - ]; + nativeBuildInputs = [ gettext ]; - postInstall = '' - rm $out/bin/linkchecker-gui + propagatedBuildInputs = with python2Packages; [ + ConfigArgParse + argcomplete + dnspython + pyxdg + requests + ]; + + checkInputs = with python2Packages; [ + parameterized + pytest + ]; + + postPatch = '' + sed -i 's/^requests.*$/requests>=2.2/' requirements.txt + sed -i "s/'request.*'/'requests >= 2.2'/" setup.py + sed -i 's~/usr/lib/python2.7/argparse.py~~g' po/Makefile ''; checkPhase = '' + runHook preCheck + # the mime test fails for me... rm tests/test_mimeutil.py ${lib.optionalString stdenv.isDarwin '' - # network tests fails on darwin - rm tests/test_network.py + # network tests fails on darwin + rm tests/test_network.py ''} make test PYTESTOPTS="--tb=short" TESTS="tests/test_*.py tests/logger/test_*.py" + + runHook postCheck ''; meta = { diff --git a/nixpkgs/pkgs/tools/networking/maphosts/default.nix b/nixpkgs/pkgs/tools/networking/maphosts/default.nix index 3a48814928e5..e54a2b21d9fd 100644 --- a/nixpkgs/pkgs/tools/networking/maphosts/default.nix +++ b/nixpkgs/pkgs/tools/networking/maphosts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript }: stdenv.mkDerivation rec { name = "maphosts-${env.gems.maphosts.version}"; @@ -16,11 +16,13 @@ stdenv.mkDerivation rec { ln -s "${env}/bin/maphosts" "$out/bin/maphosts" ''; + passthru.updateScript = bundlerUpdateScript "maphosts"; + meta = with lib; { description = "Small command line application for keeping your project hostnames in sync with /etc/hosts"; homepage = https://github.com/mpscholten/maphosts; license = licenses.mit; - maintainers = with maintainers; [ mpscholten ]; + maintainers = with maintainers; [ mpscholten nicknovitski ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/networking/mcrcon/default.nix b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix index eda93c82cce8..38b2aa531e67 100644 --- a/nixpkgs/pkgs/tools/networking/mcrcon/default.nix +++ b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcrcon-${version}"; - version = "0.0.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Tiiffi"; repo = "mcrcon"; rev = "v${version}"; - sha256 = "1pwr1cjldjy8bxqpp7w03nvdpw8l4vqfnk6w6b3mf0qpap1k700z"; + sha256 = "0as60cgl8sflykmwihc6axy1hzx6gjgjav6c7mvlbsc43dv8fs51"; }; buildPhase = '' diff --git a/nixpkgs/pkgs/tools/networking/mtr/default.nix b/nixpkgs/pkgs/tools/networking/mtr/default.nix index 3c2ced1712fd..59242551f929 100644 --- a/nixpkgs/pkgs/tools/networking/mtr/default.nix +++ b/nixpkgs/pkgs/tools/networking/mtr/default.nix @@ -1,38 +1,42 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, libcap, ncurses , withGtk ? false, gtk2 ? null }: assert withGtk -> gtk2 != null; stdenv.mkDerivation rec { - name="mtr-${version}"; - version="0.92"; + pname = "mtr"; + version = "0.93"; src = fetchFromGitHub { owner = "traviscross"; repo = "mtr"; rev = "v${version}"; - sha256 = "0ca2ml846cv0zzkpd8y7ah6i9b3czrr8wlxja3cray94ybwb294d"; + sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw"; }; - preConfigure = '' + # we need this before autoreconfHook does its thing + postPatch = '' echo ${version} > .tarball-version + ''; - ./bootstrap.sh - - substituteInPlace Makefile.in --replace ' install-exec-hook' "" + # and this after autoreconfHook has generated Makefile.in + preConfigure = '' + substituteInPlace Makefile.in \ + --replace ' install-exec-hook' "" ''; configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ncurses ] ++ stdenv.lib.optional withGtk gtk2; + buildInputs = [ libcap ncurses ] ++ stdenv.lib.optional withGtk gtk2; enableParallelBuilding = true; meta = with stdenv.lib; { description = "A network diagnostics tool"; - homepage = http://www.bitwizard.nl/mtr/; + homepage = "https://www.bitwizard.nl/mtr/"; license = licenses.gpl2; maintainers = with maintainers; [ koral orivej raskin ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix b/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix index 17460bc72f70..6b69b97552a8 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "NetworkManager-strongswan"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; - sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd"; + sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; }; buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ]; diff --git a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix index 686bb1d7ebf3..c74ceb055cea 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = [ patchelfUnstable ]; + nativeBuildInputs = optionals stdenv.isLinux [ patchelfUnstable ]; unpackPhase = "cp $src ngrok"; @@ -32,10 +32,10 @@ stdenv.mkDerivation { installPhase = '' install -D ngrok $out/bin/ngrok - + '' + optionalString stdenv.isLinux '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/ngrok - ''; + ''; passthru.updateScript = ./update.sh; diff --git a/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/nixpkgs/pkgs/tools/networking/ocserv/default.nix index 805c4bd55207..094bebe628f6 100644 --- a/nixpkgs/pkgs/tools/networking/ocserv/default.nix +++ b/nixpkgs/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ocserv-${version}"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "072256099l1c6p7dvvzp0gyafh1zvmmgmnpy0fcmv9sy80qg3p44"; + sha256 = "0lybz93ah6n5b82ywshhmsmf65im8rk6gkxnzxfbxpqxra79j517"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 4f2a26de3271..363963b1b141 100644 --- a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.3"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1fglvn6ricvb0csbrjkjfp902y6drjf6cby5fihmr5v9m7pjym1y"; + sha256 = "1x09db62i81gamj6pm9bng994z54y7gqc6wvj8hnn0j0ay9gkcf5"; }; phases = [ "installPhase" ]; diff --git a/nixpkgs/pkgs/tools/networking/openresolv/default.nix b/nixpkgs/pkgs/tools/networking/openresolv/default.nix index 209e1f64c72b..302e08617afc 100644 --- a/nixpkgs/pkgs/tools/networking/openresolv/default.nix +++ b/nixpkgs/pkgs/tools/networking/openresolv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openresolv-${version}"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { url = "mirror://roy/openresolv/${name}.tar.xz"; - sha256 = "1f2dccc52iykbpma26fbxzga2l6g4njm3bgaxz4rgdrb4cwlv82i"; + sha256 = "1wlzi88837rf4ygswmzpbcmgkbbjhn5n322n9q6ir6x367hygf1q"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/p2p/libtorrent/default.nix b/nixpkgs/pkgs/tools/networking/p2p/libtorrent/default.nix index 9c6f5eec11b7..524b75d5582d 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -5,14 +5,14 @@ , openssl, libsigcxx, zlib }: stdenv.mkDerivation rec { - name = "libtorrent-${version}"; - version = "0.13.7"; + pname = "libtorrent"; + version = "0.13.8"; src = fetchFromGitHub { owner = "rakshasa"; - repo = "libtorrent"; + repo = pname; rev = "v${version}"; - sha256 = "027qanwcisxhx0bq8dn8cpg8563q0k2pm8ls278f04n7jqvvwkp0"; + sha256 = "1h5y6ab3gs20yyprdfwcw8fh1c6czs4yrdj0kf54d2vp9qwz685r"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/rakshasa/libtorrent"; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix b/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix index 63652557efa5..2ca31a6a1e73 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - name = "rtorrent-${version}"; - version = "0.9.7"; + pname = "rtorrent"; + version = "0.9.8"; src = fetchFromGitHub { owner = "rakshasa"; - repo = "rtorrent"; + repo = pname; rev = "v${version}"; - sha256 = "0a9dk3cz56f7gad8ghsma79iy900rwdvzngs6k6x08nlwaqid8ga"; + sha256 = "0hcaf1brk402caa7hhlb2r1c93mjzxkm8gb19xfl33gkp3jpf372"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/pptp/default.nix b/nixpkgs/pkgs/tools/networking/pptp/default.nix index 03270ce87881..6a97abfab590 100644 --- a/nixpkgs/pkgs/tools/networking/pptp/default.nix +++ b/nixpkgs/pkgs/tools/networking/pptp/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchurl, perl, ppp, iproute, which }: +{ stdenv, fetchurl, perl, ppp, iproute }: stdenv.mkDerivation rec { - name = "pptp-${version}"; + pname = "pptp"; version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/pptpclient/${name}.tar.gz"; + url = "mirror://sourceforge/pptpclient/${pname}-${version}.tar.gz"; sha256 = "1x2szfp96w7cag2rcvkdqbsl836ja5148zzfhaqp7kl7wjw2sjc2"; }; - patchPhase = - '' - sed -e 's/install -o root/install/' -i Makefile - ''; - preConfigure = - '' - makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ - BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ - PPPDIR=$out/etc/ppp ) - ''; + prePatch = '' + substituteInPlace Makefile --replace 'install -o root' 'install' + ''; - nativeBuildInputs = [ perl which ]; + preConfigure = '' + makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ + PPPDIR=$out/etc/ppp ) + ''; + + buildInputs = [ perl ]; + + postFixup = '' + patchShebangs $out + ''; meta = with stdenv.lib; { description = "PPTP client for Linux"; diff --git a/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix index 26e932fc5d5e..254e5d3e5d32 100644 --- a/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "shadowsocks-libev"; - version = "3.3.0"; + version = "3.3.1"; # Git tag includes CMake build files which are much more convenient. src = fetchFromGitHub { owner = "shadowsocks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0f6fk7p49b1m78v4ipacbl522nma9b3qzrvihzp2mmsa6j3cysgr"; + sha256 = "0l15mbwlzx446rn5cix9f1726by62807bhnxkzknd41j7r937vyv"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 3515a127510f..0f7c035b4c05 100644 --- a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: stdenv.mkDerivation rec { name = "slirp4netns-${version}"; - version = "0.3.0-alpha.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "163nwdwi1qigma1c5svm8llgd8pn4sbkchw67ry3v0gfxa9mxibk"; + sha256 = "079m44l4l0p1c2sbkpzsy6zpv94glwmrc72ip2djcscnaq4b1763"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/networking/spoofer/default.nix b/nixpkgs/pkgs/tools/networking/spoofer/default.nix index 8893c5e37fe0..faeec8523aa4 100644 --- a/nixpkgs/pkgs/tools/networking/spoofer/default.nix +++ b/nixpkgs/pkgs/tools/networking/spoofer/default.nix @@ -6,12 +6,12 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.4.2"; + version = "1.4.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz"; - sha256 = "041piwc2r4fig5b4apm2ibq1wyd11ic8p3xv3ss2hrbn5d8inza1"; + sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/nixpkgs/pkgs/tools/networking/tendermint/default.nix new file mode 100644 index 000000000000..a884ed0ccd49 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "tendermint"; + version = "0.32.2"; + + src = fetchFromGitHub { + owner = "tendermint"; + repo = pname; + rev = "d70135ec71979e7588c649c80f2acea65346a99a"; + sha256 = "062lzc1c96nwg22ql10mwjkxhq68lyak7s0id5y4f9mmj6d4rd69"; + }; + + modSha256 = "0hl8ly2qx0fv9diipqkcrlaz3ncsb2h81i0ccf5gn9cmyl37x0yk"; + + meta = with stdenv.lib; { + description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; + homepage = https://tendermint.com/; + license = licenses.asl20; + maintainers = with maintainers; [ alexfmpe ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/tgt/default.nix b/nixpkgs/pkgs/tools/networking/tgt/default.nix index a9e9f351aae3..478c1ed35f29 100644 --- a/nixpkgs/pkgs/tools/networking/tgt/default.nix +++ b/nixpkgs/pkgs/tools/networking/tgt/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages -, docbook_xsl }: +{ stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages +, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, utillinux +}: stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.78"; + version = "1.0.79"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "0778silfwvbpqljxdid96nn0vkdii3fszqp6w6w2bn9hdyxhqrjp"; + sha256 = "18bp7fcpv7879q3ppdxlqj7ayqmlh5zwrkz8gch6rq9lkmmrklrf"; }; - buildInputs = [ libxslt systemd libaio docbook_xsl ]; + nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; + + buildInputs = [ systemd libaio ]; makeFlags = [ "PREFIX=${placeholder "out"}" @@ -31,14 +34,26 @@ stdenv.mkDerivation rec { ''; postInstall = '' - sed -i 's|#!/usr/bin/perl|#! ${perl}/bin/perl -I${perlPackages.ConfigGeneral}/${perl.libPrefix}|' $out/sbin/tgt-admin + substituteInPlace $out/sbin/tgt-admin \ + --replace "#!/usr/bin/perl" "#! ${perl}/bin/perl -I${perlPackages.ConfigGeneral}/${perl.libPrefix}" + wrapProgram $out/sbin/tgt-admin --prefix PATH : \ + ${lib.makeBinPath [ lsof sg3_utils (placeholder "out") ]} + + install -D scripts/tgtd.service $out/etc/systemd/system/tgtd.service + substituteInPlace $out/etc/systemd/system/tgtd.service \ + --replace "/usr/sbin/tgt" "$out/bin/tgt" + + # See https://bugzilla.redhat.com/show_bug.cgi?id=848942 + sed -i '/ExecStart=/a ExecStartPost=${coreutils}/bin/sleep 5' $out/etc/systemd/system/tgtd.service ''; enableParallelBuilding = true; - meta = { - description = "iSCSI Target daemon with rdma support"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "iSCSI Target daemon with RDMA support"; + homepage = "http://stgt.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ johnazoidberg ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix b/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix index 5f5edcb23a79..111d40478df1 100644 --- a/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix +++ b/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.15.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "12pq95pw5g777kpgad04n9az1fl8y0x1vismz81mqqij3jr5qwzb"; + sha256 = "07pipvxxa4bw11f0fxm8vjwd5ap7i82nsq93sw1kj353jn1mpwxw"; }; sourceRoot = "source/native"; diff --git a/nixpkgs/pkgs/tools/networking/whois/default.nix b/nixpkgs/pkgs/tools/networking/whois/default.nix index 5ec3199fb897..ddac709e5772 100644 --- a/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/nixpkgs/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.4.3"; + version = "5.5.0"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0rf6ggk9y6gvhyj6zcjvjsbksal8pczlw905h70mgylq20qy3jr4"; + sha256 = "0h6lvsz868533irx68vd3hjhwcz93zh88axfq0qzji5ndc0ks4qb"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/nixpkgs/pkgs/tools/networking/ytcc/default.nix index 137a9216df00..d489d84d1cc6 100644 --- a/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -11,10 +11,20 @@ python3Packages.buildPythonApplication rec { sha256 = "080p145j5pg8db88kb0y3x1pfc3v4aj3w68pdihlmi68dhjdr7i7"; }; - doCheck = false; # try to access /homeless-shelter + nativeBuildInputs = [ gettext ]; + propagatedBuildInputs = with python3Packages; [ feedparser lxml sqlalchemy youtube-dl ]; - nativeBuildInputs = [ gettext ]; + checkInputs = with python3Packages; [ nose pytest ]; + + # Disable tests that touch network or shell out to commands + checkPhase = '' + pytest . -k 'not get_channels \ + and not play_video \ + and not download_videos \ + and not update_all \ + and not add_channel_duplicate' + ''; meta = { description = "Command Line tool to keep track of your favourite YouTube channels without signing up for a Google account"; diff --git a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index 2853c595e431..76a2dbd8850a 100644 --- a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: +{ stdenv, fetchFromGitHub, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.2.12"; - name = "zerotierone-${version}"; - - src = fetchurl { - url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "1m7ynrgzpg2sp37hcmjkx6w173icfhakzn1c1zrdzrxmmszrj9r1"; + pname = "zerotierone"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "zerotier"; + repo = "ZeroTierOne"; + rev = version; + sha256 = "14iwhlxmxsnvnm9rrp6rysiz461w0v5nsmnz5p91rfi351103a63"; }; preConfigure = '' @@ -16,9 +18,6 @@ stdenv.mkDerivation rec { substituteInPlace ./osdep/ManagedRoute.cpp \ --replace '/sbin/ip' '${iproute}/bin/ip' - substituteInPlace ./osdep/LinuxEthernetTap.cpp \ - --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",' - patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ --replace '/usr/bin/ronn' '${ronn}/bin/ronn' \ |