diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-08 17:57:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:31:47 +0000 |
| commit | ee7984efa14902a2ddd820c937457667a4f40c6a (patch) | |
| tree | c9c1d046733cefe5e21fdd8a52104175d47b2443 /nixpkgs/pkgs/tools/networking | |
| parent | ffc9d4ba381da62fd08b361bacd1e71e2a3d934d (diff) | |
| parent | b3c692172e5b5241b028a98e1977f9fb12eeaf42 (diff) | |
| download | nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.gz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.bz2 nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.lz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.xz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.zst nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.zip | |
Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'
Diffstat (limited to 'nixpkgs/pkgs/tools/networking')
161 files changed, 3056 insertions, 1125 deletions
diff --git a/nixpkgs/pkgs/tools/networking/ahcpd/default.nix b/nixpkgs/pkgs/tools/networking/ahcpd/default.nix index 75a7fc83858a..83647d17ae3c 100644 --- a/nixpkgs/pkgs/tools/networking/ahcpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/ahcpd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ahcpd-0.53"; + pname = "ahcpd"; + version = "0.53"; src = fetchurl { - url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/ahcpd-${version}.tar.gz"; sha256 = "0lhdmky3zdyk51hclv2lrhw3hzymbdc8bw2khs3rnaibgn0jwqm4"; }; diff --git a/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix b/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix index 33a90636659a..f836fdf052f9 100644 --- a/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix +++ b/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix @@ -3,10 +3,11 @@ , autoreconfHook, usbutils }: stdenv.mkDerivation rec { - name = "aircrack-ng-1.6"; + pname = "aircrack-ng"; + version = "1.6"; src = fetchurl { - url = "https://download.aircrack-ng.org/${name}.tar.gz"; + url = "https://download.aircrack-ng.org/aircrack-ng-${version}.tar.gz"; sha256 = "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg"; }; diff --git a/nixpkgs/pkgs/tools/networking/aria2/default.nix b/nixpkgs/pkgs/tools/networking/aria2/default.nix index 7e4f06302f2e..db239e034f51 100644 --- a/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aria2"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "195r3711ly3drf9jkygwdc2m7q99hiqlfrig3ip1127b837gzsf9"; + sha256 = "sha256-ErjFfSJDIgZq0qy0Zn5uZ9bZS2AtJq4FuBVuUuQgPTI="; }; nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; diff --git a/nixpkgs/pkgs/tools/networking/arpoison/default.nix b/nixpkgs/pkgs/tools/networking/arpoison/default.nix index 6268d958204f..64b3229fad6b 100644 --- a/nixpkgs/pkgs/tools/networking/arpoison/default.nix +++ b/nixpkgs/pkgs/tools/networking/arpoison/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchzip, libnet }: stdenv.mkDerivation rec { - name = "arpoison-0.7"; + pname = "arpoison"; + version = "0.7"; buildInputs = [ libnet ]; src = fetchzip { - url = "http://www.arpoison.net/${name}.tar.gz"; + url = "http://www.arpoison.net/arpoison-${version}.tar.gz"; sha256 = "0krhszx3s0qwfg4rma5a51ak71nnd9xfs2ibggc3hwiz506s2x37"; }; diff --git a/nixpkgs/pkgs/tools/networking/assh/default.nix b/nixpkgs/pkgs/tools/networking/assh/default.nix index 7d3c662b368f..5bbedf0f7e5b 100644 --- a/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -20,9 +20,9 @@ buildGoModule rec { doCheck = false; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X moul.io/assh/v2/pkg/version.Version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X moul.io/assh/v2/pkg/version.Version=${version}" + ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 233c57bc635d..ebb816b1887a 100644 --- a/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; + # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "A CLI utility for displaying current network utilization"; longDescription = '' @@ -26,7 +29,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/imsnif/bandwhich"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ma27 ]; + maintainers = with maintainers; [ Br1ght0ne ma27 SuperSandro2000 ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/bgpdump/default.nix b/nixpkgs/pkgs/tools/networking/bgpdump/default.nix index 18d72daa009f..f60b60c39926 100644 --- a/nixpkgs/pkgs/tools/networking/bgpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/bgpdump/default.nix @@ -1,19 +1,21 @@ -{ lib, stdenv, fetchurl, autoreconfHook, zlib, bzip2 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, zlib, bzip2 }: stdenv.mkDerivation rec { pname = "bgpdump"; - version = "1.6.0"; + version = "1.6.2"; - src = fetchurl { - url = "https://ris.ripe.net/source/bgpdump/libbgpdump-1.6.0.tgz"; - sha256 = "144369gj35mf63nz4idqwsvgsirw7fybm8kkk07yymrjp8jr3aqk"; + src = fetchFromGitHub { + owner = "RIPE-NCC"; + repo = "bgpdump"; + rev = "v${version}"; + sha256 = "sha256-1HXMf9mHManR7jhonU2Agon0YFXOlM9APIN1Zm840AM="; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib bzip2 ]; meta = { - homepage = "https://bitbucket.org/ripencc/bgpdump/"; + homepage = "https://github.com/RIPE-NCC/bgpdump"; description = "Analyze dump files produced by Zebra/Quagga or MRT"; license = lib.licenses.hpnd; maintainers = with lib.maintainers; [ lewo ]; diff --git a/nixpkgs/pkgs/tools/networking/bgpq4/default.nix b/nixpkgs/pkgs/tools/networking/bgpq4/default.nix index 40c65b35a035..bfbb138952a9 100644 --- a/nixpkgs/pkgs/tools/networking/bgpq4/default.nix +++ b/nixpkgs/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "0.0.7"; + version = "1.2"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-iEm4BYlJi56Y4OBCdEDgRQ162F65PLZyvHSEQzULFww="; + sha256 = "sha256-8r70tetbTq8GxxtFe71gDYy+wg8yBwYpl1gsu5aAHTA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/boundary/default.nix b/nixpkgs/pkgs/tools/networking/boundary/default.nix index 5c9abf578924..7b96bcb05c8e 100644 --- a/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.4.0"; + version = "0.5.1"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-xHvg2Kdm7hoJ7Dwh4pLXJE+EPcl9Zta/00IN3wRnOzU="; - aarch64-linux = "sha256-Kbr7tZjVcYiejy1CB9r10mqG+0serRx+mjPXds2/TJQ="; - x86_64-darwin = "sha256-a8e3gKTTsK5QRAYrB4/DtrFFGM2In73wKEcEMcbeUTI="; + x86_64-linux = "sha256-+e4wo2vYSE3Z0icHcOu9aW6ZR6EDKiTe+S58d9s/1m4="; + aarch64-linux = "sha256-WR9SmUO/fHivUAAYpbXujQC0zjUmG8ATiTqGVZHly1s="; + x86_64-darwin = "sha256-Ih2uO4s0rukGDC8DhamaFb0HT4OKiBtQovRTD3rL9XY="; }; in fetchzip { diff --git a/nixpkgs/pkgs/tools/networking/brook/default.nix b/nixpkgs/pkgs/tools/networking/brook/default.nix index b6f7cb1869ad..c45f79fb2424 100644 --- a/nixpkgs/pkgs/tools/networking/brook/default.nix +++ b/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -1,26 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "brook"; - version = "20200201"; - - goPackagePath = "github.com/txthinking/brook"; + version = "20210701"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "0fyw2q99gapnrg836x299sgagx94a5jpw4x3gnsf69fih7cqp9lm"; + sha256 = "sha256-MYd9q1pjrdLbgIoIakHeBuCjlEjXib0CNivZiqk5hns="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-iaaXLpzN69yHBcAi9GS+G7LupX/7VABo1XFNegk+i3Q="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl3Only ]; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; }; } - diff --git a/nixpkgs/pkgs/tools/networking/brook/deps.nix b/nixpkgs/pkgs/tools/networking/brook/deps.nix deleted file mode 100644 index 9ccb446b5e52..000000000000 --- a/nixpkgs/pkgs/tools/networking/brook/deps.nix +++ /dev/null @@ -1,165 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "3f8c3bca5729c9b679beffd0d88a67d468f832fd"; - sha256 = "07m5dfp5190wczdw2vqzz4srcpjz5lci1z12rzww9pg9pdjs63gy"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "217d7bd9dd5494abdf2877afbeb24ba0e11b43d6"; - sha256 = "0vsmdrh5c5ngrnq91yg40l8388vh7l1p4wlv4lh7p977dp75ivg6"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "75dcda0896e109a2a22c9315bca3bb21b87b2ba5"; - sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "c3e18be99d19e6b3e8f1559eea2c161a665c4b6b"; - sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; - }; - } - { - goPackagePath = "github.com/mdp/qrterminal"; - fetch = { - type = "git"; - url = "https://github.com/mdp/qrterminal"; - rev = "b74f0e01e9f532111951caf89df78e5619193db5"; - sha256 = "1xz5f3dfkdwd6svnbh98rlr5pfr4s4hrqs4vffn9wy5vb336pp8p"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "6c0c4e6581f8e173cc562c8b3363ab984e4ae071"; - sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; - }; - } - { - goPackagePath = "github.com/patrickmn/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/patrickmn/go-cache"; - rev = "46f407853014144407b6c2ec7ccc76bf67958d93"; - sha256 = "08155wdk2883qw37p7wgrpv8wb9lbx4cpfgrraivdavs3qbjlq5j"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/txthinking/gotun2socks"; - fetch = { - type = "git"; - url = "https://github.com/txthinking/gotun2socks"; - rev = "35016fdae05e78db993d43f55eb96ddbe3958252"; - sha256 = "11rl8pqyd6jzi5alpymzi0i5q7pk2492di44v85g7r24y6livrjg"; - }; - } - { - goPackagePath = "github.com/txthinking/socks5"; - fetch = { - type = "git"; - url = "https://github.com/txthinking/socks5"; - rev = "254e122c4eaf8657900905ed5bed5777870b9df8"; - sha256 = "1q43sxzacj216mdzl44khhx51w1z78jpraw955dnjv9va0zqbhmi"; - }; - } - { - goPackagePath = "github.com/txthinking/x"; - fetch = { - type = "git"; - url = "https://github.com/txthinking/x"; - rev = "99b19c1440b66f803ee98b30b6829651cc3f90cc"; - sha256 = "0vzw9wxlgj21y35qv580806vy6k6w1z5yqd5n6ccnq8cd3lvmx70"; - }; - } - { - goPackagePath = "github.com/urfave/negroni"; - fetch = { - type = "git"; - url = "https://github.com/urfave/negroni"; - rev = "f4316798d5d3acd39eb6784301b19f27f471415f"; - sha256 = "0w4iva6s8v8sk95l8mb1a67v0bn4h7njyylv9dnwma0d3l7k24y3"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "69ecbb4d6d5dab05e49161c6e77ea40a030884e1"; - sha256 = "1ylm1lp1miihaq93p8rh2yh823qljqkyqwk3gjzk2bdvzz427pr5"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6afb5195e5aab057fda82e27171243402346b0ad"; - sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "9fbb57f87de9ccfe3a99d4e3270ce8a926ebba4f"; - sha256 = "0qaz2jjkrxzgkapmjqingdwamrgq2aiblxvzzgrcsv2qhkj0wdps"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "929e72ca90deac4784bbe451caf10faa5b256ebe"; - sha256 = "0kwyw87bx0rsc5bbqrrg36yv2b7rs4ijs4p4444s8zwzq6sw24y8"; - }; - } - { - goPackagePath = "gopkg.in/russross/blackfriday.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/russross/blackfriday.v2"; - rev = "d3b5b032dc8e8927d31a5071b56e14c89f045135"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "rsc.io/qr"; - fetch = { - type = "git"; - url = "https://github.com/rsc/qr"; - rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe"; - sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix b/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix index 189f636cd1fb..354c669b3366 100644 --- a/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix +++ b/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix @@ -3,10 +3,11 @@ # !!! Duplication: this package is almost exactly the same as `bsd-finger'. stdenv.mkDerivation rec { - name = "bsd-finger-0.17"; + pname = "bsd-finger"; + version = "0.17"; src = fetchurl { - url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz"; + url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz"; sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; }; diff --git a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index 53d1a3d4f233..e4783ddb0ef2 100644 --- a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "burpsuite"; - version = "2021.6"; + version = "2021.8.1"; src = fetchurl { name = "burpsuite.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-DPUi/KRnJkwrc7KMq10+LE6+MX9yJLgrgIHKhlfL+vc="; + sha256 = "sha256-R1WV3oaweW4nfszUOtmrfBlbKJm8HDNjwtbj97dFzB0="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix index 26cdfe7c0dbf..97f0d1823af2 100644 --- a/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix +++ b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix @@ -1,79 +1,42 @@ -{ writeText, lib, stdenv, fetchurl, ncurses }: +{ lib +, stdenv +, autoreconfHook +, fetchurl +, ncurses +}: -let - version = "0.6.1"; -in stdenv.mkDerivation rec { pname = "bwm-ng"; - inherit version; + version = "0.6.3"; src = fetchurl { url = "https://www.gropp.org/bwm-ng/${pname}-${version}.tar.gz"; - sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; + sha256 = "0ikzyvnb73msm9n7ripg1dsw9av1i0c7q2hi2173xsj8zyv559f1"; }; - buildInputs = [ ncurses ]; - - # gcc7 has some issues with inline functions - patches = [ - (writeText "gcc7.patch" - '' - --- a/src/bwm-ng.c - +++ b/src/bwm-ng.c - @@ -27,5 +27,5 @@ - /* handle interrupt signal */ - void sigint(int sig) FUNCATTR_NORETURN; - -inline void init(void); - +static inline void init(void); - - /* clear stuff and exit */ - --- a/src/options.c - +++ b/src/options.c - @@ -35,5 +35,5 @@ - inline int str2output_type(char *optarg); - #endif - -inline int str2out_method(char *optarg); - +static inline int str2out_method(char *optarg); - inline int str2in_method(char *optarg); - - '') + nativeBuildInputs = [ + autoreconfHook ]; - - # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=gnu89"; + buildInputs = [ + ncurses + ]; meta = with lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; - + maintainers = with maintainers; [ ]; longDescription = '' - Features - - supports /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit, devstat and libstatgrab - unlimited number of interfaces/devices supported - interfaces/devices are added or removed dynamically from list - white-/blacklist of interfaces/devices - output of KB/s, Kb/s, packets, errors, average, max and total sum - output in curses, plain console, CSV or HTML - configfile - - Short list of changes since 0.5 (for full list read changelog): - - curses2 output, a nice bar chart - disk input for bsd/macosx/linux/solaris - win32 network bandwidth support - moved to autotools - alot fixes - - Info - This was influenced by the old bwm util written by Barney (barney@freewill.tzo.com) which had some issues with faster interfaces and was very simple. Since i had almost all code done anyway for other projects, i decided to create my own version. - - I actually don't know if netstat input is useful at all. I saw this elsewhere, so i added it. Its target is "netstat 1.42 (2001-04-15)" linux or Free/Open/netBSD. If there are other formats i would be happy to add them. - - (from homepage) + bwm-ng supports: + - /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit, + devstat and libstatgrab + - unlimited number of interfaces/devices + - interfaces/devices are added or removed dynamically from list + - white-/blacklist of interfaces/devices + - output of KB/s, Kb/s, packets, errors, average, max and total sum + - output in curses, plain console, CSV or HTML ''; }; } diff --git a/nixpkgs/pkgs/tools/networking/cadaver/default.nix b/nixpkgs/pkgs/tools/networking/cadaver/default.nix index 70c7972bd65f..7ded22f01032 100644 --- a/nixpkgs/pkgs/tools/networking/cadaver/default.nix +++ b/nixpkgs/pkgs/tools/networking/cadaver/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}: stdenv.mkDerivation rec { - name = "cadaver-0.23.3"; + pname = "cadaver"; + version = "0.23.3"; src = fetchurl { - url = "http://www.webdav.org/cadaver/${name}.tar.gz"; + url = "http://www.webdav.org/cadaver/cadaver-${version}.tar.gz"; sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; }; diff --git a/nixpkgs/pkgs/tools/networking/carddav-util/default.nix b/nixpkgs/pkgs/tools/networking/carddav-util/default.nix index 300e03761a65..ed3f78d4da4a 100644 --- a/nixpkgs/pkgs/tools/networking/carddav-util/default.nix +++ b/nixpkgs/pkgs/tools/networking/carddav-util/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchgit, python3Packages, makeWrapper }: stdenv.mkDerivation { - - name = "carddav-0.1-2014-02-26"; + pname = "carddav"; + version = "0.1-2014-02-26"; src = fetchgit { url = "git://github.com/ljanyst/carddav-util"; diff --git a/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/nixpkgs/pkgs/tools/networking/cassowary/default.nix index 527ecfbf98d3..6280b923ec0c 100644 --- a/nixpkgs/pkgs/tools/networking/cassowary/default.nix +++ b/nixpkgs/pkgs/tools/networking/cassowary/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://github.com/rogerwelin/cassowary"; diff --git a/nixpkgs/pkgs/tools/networking/cbftp/default.nix b/nixpkgs/pkgs/tools/networking/cbftp/default.nix new file mode 100644 index 000000000000..e78b8a93dc67 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/cbftp/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, ncurses +, openssl +}: + +stdenv.mkDerivation rec { + pname = "cbftp"; + version = "1173"; + + src = fetchurl { + url = "https://cbftp.eu/${pname}-r${version}.tar.gz"; + hash = "sha256-DE6fnLzWsx6Skz2LRJAaijjIqrYFB8/HPp45P5CcEc8="; + }; + + buildInputs = [ + ncurses + openssl + ]; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + + install -D bin/* -t $out/bin/ + install -D API README -t $out/share/doc/${pname}/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://cbftp.eu/"; + description = " An advanced multi-purpose FTP/FXP client"; + longDescription = '' + Cbftp is an advanced multi-purpose FTP/FXP client that focuses on + efficient large-scale data spreading, while also supporting most regular + FTP/FXP use cases in a modern way. It runs in a terminal and provides a + semi-graphical user interface through ncurses. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/changetower/default.nix b/nixpkgs/pkgs/tools/networking/changetower/default.nix new file mode 100644 index 000000000000..e0e38c8d221d --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/changetower/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "changetower"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "Dc4ts"; + repo = "ChangeTower"; + rev = "v${version}"; + sha256 = "058ccn6d5f7w268hfqh85bz1xj6ysgfrmyj0b4asjiskq7728v9z"; + }; + + vendorSha256 = "0hagskhwrdsl6s6hn27jriysbxhaz0pqq1h43j7v0ggnwd2s03bq"; + + meta = with lib; { + description = "Tools to watch for webppage changes"; + homepage = "https://github.com/Dc4ts/ChangeTower"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/chisel/default.nix b/nixpkgs/pkgs/tools/networking/chisel/default.nix index 5d82a549e889..9df5625c2355 100644 --- a/nixpkgs/pkgs/tools/networking/chisel/default.nix +++ b/nixpkgs/pkgs/tools/networking/chisel/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; # tests require access to the network doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/cksfv/default.nix b/nixpkgs/pkgs/tools/networking/cksfv/default.nix index 581d39636fa7..f9d9224e91b1 100644 --- a/nixpkgs/pkgs/tools/networking/cksfv/default.nix +++ b/nixpkgs/pkgs/tools/networking/cksfv/default.nix @@ -1,16 +1,18 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cksfv-1.3.15"; + pname = "cksfv"; + version = "1.3.15"; src = fetchurl { - url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2"; + url = "https://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2"; sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1"; }; meta = with lib; { - homepage = "http://zakalwe.fi/~shd/foss/cksfv/"; + homepage = "https://zakalwe.fi/~shd/foss/cksfv/"; description = "A tool for verifying files against a SFV checksum file"; + maintainers = with maintainers; [ ]; platforms = platforms.all; license = licenses.gpl2; }; diff --git a/nixpkgs/pkgs/tools/networking/clash/default.nix b/nixpkgs/pkgs/tools/networking/clash/default.nix index 61e529dc8729..221a6c280b26 100644 --- a/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X github.com/Dreamacro/clash/constant.Version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/networking/cmst/default.nix b/nixpkgs/pkgs/tools/networking/cmst/default.nix index aa61d42d3d00..fb50316f7139 100644 --- a/nixpkgs/pkgs/tools/networking/cmst/default.nix +++ b/nixpkgs/pkgs/tools/networking/cmst/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { buildInputs = [ qtbase ]; - enableParallelBuilding = true; - postPatch = '' for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do substituteInPlace $f --replace /etc $out/etc --replace /usr $out diff --git a/nixpkgs/pkgs/tools/networking/corerad/default.nix b/nixpkgs/pkgs/tools/networking/corerad/default.nix index 8ba8109f2668..81fe5cacda25 100644 --- a/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "1xfqjxygf6r5wbf3brilx4d4hm0h518zaadmmzvkmbbz6w0fyl0k"; + sha256 = "0sf2r4q57hwdakv0b4skn76b0xy7bwj2j9rpj6frs5fkk6gsi6sm"; }; - vendorSha256 = "0ydyfdx9syrv719knwv64srfx4d1m9pzkivfc3q188bx5qx67pjw"; + vendorSha256 = "123f9y1pfayfd5amkw5b8jzi8dbn7a16kbf7lzbmw69c1gj4gx9z"; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/croc/default.nix b/nixpkgs/pkgs/tools/networking/croc/default.nix index 001ee1c725a9..9deb7d6c9409 100644 --- a/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.2.0"; + version = "9.3.0"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wEgR/4t2NRqdlAtHS41sACSNZpDY+4IEaeftCgRpEEk="; + sha256 = "sha256-chSVAQXGtcAFs4GzqywjAUM9qng9j6j7KOrlQalxdOw="; }; - vendorSha256 = "sha256-YwMqIbxj6ldYBjLb3Gs96oOHM2Li4Qq8PEMeYtrcSnE="; + vendorSha256 = "sha256-z8xU1IH+xemx/kxE4crj90roF73QW5D9jFLpykH7meo="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix b/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix index ab4c3292ea51..3366001042d7 100644 --- a/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,7 +1,8 @@ { buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { - name = "curl-unix-socket-2015-04-10"; + pname = "curl-unix-socket"; + version = "unstable-2015-04-10"; src = fetchFromGitHub { owner = "Soulou"; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix b/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix index e466be816e43..16b0b1ea09d6 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -65,7 +65,7 @@ let pname = "checks-base"; sourceRoot = "datadog_checks_base"; propagatedBuildInputs = with python.pkgs; [ - requests protobuf prometheus_client uuid simplejson uptime + requests protobuf prometheus-client uuid simplejson uptime ]; }; diff --git a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index cc1bad106f75..0962335ad1a3 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; + postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; meta = with lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; diff --git a/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix index dba08fea7956..b8bd1d88bf20 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpcap, perl }: -stdenv.mkDerivation { - name = "dhcpdump-1.8"; +stdenv.mkDerivation rec { + pname = "dhcpdump"; + version = "1.8"; src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_1.8.orig.tar.gz"; + url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz"; sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd"; }; diff --git a/nixpkgs/pkgs/tools/networking/dnschef/default.nix b/nixpkgs/pkgs/tools/networking/dnschef/default.nix new file mode 100644 index 000000000000..5dbb8980f063 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/dnschef/default.nix @@ -0,0 +1,27 @@ +{ buildPythonApplication, fetchFromGitHub, dnslib, lib }: + +buildPythonApplication rec { + pname = "dnschef"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "iphelix"; + repo = "dnschef"; + rev = "a395411ae1f5c262d0b80d06a45a445f696f3243"; + sha256 = "0ll3hw6w5zhzyqc2p3c9443gcp12sx6ddybg5rjpl01dh3svrk1q"; + }; + + format = "other"; + installPhase = '' + install -D ./dnschef.py $out/bin/dnschef + ''; + + propagatedBuildInputs = [ dnslib ]; + + meta = with lib; { + homepage = "https://github.com/iphelix/dnschef"; + description = "Highly configurable DNS proxy for penetration testers and malware analysts"; + license = licenses.bsd3; + maintainers = [ maintainers.gfrascadorio ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 8aedb4032608..ced5b4774653 100644 --- a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.0.45"; + version = "2.1.0"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-BvCxrFMRWPVVjK2sDlVbJKC/YK/bi4lBquIsdwOFXkw="; + sha256 = "sha256-HU5iy1dJbCp/PHnJjLi6MM+axz5Nrlcad5GEkD2p874="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index ffa2138ffa82..77f1bf694459 100644 --- a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.38.3"; + version = "0.39.4"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VfEfxcewKo8D8kNsMuCvrLOZNl632ZIFyD+RG8qzjQ4="; + sha256 = "sha256-dF3xyyOqWzjHW8cFdGlb3BCCGVy+eWW5OesKEK7pEjw="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/dnstop/default.nix b/nixpkgs/pkgs/tools/networking/dnstop/default.nix index cee24f1976ff..7669f6eec8f9 100644 --- a/nixpkgs/pkgs/tools/networking/dnstop/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnstop/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpcap, ncurses }: stdenv.mkDerivation rec { - name = "dnstop-20140915"; + pname = "dnstop"; + version = "2014-09-15"; src = fetchurl { - url = "http://dns.measurement-factory.com/tools/dnstop/src/${name}.tar.gz"; + url = "http://dns.measurement-factory.com/tools/dnstop/src/dnstop-${lib.replaceStrings ["-"] [""] version}.tar.gz"; sha256 = "0yn5s2825l826506gclbcfk3lzllx9brk9rzja6yj5jv0013vc5l"; }; diff --git a/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/nixpkgs/pkgs/tools/networking/dropbear/default.nix index f922a70344c4..1fd686735b7e 100644 --- a/nixpkgs/pkgs/tools/networking/dropbear/default.nix +++ b/nixpkgs/pkgs/tools/networking/dropbear/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2020.81"; + pname = "dropbear"; + version = "2020.81"; src = fetchurl { - url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; + url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2"; sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8"; }; diff --git a/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix index 2db99bfa8280..79ae5a9713be 100644 --- a/nixpkgs/pkgs/tools/networking/eggdrop/default.nix +++ b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "eggdrop"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "eggheads"; repo = "eggdrop"; rev = "v${version}"; - sha256 = "0xqdrv4ydxw72a740lkmpg3fs7ldicaf08b0sfqdyaj7cq8l5x5l"; + sha256 = "sha256-vh8nym7aYeTRUQ7FBZRy4ToG2ajwRDhzi4jNiJQOEyQ="; }; buildInputs = [ tcl ]; diff --git a/nixpkgs/pkgs/tools/networking/email/default.nix b/nixpkgs/pkgs/tools/networking/email/default.nix index 5c24acb912f9..2a6faa9c1731 100644 --- a/nixpkgs/pkgs/tools/networking/email/default.nix +++ b/nixpkgs/pkgs/tools/networking/email/default.nix @@ -20,7 +20,8 @@ let in stdenv.mkDerivation { - name = "email-git-2016-01-31"; + pname = "email-git"; + version = "unstable-2016-01-31"; src = eMailSrc; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/tools/networking/filegive/default.nix b/nixpkgs/pkgs/tools/networking/filegive/default.nix index 1d7bf884edd5..681bda5b4e1b 100644 --- a/nixpkgs/pkgs/tools/networking/filegive/default.nix +++ b/nixpkgs/pkgs/tools/networking/filegive/default.nix @@ -1,10 +1,11 @@ { buildGoPackage, lib, fetchurl }: buildGoPackage rec { - name = "filegive-0.7.4"; + pname = "filegive"; + version = "0.7.4"; src = fetchurl { - url = "http://viric.name/soft/filegive/${name}.tar.gz"; + url = "https://viric.name/soft/filegive/filegive-${version}.tar.gz"; sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy"; }; @@ -13,7 +14,7 @@ buildGoPackage rec { goPackagePath = "viric.name/soft/filegive"; meta = with lib; { - homepage = "http://viric.name/cgi-bin/filegive"; + homepage = "https://viric.name/cgi-bin/filegive"; description = "Easy p2p file sending program"; license = licenses.agpl3Plus; maintainers = [ maintainers.viric ]; diff --git a/nixpkgs/pkgs/tools/networking/findomain/default.nix b/nixpkgs/pkgs/tools/networking/findomain/default.nix index 018a210e4aa2..37499757e757 100644 --- a/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "4.3.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-UC70XmhAVf2a2QO9bkIRE5vEsWyIA0DudZfKraNffGY="; + sha256 = "sha256-xuabmlpejQVN8pYCNa97aL2IJUAgV7zLXpkEIp9SZRI="; }; - cargoSha256 = "sha256-Cdfh3smX6UjiG29L9hG22bOQQIjaNrv+okl153mIiso="; + cargoSha256 = "sha256-hrgTWB5D0eKmfuR+lrMN4mx6yGomHe/jUJxw2uyrjHg="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix b/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix index d31751e7d5ca..2829b3967f91 100644 --- a/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix +++ b/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - - name = "flvstreamer-2.1c1"; + pname = "flvstreamer"; + version = "2.1c1"; src = fetchurl { - url = "mirror://savannah/flvstreamer/source/${name}.tar.gz"; + url = "mirror://savannah/flvstreamer/source/flvstreamer-${version}.tar.gz"; sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee"; }; diff --git a/nixpkgs/pkgs/tools/networking/fping/default.nix b/nixpkgs/pkgs/tools/networking/fping/default.nix index 7974fdd244bd..8e87eaf6942f 100644 --- a/nixpkgs/pkgs/tools/networking/fping/default.nix +++ b/nixpkgs/pkgs/tools/networking/fping/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-5.0"; + pname = "fping"; + version = "5.0"; src = fetchurl { - url = "https://www.fping.org/dist/${name}.tar.gz"; + url = "https://www.fping.org/dist/fping-${version}.tar.gz"; sha256 = "1f2prmii4fyl44cfykp40hp4jjhicrhddh9v3dfs11j6nsww0f7d"; }; diff --git a/nixpkgs/pkgs/tools/networking/frp/default.nix b/nixpkgs/pkgs/tools/networking/frp/default.nix index 871dd5ee5bd9..1fc91277ef3b 100644 --- a/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.36.1"; + version = "0.37.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oOq5Y/6n7VHU9WPjnt+moVWZgo8mQl6Jd8daLJ2/pSQ="; + sha256 = "sha256-TEVSxTzMgoIPcIUmhtRnFSp3xClJmOsIUjpKEr5sId8="; }; - vendorSha256 = "sha256-Q4ZwCH/RTa8cLtSg06s1S790MdZLgfWOvaD+WAt/RBM="; + vendorSha256 = "sha256-4vvIobj1I7FbPVJJG4NZogwv4BMo7GRa5Fo5gO2Daws="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/gftp/default.nix b/nixpkgs/pkgs/tools/networking/gftp/default.nix deleted file mode 100644 index b228967a73b5..000000000000 --- a/nixpkgs/pkgs/tools/networking/gftp/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }: - -stdenv.mkDerivation { - name = "gftp-2.0.19"; - - src = fetchurl { - url = "https://www.gftp.org/gftp-2.0.19.tar.bz2"; - sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; - }; - - postPatch = '' - sed -i -e '/<stropts.h>/d' lib/pty.c - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 readline ncurses gettext openssl ]; - - meta = { - description = "GTK-based FTP client"; - homepage = "http://www.gftp.org"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix b/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix index 5d00b493bc37..43cfe4812909 100644 --- a/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/ghostunnel/default.nix @@ -1,22 +1,35 @@ -{ - buildGoModule, - fetchFromGitHub, - lib, - nixosTests, +{ buildGoModule +, fetchFromGitHub +, lib +, nixosTests }: buildGoModule rec { pname = "ghostunnel"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ghostunnel"; repo = "ghostunnel"; rev = "v${version}"; - sha256 = "15rmd89j7sfpznzznss899smizbyshprsrvsdmrbhb617myd9fpy"; + sha256 = "sha256-EE8gCm/gOp3lmCx1q4PahulipLoBZnEatNAVUXzHIVw="; }; - vendorSha256 = "1i95fx4a0fh6id6iy6afbva4pazr7ym6sbwi9r7la6gxzyncd023"; + vendorSha256 = "sha256-XgmvqB1PCfL2gSDqwqauSixk8vlINHRmX6U0h9EXXdU="; + + deleteVendor = true; + + # The certstore directory isn't recognized as a subpackage, but is when moved + # into the vendor directory. + postUnpack = '' + mkdir -p $sourceRoot/vendor/ghostunnel + mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/ + ''; + + passthru.tests = { + nixos = nixosTests.ghostunnel; + podman = nixosTests.podman-tls-ghostunnel; + }; meta = with lib; { description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications"; @@ -24,6 +37,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ roberth ]; }; - - passthru.tests.nixos = nixosTests.ghostunnel; } diff --git a/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/nixpkgs/pkgs/tools/networking/gobgp/default.nix index 98925489e548..6ba0752222ac 100644 --- a/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - buildFlagsArray = '' - -ldflags= - -s -w -extldflags '-static' - ''; + ldflags = [ + "-s" "-w" "-extldflags '-static'" + ]; subPackages = [ "cmd/gobgp" ]; diff --git a/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix b/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix index 619e364c884f..968d5774b5b5 100644 --- a/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix +++ b/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix @@ -1,24 +1,24 @@ -{ buildGoPackage, fetchFromGitLab, lib, runtimeShell }: +{ buildGoModule, fetchFromGitLab, lib, runtimeShell }: -buildGoPackage rec { +buildGoModule rec { pname = "goimapnotify"; - version = "2.0"; - - goPackagePath = "gitlab.com/shackra/goimapnotify"; + version = "2.3.2"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; rev = version; - sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42"; + sha256 = "sha256-pkpdIkabxz9bu0LnyU1/wu1qqPc/pQqCn8tePc2fIfg="; }; + vendorSha256 = "sha256-4+2p/7BAEk+1V0TII9Q2O2YNX0rvBiw2Ss7k1dsvUbk="; + postPatch = '' - substituteInPlace command.go --replace '"sh"' '"${runtimeShell}"' + for f in command.go command_test.go; do + substituteInPlace $f --replace '"sh"' '"${runtimeShell}"' + done ''; - goDeps = ./deps.nix; - meta = with lib; { description = "Execute scripts on IMAP mailbox changes (new/deleted/updated messages) using IDLE"; diff --git a/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/nixpkgs/pkgs/tools/networking/grpcui/default.nix index a9fb7c823f9e..1fa47ba917fc 100644 --- a/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/grpcui" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; diff --git a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix index ec181c17e9ea..e6cd09dc2fd7 100644 --- a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "sha256-BxmoIGhuAt/uhHLNdMiSrNVWAoxAAMKPJ/NsXjf2ynk="; + sha256 = "sha256-/no8bRGoKibtcjaITUuzwAbX+gPHNJROSf79iuuRwe4="; }; subPackages = [ "cmd/grpcurl" ]; - vendorSha256 = "sha256-EnstvJk2kZ1Ft5xY1dO14wnmT//2K72OnDMZqeaOeQI="; + vendorSha256 = "sha256-nl8vKVhUMSO20qCDyhNkU5cghNy8vIFqSBvLk59nbWg="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"; diff --git a/nixpkgs/pkgs/tools/networking/gvproxy/default.nix b/nixpkgs/pkgs/tools/networking/gvproxy/default.nix new file mode 100644 index 000000000000..662f909b6245 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/gvproxy/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "gvproxy"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "gvisor-tap-vsock"; + rev = "v${version}"; + sha256 = "sha256-cXaX7A8Wgq/PEHnFrparZjOKdENX3pWWXYfrEuFLDx0="; + }; + + vendorSha256 = null; + + buildPhase = '' + runHook preBuild + make build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install bin/* -Dt $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Network stack based on gVisor"; + homepage = "https://github.com/containers/gvisor-tap-vsock"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index bb79ad956a67..32fa2af818bf 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.10"; + version = "2.3.13"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-mUbgz8g/KQcrNDHjckYiHPnUqdKKFYwHVxTTRSZvTzU="; + sha256 = "0mz2vga8wwhqa8n4psphbqfd5q33n4m8ar7ac9chhn0i397s8lf6"; }; buildInputs = [ openssl zlib ] diff --git a/nixpkgs/pkgs/tools/networking/hp2p/default.nix b/nixpkgs/pkgs/tools/networking/hp2p/default.nix new file mode 100644 index 000000000000..52f3455ed4d5 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/hp2p/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, mpi, python3Packages, autoconf, automake } : + +stdenv.mkDerivation rec { + pname = "hp2p"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "cea-hpc"; + repo = "hp2p"; + rev = version; + sha256 = "0zvlwb941rlp3vrf9yzv7njgpj3mh4671ch7qvxfa4hq2ivd52br"; + }; + + patches = [ ./python3.patch ]; + enableParallelBuilding = true; + nativeBuildInputs = [ autoconf automake python3Packages.wrapPython ]; + buildInputs = [ mpi ] ++ (with python3Packages; [ python numpy matplotlib plotly mpldatacursor ]) ; + pythonPath = (with python3Packages; [ numpy matplotlib plotly mpldatacursor ]) ; + + preConfigure = '' + patchShebangs autogen.sh + ./autogen.sh + export CC=mpicc + export CXX=mpic++ + ''; + + postInstall = '' + wrapPythonPrograms + ''; + + meta = with lib; { + description = "A MPI based benchmark for network diagnostics"; + homepage = "https://github.com/cea-hpc/hp2p"; + platforms = platforms.unix; + license = licenses.cecill-c; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/hp2p/python3.patch b/nixpkgs/pkgs/tools/networking/hp2p/python3.patch new file mode 100644 index 000000000000..13043d9f09f1 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/hp2p/python3.patch @@ -0,0 +1,120 @@ +diff -u -r source.orig/src/vizhp2p source/src/vizhp2p +--- source.orig/src/vizhp2p 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/vizhp2p 2021-08-24 10:41:42.926881770 +0200 +@@ -94,25 +94,25 @@ + with open(hostfile) as fd: + for line in fd: + if line.startswith(motif_rank): +- print line ++ print(line) + c,v = line[len(motif_rank)+1:-1].split(separator) + nodes[c] = v + + # display k worst nodes indices +- print "\nTop %d bad mean:" % k ++ print("\nTop %d bad mean:" % k) + mean_order = np.argsort(a_mean) +- print [nodes[str(c)] for c in mean_order[:k]] ++ print([nodes[str(c)] for c in mean_order[:k]]) + mean_st = "Top nodes with bad mean:\n" + for i in range(0, k, hostname_per_line): + mean_st += repr([nodes[str(c)] for c + in mean_order[i:i + hostname_per_line]]) + "\n" + +- print "Top %d bad std:" % k +- print [nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]] ++ print("Top %d bad std:" % k) ++ print([nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]]) + +- print "Top %d bad mean/std:" % k ++ print("Top %d bad mean/std:" % k) + pen_order = np.argsort(a_mean / a_std) +- print [nodes[str(c)] for c in pen_order[:k]] ++ print([nodes[str(c)] for c in pen_order[:k]]) + pen_st = "Top nodes with bad mean/std:\n" + for i in range(0, k, hostname_per_line): + pen_st += repr([nodes[str(c)] for c +@@ -293,9 +293,9 @@ + # and 'p' (snapshot) + def onrefresh(event): + if event.key == 'r': +- print "refreshing...", ++ print("refreshing...", end=' ') + loop() +- print "ok" ++ print("ok") + elif event.key == 'q': + exit() + elif event.key == 'p': +@@ -303,9 +303,9 @@ + fig1.savefig(snapfile) + snapfile = outputname + "_snapshot_time.png" + fig2.savefig(snapfile) +- print 'snapshot saved (%s)' % snapfile ++ print('snapshot saved (%s)' % snapfile) + else: +- print "The answer to %s is 42." % event.key ++ print("The answer to %s is 42." % event.key) + + + if __name__ == "__main__": +@@ -356,11 +356,11 @@ + countfile = outputname + ".count.bin" + + print("visu_hp2p configuration:") +- print(" DATAFILE : %s"%resfile) +- print(" BIN_TIMER_FILE : %s"%resfile_time) +- print(" HOSTFILE : %s"%hostfile) +- print(" Bad nodes to display: %d"%k) +- print(" GUI resolution : %s"%resolution) ++ print((" DATAFILE : %s"%resfile)) ++ print((" BIN_TIMER_FILE : %s"%resfile_time)) ++ print((" HOSTFILE : %s"%hostfile)) ++ print((" Bad nodes to display: %d"%k)) ++ print((" GUI resolution : %s"%resolution)) + + hostname_per_line = 4 # for GUI layout + refresh_in_sec = 60 +@@ -377,7 +377,7 @@ + # wait for resfile + while not os.path.exists(resfile) : + time.sleep(5) +- print "Waiting for input files..." ++ print("Waiting for input files...") + + # add callback on key press event + cid1 = fig1.canvas.mpl_connect('key_press_event', onrefresh) +Only in source/src: vizhp2p.bak +diff -u -r source.orig/src/vizhp2p_html source/src/vizhp2p_html +--- source.orig/src/vizhp2p_html 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/vizhp2p_html 2021-08-24 10:41:54.799946303 +0200 +@@ -118,7 +118,7 @@ + hostfile = args.hostfile + clustername = args.clustername + if len(args.OutputName) == 0: +- print "No DATAFILE given! Please provide Hp2p output files name !" ++ print("No DATAFILE given! Please provide Hp2p output files name !") + exit(0) + else: + outputname = args.OutputName.split('.')[0] +@@ -134,13 +134,13 @@ + else: + outfile = args.outfile + +- print "%s configuration:"%commandname +- print " DATAFILE : %s"%resfile +- print " HOSTFILE : %s"%hostfile +- print " CLUSTER : %s"%clustername +- print " OUTPUTFILE : %s"%outfile ++ print("%s configuration:"%commandname) ++ print(" DATAFILE : %s"%resfile) ++ print(" HOSTFILE : %s"%hostfile) ++ print(" CLUSTER : %s"%clustername) ++ print(" OUTPUTFILE : %s"%outfile) + if not os.path.exists(resfile): +- print "%s doesn't exist...Exiting"%resfile ++ print("%s doesn't exist...Exiting"%resfile) + exit(0) + + # Data management +Only in source/src: vizhp2p_html.bak diff --git a/nixpkgs/pkgs/tools/networking/http-prompt/default.nix b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix index 3732fbd879f5..3f42fa83c64f 100644 --- a/nixpkgs/pkgs/tools/networking/http-prompt/default.nix +++ b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { click httpie parsimonious - (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) + (python.pkgs.callPackage ../../../development/python-modules/prompt-toolkit/1.nix {}) pygments six ]; diff --git a/nixpkgs/pkgs/tools/networking/hurl/default.nix b/nixpkgs/pkgs/tools/networking/hurl/default.nix new file mode 100644 index 000000000000..6ecff2e6e389 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/hurl/default.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libxml2 +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "hurl"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Orange-OpenSource"; + repo = pname; + rev = version; + sha256 = "0hbyqj794pvvfrg6jgz63mih73bnmnvgmwbv705c2238w7wsgk9w"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxml2 + openssl + ]; + + # Tests require network access to a test server + doCheck = false; + + cargoSha256 = "09ndgm6kmqwdz7yn2rqxk5xr1qkai87zm1k138cng4wq135c3w6g"; + + meta = with lib; { + description = "Command line tool that performs HTTP requests defined in a simple plain text format."; + homepage = "https://hurl.dev/"; + maintainers = with maintainers; [ eonpatapon ]; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/hyenae/default.nix b/nixpkgs/pkgs/tools/networking/hyenae/default.nix index 5007a69fb9b7..b0e579de2209 100644 --- a/nixpkgs/pkgs/tools/networking/hyenae/default.nix +++ b/nixpkgs/pkgs/tools/networking/hyenae/default.nix @@ -1,12 +1,13 @@ {lib, stdenv, fetchurl, libdnet, pkg-config, libpcap}: -stdenv.mkDerivation { - name = "hyenae-0.36-1"; +stdenv.mkDerivation rec { + pname = "hyenae"; + version = "0.36-1"; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz"; + url = "mirror://sourceforge/hyenae/${version}/hyenae-${version}.tar.gz"; sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; diff --git a/nixpkgs/pkgs/tools/networking/iftop/default.nix b/nixpkgs/pkgs/tools/networking/iftop/default.nix index c3e71e6132de..abdb7d05b28b 100644 --- a/nixpkgs/pkgs/tools/networking/iftop/default.nix +++ b/nixpkgs/pkgs/tools/networking/iftop/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }: -stdenv.mkDerivation { - name = "iftop-1.0pre4"; +stdenv.mkDerivation rec { + pname = "iftop"; + version = "1.0pre4"; src = fetchurl { - url = "http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz"; + url = "http://ex-parrot.com/pdw/iftop/download/iftop-${version}.tar.gz"; sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp"; }; diff --git a/nixpkgs/pkgs/tools/networking/imapproxy/default.nix b/nixpkgs/pkgs/tools/networking/imapproxy/default.nix index dd149f57432b..ca0ce6f933fc 100644 --- a/nixpkgs/pkgs/tools/networking/imapproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/imapproxy/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, openssl, ncurses}: -stdenv.mkDerivation { - name = "imapproxy-1.2.7"; +stdenv.mkDerivation rec { + pname = "imapproxy"; + version = "1.2.7"; + src = fetchurl { - url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2"; + url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-${version}.tar.bz2"; sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx"; }; diff --git a/nixpkgs/pkgs/tools/networking/imapsync/default.nix b/nixpkgs/pkgs/tools/networking/imapsync/default.nix index bec0b197c184..4c91fb9096b6 100644 --- a/nixpkgs/pkgs/tools/networking/imapsync/default.nix +++ b/nixpkgs/pkgs/tools/networking/imapsync/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }: stdenv.mkDerivation rec { - name = "imapsync-1.727"; + pname = "imapsync"; + version = "1.727"; + src = fetchurl { - url = "https://releases.pagure.org/imapsync/${name}.tgz"; + url = "https://releases.pagure.org/imapsync/imapsync-${version}.tgz"; sha256 = "1axacjw2wyaphczfw3kfmi5cl83fyr8nb207nks40fxkbs8q5dlr"; }; diff --git a/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/nixpkgs/pkgs/tools/networking/inadyn/default.nix index 47d866150266..7a3ee1e01211 100644 --- a/nixpkgs/pkgs/tools/networking/inadyn/default.nix +++ b/nixpkgs/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.7"; + version = "2.8.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "00jhayx0hfl9dw78d58bdxa5390bvxq73lz26q9h1gg1xw76adan"; + sha256 = "sha256-kr9xh7HMikargi0hhj3epH2c6R5lN4qD9nDaChNI4Kg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/nixpkgs/pkgs/tools/networking/inetutils/default.nix index 285031aaca52..f5c9ff00d924 100644 --- a/nixpkgs/pkgs/tools/networking/inetutils/default.nix +++ b/nixpkgs/pkgs/tools/networking/inetutils/default.nix @@ -3,18 +3,17 @@ }: stdenv.mkDerivation rec { - name = "inetutils-1.9.4"; + pname = "inetutils"; + version = "2.2"; src = fetchurl { - url = "mirror://gnu/inetutils/${name}.tar.gz"; - sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-1Uf2kXLfc6/vaRoPeIYoD9eBrOoo3vT/S0shIIaonYA"; }; outputs = ["out" "apparmor"]; patches = [ - ./whois-Update-Canadian-TLD-server.patch - ./service-name.patch # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch ]; diff --git a/nixpkgs/pkgs/tools/networking/inetutils/service-name.patch b/nixpkgs/pkgs/tools/networking/inetutils/service-name.patch deleted file mode 100644 index e34516313c57..000000000000 --- a/nixpkgs/pkgs/tools/networking/inetutils/service-name.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inetutils-1.9.4.org/whois/whois.c 2015-03-31 17:40:50.000000000 +0200 -+++ inetutils-1.9.4/whois/whois.c 2017-04-20 10:23:38.487358708 +0200 -@@ -576,7 +576,7 @@ - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - -- if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0) -+ if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0) - err_quit ("getaddrinfo: %s", gai_strerror (i)); - - for (ressave = res; res; res = res->ai_next) diff --git a/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch b/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch deleted file mode 100644 index d63d4e29daf0..000000000000 --- a/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 73e2811a0512556fd5359acc4387f46c79a9884a Mon Sep 17 00:00:00 2001 -From: Mats Erik Andersson <gnu@gisladisker.se> -Date: Thu, 2 Mar 2017 15:38:38 +0100 -Subject: [PATCH] whois: Update Canadian TLD server. -Content-Type: text/plain; charset=utf-8 - ---- - ChangeLog | 8 ++++++++ (OMITTED) - whois/tld_serv_list | 2 +- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/whois/tld_serv_list b/whois/tld_serv_list -index 056efcf..91697b8 100644 ---- a/whois/tld_serv_list -+++ b/whois/tld_serv_list -@@ -81,7 +81,7 @@ - #.bw # NIC? www.botsnet.bw - #.by NONE # NIC? http://unibel.by www.open.by - .bz NONE # http://www.psg.com/dns/bz/ --.ca whois.cdnnet.ca -+.ca whois.cira.ca - .cc whois.nic.cc - .cd WEB http://www.nic.cd/database/cd/ - #.cf NONE # NIC? http://www.socatel.intnet.cf --- -2.10.0 - diff --git a/nixpkgs/pkgs/tools/networking/innernet/default.nix b/nixpkgs/pkgs/tools/networking/innernet/default.nix index f643702d625b..a00164670e1a 100644 --- a/nixpkgs/pkgs/tools/networking/innernet/default.nix +++ b/nixpkgs/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n+xNWhOkRCIcoBHR8u+xZK81fU0usIfFhYg3BO9yXik="; + sha256 = "sha256-ss3BtwRnRAUPfM6yjl14rQrYZ7PHAT3s/MEHnbV7IEU="; }; - cargoSha256 = "sha256-cTqQtJpuwVlUKfAK8ASf6vq6PU2NE8PT/el/Hz4HgtA="; + cargoSha256 = "sha256-hhsRLm8wsmvnu3wRK9s4Fjdy0bKLboAKw6qS2XQ1nsI="; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/nixpkgs/pkgs/tools/networking/ipcalc/default.nix b/nixpkgs/pkgs/tools/networking/ipcalc/default.nix index 5fec55899e46..2237c739ec14 100644 --- a/nixpkgs/pkgs/tools/networking/ipcalc/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipcalc/default.nix @@ -1,20 +1,38 @@ -{lib, stdenv, fetchurl, perl}: +{ lib +, stdenv +, fetchFromGitLab +, glib +, meson +, ninja +, libmaxminddb +, pkg-config +, ronn +}: + stdenv.mkDerivation rec { pname = "ipcalc"; - version = "0.41"; - src = fetchurl { - url = "http://jodies.de/ipcalc-archive/${pname}-${version}.tar.gz"; - sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a"; + version = "1.0.1"; + + src = fetchFromGitLab { + owner = "ipcalc"; + repo = "ipcalc"; + rev = version; + sha256 = "0qg516jv94dlk0qj0bj5y1dd0i31ziqcjd6m00w8xp5wl97bj2ji"; }; - buildInputs = [perl]; - installPhase = '' - mkdir -p $out/bin - cp ipcalc $out/bin - ''; - meta = { + + nativeBuildInputs = [ + glib + meson + ninja + pkg-config + libmaxminddb + ronn + ]; + + meta = with lib; { description = "Simple IP network calculator"; - homepage = "http://jodies.de/ipcalc"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; + homepage = "https://gitlab.com/ipcalc/ipcalc"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/iperf/2.nix b/nixpkgs/pkgs/tools/networking/iperf/2.nix index 3270a25e67b2..82c1ba34f143 100644 --- a/nixpkgs/pkgs/tools/networking/iperf/2.nix +++ b/nixpkgs/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.13"; + pname = "iperf"; + version = "2.1.4"; src = fetchurl { - url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1bbq6xr0vrd88zssfiadvw3awyn236yv94fsdl9q2sh9cv4xx2n8"; + url = "mirror://sourceforge/iperf2/files/${pname}-${version}.tar.gz"; + sha256 = "1yflnj2ni988nm0p158q8lnkiq2gn2chmvsglyn2gqmqhwp3jaq6"; }; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/tools/networking/iperf/3.nix b/nixpkgs/pkgs/tools/networking/iperf/3.nix index 5ab3f7f30fbd..f32a4249c006 100644 --- a/nixpkgs/pkgs/tools/networking/iperf/3.nix +++ b/nixpkgs/pkgs/tools/networking/iperf/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iperf"; - version = "3.9"; + version = "3.10.1"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; - sha256 = "0f601avdmzpwsa3lbi0ppjhkrdipm5wifhhxy5czf99370k3mdi4"; + sha256 = "0nkisr2215w68ivadg3sx3q50iwamznwigs63lclb8jlrih9gg03"; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/tools/networking/ipinfo/default.nix b/nixpkgs/pkgs/tools/networking/ipinfo/default.nix index 91bc654c83a0..9a48588d3d86 100644 --- a/nixpkgs/pkgs/tools/networking/ipinfo/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "${pname}-${version}"; - sha256 = "00rqqkybvzxcpa6fy799fxmn95xqx7s3z3mqfryzi35dlmjdfzqy"; + sha256 = "15pwx94n4qi02r3ppqkpnkikpnbqmr8rrn9gmkbjy2vbdi147qwl"; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/isync/default.nix b/nixpkgs/pkgs/tools/networking/isync/default.nix index 666e19ca81ae..a6181e6f2ded 100644 --- a/nixpkgs/pkgs/tools/networking/isync/default.nix +++ b/nixpkgs/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r"; + sha256 = "024p3glj4p7fhrssw5sr55arls9zna1igxxrspxlfd6sbds21ixl"; }; nativeBuildInputs = [ pkg-config perl ]; diff --git a/nixpkgs/pkgs/tools/networking/jnettop/default.nix b/nixpkgs/pkgs/tools/networking/jnettop/default.nix index bd31235b6f94..91f92236ecf8 100644 --- a/nixpkgs/pkgs/tools/networking/jnettop/default.nix +++ b/nixpkgs/pkgs/tools/networking/jnettop/default.nix @@ -1,10 +1,11 @@ { fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkg-config, glib }: -stdenv.mkDerivation { - name = "jnettop-0.13.0"; +stdenv.mkDerivation rec { + pname = "jnettop"; + version = "0.13.0"; src = fetchurl { - url = "http://jnettop.kubs.info/dist/jnettop-0.13.0.tar.gz"; + url = "http://jnettop.kubs.info/dist/jnettop-${version}.tar.gz"; sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; diff --git a/nixpkgs/pkgs/tools/networking/jwhois/default.nix b/nixpkgs/pkgs/tools/networking/jwhois/default.nix index 6eb26de82fc9..5a79a09281c3 100644 --- a/nixpkgs/pkgs/tools/networking/jwhois/default.nix +++ b/nixpkgs/pkgs/tools/networking/jwhois/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, lynx, fetchurl}: -stdenv.mkDerivation { - name = "jwhois-4.0"; +stdenv.mkDerivation rec { + pname = "jwhois"; + version = "4.0"; src = fetchurl { - url = "mirror://gnu/jwhois/jwhois-4.0.tar.gz"; + url = "mirror://gnu/jwhois/jwhois-${version}.tar.gz"; sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs"; }; diff --git a/nixpkgs/pkgs/tools/networking/kea/default.nix b/nixpkgs/pkgs/tools/networking/kea/default.nix index e3e4a67c131f..8928215dccb7 100644 --- a/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.9"; + version = "1.9.10"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-iVSWBR1+SkXlkwMii2PXpcxFSXYigz4lfNnMZBvS2kM="; + sha256 = "08pr2qav87jmrf074v8zbqyjkl51wf6r9hhgbkzhdav9d4f9kny3"; }; patches = [ ./dont-create-var.patch ]; diff --git a/nixpkgs/pkgs/tools/networking/libreswan/default.nix b/nixpkgs/pkgs/tools/networking/libreswan/default.nix index 24b7176e82b5..766a1030fd7e 100644 --- a/nixpkgs/pkgs/tools/networking/libreswan/default.nix +++ b/nixpkgs/pkgs/tools/networking/libreswan/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , nixosTests , pkg-config , systemd @@ -43,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "libreswan"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; - sha256 = "0xj974yc0y1r7235zl4jhvxqz3bpb8js2fy9ic820zq9swh0lgsz"; + sha256 = "18whvmaxqfmaqbmq72calyzk21wyvxa0idddcsxd8x36vhdza0q7"; }; strictDeps = true; @@ -70,14 +69,6 @@ stdenv.mkDerivation rec { python3 bash ] ++ lib.optional stdenv.isLinux libselinux; - patches = [ - # Fix compilation on aarch64, remove on next update - (fetchpatch { - url = "https://github.com/libreswan/libreswan/commit/ea50d36d2886e44317ba5ba841de1d1bf91aee6c.patch"; - sha256 = "1jp89rm9jp55zmiyimyhg7yadj0fwwxaw7i5gyclrs38w3y1aacj"; - }) - ]; - prePatch = '' # Correct iproute2 path sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \ @@ -111,10 +102,8 @@ stdenv.mkDerivation rec { -i configs/Makefile ''; - # Set appropriate paths for build - preBuild = "export INC_USRLOCAL=\${out}"; - makeFlags = [ + "PREFIX=$(out)" "INITSYSTEM=systemd" "UNITDIR=$(out)/etc/systemd/system/" "TMPFILESDIR=$(out)/lib/tmpfiles.d/" diff --git a/nixpkgs/pkgs/tools/networking/lsh/default.nix b/nixpkgs/pkgs/tools/networking/lsh/default.nix index b03098d540a3..5893579b1a7b 100644 --- a/nixpkgs/pkgs/tools/networking/lsh/default.nix +++ b/nixpkgs/pkgs/tools/networking/lsh/default.nix @@ -2,9 +2,11 @@ , nettools, lsof, procps }: stdenv.mkDerivation rec { - name = "lsh-2.0.4"; + pname = "lsh"; + version = "2.0.4"; + src = fetchurl { - url = "mirror://gnu/lsh/${name}.tar.gz"; + url = "mirror://gnu/lsh/lsh-${version}.tar.gz"; sha256 = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091"; }; diff --git a/nixpkgs/pkgs/tools/networking/maildrop/default.nix b/nixpkgs/pkgs/tools/networking/maildrop/default.nix index b258c638df52..143172735919 100644 --- a/nixpkgs/pkgs/tools/networking/maildrop/default.nix +++ b/nixpkgs/pkgs/tools/networking/maildrop/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, pkg-config, pcre, perl }: -stdenv.mkDerivation { - name = "maildrop-2.6.0"; +stdenv.mkDerivation rec { + pname = "maildrop"; + version = "2.6.0"; src = fetchurl { - url = "mirror://sourceforge/courier/maildrop/2.6.0/maildrop-2.6.0.tar.bz2"; + url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2"; sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg"; }; diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 06ec1b5a83f7..893537e167ad 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-06-13T17-48-22Z"; + version = "2021-07-27T06-46-19Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-u0WO7KSalDqlRwbN3b74FOb632fIGPZ2F0T8qLrvt+U="; + sha256 = "1h0r8c22v94w2hhbc0hv9rc9jyr5ar7gpa76lhr9l8ra0k3qra43"; }; - vendorSha256 = "sha256-BadW8AKHcrkCS3sXR7bqdgNhRYkfXIQOteMxIbiLvwg="; + vendorSha256 = "1s1bq166dlhqll0r5lcdjpd2446cwi1slbi895582jgs38zpkzvw"; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix index aea0faddf5d7..da950cdd2b8e 100644 --- a/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix @@ -7,12 +7,13 @@ let scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ]; in stdenv.mkDerivation rec { - name = "miniupnpd-2.1.20190502"; + pname = "miniupnpd"; + version = "2.1.20190502"; src = fetchurl { - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=miniupnpd-${version}.tar.gz"; sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b"; - name = "${name}.tar.gz"; + name = "miniupnpd-${version}.tar.gz"; }; buildInputs = [ iptables libuuid ]; diff --git a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix index 2a99c127acbc..9d8f13a40709 100644 --- a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , glib, udev, libgudev, polkit, ppp, gettext, pkg-config, python3 , libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.16.6"; + version = "1.16.8"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "05wn94x71qr36avxjzvyf56nj5illynnf9nn15b17lv61wkbd41a"; + sha256 = "sha256-If36+UFxJhrZ2ZdxiU9a3kvDnvPR/x1CEFTRRxPpeIA="; }; - patches = [ - # Fix a broken test. - # https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/556 - (fetchpatch { - url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/a324667386f35df0c3b3bbf615fa0560d215485d.patch"; - sha256 = "1xj9gfl6spbp4xdp6gn76k8zvzam5m6lgmbiwdn6ixffzhlfwi5l"; - }) - ]; - nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; diff --git a/nixpkgs/pkgs/tools/networking/mpack/default.nix b/nixpkgs/pkgs/tools/networking/mpack/default.nix index 3aca81596e08..2c9bf4ff2d30 100644 --- a/nixpkgs/pkgs/tools/networking/mpack/default.nix +++ b/nixpkgs/pkgs/tools/networking/mpack/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mpack-1.6"; + pname = "mpack"; + version = "1.6"; src = fetchurl { - url = "http://ftp.andrew.cmu.edu/pub/mpack/${name}.tar.gz"; + url = "http://ftp.andrew.cmu.edu/pub/mpack/mpack-${version}.tar.gz"; sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97"; }; diff --git a/nixpkgs/pkgs/tools/networking/mu/default.nix b/nixpkgs/pkgs/tools/networking/mu/default.nix index 4553063929fd..db8f9bdb9d1a 100644 --- a/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.15"; + version = "1.6.5"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "sha256-VIUA0W+AmEbvGWatv4maBGILvUTGhBgO3iQtjIc3vG8="; + sha256 = "ZHEUJiEJzQzSwWgY07dDflY5GRiD1We435htY/7IOdQ="; }; postPatch = lib.optionalString (batchSize != null) '' @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; changelog = "https://github.com/djcb/mu/releases/tag/${version}"; - maintainers = with maintainers; [ antono peterhoeg ]; + maintainers = with maintainers; [ antono chvp peterhoeg ]; platforms = platforms.mesaPlatforms; }; } diff --git a/nixpkgs/pkgs/tools/networking/mubeng/default.nix b/nixpkgs/pkgs/tools/networking/mubeng/default.nix index 11ebe338c90b..2c560cffb07b 100644 --- a/nixpkgs/pkgs/tools/networking/mubeng/default.nix +++ b/nixpkgs/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.4.5"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - sha256 = "03hm4wqlvsbi06g0ijrhvbk9i2ahmd1m8l80wbcijznhbdl5msl8"; + sha256 = "sha256-jwBDa/TfXrD+f0q4nyQkpi52Jwl1XWZrMd3fPowNzgA="; }; - vendorSha256 = "1qcxix6724ly0klsr8bw3nv6pxn0wixqiqcgqkcp6sia4dxbbg14"; + vendorSha256 = "sha256-/K1kBuxGEDUCBC7PiSpQRv1NEvTKwN+vNg2rz7pg838="; meta = with lib; { description = "Proxy checker and IP rotator"; diff --git a/nixpkgs/pkgs/tools/networking/nbd/default.nix b/nixpkgs/pkgs/tools/networking/nbd/default.nix index 6478a15aa1a4..3f3a9b2b7235 100644 --- a/nixpkgs/pkgs/tools/networking/nbd/default.nix +++ b/nixpkgs/pkgs/tools/networking/nbd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, which }: stdenv.mkDerivation rec { - name = "nbd-3.21"; + pname = "nbd"; + version = "3.21"; src = fetchurl { - url = "mirror://sourceforge/nbd/${name}.tar.xz"; + url = "mirror://sourceforge/nbd/nbd-${version}.tar.xz"; sha256 = "sha256-52iK852Rczu80tsIBixE/lA9AE5RUodAE5xEr/amvvk="; }; @@ -14,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which ]; postInstall = '' - mkdir -p "$out/share/doc/${name}" - cp README.md "$out/share/doc/${name}/" + mkdir -p "$out/share/doc/nbd-${version}" + cp README.md "$out/share/doc/nbd-${version}/" ''; doCheck = true; diff --git a/nixpkgs/pkgs/tools/networking/ndisc6/default.nix b/nixpkgs/pkgs/tools/networking/ndisc6/default.nix index 6612315c6f2d..6a728ec30bfe 100644 --- a/nixpkgs/pkgs/tools/networking/ndisc6/default.nix +++ b/nixpkgs/pkgs/tools/networking/ndisc6/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "ndisc6-1.0.4"; + pname = "ndisc6"; + version = "1.0.4"; src = fetchurl { - url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; + url = "https://www.remlab.net/files/ndisc6/archive/ndisc6-${version}.tar.bz2"; sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb"; }; diff --git a/nixpkgs/pkgs/tools/networking/nebula/default.nix b/nixpkgs/pkgs/tools/networking/nebula/default.nix index 06615ae25fae..2aec2fb50c76 100644 --- a/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; - buildFlagsArray = [ "-ldflags=" "-X main.Build=${version}" ]; + ldflags = [ "-X main.Build=${version}" ]; meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; diff --git a/nixpkgs/pkgs/tools/networking/netboot/default.nix b/nixpkgs/pkgs/tools/networking/netboot/default.nix index e7d984a798b3..fdd1857ef10e 100644 --- a/nixpkgs/pkgs/tools/networking/netboot/default.nix +++ b/nixpkgs/pkgs/tools/networking/netboot/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, bison, lzo, db4 }: stdenv.mkDerivation rec { - name = "netboot-0.10.2"; + name = "netboot"; + version = "0.10.2"; + src = fetchurl { - url = "mirror://sourceforge/netboot/${name}.tar.gz"; + url = "mirror://sourceforge/netboot/netboot-${version}.tar.gz"; sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; }; diff --git a/nixpkgs/pkgs/tools/networking/netcat/default.nix b/nixpkgs/pkgs/tools/networking/netcat/default.nix index 7b325b2f4840..ef035d3c671a 100644 --- a/nixpkgs/pkgs/tools/networking/netcat/default.nix +++ b/nixpkgs/pkgs/tools/networking/netcat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "netcat-gnu-0.7.1"; +stdenv.mkDerivation rec { + pname = "netcat-gnu"; + version = "0.7.1"; src = fetchurl { - url = "mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2"; + url = "mirror://sourceforge/netcat/netcat-${version}.tar.bz2"; sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; }; diff --git a/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix b/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix index 3a7a3a1deb49..3ebfa3b96bc1 100644 --- a/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix @@ -1,13 +1,14 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "netkit-tftp-0.17"; + pname = "netkit-tftp"; + version = "0.17"; src = fetchurl { urls = [ - "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" - "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz" - "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" + "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz" + "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${version}.tar.gz" + "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz" ]; sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs"; }; diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix index 5f83ffae055f..e6cf8d0e09cc 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xw2AtI1AqcuZ7JZ8xDifZ+fwMBUopp1IFXIEEzGmRr4="; + sha256 = "sha256-ufS8pdA1Jxjge3OF+xlam7yP1oa3lZt0E3hU1SqrnFg="; }; mesonFlags = [ diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 4f3b7a3204d8..63c52a337103 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -1,20 +1,64 @@ -{ lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus -, gnome, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala -, libgcrypt, dnsmasq, bluez5, readline, libselinux, audit -, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt -, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43 -, openconnect, curl, meson, ninja, libpsl, mobile-broadband-provider-info, runtimeShell }: +{ lib +, stdenv +, fetchurl +, substituteAll +, intltool +, pkg-config +, fetchpatch +, dbus +, gnome +, systemd +, libuuid +, polkit +, gnutls +, ppp +, dhcp +, iptables +, nftables +, python3 +, vala +, libgcrypt +, dnsmasq +, bluez5 +, readline +, libselinux +, audit +, gobject-introspection +, modemmanager +, openresolv +, libndp +, newt +, libsoup +, ethtool +, gnused +, iputils +, kmod +, jansson +, gtk-doc +, libxslt +, docbook_xsl +, docbook_xml_dtd_412 +, docbook_xml_dtd_42 +, docbook_xml_dtd_43 +, openconnect +, curl +, meson +, ninja +, libpsl +, mobile-broadband-provider-info +, runtimeShell +}: let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.30.4"; + version = "1.32.6"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-YFC3JCEuo85zhhEzWb6pr6H2eaVPYNmZpZmYkuZywZA="; + sha256 = "sha256-PSdGBR87MylArCk1TgFpEVnUZ4PXL9IyvTbpgijOWgk="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -23,34 +67,46 @@ in stdenv.mkDerivation rec { # patch networkmanager to allow passing these path in config file. This will # remove unneeded build-time dependencies. mesonFlags = [ - "-Ddhclient=${dhcp}/bin/dhclient" - "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" - # Upstream prefers dhclient, so don't add dhcpcd to the closure - "-Ddhcpcd=no" - "-Ddhcpcanon=no" - "-Dpppd=${ppp}/bin/pppd" - "-Diptables=${iptables}/bin/iptables" + # System paths + "--sysconfdir=/etc" + "--localstatedir=/var" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" # to enable link-local connections "-Dudev_dir=${placeholder "out"}/lib/udev" - "-Dresolvconf=${openresolv}/bin/resolvconf" "-Ddbus_conf_dir=${placeholder "out"}/share/dbus-1/system.d" - "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "-Dkernel_firmware_dir=/run/current-system/firmware" - "--sysconfdir=/etc" - "--localstatedir=/var" - "-Dcrypto=gnutls" + + # Platform "-Dsession_tracking=systemd" - "-Dmodem_manager=true" - "-Dnmtui=true" - "-Ddocs=true" - "-Dtests=no" - "-Dqt=false" + "-Dlibaudit=yes-disabled-by-default" "-Dpolkit_agent_helper_1=/run/wrappers/bin/polkit-agent-helper-1" + + # Features # Allow using iwd when configured to do so "-Diwd=true" - "-Dlibaudit=yes-disabled-by-default" + "-Dpppd=${ppp}/bin/pppd" + "-Diptables=${iptables}/bin/iptables" + "-Dnft=${nftables}/bin/nft" + "-Dmodem_manager=true" + "-Dnmtui=true" + "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" + "-Dqt=false" + + # Handlers + "-Dresolvconf=${openresolv}/bin/resolvconf" + + # DHCP clients + "-Ddhclient=${dhcp}/bin/dhclient" + # Upstream prefers dhclient, so don't add dhcpcd to the closure + "-Ddhcpcd=no" + "-Ddhcpcanon=no" + + # Miscellaneous + "-Ddocs=true" # We don't use firewalld in NixOS "-Dfirewalld_zone=false" + "-Dtests=no" + "-Dcrypto=gnutls" ]; patches = [ @@ -66,17 +122,44 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - systemd libselinux audit libpsl libuuid polkit ppp libndp curl mobile-broadband-provider-info - bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson + systemd + libselinux + audit + libpsl + libuuid + polkit + ppp + libndp + curl + mobile-broadband-provider-info + bluez5 + dnsmasq + gobject-introspection + modemmanager + readline + newt + libsoup + jansson ]; propagatedBuildInputs = [ gnutls libgcrypt ]; nativeBuildInputs = [ - meson ninja intltool pkg-config - vala gobject-introspection dbus + meson + ninja + intltool + pkg-config + vala + gobject-introspection + dbus # Docs - gtk-doc libxslt docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 pythonForDocs + gtk-doc + libxslt + docbook_xsl + docbook_xml_dtd_412 + docbook_xml_dtd_42 + docbook_xml_dtd_43 + pythonForDocs ]; doCheck = false; # requires /sys, the net @@ -92,7 +175,7 @@ in stdenv.mkDerivation rec { # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that will be overridden during installation. mkdir -p ${placeholder "out"}/lib - ln -s $PWD/libnm/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0 + ln -s $PWD/src/libnm-client-impl/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0 ''; passthru = { @@ -107,7 +190,8 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz ]); + changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS"; + maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz maxeaubrey ]); platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch b/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch index cb9d3c3a0d20..8c7c4b2fa4d8 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -1,26 +1,5 @@ -diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c -index 15c47c3ec..4d1913aa6 100644 ---- a/clients/common/nm-vpn-helpers.c -+++ b/clients/common/nm-vpn-helpers.c -@@ -208,15 +208,7 @@ nm_vpn_openconnect_authenticate_helper(const char *host, - NULL, - }; - -- path = nm_utils_file_search_in_paths("openconnect", -- "/usr/sbin/openconnect", -- DEFAULT_PATHS, -- G_FILE_TEST_IS_EXECUTABLE, -- NULL, -- NULL, -- error); -- if (!path) -- return FALSE; -+ path = "@openconnect@/bin/openconnect"; - - if (!g_spawn_sync(NULL, - (char **) NM_MAKE_STRV(path, "--authenticate", host), diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules -index e398cb9f2..a43d61864 100644 +index e398cb9f2f..a43d61864f 100644 --- a/data/84-nm-drivers.rules +++ b/data/84-nm-drivers.rules @@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" @@ -32,7 +11,7 @@ index e398cb9f2..a43d61864 100644 LABEL="nm_drivers_end" diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 91ebd9a36..5201a56c3 100644 +index e23b3a5282..c7246a3b61 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ @@ -44,23 +23,11 @@ index 91ebd9a36..5201a56c3 100644 #ExecReload=/bin/kill -HUP $MAINPID ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure -diff --git a/libnm/meson.build b/libnm/meson.build -index d0846419c..a7adb2cc6 100644 ---- a/libnm/meson.build -+++ b/libnm/meson.build -@@ -280,7 +280,6 @@ if enable_introspection - output: 'nm-settings-docs-gir.xml', - command: [ - generate_setting_docs_env, -- python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), - '--lib-path', meson.current_build_dir(), - '--gir', '@INPUT@', diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index 040dd0b4d..98aea3aa9 100644 +index 21863b9533..c9b709659d 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -13957,14 +13957,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -13994,14 +13994,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_ip4_config_best_default_route_get(priv->ip_config_4); if (gw) { _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -77,11 +44,31 @@ index 040dd0b4d..98aea3aa9 100644 log_domain = LOGD_IP6; } } -diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c -index 9075c30dd..4b140e92b 100644 ---- a/src/core/nm-core-utils.c -+++ b/src/core/nm-core-utils.c -@@ -333,7 +333,7 @@ nm_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *a +diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build +index 21a01e0b04..091c98428f 100644 +--- a/src/libnm-client-impl/meson.build ++++ b/src/libnm-client-impl/meson.build +@@ -162,7 +162,6 @@ if enable_introspection + input: libnm_core_settings_sources, + output: 'nm-propery-infos-' + info + '.xml', + command: [ +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'), + info, + '@OUTPUT@', +@@ -219,7 +218,6 @@ if enable_introspection + 'env', + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path, +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), + '--lib-path', meson.current_build_dir(), + '--gir', '@INPUT@', +diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c +index 6435dcc482..214d01194e 100644 +--- a/src/libnm-platform/nm-platform-utils.c ++++ b/src/libnm-platform/nm-platform-utils.c +@@ -2097,7 +2097,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char * /* construct the argument list */ argv = g_ptr_array_sized_new(4); @@ -90,3 +77,58 @@ index 9075c30dd..4b140e92b 100644 g_ptr_array_add(argv, "--use-blacklist"); g_ptr_array_add(argv, (char *) arg1); +diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c +index 72691e34c2..95495b6585 100644 +--- a/src/libnmc-base/nm-vpn-helpers.c ++++ b/src/libnmc-base/nm-vpn-helpers.c +@@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host, + gs_free const char **output_v = NULL; + const char *const * iter; + const char * path; +- const char *const DEFAULT_PATHS[] = { +- "/sbin/", +- "/usr/sbin/", +- "/usr/local/sbin/", +- "/bin/", +- "/usr/bin/", +- "/usr/local/bin/", +- NULL, +- }; + +- path = nm_utils_file_search_in_paths("openconnect", +- "/usr/sbin/openconnect", +- DEFAULT_PATHS, +- G_FILE_TEST_IS_EXECUTABLE, +- NULL, +- NULL, +- error); +- if (!path) +- return FALSE; ++ path = "@openconnect@/bin/openconnect"; + + if (!g_spawn_sync(NULL, + (char **) NM_MAKE_STRV(path, "--authenticate", host), +diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build +index 8f07ae634e..a1326b3403 100644 +--- a/src/libnmc-setting/meson.build ++++ b/src/libnmc-setting/meson.build +@@ -6,7 +6,6 @@ if enable_docs + input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']], + output: 'settings-docs-input.xml', + command: [ +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'), + '@OUTPUT@', + nm_property_infos_xml['nmcli'], +diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build +index b2e455bbbd..a12ebf212a 100644 +--- a/src/tests/client/meson.build ++++ b/src/tests/client/meson.build +@@ -6,7 +6,6 @@ test( + args: [ + build_root, + source_root, +- python.path(), + ], + timeout: 120, + ) diff --git a/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/nixpkgs/pkgs/tools/networking/nfdump/default.nix index 1319e7997dde..30ab31013bcd 100644 --- a/nixpkgs/pkgs/tools/networking/nfdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, bison }: -let version = "1.6.22"; in +let version = "1.6.23"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj"; + sha256 = "sha256-aM7U+JD8EtxEusvObsRgqS0aqfTfF3vYxCqvw0bgX20="; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ]; diff --git a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix index 82f6ed4760cf..d33b749399ff 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { export sourceRoot=$sourceRoot/src/ngrok ''; - buildFlags = [ "-tags release" ]; + tags = [ "release" ]; meta = { homepage = "https://ngrok.com/"; diff --git a/nixpkgs/pkgs/tools/networking/noip/default.nix b/nixpkgs/pkgs/tools/networking/noip/default.nix index 3425d1e3a82e..4b57ef7731ed 100644 --- a/nixpkgs/pkgs/tools/networking/noip/default.nix +++ b/nixpkgs/pkgs/tools/networking/noip/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation { - name = "noip-2.1.9-1"; + pname = "noip"; + version = "2.1.9-1"; src = fetchurl { url = "https://www.noip.com/client/linux/noip-duc-linux.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix b/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix index 212f7bfc2877..6faf1f06dbb8 100644 --- a/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, fetchpatch }: stdenv.mkDerivation rec { - name = "nss-mdns-0.10"; + pname = "nss-mdns"; + version = "0.10"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz"; + url = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${version}.tar.gz"; sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y"; }; diff --git a/nixpkgs/pkgs/tools/networking/ntopng/default.nix b/nixpkgs/pkgs/tools/networking/ntopng/default.nix index 2ba373a2c61c..46dd586c0fa1 100644 --- a/nixpkgs/pkgs/tools/networking/ntopng/default.nix +++ b/nixpkgs/pkgs/tools/networking/ntopng/default.nix @@ -7,12 +7,13 @@ # directory, but we use luajit, zeromq, and rrdtool from nixpkgs stdenv.mkDerivation rec { - name = "ntopng-2.0"; + pname = "ntopng"; + version = "2.0"; src = fetchurl { urls = [ - "mirror://sourceforge/project/ntop/ntopng/old/${name}.tar.gz" - "mirror://sourceforge/project/ntop/ntopng/${name}.tar.gz" + "mirror://sourceforge/project/ntop/ntopng/old/ntopng-${version}.tar.gz" + "mirror://sourceforge/project/ntop/ntopng/ntopng-${version}.tar.gz" ]; sha256 = "0l82ivh05cmmqcvs26r6y69z849d28njipphqzvnakf43ggddgrw"; }; diff --git a/nixpkgs/pkgs/tools/networking/ntp/default.nix b/nixpkgs/pkgs/tools/networking/ntp/default.nix index 8c62e3b0d646..c8af08a3a30d 100644 --- a/nixpkgs/pkgs/tools/networking/ntp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ntp/default.nix @@ -8,10 +8,11 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p15"; + pname = "ntp"; + version = "4.2.8p15"; src = fetchurl { - url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; + url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz"; sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"; }; diff --git a/nixpkgs/pkgs/tools/networking/nttcp/default.nix b/nixpkgs/pkgs/tools/networking/nttcp/default.nix new file mode 100644 index 000000000000..c5a4c4c1cd1f --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/nttcp/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "nttcp"; + version = "1.47"; + + src = fetchurl { + url = "https://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz"; + sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50"; + }; + + patches = [ + # Fix format string compiler error + ./format-security.patch + ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + ]; + + meta = with lib; { + description = "New test TCP program"; + license = licenses.unfree; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/nttcp/format-security.patch b/nixpkgs/pkgs/tools/networking/nttcp/format-security.patch new file mode 100644 index 000000000000..f0a604577686 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/nttcp/format-security.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' nttcp-1.47/nttcp.c nttcp-1.47.new/nttcp.c +--- nttcp-1.47/nttcp.c 2000-12-18 05:16:54.000000000 -0500 ++++ nttcp-1.47.new/nttcp.c 2012-01-30 23:44:02.260501225 -0500 +@@ -372,7 +372,7 @@ + #define Message(x) fMessage(stdout, x) + + void Exit(char *s, int ret) { +- syslog(LOG_DEBUG, s); ++ syslog(LOG_DEBUG, "%s", s); + fMessage(stderr,s); + exit(ret); + } diff --git a/nixpkgs/pkgs/tools/networking/nylon/default.nix b/nixpkgs/pkgs/tools/networking/nylon/default.nix index 840b714fc9f8..b519db4b55b9 100644 --- a/nixpkgs/pkgs/tools/networking/nylon/default.nix +++ b/nixpkgs/pkgs/tools/networking/nylon/default.nix @@ -6,10 +6,11 @@ let paths = [ libevent.dev libevent.out ]; }; in -stdenv.mkDerivation { - name = "nylon-1.21"; +stdenv.mkDerivation rec { + pname = "nylon"; + version = "1.21"; src = fetchurl { - url = "https://monkey.org/~marius/nylon/nylon-1.21.tar.gz"; + url = "https://monkey.org/~marius/nylon/nylon-${version}.tar.gz"; sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; diff --git a/nixpkgs/pkgs/tools/networking/nzbget/default.nix b/nixpkgs/pkgs/tools/networking/nzbget/default.nix index 375896258bc7..fc44c193b069 100644 --- a/nixpkgs/pkgs/tools/networking/nzbget/default.nix +++ b/nixpkgs/pkgs/tools/networking/nzbget/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, libxml2, ncurses, libsigcxx, libpar2 -, gnutls, libgcrypt, zlib, openssl }: +, gnutls, libgcrypt, zlib, openssl, nixosTests }: stdenv.mkDerivation rec { pname = "nzbget"; - version = "21.0"; + version = "21.1"; src = fetchurl { url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "0lwd0pfrs4a5ms193hgz2qiyf7grrc925dw6y0nfc0gkp27db9b5"; + sha256 = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU="; }; nativeBuildInputs = [ pkg-config ]; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { inherit (nixosTests) nzbget; }; + meta = with lib; { homepage = "https://nzbget.net"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix b/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix index ce490cafef6a..41e80a3e12cb 100644 --- a/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix +++ b/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.6.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-doJ1ceuJ/gL9vlGgV/hKIJeAErAseH0dtHKJX2z7pV0="; + sha256 = "sha256-8hyRuGKspWqv+uBeSz4i12Grl83EQVPWB1weEVf9yhA="; }; - vendorSha256 = "sha256-Y4WM+o+5jiwj8/99UyNHLpBNbtJkKteIGW2P1Jd9L6M="; + vendorSha256 = "sha256-YCZzIsu1mMAAjLGHISrDkfY4Lx0az2SZV8bnZOMalx8="; # Tests use network doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix index 0de96169769a..5dc789e0dc58 100644 --- a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix +++ b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix @@ -1,17 +1,40 @@ -{ lib, fetchFromGitHub, python2Packages, - asciidoc, cacert, libxml2, libxslt, docbook_xsl }: +{ lib +, fetchFromGitHub +, python2Packages +, asciidoc +, cacert +, docbook_xsl +, installShellFiles +, libxml2 +, libxslt +}: python2Packages.buildPythonApplication rec { - version = "7.3.3"; + version = "7.3.4"; pname = "offlineimap"; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "1gg8ry67i20qapj4z20am9bm67m2q28kixcj7ja75m897vhzarnq"; + sha256 = "sha256-sra2H0+5+LAIU3+uJnii+AYA05nuDyKVMW97rbaFOfI="; }; + nativeBuildInputs = [ + asciidoc + docbook_xsl + installShellFiles + libxml2 + libxslt + ]; + + propagatedBuildInputs = with python2Packages; [ + six + kerberos + rfc6555 + pysocks + ]; + postPatch = '' # Skip xmllint to stop failures due to no network access sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |" @@ -20,21 +43,19 @@ python2Packages.buildPythonApplication rec { sed -i offlineimap/utils/distro.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; - doCheck = false; - - nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ]; - propagatedBuildInputs = with python2Packages; [ six kerberos rfc6555 pysocks ]; - postInstall = '' make -C docs man - install -D -m 644 docs/offlineimap.1 ''${!outputMan}/share/man/man1/offlineimap.1 - install -D -m 644 docs/offlineimapui.7 ''${!outputMan}/share/man/man7/offlineimapui.7 + installManPage docs/offlineimap.1 + installManPage docs/offlineimapui.7 ''; - meta = { + # Test requires credentials + doCheck = false; + + meta = with lib; { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; homepage = "http://offlineimap.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ endocrimes ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ endocrimes ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/ofono/default.nix b/nixpkgs/pkgs/tools/networking/ofono/default.nix index 93e1415b91c4..647cfd4a44ff 100644 --- a/nixpkgs/pkgs/tools/networking/ofono/default.nix +++ b/nixpkgs/pkgs/tools/networking/ofono/default.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { "--with-dbusconfdir=${placeholder "out"}/share" "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" "--enable-external-ell" + "--sysconfdir=/etc" ]; - postInstall = '' - rm -r $out/etc/ofono - ln -s /etc/ofono $out/etc/ofono - ''; + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; enableParallelBuilding = true; enableParallelChecking = false; diff --git a/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/nixpkgs/pkgs/tools/networking/oneshot/default.nix index 48c20643580f..2e809eb2d1bd 100644 --- a/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oneshot"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "sha256-UD67xYBb1rvGMSPurte5z2Hcd7+JtXDPbgp3BVBdLuk="; + sha256 = "sha256-LxLMETZzoeu7qEHpUFmo/h+7sdly+R5ZWsNhyttcbpA="; }; - vendorSha256 = "sha256-d+YE618OywSDOWiiULHENFEqzRmFVUFKPuPXnL1JubM="; + vendorSha256 = "sha256-rL/NWIIggvngTrdTDm1g1uH3vC55JF3cWllPc6Yb5jc="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 34d2c22fb242..606b3b4ee9e6 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 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "5.1.0"; + version = "5.2.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2"; + sha256 = "sha256-mZYGCIR7XOvONnNFDM86qSM7iug48noNgBcHdik81vk="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/networking/opensm/default.nix b/nixpkgs/pkgs/tools/networking/opensm/default.nix index a21fe68e8163..6026292f386f 100644 --- a/nixpkgs/pkgs/tools/networking/opensm/default.nix +++ b/nixpkgs/pkgs/tools/networking/opensm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opensm"; - version = "3.3.23"; + version = "3.3.24"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "opensm"; rev = version; - sha256 = "0r0nw7b2711ca6mrj19ymg97x862hdxv54fhhm4kiqvdh6n75y0s"; + sha256 = "sha256-/bqo5r9pVt7vg29xaRRO/9k21AMlmoe2327Ot5gVIwc="; }; nativeBuildInputs = [ autoconf automake libtool bison flex ]; diff --git a/nixpkgs/pkgs/tools/networking/openssh/copyid.nix b/nixpkgs/pkgs/tools/networking/openssh/copyid.nix index 71baa6a23f1f..40707c2a7346 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/copyid.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/copyid.nix @@ -1,6 +1,6 @@ -{ runCommandNoCC, openssh }: +{ runCommand, openssh }: -runCommandNoCC "ssh-copy-id-${openssh.version}" { +runCommand "ssh-copy-id-${openssh.version}" { meta = openssh.meta // { description = "A tool to copy SSH public keys to a remote machine"; priority = (openssh.meta.priority or 0) - 1; diff --git a/nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh b/nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh deleted file mode 100644 index 9d41dba2e439..000000000000 --- a/nixpkgs/pkgs/tools/networking/p2p/azureus/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/jars -cp $src $out/jars/azureus.jar - -mkdir -p $out/bin -cat > $out/bin/azureus <<EOF -#! $SHELL -e -azureusHome=$out -if test -n "\$HOME"; then - azureusHome=\$HOME/.Azureus -fi -exec $jdk/bin/java -Xms16m -Xmx128m \ - -cp $out/jars/azureus.jar:$swt/jars/swt.jar \ - -Djava.library.path=$swt/lib \ - -Dazureus.install.path=\$azureusHome \ - org.gudy.azureus2.ui.swt.Main -EOF -chmod +x $out/bin/azureus diff --git a/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix b/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix deleted file mode 100644 index 1c72be0c5100..000000000000 --- a/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{lib, stdenv, fetchurl, jdk, swt}: - -stdenv.mkDerivation { - name = "azureus-2.3.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar"; - sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; - }; - - inherit jdk swt; - - meta = { - platforms = lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index d55a46f609b1..b0f4cd1f788a 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,18 +1,19 @@ -{ fetchurl, lib, nettools, pythonPackages, texinfo }: +{ lib, nettools, python3Packages, texinfo, fetchFromGitHub }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) # store path. The problem appears to be non-fatal, but there's probably # some loss of functionality because of it. -pythonPackages.buildPythonApplication rec { - version = "1.13.0"; +python3Packages.buildPythonApplication rec { pname = "tahoe-lafs"; - namePrefix = ""; + version = "unstable-2021-07-09"; - src = fetchurl { - url = "https://tahoe-lafs.org/downloads/tahoe-lafs-${version}.tar.bz2"; - sha256 = "11pfz9yyy6qkkyi0kskxlbn2drfppx6yawqyv4kpkrkj4q7x5m42"; + src = fetchFromGitHub { + owner = "tahoe-lafs"; + repo = "tahoe-lafs"; + rev = "8e28a9d0e02fde2388aca549da2b5c452ac4337f"; + sha256 = "sha256-MuD/ZY+die7RCsuVdcePSD0DdwatXRi7CxW2iFt22L0="; }; outputs = [ "out" "doc" "info" ]; @@ -38,26 +39,30 @@ pythonPackages.buildPythonApplication rec { cd src/allmydata/test # Buggy? - rm cli/test_create.py test_backupdb.py + rm cli/test_create.py test_client.py # These require Tor and I2P. rm test_connections.py test_iputil.py test_hung_server.py test_i2p_provider.py test_tor_provider.py + # Fails due to the above tests missing + rm test_python3.py + # Expensive rm test_system.py ) ''; - nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; + nativeBuildInputs = with python3Packages; [ sphinx texinfo ]; # The `backup' command requires `sqlite3'. - propagatedBuildInputs = with pythonPackages; [ - twisted foolscap nevow simplejson zfec pycryptopp darcsver - setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface - service-identity pyyaml magic-wormhole treq characteristic + propagatedBuildInputs = with python3Packages; [ + appdirs beautifulsoup4 characteristic distro eliot fixtures foolscap future + html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark + service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec + zope_interface ]; - checkInputs = with pythonPackages; [ mock hypothesis twisted ]; + checkInputs = with python3Packages; [ mock hypothesis twisted ]; # Install the documentation. postInstall = '' @@ -78,7 +83,7 @@ pythonPackages.buildPythonApplication rec { trial --rterrors allmydata ''; - meta = { + meta = with lib; { description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system"; longDescription = '' Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem. @@ -86,10 +91,9 @@ pythonPackages.buildPythonApplication rec { such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. ''; - homepage = "http://tahoe-lafs.org/"; - license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; + homepage = "https://tahoe-lafs.org/"; + license = [ licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; - broken = true; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix index ee5212b97508..bdce32f0813e 100644 --- a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix +++ b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.4"; + pname = "pcapfix"; + version = "1.1.4"; src = fetchurl { - url = "https://f00l.de/pcapfix/${name}.tar.gz"; + url = "https://f00l.de/pcapfix/pcapfix-${version}.tar.gz"; sha256 = "0m6308ka33wqs568b7cwa1f5q0bv61j2nwfizdyzrazw673lnh6d"; }; diff --git a/nixpkgs/pkgs/tools/networking/pdnsd/default.nix b/nixpkgs/pkgs/tools/networking/pdnsd/default.nix index a08182394b1f..d797833618cc 100644 --- a/nixpkgs/pkgs/tools/networking/pdnsd/default.nix +++ b/nixpkgs/pkgs/tools/networking/pdnsd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "pdnsd-1.2.9a-par"; +stdenv.mkDerivation rec { + pname = "pdnsd"; + version = "1.2.9a-par"; src = fetchurl { - url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz"; + url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-${version}.tar.gz"; sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v"; }; diff --git a/nixpkgs/pkgs/tools/networking/pdsh/default.nix b/nixpkgs/pkgs/tools/networking/pdsh/default.nix index 87601b0ddf37..d7ac9ad54e6f 100644 --- a/nixpkgs/pkgs/tools/networking/pdsh/default.nix +++ b/nixpkgs/pkgs/tools/networking/pdsh/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: stdenv.mkDerivation rec { - name = "pdsh-2.34"; + pname = "pdsh"; + version = "2.34"; src = fetchurl { - url = "https://github.com/chaos/pdsh/releases/download/${name}/${name}.tar.gz"; + url = "https://github.com/chaos/pdsh/releases/download/pdsh-${version}/pdsh-${version}.tar.gz"; sha256 = "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl"; }; diff --git a/nixpkgs/pkgs/tools/networking/polygraph/default.nix b/nixpkgs/pkgs/tools/networking/polygraph/default.nix index 74347ff83957..f4742e660d83 100644 --- a/nixpkgs/pkgs/tools/networking/polygraph/default.nix +++ b/nixpkgs/pkgs/tools/networking/polygraph/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, openssl, zlib, ncurses }: stdenv.mkDerivation rec { - name = "polygraph-4.13.0"; + pname = "polygraph"; + version = "4.13.0"; src = fetchurl { - url = "http://www.web-polygraph.org/downloads/srcs/${name}-src.tgz"; + url = "http://www.web-polygraph.org/downloads/srcs/polygraph-${version}-src.tgz"; sha256 = "1rwzci3n7q33hw3spd79adnclzwgwlxcisc9szzjmcjqhbkcpj1a"; }; diff --git a/nixpkgs/pkgs/tools/networking/proxify/default.nix b/nixpkgs/pkgs/tools/networking/proxify/default.nix index 6a0bfcc6ee22..47e36df3ac64 100644 --- a/nixpkgs/pkgs/tools/networking/proxify/default.nix +++ b/nixpkgs/pkgs/tools/networking/proxify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "proxify"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; rev = "v${version}"; - sha256 = "15j2q9zrs8bdf72jgldkai3xbi4irk69wyjzv48r74rdgf2k49gn"; + sha256 = "0qhr51naa7ad80fsr12ka432071mfb1zq2wd852p1lyvy0mdf52s"; }; - vendorSha256 = "1x78n88ri8kph827k03x1q06zpbbbp7793xsvc376ljda5n6bqig"; + vendorSha256 = "0dynyhqh8jzmljqng1yh07r6k6zfzlsgh36rlynbdgcvjl7jdhnx"; meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; diff --git a/nixpkgs/pkgs/tools/networking/proxychains/default.nix b/nixpkgs/pkgs/tools/networking/proxychains/default.nix index 56a553c0c803..b93c6ae12cfb 100644 --- a/nixpkgs/pkgs/tools/networking/proxychains/default.nix +++ b/nixpkgs/pkgs/tools/networking/proxychains/default.nix @@ -19,10 +19,6 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-Werror" "-Werror -Wno-stringop-truncation" ''; - postInstall = '' - cp src/proxychains.conf $out/etc - ''; - meta = with lib; { description = "Proxifier for SOCKS proxies"; homepage = "http://proxychains.sourceforge.net"; diff --git a/nixpkgs/pkgs/tools/networking/rdrview/default.nix b/nixpkgs/pkgs/tools/networking/rdrview/default.nix index 8f5103957053..24ba1d35e9af 100644 --- a/nixpkgs/pkgs/tools/networking/rdrview/default.nix +++ b/nixpkgs/pkgs/tools/networking/rdrview/default.nix @@ -1,22 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, libxml2, curl, libseccomp }: +{ lib, stdenv, fetchFromGitHub, libxml2, curl, libseccomp, installShellFiles }: stdenv.mkDerivation { - name = "rdrview"; - version = "unstable-2020-12-22"; + pname = "rdrview"; + version = "unstable-2021-05-30"; src = fetchFromGitHub { owner = "eafer"; repo = "rdrview"; - rev = "7be01fb36a6ab3311a9ad1c8c2c75bf5c1345d93"; - sha256 = "00hnvrrrkyp5429rzcvabq2z00lp1l8wsqxw4h7qsdms707mjnxs"; + rev = "444ce3d6efd8989cd6ecfdc0560071b20e622636"; + sha256 = "02VC8r8PdcAfMYB0/NtbPnhsWatpLQc4mW4TmSE1+zk="; }; buildInputs = [ libxml2 curl libseccomp ]; + nativeBuildInputs = [ installShellFiles ]; installPhase = '' + runHook preInstall install -Dm755 rdrview -t $out/bin + installManPage rdrview.1 + runHook postInstall ''; + enableParallelBuilding = true; + meta = with lib; { description = "Command line tool to extract main content from a webpage"; homepage = "https://github.com/eafer/rdrview"; diff --git a/nixpkgs/pkgs/tools/networking/s5cmd/default.nix b/nixpkgs/pkgs/tools/networking/s5cmd/default.nix index f4a6c2915be6..c472e2626e01 100644 --- a/nixpkgs/pkgs/tools/networking/s5cmd/default.nix +++ b/nixpkgs/pkgs/tools/networking/s5cmd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "s5cmd"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "peak"; repo = "s5cmd"; rev = "v${version}"; - sha256 = "sha256-09vBYwnTfLIuu2SPP7DYB+U6sUkQffglIOHNn4+47qQ="; + sha256 = "sha256-sood01wI0ZnkXUKDHX14ix3bWHR/PRu6+MDNeos5Jk0="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix index e6b1c823eb88..a75936a15204 100644 --- a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-X main.tag=v${version}" + ldflags = [ + "-X main.tag=v${version}" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/sish/default.nix b/nixpkgs/pkgs/tools/networking/sish/default.nix index 181582f5452f..769b0c57698c 100644 --- a/nixpkgs/pkgs/tools/networking/sish/default.nix +++ b/nixpkgs/pkgs/tools/networking/sish/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sish"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "antoniomika"; repo = pname; rev = "v${version}"; - sha256 = "06ckgxhnijs7yrj0hhwh1vk2fvapwn6wb44w3g6qs6n6fmqh92mb"; + sha256 = "sha256-tljJp6Yoc19kkG7F3g1XhSDK2Y/D/2oRHiDkkOP3nn0="; }; - vendorSha256 = "0vfazbaiaqka5nd7imh5ls7k3asf1c17y081nzkban98svg3l3sj"; + vendorSha256 = "sha256-AHCa6ErxXzDPUFuq4ATD08e2Wz0tNibV2lLXoD7Sygk="; meta = with lib; { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; diff --git a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index c08f234ab5b1..44b08bc13726 100644 --- a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.11"; + version = "1.1.12"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "sha256-Gxcu9XlLPLcFUoCDrMeWJ6SGUSHU9ZKPHq1oBvmNoJ8="; + sha256 = "sha256-NhE5XxInNfGN6hTyZItc7+4HBjcyBLAFTpirEidcipk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/snmpcheck/default.nix b/nixpkgs/pkgs/tools/networking/snmpcheck/default.nix new file mode 100644 index 000000000000..e27ead59e971 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/snmpcheck/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchurl, ruby }: + +let + rubyEnv = ruby.withPackages (ps: [ ps.snmp ]); +in +stdenv.mkDerivation rec { + pname = "snmpcheck"; + version = "1.9"; + src = fetchurl { + url = "http://www.nothink.org/codes/snmpcheck/snmpcheck-${version}.rb"; + sha256 = "sha256-9xkLqbgxU1uykx+M9QsbPAH8OI/Cqn9uw6ALe23Lbq0="; + executable = true; + }; + + dontUnpack = true; + + buildInputs = [ rubyEnv.wrappedRuby ]; + + installPhase = '' + mkdir -p $out/bin + cp $src $out/bin/snmp-check + ''; + + meta = with lib; { + description = "SNMP enumerator"; + homepage = "http://www.nothink.org/codes/snmpcheck/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/socat/2.x.nix b/nixpkgs/pkgs/tools/networking/socat/2.x.nix deleted file mode 100644 index 0105fa322c1a..000000000000 --- a/nixpkgs/pkgs/tools/networking/socat/2.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, openssl }: - -stdenv.mkDerivation rec { - name = "socat-2.0.0-b9"; - - src = fetchurl { - url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "1ll395xjv4byvv0k2zjbxk8vp3mg3y2w5paa05wv553bqsjv1vs9"; - }; - - buildInputs = [ openssl ]; - - patches = lib.singleton ./libressl-fixes.patch ; - - meta = with lib; { - description = "A utility for bidirectional data transfer between two independent data channels"; - homepage = "http://www.dest-unreach.org/socat/"; - repositories.git = "git://repo.or.cz/socat.git"; - platforms = platforms.unix; - license = licenses.gpl2; - maintainers = [ maintainers.eelco ]; - broken = true; # broken with openssl 1.1 - }; -} diff --git a/nixpkgs/pkgs/tools/networking/socat/libressl-fixes.patch b/nixpkgs/pkgs/tools/networking/socat/libressl-fixes.patch deleted file mode 100644 index cf66033584eb..000000000000 --- a/nixpkgs/pkgs/tools/networking/socat/libressl-fixes.patch +++ /dev/null @@ -1,173 +0,0 @@ -Patch from OpenBSD ---- a/sslcls.c Sat Jan 24 03:15:22 2015 -+++ b/sslcls.c Sat Jul 18 20:01:59 2015 -@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) { - } - #endif - -+#ifdef HAVE_SSLv3_client_method - const SSL_METHOD *sycSSLv3_client_method(void) { - const SSL_METHOD *result; - Debug("SSLv3_client_method()"); -@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) { - Debug1("SSLv3_client_method() -> %p", result); - return result; - } -+#endif - -+#ifdef HAVE_SSLv3_server_method - const SSL_METHOD *sycSSLv3_server_method(void) { - const SSL_METHOD *result; - Debug("SSLv3_server_method()"); -@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) { - Debug1("SSLv3_server_method() -> %p", result); - return result; - } -+#endif - - const SSL_METHOD *sycSSLv23_client_method(void) { - const SSL_METHOD *result; -@@ -331,14 +335,6 @@ void sycSSL_free(SSL *ssl) { - return; - } - --int sycRAND_egd(const char *path) { -- int result; -- Debug1("RAND_egd(\"%s\")", path); -- result = RAND_egd(path); -- Debug1("RAND_egd() -> %d", result); -- return result; --} -- - DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) { - DH *result; - Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)", -@@ -375,7 +371,7 @@ int sycFIPS_mode_set(int onoff) { - } - #endif /* WITH_FIPS */ - --#if OPENSSL_VERSION_NUMBER >= 0x00908000L -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) - const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) { - const COMP_METHOD *result; - Debug1("SSL_get_current_compression(%p)", ssl); ---- a/sslcls.h Sat Jan 24 11:15:22 2015 -+++ b/sslcls.h Mon Apr 13 15:06:25 2015 -@@ -47,7 +47,6 @@ X509 *sycSSL_get_peer_certificate(SSL *ssl); - int sycSSL_shutdown(SSL *ssl); - void sycSSL_CTX_free(SSL_CTX *ctx); - void sycSSL_free(SSL *ssl); --int sycRAND_egd(const char *path); - - DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u); - -@@ -55,7 +54,7 @@ BIO *sycBIO_new_file(const char *filename, const char - - int sycFIPS_mode_set(int onoff); - --#if OPENSSL_VERSION_NUMBER >= 0x00908000L -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) - const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl); - const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl); - const char *sycSSL_COMP_get_name(const COMP_METHOD *comp); -@@ -98,7 +97,6 @@ const char *sycSSL_COMP_get_name(const COMP_METHOD *co - #define sycSSL_shutdown(s) SSL_shutdown(s) - #define sycSSL_CTX_free(c) SSL_CTX_free(c) - #define sycSSL_free(s) SSL_free(s) --#define sycRAND_egd(p) RAND_egd(p) - - #define sycPEM_read_bio_DHparams(b,x,p,u) PEM_read_bio_DHparams(b,x,p,u) - ---- a/xio-openssl.c Sat Jan 24 15:33:42 2015 -+++ b/xio-openssl.c Mon Apr 13 14:59:12 2015 -@@ -108,7 +108,6 @@ const struct optdesc opt_openssl_key = { "open - const struct optdesc opt_openssl_dhparam = { "openssl-dhparam", "dh", OPT_OPENSSL_DHPARAM, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; - const struct optdesc opt_openssl_cafile = { "openssl-cafile", "cafile", OPT_OPENSSL_CAFILE, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; - const struct optdesc opt_openssl_capath = { "openssl-capath", "capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; --const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; - const struct optdesc opt_openssl_pseudo = { "openssl-pseudo", "pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL, OFUNC_SPEC }; - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC }; -@@ -147,7 +146,7 @@ int xio_reset_fips_mode(void) { - static void openssl_conn_loginfo(SSL *ssl) { - Notice1("SSL connection using %s", SSL_get_cipher(ssl)); - --#if OPENSSL_VERSION_NUMBER >= 0x00908000L -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) - { - const COMP_METHOD *comp, *expansion; - -@@ -722,7 +721,6 @@ int - char *opt_dhparam = NULL; /* file name of DH params */ - char *opt_cafile = NULL; /* certificate authority file */ - char *opt_capath = NULL; /* certificate authority directory */ -- char *opt_egd = NULL; /* entropy gathering daemon socket path */ - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - char *opt_compress = NULL; /* compression method */ - #endif -@@ -741,7 +739,6 @@ int - retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath); - retropt_string(opts, OPT_OPENSSL_KEY, &opt_key); - retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam); -- retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd); - retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo); - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress); -@@ -877,10 +874,6 @@ int - } - } - -- if (opt_egd) { -- sycRAND_egd(opt_egd); -- } -- - if (opt_pseudo) { - long int randdata; - /* initialize libc random from actual microseconds */ -@@ -1098,7 +1091,7 @@ static int openssl_SSL_ERROR_SSL(int level, const char - if (e == ((ERR_LIB_RAND<<24)| - (RAND_F_SSLEAY_RAND_BYTES<<12)| - (RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) { -- Error("too few entropy; use options \"egd\" or \"pseudo\""); -+ Error("too few entropy; use option \"pseudo\""); - stat = STAT_NORETRY; - } else { - Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf)); ---- a/xio-openssl.h Sun Jun 23 07:16:48 2013 -+++ b/xio-openssl.h Sat Apr 19 15:58:21 2014 -@@ -21,7 +21,6 @@ extern const struct optdesc opt_openssl_key; - extern const struct optdesc opt_openssl_dhparam; - extern const struct optdesc opt_openssl_cafile; - extern const struct optdesc opt_openssl_capath; --extern const struct optdesc opt_openssl_egd; - extern const struct optdesc opt_openssl_pseudo; - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - extern const struct optdesc opt_openssl_compress; ---- a/xioopts.c Sat Jan 24 11:15:22 2015 -+++ b/xioopts.c Mon Apr 13 15:06:25 2015 -@@ -412,7 +412,6 @@ const struct optname optionnames[] = { - #ifdef ECHOPRT - IF_TERMIOS("echoprt", &opt_echoprt) - #endif -- IF_OPENSSL("egd", &opt_openssl_egd) - IF_ANY ("end-close", &opt_end_close) - IF_TERMIOS("eof", &opt_veof) - IF_TERMIOS("eol", &opt_veol) -@@ -1102,7 +1101,6 @@ const struct optname optionnames[] = { - IF_OPENSSL("openssl-compress", &opt_openssl_compress) - #endif - IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam) -- IF_OPENSSL("openssl-egd", &opt_openssl_egd) - #if WITH_FIPS - IF_OPENSSL("openssl-fips", &opt_openssl_fips) - #endif ---- a/xioopts.h Sat Jan 24 11:15:22 2015 -+++ b/xioopts.h Mon Apr 13 15:06:25 2015 -@@ -478,7 +478,6 @@ enum e_optcode { - OPT_OPENSSL_COMPRESS, - #endif - OPT_OPENSSL_DHPARAM, -- OPT_OPENSSL_EGD, - OPT_OPENSSL_FIPS, - OPT_OPENSSL_KEY, - OPT_OPENSSL_METHOD, diff --git a/nixpkgs/pkgs/tools/networking/sockperf/default.nix b/nixpkgs/pkgs/tools/networking/sockperf/default.nix new file mode 100644 index 000000000000..d58bcb2f3cac --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/sockperf/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen +, enableTool ? false +, enableTest ? false }: + +stdenv.mkDerivation rec { + pname = "sockperf"; + version = "3.7"; + + src = fetchFromGitHub { + owner = "Mellanox"; + repo = "sockperf"; + rev = version; + sha256 = "MtpV21lCEAv7ARxk0dAxoOxxlqDM+skdQnPlqOvksjw="; + }; + + nativeBuildInputs = [ autoreconfHook doxygen ]; + + configureFlags = [ "--enable-doc" ] + ++ lib.optional enableTest "--enable-test" + ++ lib.optional enableTool "--enable-tool"; + + doCheck = true; + + meta = with lib; { + description = "Network Benchmarking Utility"; + homepage = "https://github.com/Mellanox/sockperf"; + license = licenses.bsd3; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/spoofer/default.nix b/nixpkgs/pkgs/tools/networking/spoofer/default.nix index f5c8317d89b8..c28293c570aa 100644 --- a/nixpkgs/pkgs/tools/networking/spoofer/default.nix +++ b/nixpkgs/pkgs/tools/networking/spoofer/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-+4FNC+rMxIoVXlW7HnBXUg0P4FhNvMTAqJ9c7lXQ6vE="; + sha256 = "sha256-6ov1dZbxmBRIhfIzUaxiaHUeiU6SbNKhiQX1W4lmhD8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/srelay/default.nix b/nixpkgs/pkgs/tools/networking/srelay/default.nix index 9ff25d6a17cd..da09395fc7a8 100644 --- a/nixpkgs/pkgs/tools/networking/srelay/default.nix +++ b/nixpkgs/pkgs/tools/networking/srelay/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "srelay-0.4.8"; +stdenv.mkDerivation rec { + pname = "srelay"; + version = "0.4.8"; src = fetchurl { - url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-0.4.8/srelay-0.4.8.tar.gz"; + url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-${version}/srelay-${version}.tar.gz"; sha256 = "1sn6005aqyfvrlkm5445cyyaj6h6wfyskfncfmds55x34hfyxpvl"; }; diff --git a/nixpkgs/pkgs/tools/networking/sshpass/default.nix b/nixpkgs/pkgs/tools/networking/sshpass/default.nix index 60c9ab97a8b3..4704339aed67 100644 --- a/nixpkgs/pkgs/tools/networking/sshpass/default.nix +++ b/nixpkgs/pkgs/tools/networking/sshpass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sshpass"; - version = "1.06"; + version = "1.09"; src = fetchurl { url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz"; - sha256 = "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6"; + sha256 = "sha256-cXRuXgV//psAtErEBFO/RwkZMMupa76o3Ehxfe3En7c="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/nixpkgs/pkgs/tools/networking/ssldump/default.nix index fc92f43981b6..0d3e5ccf07e6 100644 --- a/nixpkgs/pkgs/tools/networking/ssldump/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssldump/default.nix @@ -1,30 +1,52 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libpcap }: +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, json_c +, libnet +, libpcap +, openssl +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ssldump"; - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { owner = "adulau"; repo = "ssldump"; - rev = "7491b9851505acff95b2c68097e9b9f630d418dc"; - sha256 = "1j3rln86khdnc98v50hclvqaq83a24c1rfzbcbajkbfpr4yxpnpd"; + rev = "v${version}"; + sha256 = "1xnlfqsl93nxbcv4x4xsgxa6mnhcx37hijrpdb7vzla6q7xvg8qr"; }; - buildInputs = [ libpcap openssl ]; + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + json_c + libnet + libpcap + openssl + ]; + prePatch = '' sed -i -e 's|#include.*net/bpf.h|#include <pcap/bpf.h>|' \ base/pcap-snoop.c ''; - configureFlags = [ "--with-pcap-lib=${libpcap}/lib" - "--with-pcap-inc=${libpcap}/include" - "--with-openssl-lib=${openssl}/lib" - "--with-openssl-inc=${openssl}/include" ]; - meta = { + + configureFlags = [ + "--with-pcap-lib=${libpcap}/lib" + "--with-pcap-inc=${libpcap}/include" + "--with-openssl-lib=${openssl}/lib" + "--with-openssl-inc=${openssl}/include" + ]; + + meta = with lib; { description = "An SSLv3/TLS network protocol analyzer"; homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; - maintainers = with lib.maintainers; [ aycanirican ]; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ aycanirican ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/ssmtp/default.nix b/nixpkgs/pkgs/tools/networking/ssmtp/default.nix index 6957d43e7913..ec309a4a2ce0 100644 --- a/nixpkgs/pkgs/tools/networking/ssmtp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssmtp/default.nix @@ -1,12 +1,11 @@ -{lib, stdenv, fetchurl, tlsSupport ? true, openssl ? null}: +{ lib, stdenv, fetchurl, tlsSupport ? true, openssl }: -assert tlsSupport -> openssl != null; - -stdenv.mkDerivation { - name = "ssmtp-2.64"; +stdenv.mkDerivation rec { + pname = "ssmtp"; + version = "2.64"; src = fetchurl { - url = "mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2"; + url = "mirror://debian/pool/main/s/ssmtp/ssmtp_${version}.orig.tar.bz2"; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; }; @@ -19,16 +18,15 @@ stdenv.mkDerivation { (lib.enableFeature tlsSupport "ssl") ]; - postConfigure = - '' - # Don't run the script that interactively generates a config file. - # Also don't install the broken, cyclic symlink /lib/sendmail. - sed -e '/INSTALLED_CONFIGURATION_FILE/d' \ - -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \ - -i Makefile - substituteInPlace Makefile \ - --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)' - ''; + postConfigure = '' + # Don't run the script that interactively generates a config file. + # Also don't install the broken, cyclic symlink /lib/sendmail. + sed -e '/INSTALLED_CONFIGURATION_FILE/d' \ + -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \ + -i Makefile + substituteInPlace Makefile \ + --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)' + ''; installFlags = [ "etcdir=$(out)/etc" ]; @@ -39,6 +37,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = lib.optionalString tlsSupport "-lcrypto"; meta = with lib; { + description = "simple MTA to deliver mail from a computer to a mail hub"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ basvandijk ]; diff --git a/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/nixpkgs/pkgs/tools/networking/strongswan/default.nix index 67df00b8e694..ff69dbc75445 100644 --- a/nixpkgs/pkgs/tools/networking/strongswan/default.nix +++ b/nixpkgs/pkgs/tools/networking/strongswan/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchpatch -, pkg-config, autoreconfHook +{ lib, stdenv, fetchpatch, fetchFromGitHub +, pkg-config, autoreconfHook, perl, gperf, bison, flex , gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib , openresolv , systemd, pam @@ -19,14 +19,16 @@ stdenv.mkDerivation rec { pname = "strongswan"; version = "5.8.1"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading! - src = fetchurl { - url = "https://download.strongswan.org/${pname}-${version}.tar.bz2"; - sha256 = "034rd6kr1bmnvj8rg2kcxdjb0cgj3dn9310mmm94j1awxan71byr"; + src = fetchFromGitHub { + owner = "strongswan"; + repo = "strongswan"; + rev = version; + sha256 = "1a1hw2jsbwvkdhhxjmq87hz13ivbgvqwks1q3adz14mqgbc64snd"; }; dontPatchELF = true; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook perl gperf bison flex ]; buildInputs = [ curl gmp python3 ldns unbound openssl pcsclite ] ++ optionals enableTNC [ trousers sqlite libxml2 ] diff --git a/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/nixpkgs/pkgs/tools/networking/stunnel/default.nix index befc1c3c3eef..68c2fc935fcd 100644 --- a/nixpkgs/pkgs/tools/networking/stunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.59"; + version = "5.60"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-E3d232vo8XAfHNWQt3eZMuEjR5+5HlGSFxwWeYgVzp8="; + sha256 = "sha256-xF12WxUhhh/qmwO0JbndfUizBVEowK7Gc7ul75uPeH0="; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/nixpkgs/pkgs/tools/networking/surfraw/default.nix b/nixpkgs/pkgs/tools/networking/surfraw/default.nix index 70bb5453518a..44e8877eb5d1 100644 --- a/nixpkgs/pkgs/tools/networking/surfraw/default.nix +++ b/nixpkgs/pkgs/tools/networking/surfraw/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, perl}: -stdenv.mkDerivation { - name = "surfraw-2.3.0"; +stdenv.mkDerivation rec { + pname = "surfraw"; + version = "2.3.0"; src = fetchurl { - url = "https://gitlab.com/surfraw/Surfraw/uploads/2de827b2786ef2fe43b6f07913ca7b7f/surfraw-2.3.0.tar.gz"; + url = "https://gitlab.com/surfraw/Surfraw/uploads/2de827b2786ef2fe43b6f07913ca7b7f/surfraw-${version}.tar.gz"; sha256 = "099nbif0x5cbcf18snc58nx1a3q7z0v9br9p2jiq9pcc7ic2015d"; }; diff --git a/nixpkgs/pkgs/tools/networking/swec/default.nix b/nixpkgs/pkgs/tools/networking/swec/default.nix index c98a3417d1c4..6751b1cf5eb8 100644 --- a/nixpkgs/pkgs/tools/networking/swec/default.nix +++ b/nixpkgs/pkgs/tools/networking/swec/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "swec-0.4"; + pname = "swec"; + version = "0.4"; src = fetchurl { - url = "http://files.zerodogg.org/swec/${name}.tar.bz2"; + url = "http://files.zerodogg.org/swec/swec-${version}.tar.bz2"; sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; }; @@ -24,9 +25,9 @@ stdenv.mkDerivation rec { installPhase = '' make install prefix="$out" - mkdir -p "$out/share/${name}" - cp -v default.sdf "$out/share/${name}" - sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" + mkdir -p "$out/share/swec-${version}" + cp -v default.sdf "$out/share/swec-${version}" + sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/swec-${version}/swec'|g" wrapProgram "$out/bin/swec" \ --prefix PERL5LIB : ${with perlPackages; makePerlPath [ LWP URI HTMLParser ]} diff --git a/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/nixpkgs/pkgs/tools/networking/telepresence2/default.nix index 54de621763c5..e7ae903e8682 100644 --- a/nixpkgs/pkgs/tools/networking/telepresence2/default.nix +++ b/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.3.6"; + version = "2.4.0"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "1bs4h450109vhy18kpyy6y4p5l9kvz4w09m56fxh5z547m5ax6k3"; + sha256 = "1v2jkhdlyq37akqyhb8mwsh7rjdv2fjw8kyzys3dv04k3dy5sl0f"; }; - vendorSha256 = "0xmw9mc0iy64kb12lsii4nn63ynh6gab9ls8z6mrizjjqz845sa5"; + vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" + ]; subPackages = [ "cmd/telepresence" ]; diff --git a/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/nixpkgs/pkgs/tools/networking/tendermint/default.nix index b97c49dd9c96..5afd8aec348e 100644 --- a/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.8"; + version = "0.34.12"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256:03k44w23167az2kk6ccp3139kykzkhack4w2vy0wvs2lb67xiqd9"; + sha256 = "sha256-CBE0ErHIafJ9OYC8DR3KriYX1aiqKUJk2UoBkIdO1QY="; }; - vendorSha256 = "sha256-0Y9QDBVNYE2x3nY3loRKTCtYWXRnK7v+drRVvTMY4Dg="; + vendorSha256 = "sha256-cW3YKdF1dAfeewQ/0mhoillIpIMuC2KDsW1XWc7WRoI="; subPackages = [ "cmd/tendermint" ]; diff --git a/nixpkgs/pkgs/tools/networking/termshark/default.nix b/nixpkgs/pkgs/tools/networking/termshark/default.nix index 7b9a3c42d606..d35e70ad52e4 100644 --- a/nixpkgs/pkgs/tools/networking/termshark/default.nix +++ b/nixpkgs/pkgs/tools/networking/termshark/default.nix @@ -22,10 +22,9 @@ buildGoModule rec { wrapProgram $out/bin/termshark --prefix PATH : ${lib.makeBinPath [ wireshark-cli ]} ''; - buildFlagsArray = '' - -ldflags= - -X github.com/gcla/termshark.Version=${version} - ''; + ldflags = [ + "-X github.com/gcla/termshark.Version=${version}" + ]; meta = with lib; { homepage = "https://termshark.io/"; diff --git a/nixpkgs/pkgs/tools/networking/toxvpn/default.nix b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix index c433d7d0a668..c5aaec66d9e3 100644 --- a/nixpkgs/pkgs/tools/networking/toxvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix @@ -1,33 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, cmake, nlohmann_json, - libtoxcore, libsodium, libcap, zeromq, - systemd ? null }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, cmake +, nlohmann_json +, libtoxcore +, libsodium +, libcap +, zeromq +, systemd +}: stdenv.mkDerivation { - name = "toxvpn-2019-09-09"; + name = "toxvpn"; + version = "unstable-2019-09-09"; src = fetchFromGitHub { - owner = "cleverca22"; - repo = "toxvpn"; - rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a"; + owner = "cleverca22"; + repo = "toxvpn"; + rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a"; sha256 = "193crarrx6q0zd2p6dn67pzv8kngwi440zm1y54njgcz0v3fpxmb"; }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] - ++ optionals stdenv.isLinux [ libcap systemd ]; + ++ lib.optionals stdenv.isLinux [ libcap systemd ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; + cmakeFlags = lib.optional stdenv.isLinux [ "-DSYSTEMD=1" ]; postInstall = "$out/bin/toxvpn -h"; meta = with lib; { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; - homepage = "https://github.com/cleverca22/toxvpn"; - license = licenses.gpl3; + homepage = "https://github.com/cleverca22/toxvpn"; + license = licenses.gpl3; maintainers = with maintainers; [ cleverca22 obadz toonn ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/trickle/default.nix b/nixpkgs/pkgs/tools/networking/trickle/default.nix index 8a5143d1e3bd..f07bf5bdca3a 100644 --- a/nixpkgs/pkgs/tools/networking/trickle/default.nix +++ b/nixpkgs/pkgs/tools/networking/trickle/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libevent, libtirpc }: stdenv.mkDerivation rec { - name = "trickle-1.07"; + pname = "trickle"; + version = "1.07"; src = fetchurl { - url = "https://monkey.org/~marius/trickle/${name}.tar.gz"; + url = "https://monkey.org/~marius/trickle/trickle-${version}.tar.gz"; sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; }; diff --git a/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix b/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix index 0d6e0a2f8d96..4b307079266b 100644 --- a/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ucspi-tcp-0.88"; + pname = "ucspi-tcp"; + version = "0.88"; src = fetchurl { - url = "https://cr.yp.to/ucspi-tcp/${name}.tar.gz"; + url = "https://cr.yp.to/ucspi-tcp/ucspi-tcp-${version}.tar.gz"; sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja"; }; diff --git a/nixpkgs/pkgs/tools/networking/udptunnel/default.nix b/nixpkgs/pkgs/tools/networking/udptunnel/default.nix index 6063cb38b568..362f6fbbc2cf 100644 --- a/nixpkgs/pkgs/tools/networking/udptunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/udptunnel/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "udptunnel-19"; +stdenv.mkDerivation rec { + pname = "udptunnel"; + version = "19"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r19.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r${version}.tar.gz"; sha256 = "1hkrn153rdyrp9g15z4d5dq44cqlnby2bfplp6z0g3862lnv7m3l"; }; diff --git a/nixpkgs/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix index a0c774fb7341..249376abbb06 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { version = "1.13.1"; src = fetchurl { - url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; + url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg="; }; @@ -59,6 +59,13 @@ stdenv.mkDerivation rec { "--with-libnghttp2=${libnghttp2.dev}" ]; + # Remove references to compile-time dependencies that are included in the configure flags + postConfigure = let + inherit (builtins) storeDir; + in '' + sed -E '/CONFCMDLINE/ s;${storeDir}/[a-z0-9]{32}-;${storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-;g' -i config.h + ''; + installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/networking/unbound/python.nix b/nixpkgs/pkgs/tools/networking/unbound/python.nix index fcfd93be4d67..067f5d2b417b 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/python.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/python.nix @@ -1,22 +1,21 @@ -{ lib, stdenv, fetchurl, openssl, expat, libevent, swig, pythonPackages }: +{ lib, stdenv, unbound, openssl, expat, libevent, swig, pythonPackages }: let inherit (pythonPackages) python; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "pyunbound"; - version = "1.9.3"; + inherit (unbound) version src; - src = fetchurl { - url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; - sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v"; - }; + nativeBuildInputs = [ swig ]; - buildInputs = [ openssl expat libevent swig python ]; + buildInputs = [ openssl expat libevent python ]; - patchPhase = ''substituteInPlace Makefile.in \ - --replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}" \ - --replace "\$(LIBTOOL) --mode=install cp _unbound.la" "cp _unbound.la" - ''; + postPatch = '' + substituteInPlace Makefile.in \ + --replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}" \ + --replace "\$(LIBTOOL) --mode=install cp _unbound.la" "cp _unbound.la" + ''; preConfigure = "export PYTHON_VERSION=${python.pythonVersion}"; @@ -30,18 +29,22 @@ in stdenv.mkDerivation rec { "--enable-pie" "--enable-relro-now" "--with-pyunbound" - "DESTDIR=$out PREFIX=" + "DESTDIR=$out" + "PREFIX=" ]; preInstall = '' mkdir -p $out/${python.sitePackages} $out/etc/${pname} cp .libs/_unbound.so .libs/libunbound.so* $out/${python.sitePackages} substituteInPlace _unbound.la \ - --replace "-L.libs $PWD/libunbound.la" "-L$out/${python.sitePackages}" \ - --replace "libdir=\'$PWD/${python.sitePackages}\'" "libdir=\'$out/${python.sitePackages}\'" - ''; + --replace "-L.libs $PWD/libunbound.la" "-L$out/${python.sitePackages}" + ''; - installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf pyunbound-install lib" ]; + installFlags = [ + "configfile=\${out}/etc/unbound/unbound.conf" + "pyunbound-install" + "lib" + ]; # All we want is the Unbound Python module postInstall = '' @@ -50,16 +53,18 @@ in stdenv.mkDerivation rec { $out/bin/unbound-anchor -l | head -1 > $out/etc/${pname}/root.anchor $out/bin/unbound-anchor -l | tail --lines=+2 - > $out/etc/${pname}/root.key # We don't need anything else - rm -fR $out/bin $out/share $out/include $out/etc/unbound - patchelf --replace-needed libunbound.so.2 $out/${python.sitePackages}/libunbound.so.2 $out/${python.sitePackages}/_unbound.so - ''; + rm -r $out/bin $out/share $out/include $out/etc/unbound + '' + # patchelf is only available on Linux and no patching is needed on darwin + + lib.optionalString stdenv.isLinux '' + patchelf --replace-needed libunbound.so.8 $out/${python.sitePackages}/libunbound.so.8 $out/${python.sitePackages}/_unbound.so + ''; meta = with lib; { description = "Python library for Unbound, the validating, recursive, and caching DNS resolver"; license = licenses.bsd3; - homepage = "http://www.unbound.net"; + homepage = "https://www.unbound.net"; maintainers = with maintainers; [ leenaars ]; - platforms = lib.platforms.unix; - broken = true; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/uwimap/default.nix b/nixpkgs/pkgs/tools/networking/uwimap/default.nix index e675268163ac..78480bbc3dff 100644 --- a/nixpkgs/pkgs/tools/networking/uwimap/default.nix +++ b/nixpkgs/pkgs/tools/networking/uwimap/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, pam, openssl }: -stdenv.mkDerivation ({ - name = "uw-imap-2007f"; +stdenv.mkDerivation rec { + pname = "uw-imap"; + version = "2007f"; src = fetchurl { - url = "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz"; + url = "ftp://ftp.cac.washington.edu/imap/imap-${version}.tar.gz"; sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; }; @@ -59,4 +60,4 @@ stdenv.mkDerivation ({ echo "Cross-compilation, injecting make flags" makeFlagsArray+=("ARRC=${stdenv.hostPlatform.config}-ar rc") ''; -}) +} diff --git a/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/nixpkgs/pkgs/tools/networking/v2ray/default.nix index 8c82c379c38a..33fbd5bc92f5 100644 --- a/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.41.0"; + version = "4.41.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "1300gl6y94i1488ja6kic0m5fa2qxakbdc06qd0lgkg6inzbm6gz"; + sha256 = "14zqvmf7xa4knmc57ck1ns0i0va0223qdp64qmm3q2w82dh9mnb8"; }; - vendorSha256 = "sha256-oHKXDzufvTzOzBqFjBzu3vCwTF/FJMomopY3cUktwiM="; + vendorSha256 = "sha256-K8gFF9TbhVgNOySz7nhPFIdSNWNYKUyFD0LIk6acnkc="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202106240309"; - geoipSha256 = "0ypydpgvizf9pfdxna3f6fqn1svsrkac0p3j9s63y55gbqpglacq"; + geoipRev = "202107290023"; + geoipSha256 = "14xgy0bsamj2k4knfs1r453yp27wq8qmjqifq63zbp4lb9v8xnjy"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210626145509"; - geositeSha256 = "0skhwwlzlyh8rvzyblg1l2xw1bawqs12i6zw5sv3d55pnw7wmf2z"; + geositeRev = "20210727125446"; + geositeSha256 = "14z1419dkbippm12z6gvwh3q1wd6x1p4sk6zp2i4qa408i1gc81c"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/nixpkgs/pkgs/tools/networking/vde2/default.nix b/nixpkgs/pkgs/tools/networking/vde2/default.nix index 58fae3f9f157..694a2bc02056 100644 --- a/nixpkgs/pkgs/tools/networking/vde2/default.nix +++ b/nixpkgs/pkgs/tools/networking/vde2/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, libpcap, python2, withPython ? false }: stdenv.mkDerivation rec { - name = "vde2-2.3.2"; + pname = "vde2"; + version = "2.3.2"; src = fetchurl { - url = "mirror://sourceforge/vde/vde2/2.3.1/${name}.tar.gz"; + url = "mirror://sourceforge/vde/vde2/${version}/vde2-${version}.tar.gz"; sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"; }; diff --git a/nixpkgs/pkgs/tools/networking/vlan/default.nix b/nixpkgs/pkgs/tools/networking/vlan/default.nix index 2d329cb29b06..8ddbb8346347 100644 --- a/nixpkgs/pkgs/tools/networking/vlan/default.nix +++ b/nixpkgs/pkgs/tools/networking/vlan/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "vlan-1.9"; +stdenv.mkDerivation rec { + pname = "vlan"; + version = "1.9"; src = fetchurl { - url = "mirror://gentoo/distfiles/vlan.1.9.tar.gz"; + url = "mirror://gentoo/distfiles/vlan.${version}.tar.gz"; sha256 = "1jjc5f26hj7bk8nkjxsa8znfxcf8pgry2ipnwmj2fr6ky0dhm3rv"; }; diff --git a/nixpkgs/pkgs/tools/networking/vpnc/default.nix b/nixpkgs/pkgs/tools/networking/vpnc/default.nix index edb50559fc0f..6928bacd6ce7 100644 --- a/nixpkgs/pkgs/tools/networking/vpnc/default.nix +++ b/nixpkgs/pkgs/tools/networking/vpnc/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: stdenv.mkDerivation { - name = "vpnc-0.5.3-post-r550"; + pname = "vpnc"; + version = "0.5.3-post-r550"; src = fetchsvn { url = "https://svn.unix-ag.uni-kl.de/vpnc"; rev = "550"; diff --git a/nixpkgs/pkgs/tools/networking/vtun/default.nix b/nixpkgs/pkgs/tools/networking/vtun/default.nix index 4d79fdc9bc58..61c18af16561 100644 --- a/nixpkgs/pkgs/tools/networking/vtun/default.nix +++ b/nixpkgs/pkgs/tools/networking/vtun/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }: stdenv.mkDerivation rec { - name = "vtun-3.0.4"; + pname = "vtun"; + version = "3.0.4"; src = fetchurl { - url = "mirror://sourceforge/vtun/${name}.tar.gz"; + url = "mirror://sourceforge/vtun/vtun-${version}.tar.gz"; sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b"; }; diff --git a/nixpkgs/pkgs/tools/networking/wakelan/default.nix b/nixpkgs/pkgs/tools/networking/wakelan/default.nix index 96e01141c180..5365e696fadc 100644 --- a/nixpkgs/pkgs/tools/networking/wakelan/default.nix +++ b/nixpkgs/pkgs/tools/networking/wakelan/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wakelan-1.1"; + pname = "wakelan"; + version = "1.1"; src = fetchurl { - url = "mirror://metalab/system/network/misc/${name}.tar.gz"; + url = "mirror://metalab/system/network/misc/wakelan-${version}.tar.gz"; sha256 = "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x"; }; diff --git a/nixpkgs/pkgs/tools/networking/webalizer/default.nix b/nixpkgs/pkgs/tools/networking/webalizer/default.nix index 332d1cf2867f..200202f9ae26 100644 --- a/nixpkgs/pkgs/tools/networking/webalizer/default.nix +++ b/nixpkgs/pkgs/tools/networking/webalizer/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, libpng, gd, geoip, db }: -stdenv.mkDerivation { - name = "webalizer-2.23-05"; +stdenv.mkDerivation rec { + pname = "webalizer"; + version = "2.23-05"; src = fetchurl { - url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2"; + url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-${version}-src.tar.bz2"; sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g"; }; diff --git a/nixpkgs/pkgs/tools/networking/whois/default.nix b/nixpkgs/pkgs/tools/networking/whois/default.nix index 55a356e32980..0caa0af061b8 100644 --- a/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/nixpkgs/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.8"; + version = "5.5.10"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "sha256-WSAqJMVeHkcqzcgwvFKKBXJiIfKXBQr2mjioG7CgkIo="; + sha256 = "179hgmh9yqk8jq26ybik4cr3lgryd5p6kdwccc3r7mfssk3yp8lz"; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/wifite2/default.nix b/nixpkgs/pkgs/tools/networking/wifite2/default.nix index 054b77f8c9b8..2482c1749959 100644 --- a/nixpkgs/pkgs/tools/networking/wifite2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wifite2/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, fetchpatch, python3, wirelesstools , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools -, hcxdumptool, pyrit, which }: +, hcxdumptool, pyrit, which, bully }: python3.pkgs.buildPythonApplication rec { - version = "2.5.5"; + version = "2.5.7"; pname = "wifite2"; src = fetchFromGitHub { owner = "kimocoder"; repo = "wifite2"; rev = version; - sha256 = "0rh54gj471dn8442imxwasjrrwzsx4m40nylkw3y6p8rbjmb92h4"; + sha256 = "sha256-dJ+UOSIR48m8nGoci/6iblLsX296ZGL1hZ74RUsa9lw="; }; patches = [ @@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { wirelesstools pyrit which + bully ]; postFixup = let diff --git a/nixpkgs/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch b/nixpkgs/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch deleted file mode 100644 index d79d9e3531f3..000000000000 --- a/nixpkgs/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 63360467da4ae6d7fc8c0e05619bdf8813c7e417 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sun, 5 Jan 2020 15:35:15 +0100 -Subject: [PATCH] Fix darwin build - ---- - rwcancel/select_default.go | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go -index dd23cda..03f3452 100644 ---- a/rwcancel/select_default.go -+++ b/rwcancel/select_default.go -@@ -9,6 +9,7 @@ package rwcancel - - import "golang.org/x/sys/unix" - --func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error { -- return unix.Select(nfd, r, w, e, timeout) -+func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) { -+ _, err = unix.Select(nfd, r, w, e, timeout) -+ return - } --- -2.23.1 - diff --git a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix index 35c5371113c1..3fa487a7dc6d 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix @@ -2,17 +2,15 @@ buildGoPackage rec { pname = "wireguard-go"; - version = "0.0.20200320"; + version = "0.0.20210424"; goPackagePath = "golang.zx2c4.com/wireguard"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r"; + sha256 = "RUUueSsfEi1H+ckrnPKqbVlWONhCplMMftlyAmwK+ss="; }; - patches = [ ./0001-Fix-darwin-build.patch ]; - goDeps = ./deps.nix; passthru.updateScript = ./update.sh; @@ -21,10 +19,12 @@ buildGoPackage rec { mv $out/bin/wireguard $out/bin/wireguard-go ''; + doCheck = true; + meta = with lib; { description = "Userspace Go implementation of WireGuard"; homepage = "https://git.zx2c4.com/wireguard-go/about/"; - license = licenses.gpl2; + license = licenses.mit; maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix b/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix index 859b8572f82e..4ffcfa6b2dec 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-go/deps.nix @@ -1,12 +1,13 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) [ { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "34f69633bfdc"; - sha256 = "0169vcn9s4c851y9vm7xqnar3vdfjrp7qsvcxadpfhsmwlfhxzgg"; + rev = "5ea612d1eb83"; + sha256 = "0mbhp35qad92a9fpcpc783jfrhhbgv9zsl0h98k10522blqhd9v5"; + moduleDir = ""; }; } { @@ -14,8 +15,9 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "d98b1b443823"; - sha256 = "1vzwpy56g056dsq304xga3d55jg2cxx89bijpfwjlhwyqyskybsz"; + rev = "e18ecbb05110"; + sha256 = "1vlq8mdscp7yfaa1lmyv03y5m4c2d67ydg2q1i6smkrxghn3zn3q"; + moduleDir = ""; }; } { @@ -23,8 +25,19 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "5c8b2ff67527"; - sha256 = "0r5s7f4w7crrbcf5ydpr2xzsq0svjm332vsds41yp58kwi2lvh2v"; + rev = "94ec62e08169"; + sha256 = "1ir32rrysr7a06ixxr7vkwqx0c3y1rfxyfspc5xk0628cqhj1320"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/term"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/term"; + rev = "7de9c90e9dd1"; + sha256 = "1ba252xmv6qsvf1w1gcy98mngrj0vd4inbjw0lsklqvva65nljna"; + moduleDir = ""; }; } { @@ -32,8 +45,9 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + rev = "v0.3.3"; + sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh"; + moduleDir = ""; }; } { @@ -43,6 +57,1748 @@ url = "https://go.googlesource.com/tools"; rev = "90fa682c2a6e"; sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + moduleDir = ""; + }; + } + { + goPackagePath = "bazil.org/fuse"; + fetch = { + type = "git"; + url = "https://github.com/bazil/fuse"; + rev = "371fbbdaa898"; + sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w"; + moduleDir = ""; + }; + } + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "v0.75.0"; + sha256 = "0mb65np9961xawb0njlqmnqrf8pnazzp9zcbqnlcaj73hhz9zrv9"; + moduleDir = ""; + }; + } + { + goPackagePath = "cloud.google.com/go/bigquery"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "bigquery/v1.8.0"; + sha256 = "1127ha4r0xjsfl04mdb134b6kvpc6yz5bx4bba8m1jmb4k3vyg3j"; + moduleDir = "bigquery"; + }; + } + { + goPackagePath = "cloud.google.com/go/datastore"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "datastore/v1.1.0"; + sha256 = "18f1l28665x1a8j8a5bh2i7wb2vrwj050d1g5qda50isgqaybixd"; + moduleDir = "datastore"; + }; + } + { + goPackagePath = "cloud.google.com/go/pubsub"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "pubsub/v1.3.1"; + sha256 = "1fxsj63d773yf6mjas5gwsq2caa6iqxmss6mms0yfdcc6krg6zkf"; + moduleDir = "pubsub"; + }; + } + { + goPackagePath = "cloud.google.com/go/storage"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "storage/v1.10.0"; + sha256 = "10fp6galzz8jwx35159xdcrwsqaz95xw78iwv1z5n67vhglwi5nf"; + moduleDir = "storage"; + }; + } + { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/v0.9.0"; + sha256 = "01fg6x3a6as2kh0km8kvjzjalq7xiqa17hnsdwawzlpnfpqgslvq"; + moduleDir = "autorest"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest/adal"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/adal/v0.5.0"; + sha256 = "07zbbshyz1s9fj9ifa6zzks4wq7455rna50z1ahpgin92jk0s6la"; + moduleDir = "autorest/adal"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest/date"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/date/v0.1.0"; + sha256 = "1w94wxjjkiv8m44rcdm1af9h0ap2r8kpp9198cxpxj8d5xxkaxpz"; + moduleDir = "autorest/date"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest/mocks"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/mocks/v0.2.0"; + sha256 = "04jsq3bnz9s27kp45n7q5wj2fi3bxwvxrxcmiswrhqz4pj35b561"; + moduleDir = "autorest/mocks"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/logger"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "logger/v0.1.0"; + sha256 = "1w94wxjjkiv8m44rcdm1af9h0ap2r8kpp9198cxpxj8d5xxkaxpz"; + moduleDir = "logger"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/tracing"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "tracing/v0.5.0"; + sha256 = "0n482cjr2pk6ql6awcnn6llrnygjzakihbjaahgmylf3znwil7jp"; + moduleDir = "tracing"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/BurntSushi/xgb"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/xgb"; + rev = "27f122750802"; + sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.16"; + sha256 = "0snwbwdjs34x0my9ri77cvrbnahdiyjh2jlkzf12fy48p7fyk7pq"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Microsoft/hcsshim"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/hcsshim"; + rev = "v0.8.14"; + sha256 = "0k57knv8zrf32hp7rpv1km9j772w6752pfvdbpd3l711ism48c84"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/NYTimes/gziphandler"; + fetch = { + type = "git"; + url = "https://github.com/NYTimes/gziphandler"; + rev = "56545f4a5d46"; + sha256 = "1fwk9wz6vrvq72f2gq8jhvd1nvv6grqgwrjq66vjpm0726pxar72"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "v1.0.0"; + sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5bd2802263f2"; + sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "2146c9339422"; + sha256 = "03brp5ymv5pqfz2rkq2vggh6makbr3vbvdydxzp99dgk0r22vgrf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/census-instrumentation/opencensus-proto"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-proto"; + rev = "v0.2.1"; + sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cilium/ebpf"; + fetch = { + type = "git"; + url = "https://github.com/cilium/ebpf"; + rev = "v0.2.0"; + sha256 = "0f7my8n5v2c5cmgrcikgi0naamglr7c4khgxkbb1k5wl8mm9465a"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cncf/udpa/go"; + fetch = { + type = "git"; + url = "https://github.com/cncf/udpa"; + rev = "5459f2c99403"; + sha256 = "0i3al193dsp91j7iywqrm6fr56y2sz51ci4vf19mb3j4n2x44gsi"; + moduleDir = "go"; + }; + } + { + goPackagePath = "github.com/containerd/cgroups"; + fetch = { + type = "git"; + url = "https://github.com/containerd/cgroups"; + rev = "4cbc285b3327"; + sha256 = "1ps8z33nrh46gg7cn5p0cfp5hb6qy1dymxp5i5vfzq6qgqv18an4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/console"; + fetch = { + type = "git"; + url = "https://github.com/containerd/console"; + rev = "v1.0.1"; + sha256 = "0s837wj6h80fykk2pdmaji75rw9c3863by0gh0cq51hh0lgyjpvg"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/containerd"; + fetch = { + type = "git"; + url = "https://github.com/containerd/containerd"; + rev = "v1.3.9"; + sha256 = "1isi1wgq61b4l0lxy1d8n6dnmcb8s5ihn2yqjb6525y3dj5c5i1j"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/continuity"; + fetch = { + type = "git"; + url = "https://github.com/containerd/continuity"; + rev = "50096c924a4e"; + sha256 = "1drmxbb2l4z12b19dq3vvh1ss7b4z8fq1n5g6c8ln13mjgz6cq48"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/fifo"; + fetch = { + type = "git"; + url = "https://github.com/containerd/fifo"; + rev = "ff969a566b00"; + sha256 = "1pmwdhbbk3vlbq6dvpwk3f71c3si6scc9ykafk8yg9rs2dj2ipfb"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/go-runc"; + fetch = { + type = "git"; + url = "https://github.com/containerd/go-runc"; + rev = "7016d3ce2328"; + sha256 = "1mx2lvfkxw9kiyhi18g3c6hcpb9r2115zjzyvz6rkdqr08xrij9k"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/ttrpc"; + fetch = { + type = "git"; + url = "https://github.com/containerd/ttrpc"; + rev = "v1.0.2"; + sha256 = "0plkm3yrr20vccfl0x8dxys3iphjwnmi285in0pivff6p9djf3yz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/typeurl"; + fetch = { + type = "git"; + url = "https://github.com/containerd/typeurl"; + rev = "b45ef1f1f737"; + sha256 = "03gfqx85990q2pbiibnj9bb0i2v02i1p5hma2pisrxl50dazav22"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd/v22"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "v22.1.0"; + sha256 = "127dj1iwp69yj74nwh9ckgc0mkk1mv4yzbxmbdxix1r7j6q35z3j"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man/v2"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v2.0.0"; + sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "0d3efadf0154"; + sha256 = "1wayhmcxr6l281fqkbw1gh0ymhxlznf4jj1rcldhwrc64l2zjh8l"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "9e7d5ac5ea55"; + sha256 = "0zcv52431a6pj4743rw6342aq9aphwdlbhvz5zs2i3v6q70acxg9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "v0.3.0"; + sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-events"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-events"; + rev = "e31b211e4f1c"; + sha256 = "09gm4z43g23isbklabnsnfb87bwf8kjdgvvyi3vfjq2bqdjdg7cl"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "v0.4.0"; + sha256 = "0k8gja8ql4pqg5rzmqvka42vjfs6rzablak87whcnqba6qxpimvz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/spdystream"; + fetch = { + type = "git"; + url = "https://github.com/docker/spdystream"; + rev = "449fdfce4d96"; + sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/elazarl/goproxy"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/goproxy"; + rev = "c4fc26588b6e"; + sha256 = "1s3v02px61a3hmvb47rqk598z5visayxq46k3c8dcrayhhngv2fw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "ff4f55a20633"; + sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/envoyproxy/go-control-plane"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/go-control-plane"; + rev = "fd9021fe5dad"; + sha256 = "0piyk6pk36x2qr3bhys2k240pfwz3bv64fhi2l0vx1mzwiddapbm"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/protoc-gen-validate"; + rev = "v0.1.0"; + sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "v4.2.0"; + sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "73d445a93680"; + sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-gl/glfw"; + fetch = { + type = "git"; + url = "https://github.com/go-gl/glfw"; + rev = "e6da0acd62b1"; + sha256 = "0prvx5r7q8yrhqvnwibv4xz3dayjbq36yajzqvh0z4lqsh4hyhch"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-gl/glfw/v3.3/glfw"; + fetch = { + type = "git"; + url = "https://github.com/go-gl/glfw"; + rev = "6f7a984d4dc4"; + sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; + moduleDir = "v3.3/glfw"; + }; + } + { + goPackagePath = "github.com/go-logr/logr"; + fetch = { + type = "git"; + url = "https://github.com/go-logr/logr"; + rev = "v0.1.0"; + sha256 = "0fhijjhxz4n2j5i24ckzv8r9kri3v44jdyklgbqjfq0xm7izqg14"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "46af16f9f7b1"; + sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "13c6e3589ad9"; + sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "6aced65f8501"; + sha256 = "0yf0nw7167yjpiqrikns5djarjpf2r07q6xnq9xb1cfsc4m7ynm4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "1d0bd113de87"; + sha256 = "0fmk42chj20679n87n6sig3czs25lavyj6w208000n6kccv1ns3c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/godbus/dbus/v5"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v5.0.3"; + sha256 = "1bkc904073k807yxg6mvqaxrr6ammmhginr9p54jfb55mz3hfw3s"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gofrs/flock"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/flock"; + rev = "886344bea079"; + sha256 = "0qjqhs61y9mnjw4fb1klf74ab4lqbwpapdv3g6k0x1bzd2q1w6zr"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gogo/googleapis"; + fetch = { + type = "git"; + url = "https://github.com/gogo/googleapis"; + rev = "v1.4.0"; + sha256 = "1kka9qmra1klfkjza0s5papqvsi65f2d349dl8k1lvfq487iv9r4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.3.1"; + sha256 = "0x77x64sxjgfhmbijqfzmj8h4ar25l2w97h01q3cqs1wk7zfnkhp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "8c9f03a8e57e"; + sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.4.4"; + sha256 = "1lj0dvd6div4jaq1s0afpwqaq9ah8cxhkq93wii2ably1xmp2l0a"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.4.3"; + sha256 = "1kf1d7xmyjvy0z6j5czp6nqyvj9zrk6liv6znif08927xqfrzyln"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "v1.0.0"; + sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.5.4"; + sha256 = "1ld9pwb6l22g75g1zpa691l7q9ki7pjgpcqhwgdfr3va1zisr5ci"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-github/v32"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "v32.1.0"; + sha256 = "0qaxcm2p655r1jd59rv1hd58driadw5hxlfy7h53c7pzcsmf2546"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/martian"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v2.1.0"; + sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/martian/v3"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v3.1.0"; + sha256 = "1pr9akggfzj2vw11l7ry4sij0hqslpc3gwx4ynbzyvbjhvh64sbc"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/pprof"; + fetch = { + type = "git"; + url = "https://github.com/google/pprof"; + rev = "39141e76b647"; + sha256 = "19j8qaw1k3zx5yd00l0j5982jpz72nlh98l941qrybgslgnh7cxd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/renameio"; + fetch = { + type = "git"; + url = "https://github.com/google/renameio"; + rev = "v0.1.0"; + sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/subcommands"; + fetch = { + type = "git"; + url = "https://github.com/google/subcommands"; + rev = "636abe8753b8"; + sha256 = "1gh40acx3f69fxmar6rmh18xrjw2rw3hyiyfcq9p44r9wlsfwl5x"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.2"; + sha256 = "1rbpfa0v0ly9sdnixcxhf79swki54ikgm1zkwwkj64p1ws66syqd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go/v2"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "v2.0.5"; + sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "0c5108395e2d"; + sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gophercloud/gophercloud"; + fetch = { + type = "git"; + url = "https://github.com/gophercloud/gophercloud"; + rev = "v0.1.0"; + sha256 = "0794s9c144gphm4dh1wgba6ydsb4zdwgglj1p9im43jv0lvh6p81"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "9cad4c3443a7"; + sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "v1.0.0"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "v1.1.0"; + sha256 = "0pmjpzpra7lqgikxzwlcp5mh01b46j2vhyxkixz0v86fr9kf0k3k"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.1"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ianlancetaylor/demangle"; + fetch = { + type = "git"; + url = "https://github.com/ianlancetaylor/demangle"; + rev = "28f6c0f3b639"; + sha256 = "0rsq3622gd40f1x1l7caidsxrmzg1993ich2higwd94fqbxs1r83"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.5"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.7"; + sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "v0.9.1"; + sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kisielk/errcheck"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/errcheck"; + rev = "v1.2.0"; + sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "7dc38fb350b1"; + sha256 = "0h5x6dys758vgb9s5y1qpf6g9712a4jjs94f9rg4i4qw4ypzjfg6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "d5b7844b561a"; + sha256 = "1g84l4wns28xjpn6nl1g33dcj3sfgxlkqqsa6w8fbq2kwyd50xka"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mattbaird/jsonpatch"; + fetch = { + type = "git"; + url = "https://github.com/mattbaird/jsonpatch"; + rev = "81af80346b1a"; + sha256 = "0ll22kpf75m72r7i5ddg3r87gdlagbj2x24bppgbi8jp018pdq95"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mohae/deepcopy"; + fetch = { + type = "git"; + url = "https://github.com/mohae/deepcopy"; + rev = "bb9b5e7adda9"; + sha256 = "173j05wv4yy8jh9ccjw46xfy1knxwvv1ir6b8l6g9pc5j5damm1f"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/munnerz/goautoneg"; + fetch = { + type = "git"; + url = "https://github.com/munnerz/goautoneg"; + rev = "a547fc61f48d"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mxk/go-flowrate"; + fetch = { + type = "git"; + url = "https://github.com/mxk/go-flowrate"; + rev = "cca7078d478f"; + sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.8.0"; + sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.5.0"; + sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "v1.0.0"; + sha256 = "0i5acjajvr6hi9zb7gxwifd8w28y884cv7cx36adj8lngj647xbi"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "v1.0.1"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "v0.1.1"; + sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/runtime-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runtime-spec"; + rev = "v1.0.2"; + sha256 = "19w981vcmd5lp2hy0630x6ayb8zz17n2vxqm2py5mg945xflcizg"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "v1.2.0"; + sha256 = "0f146yjqwx2mr110kl8scjhqd08hys7vr5z0d0a3lskb6yy22gfg"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/diskv"; + rev = "v2.0.1"; + sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "14fe0d1b01d4"; + sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "bc1a522cf7b1"; + sha256 = "13ws66kd65zbhk31zmax9qgmh22fzjcgs5ihy4fm1d775w6bmdzx"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/rogpeppe/go-internal"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/go-internal"; + rev = "v1.3.0"; + sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/russross/blackfriday/v2"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.7.0"; + sha256 = "1a59pw7zimvm8k423iq9l4f4qjj1ia1xc6pkmhwl2mxc46y2n442"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.2.2"; + sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "2da4a54c5cee"; + sha256 = "18qbrp774fx6dyibjcy9snld705gslq6z2sql1biyjahxkm1vpfy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.5"; + sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/syndtr/gocapability"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gocapability"; + rev = "d98352740cb2"; + sha256 = "065y16562ynixxzj7iys4f4spb7knilbj3h833qlhds381j8hn93"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.22.2"; + sha256 = "10mcnvi5qmn00vpyk6si8gjka7p654wr9hac4zc9w5h3ickhvbdc"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "2ec5bdc52b86"; + sha256 = "0p4vn379h68ca7nbid7nbd2rgzg2cnapbqqqmfsp3sgyf4q9bx72"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "2eb08e3e575f"; + sha256 = "0d5f1dvcps51rkfn3s2xzcqjz45ljvj2w1r8y4zz5zwf8y461ksw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "4e3ac2762d5f"; + sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "bd5ef7bd5415"; + sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "v1.2.0"; + sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/yuin/goldmark"; + fetch = { + type = "git"; + url = "https://github.com/yuin/goldmark"; + rev = "v1.2.1"; + sha256 = "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"; + moduleDir = ""; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "v0.22.5"; + sha256 = "18s1d7bk28i8gbs6i587ccd31qp3f8gibgd14dpkzs05gyvlccy6"; + moduleDir = ""; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.7.0"; + sha256 = "0yxvb5sixh76cl9j8dpa97gznj0p8pmg2cdw0ypfwhd3ipx9wph1"; + moduleDir = ""; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "v1.6.0"; + sha256 = "162941s8f6a9x2w04qm4qa3zz0zylwag9149hywrj9ibp2nzcsqz"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "6cc2880d07d6"; + sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "cff245a6509b"; + sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "83fdc39ff7b5"; + sha256 = "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/mobile"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mobile"; + rev = "d2bd2a29d028"; + sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "v0.4.0"; + sha256 = "1ri003765yxawq6s8jbkbiaijihwrg980c4qwqsaa5x0sq2psrg1"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "08078c50e5b5"; + sha256 = "0zynwxw47nhwhs6n1c87c9np43lwl9m9z2w2cmdvjwhsisa93b75"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "67f06af15bc9"; + sha256 = "093p4panc808ak5bamzz7m9nb0xxib7778jpnr6f0xkz1n4fzyw5"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "f8bda1e9f3ba"; + sha256 = "0d3ba0p47j9v5f7wwg29whyfwz9rv94ada5nv8f8hn7v87820xqi"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "v0.1.0"; + sha256 = "1asrm22kv5x891qkbpap8alg612k321jbs1akc0vwsan251gm507"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "5ec99f83aff1"; + sha256 = "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-api-go-client"; + rev = "v0.36.0"; + sha256 = "1x6wlavrqi2r6ss3h2kg94p2lfj0z019kc85zm1pajpf0k23fxp7"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.6.7"; + sha256 = "1wkipg7xxc0ha5p6c3bj0vpgq38l18441n5l6zxdhx0gzvz5z1hs"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/go-genproto"; + rev = "ffc7fda8c3d7"; + sha256 = "14zgn3g8b5rrd9cbznx0dgg64p7aqb0f42z76h4bkgywlp2mizfp"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "9280052d3665"; + sha256 = "0n036fz5ssamrm8acxclvm6l1196pznsgygwhkc3cl1kvfs93mxh"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/protobuf"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/protobuf"; + rev = "d3470999428b"; + sha256 = "0sgwfkcr6n7m1ivyq34rz4rd6gm5pzswa73nvzj59dkaknj68xfb"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/errgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/errgo.v2"; + rev = "v2.1.0"; + sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "v0.9.1"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + moduleDir = ""; + }; + } + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + moduleDir = ""; + }; + } + { + goPackagePath = "gvisor.dev/gvisor"; + fetch = { + type = "git"; + url = "https://github.com/google/gvisor"; + rev = "a64c3a1b5a9f"; + sha256 = "0jw63la37gskknn7vlpwv9iw39zr4bv87rrr2lwqicq9mqi5ajl8"; + moduleDir = ""; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "v0.1.1"; + sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "v0.16.13"; + sha256 = "0dzsvihy7rjwknk44qphridpqyd13143gzlqb8jdx7524dg3m28a"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "v0.16.14-rc.0"; + sha256 = "1nsw0p6mmsraqysglihjr3y9rfdp8nryygb7hndg98fz47hzs7yz"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "v0.16.13"; + sha256 = "02cxhmpkqqrvjq1wv6y81p8a4rikmwsqfbl3yzjj9b8wn306jx0z"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/gengo"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/gengo"; + rev = "0689ccc1d7d6"; + sha256 = "10c0kbm07pzxwdxpsmcgqkcxqxaijyywvwj1rciw6ssfcgx7kdc5"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/klog"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/klog"; + rev = "v1.0.0"; + sha256 = "1cgannfmldcrcksb2wqdn2b5qabqyxl9r25w9y4qbljw24hhnlvn"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "594e756bea31"; + sha256 = "07d9f1sipjyrgfq8965h4irzcl7bfs439z13x2198lwrys6nhcjf"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/utils"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/utils"; + rev = "581e00157fb1"; + sha256 = "0mpymzis079wnqfzwy2b2ijv2b24rcy2ky468qqizgram564i9ba"; + moduleDir = ""; + }; + } + { + goPackagePath = "rsc.io/binaryregexp"; + fetch = { + type = "git"; + url = "https://github.com/rsc/binaryregexp"; + rev = "v0.2.0"; + sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; + moduleDir = ""; + }; + } + { + goPackagePath = "rsc.io/quote/v3"; + fetch = { + type = "git"; + url = "https://github.com/rsc/quote"; + rev = "v3.1.0"; + sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i"; + moduleDir = ""; + }; + } + { + goPackagePath = "rsc.io/sampler"; + fetch = { + type = "git"; + url = "https://github.com/rsc/sampler"; + rev = "v1.3.0"; + sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh"; + moduleDir = ""; + }; + } + { + goPackagePath = "sigs.k8s.io/structured-merge-diff"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/structured-merge-diff"; + rev = "15d366b2352e"; + sha256 = "1anrx09ksgrwjwmbrcrk3hx8wyzjaakzmmn36nd23if36nv1xg11"; + moduleDir = ""; + }; + } + { + goPackagePath = "sigs.k8s.io/yaml"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/yaml"; + rev = "v1.1.0"; + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; + moduleDir = ""; }; } + ] diff --git a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 5972d781bd15..e237850b12ae 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -53,10 +53,17 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for the WireGuard secure network tunnel"; + longDescription = '' + Supplies the main userspace tooling for using and configuring WireGuard tunnels, including the wg(8) and wg-quick(8) utilities. + - wg : the configuration utility for getting and setting the configuration of WireGuard tunnel interfaces. The interfaces + themselves can be added and removed using ip-link(8) and their IP addresses and routing tables can be set using ip-address(8) + and ip-route(8). The wg utility provides a series of sub-commands for changing WireGuard-specific aspects of WireGuard interfaces. + - wg-quick : an extremely simple script for easily bringing up a WireGuard interface, suitable for a few common use cases. + ''; downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; homepage = "https://www.wireguard.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ]; + maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 d-xo ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix b/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix index d33dd3df12ee..87bd5c77c335 100644 --- a/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }: -stdenv.mkDerivation { - name = "x11-ssh-askpass-1.2.4.1"; +stdenv.mkDerivation rec { + pname = "x11-ssh-askpass"; + version = "1.2.4.1"; outputs = [ "out" "man" ]; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-${version}.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-${version}.tar.gz"; sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; diff --git a/nixpkgs/pkgs/tools/networking/xh/default.nix b/nixpkgs/pkgs/tools/networking/xh/default.nix index 0a62fee4bd74..90f99120cd49 100644 --- a/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "0b9cgjgzf1vxd9j6cz44g68xbaii8gb3973pvjf0p6barnqzvqvq"; + sha256 = "sha256-icJBQdFWdiHCYrZ7U90g6CdXdAkv3Y/WJu0IfZAdGv0="; }; - cargoSha256 = "0lwxmqp0ww9wf9p3nd42q89j0g7ichpkcm0mb1p5hhagwqgb0z15"; + cargoSha256 = "sha256-htv5OQnat4Qi6A6lmVonuz+8/DWz8fOGYPbnCnlizBo="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix b/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix index 26731817c80f..5abe4ea09673 100644 --- a/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xl2tpd"; - version = "1.3.15"; + version = "1.3.16"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "0ppwza8nwm1av1vldw40gin9wrjrs4l9si50jad414js3k8ycaag"; + sha256 = "sha256-1Hipek50qjcr0vgTNr4PQyCf1qLZ3UKqu+DLuDNjRUc="; }; buildInputs = [ libpcap ]; diff --git a/nixpkgs/pkgs/tools/networking/xnbd/default.nix b/nixpkgs/pkgs/tools/networking/xnbd/default.nix index 0488fb9fa186..348d557da76d 100644 --- a/nixpkgs/pkgs/tools/networking/xnbd/default.nix +++ b/nixpkgs/pkgs/tools/networking/xnbd/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, jansson }: stdenv.mkDerivation rec { - name = "xnbd-0.4.0"; + pname = "xnbd"; + version = "0.4.0"; src = fetchurl { - url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tgz"; + url = "https://bitbucket.org/hirofuchi/xnbd/downloads/xnbd-${version}.tgz"; sha256 = "00wkvsa0yaq4mabczcbfpj6rjvp02yahw8vdrq8hgb3wpm80x913"; }; - sourceRoot = "${name}/trunk"; + sourceRoot = "xnbd-${version}/trunk"; patches = [ ./0001-Fix-build-for-glibc-2.28.patch ]; diff --git a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index 506869238e57..874205f592bd 100644 --- a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -22,12 +22,11 @@ buildGoModule rec { subPackages = [ "cmd/yggdrasil" "cmd/yggdrasilctl" ]; - buildFlagsArray = '' - -ldflags= - -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version} - -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname} - -s -w - ''; + ldflags = [ + "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" + "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}" + "-s" "-w" + ]; passthru.tests.basic = nixosTests.yggdrasil; diff --git a/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/nixpkgs/pkgs/tools/networking/ytcc/default.nix index 6bd12963b7ee..38bb5c06607d 100644 --- a/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "1rhnrmanad10zy2as9q5wjfjlk18f51vf801syyfgxvk0pdcsk6w"; + sha256 = "1q0w3b7r93416s28qra608n0d7cjh95nwkzgg23z5hp5sq3w3izr"; }; nativeBuildInputs = [ gettext ]; |