diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/networking')
105 files changed, 781 insertions, 422 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/6tunnel/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/6tunnel/default.nix index bf0e8ba33162..fbdd23f754ef 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/6tunnel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/6tunnel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Tunnelling for application that don't speak IPv6"; homepage = "https://github.com/wojtekka/6tunnel"; license = licenses.gpl2; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/node.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/node.nix index e306e49c8498..055fc5267c37 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/node.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/node.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/amass/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/amass/default.nix index 61746ebfcc5f..6277c158f249 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.10.3"; + version = "3.10.5"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1vjplwjv0vwwxdpbky7i6dz3phl7yfcbr8fwrbsb47bmj0ldkapc"; + sha256 = "0zxjgg9z45cs116wa643dfh12skz8zydb85vn03ss150hdlgspda"; }; - vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w"; + vendorSha256 = "1l7y2h7kpvj6lh3dki5sw0ziyzwihfy0scdk8jqf108ca23g8zv8"; outputs = [ "out" "wordlists" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/aria2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/aria2/default.nix index 5ede0db598c9..614584a5f565 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "A lightweight, multi-protocol, multi-source, command-line download utility"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ filalex77 koral ]; + maintainers = with maintainers; [ Br1ght0ne koral ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/axel/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/axel/default.nix index 5cd8e41f70c8..baa498042f94 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/axel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/axel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.9"; + version = "2.17.10"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "1bhzgvvqcwa5bd487400hg1nycvw8qqxzbzvq5ywyz5d9j12hdrd"; + sha256 = "01mpfkz98r2fx4n0gyi3b4zvlyfd5bxydp2wh431lnj0ahrsiikp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix new file mode 100644 index 000000000000..596b30d03e89 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "bacnet-stack"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "bacnet-stack"; + repo = "bacnet-stack"; + rev = "bacnet-stack-${version}"; + sha256 = "078p7qsy9v6fl7pzwgcr72pgjqxfxmfxyqajih2zqlb5g5sf88vh"; + }; + + hardeningDisable = [ "all" ]; + + buildPhase = '' + make BUILD=debug BACNET_PORT=linux BACDL_DEFINE=-DBACDL_BIP=1 BACNET_DEFINES=" -DPRINT_ENABLED=1 -DBACFILE -DBACAPP_ALL -DBACNET_PROPERTY_LISTS" + ''; + + installPhase = '' + mkdir $out + cp -r bin $out/bin + ''; + + meta = with stdenv.lib; { + description = "BACnet open source protocol stack for embedded systems, Linux, and Windows"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ WhittlesJr ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 58bb1e3e3904..46739742bd44 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0963yfbf88hb5fvyckhs1vfvib5skkj9n17qibpv5vsdlynbaa96"; + sha256 = "014blvrv0kk4gzga86mbk7gd5dl1szajfi972da3lrfznck1w24n"; }; - cargoSha256 = "0xp45kb0z7wiq6vnws4q7khbzslywh24sb43ssr39l1rajf7w64r"; + cargoSha256 = "0b5pqsdggdjq9sl54rmh2gaq31va6b2crdv7ihh3198ixwasaf02"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/imsnif/bandwhich"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ma27 ]; + maintainers = with maintainers; [ Br1ght0ne ma27 ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/bud/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/bud/default.nix index a79cbdc8bbd8..724d25d49f93 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/bud/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/bud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, python, gyp, utillinux }: +{ stdenv, lib, fetchgit, python, gyp, util-linux }: stdenv.mkDerivation { pname = "bud"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ python gyp - ] ++ lib.optional stdenv.isLinux utillinux; + ] ++ lib.optional stdenv.isLinux util-linux; buildPhase = '' python ./gyp_bud -f make diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/bukubrow/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/bukubrow/default.nix index b8f2d70848d5..ed8a6088db07 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/bukubrow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/bukubrow/default.nix @@ -39,7 +39,7 @@ in rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager"; + description = "A WebExtension for Buku, a command-line bookmark manager"; homepage = "https://github.com/SamHH/bukubrow-host"; license = licenses.gpl3; maintainers = with maintainers; [ infinisil ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/allow-clock_adjtime.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/allow-clock_adjtime.patch deleted file mode 100644 index 2fa3baca7221..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/allow-clock_adjtime.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0cf506c92967c84f9ed83ba9e1be946a7fda6425 Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar <mlichvar@redhat.com> -Date: Mon, 2 Dec 2019 12:47:13 +0100 -Subject: sys_linux: allow clock_adjtime in seccomp filter - -The adjtimex() function in glibc was switched to the clock_adjtime -system call. - -diff --git a/sys_linux.c b/sys_linux.c -index 63eb8f1..fcf89c2 100644 ---- a/sys_linux.c -+++ b/sys_linux.c -@@ -478,8 +478,8 @@ SYS_Linux_EnableSystemCallFilter(int level) - { - const int syscalls[] = { - /* Clock */ -- SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday), -- SCMP_SYS(settimeofday), SCMP_SYS(time), -+ SCMP_SYS(adjtimex), SCMP_SYS(clock_adjtime), SCMP_SYS(clock_gettime), -+ SCMP_SYS(gettimeofday), SCMP_SYS(settimeofday), SCMP_SYS(time), - /* Process */ - SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid), - SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), --- -cgit v0.10.2 - diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/default.nix index 6c8254c797b7..374036d11a44 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/default.nix @@ -1,27 +1,22 @@ { stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr -, libseccomp, pps-tools }: +, libseccomp, pps-tools, gnutls }: assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { pname = "chrony"; - version = "3.5.1"; + version = "4.0"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - sha256 = "19ywl8a3lb2id7lcna5hp2g4pjnfwdc9ihr0fk6i9m45vdq2za0v"; + sha256 = "09f6w2x5h5kamb4rhcbaz911q1f730qdalgsn8s48yjyqlafl9xy"; }; - patches = [ - ./allow-clock_adjtime.patch - ./fix-seccomp-build.patch - ]; - postPatch = '' patchShebangs test ''; - buildInputs = [ readline texinfo nss nspr ] + buildInputs = [ readline texinfo nss nspr gnutls ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/fix-seccomp-build.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/fix-seccomp-build.patch deleted file mode 100644 index 6888e7efeb72..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/chrony/fix-seccomp-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sys_linux.c b/sys_linux.c -index 898dc7a7f75..fcd334ecf03 100644 ---- a/sys_linux.c -+++ b/sys_linux.c -@@ -503,7 +503,7 @@ SYS_Linux_EnableSystemCallFilter(int level) - SCMP_SYS(socketcall), - /* General I/O */ - SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe), -- SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), SCMP_SYS(read), -+ SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(pselect6), SCMP_SYS(read), - SCMP_SYS(futex), SCMP_SYS(select), SCMP_SYS(set_robust_list), SCMP_SYS(write), - /* Miscellaneous */ - SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/cjdns/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/cjdns/default.nix index 13388d337791..28a418c27f28 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/cjdns/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/cjdns/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }: stdenv.mkDerivation rec { pname = "cjdns"; - version = "20.7"; + version = "21"; src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "09gpqpzc00pp3cj7lyq9876p7is4bcndpdi5knqbv824vk4bj3k0"; + sha256 = "1s9d8yrdrj2gviig05jhr0fnzazb88lih0amxfk0av786rvh7ymj"; }; buildInputs = [ which python27 nodejs ] ++ # for flock - stdenv.lib.optional stdenv.isLinux utillinux; + stdenv.lib.optional stdenv.isLinux util-linux; CFLAGS = "-O2 -Wno-error=stringop-truncation"; buildPhase = diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/cksfv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/cksfv/default.nix index c777f487b3d4..00073686238d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/cksfv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/cksfv/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cksfv-1.3.14"; + name = "cksfv-1.3.15"; src = fetchurl { url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2"; - sha256 = "0lnz0z57phl6s52hjvlryn96xrlph9b0h89ahhv027sa79pj8g4g"; + sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix index 4447ab0f048e..502a4b4bbd42 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "0cbbih035h40hhl7ykmyh9q9nzdqq1p8hmvzd4358cigz1gjc3j2"; + sha256 = "1y0im2xs6pibbfri2k7g9jqbzm90jd9a5lghrzasxmkzjfcimrnf"; }; - vendorSha256 = "0s7mhbjfpfmzqf48d7k0d416m39x6fh5ds4q3xnvhcfx5kmdymq6"; + vendorSha256 = "0lljm594xgcv7ylz7qn170r9526k9d1lh77m9f9zcnhdd2qw4rw1"; doCheck = false; @@ -24,6 +24,6 @@ buildGoModule rec { description = "A rule-based tunnel in Go"; homepage = "https://github.com/Dreamacro/clash"; license = licenses.gpl3; - maintainers = with maintainers; [ contrun filalex77 ]; + maintainers = with maintainers; [ contrun Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/corerad/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/corerad/default.nix index 4ab266e54959..38331163c122 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; - description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; + description = "Extensible and observable IPv6 NDP RA daemon"; license = licenses.asl20; maintainers = with maintainers; [ mdlayher ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix index 97da6497c6b6..08eb3d69128b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -1,22 +1,27 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, callPackage}: buildGoModule rec { pname = "croc"; - version = "8.5.0"; + version = "8.6.6"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0c8gj4fv5q8zl48lfvw06rxng2scgivb6zls136kxq5f2fb2dyk5"; + sha256 = "0bd7q3j2i0r3v4liv2xpqlvx4nrixpdhr1yy1c579bls7y4myv61"; }; - vendorSha256 = "0cgvbwxscmqjzva0bp5sqb4hnvk2ww50yqw34iya5lk2db9vn3ha"; + vendorSha256 = "06hqb5r9p67zh0v5whdsb3rvax6461y2n6jkhjwmn6zzswpgkg7y"; doCheck = false; subPackages = [ "." ]; + passthru = { + tests = { + local-relay = callPackage ./test-local-relay.nix {}; + }; + }; meta = with stdenv.lib; { description = "Easily and securely send things from one computer to another"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix new file mode 100644 index 000000000000..bde05d6deb0a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/test-local-relay.nix @@ -0,0 +1,20 @@ +{ stdenv, croc }: + +stdenv.mkDerivation { + name = "croc-test-local-relay"; + meta.timeout = 300; + buildCommand = '' + HOME=$(mktemp -d) + # start a local relay + ${croc}/bin/croc relay --ports 11111,11112 & + # start sender in background + MSG="See you later, alligator!" + ${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & + # wait for things to settle + sleep 1 + # receive + MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple) + # compare + [ "$MSG" = "$MSG2" ] && touch $out + ''; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/curl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/curl/default.nix index 8e151bc2ead0..c466a48434f2 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.72.0"; + version = "7.73.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd"; + sha256 = "sha256-zzT+Cwe4APHAGkmabosq9Uj20OBE3KSinYikvuFG0TE="; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/curlie/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/curlie/default.nix index f8147cb16115..9ae9644eb940 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/curlie/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/curlie/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "curlie"; - version = "1.5.4"; + version = "1.6.0"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "0z92gz39m0gk8j7l2nwa5vrfr3mq160vr1b15sy13jwi1zspc7hx"; + sha256 = "sha256-rrwdqaKrC37BaI9RuTTv6EiOZ3ztgd7nGuplmeW02h8="; }; - vendorSha256 = "1qnl15b9cs6xi8z368a9n34v3wr2adwp376cjzhyllni7sf6v1mm"; + vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; doCheck = false; meta = with lib; { - description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; + description = "Frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; homepage = "https://curlie.io/"; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/davix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/davix/default.nix index 797791e1c0b9..ca9e7b033c51 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; - # using the url below since the 0.7.6 release did carry a broken CMake file, - # supposedly fixed in the next release - # https://github.com/cern-fts/davix/issues/40 + # using the url below since the github release page states + # "please ignore the GitHub-generated tarballs, as they are incomplete" + # https://github.com/cern-fts/davix/releases/tag/R_0_7_6 src = fetchurl { - url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz"; + url = "https://github.com/cern-fts/${pname}/releases/download/R_${stdenv.lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 8f279ff688af..b2c19e2acf93 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.32.0"; + version = "0.33.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "14iwwg1iqfxjhpw9p3ddq53l901v9l9n2r60q9q6jls8hfqcgsnj"; + sha256 = "0x005lgncaf1fzs27fpcpf6dcncb7wia6fka64pmjxdsq7nmh1hh"; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnstracer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnstracer/default.nix index b0369ec80bd4..558e0dca9034 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnstracer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnstracer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; meta = with stdenv.lib; { - description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; + description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; maintainers = with maintainers; [ andir ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dogdns/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dogdns/default.nix new file mode 100644 index 000000000000..71e065e5d14c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dogdns/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, Security +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "dogdns"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ogham"; + repo = "dog"; + rev = "v${version}"; + sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy"; + }; + + nativeBuildInputs = [ installShellFiles ] + ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6"; + + postInstall = '' + installShellCompletion completions/dog.{bash,fish,zsh} + ''; + + meta = with stdenv.lib; { + description = "Command-line DNS client"; + homepage = "https://dns.lookup.dog"; + license = licenses.eupl12; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/driftnet/default.nix index 441019103716..7a5ceda96694 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/driftnet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/driftnet/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; meta = { - description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display"; + description = "Watches network traffic, and picks out and displays JPEG and GIF images for display"; homepage = "https://github.com/deiv/driftnet"; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/drill/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/drill/default.nix index 572dc0d83848..176062ed314b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/drill/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/drill/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "drill"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "fcsonline"; repo = pname; rev = version; - sha256 = "0pcc91nk68z7hlhj7xvh6v3rybxpy6bzv3pzjcyaq7l0szjljrpw"; + sha256 = "07zz0dj0wjwrc1rmayz7s8kpcv03i0ygl4vfwsam72qd4nf6v538"; }; - cargoSha256 = "1611w8b60d3x16ik8v96za0mkr5p0f9gdpz0awprfgj6c3r6s16m"; + cargoSha256 = "1nbfbmm9v1yp7380zdzz7qrc7x6krwlvgn5x5yzb8yn1rc99jzx4"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] @@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec { description = "HTTP load testing application inspired by Ansible syntax"; homepage = "https://github.com/fcsonline/drill"; license = licenses.gpl3; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dropbear/default.nix index b80eba3f6cac..88217302915e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dropbear/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2020.80"; + name = "dropbear-2020.81"; src = fetchurl { url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0jbrbpdzyv11x5rkljdimzq9p6a7da5siw9k405ibnpjj4dr89yr"; + sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8"; }; dontDisableStatic = enableStatic; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dsniff/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dsniff/default.nix index 7d8cf97f46d8..db9c608e931b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dsniff/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dsniff/default.nix @@ -38,7 +38,7 @@ let inherit (openssl) name; paths = with openssl.override { static = true; }; [ out dev ]; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "dsniff"; version = "2.4b1"; # upstream is so old that nearly every distribution packages the beta version. @@ -49,7 +49,7 @@ in stdenv.mkDerivation { domain = "salsa.debian.org"; owner = "pkg-security-team"; repo = "dsniff"; - rev = "debian%2F2.4b1%2Bdebian-29"; # %2B = urlquote("+"), %2F = urlquote("/") + rev = "debian/${version}+debian-29"; sha256 = "10zz9krf65jsqvlcr72ycp5cd27xwr18jkc38zqp2i4j6x0caj2g"; name = "dsniff.tar.gz"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/default.nix index 90e05e5310bd..4568aec9c5d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, runtimeShell }: let - version = "3.0.0"; + version = "3.0.8"; in stdenv.mkDerivation { pname = "easyrsa"; inherit version; @@ -10,14 +10,15 @@ in stdenv.mkDerivation { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - sha256 = "0wbdv3wmqwm5680rpb971l56xiw49adpicqshk3vhfmpvqzl4dbs"; + sha256 = "05q60s343ydh9j6hzj0840qdcq8fkyz06q68yw4pqgqg4w68rbgs"; }; patches = [ ./fix-paths.patch ]; installPhase = '' mkdir -p $out/share/easyrsa - cp -r easyrsa3/{openssl*.cnf,x509-types,vars.example} $out/share/easyrsa + cp -r easyrsa3/{*.cnf,x509-types,vars.example} $out/share/easyrsa + cp easyrsa3/openssl-easyrsa.cnf $out/share/easyrsa/safessl-easyrsa.cnf install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa substituteInPlace $out/bin/easyrsa \ --subst-var out \ @@ -35,7 +36,7 @@ in stdenv.mkDerivation { description = "Simple shell based CA utility"; homepage = "https://openvpn.net/"; license = licenses.gpl2; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline maintainers.numinit ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch index 82688fa79460..7891adcb20c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/easyrsa/fix-paths.patch @@ -1,33 +1,49 @@ diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa -index 6fec288..210648a 100755 +index 261336f..7b9a79b 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa -@@ -1003,7 +1003,7 @@ Note: using Easy-RSA configuration from: $vars" +@@ -1661,7 +1661,7 @@ Note: using Easy-RSA configuration from: $vars" # Set defaults, preferring existing env-vars if present - set_var EASYRSA "$PWD" + set_var EASYRSA "$prog_dir" - set_var EASYRSA_OPENSSL openssl + set_var EASYRSA_OPENSSL "@openssl@" - set_var EASYRSA_PKI "$EASYRSA/pki" + set_var EASYRSA_PKI "$PWD/pki" set_var EASYRSA_DN cn_only set_var EASYRSA_REQ_COUNTRY "US" -@@ -1030,13 +1030,17 @@ Note: using Easy-RSA configuration from: $vars" - # Detect openssl config, preferring EASYRSA_PKI over EASYRSA - if [ -f "$EASYRSA_PKI/openssl-1.0.cnf" ]; then - set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-1.0.cnf" -- else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf" -+ elif [ -f "$EASYRSA/openssl-1.0.cnf" ]; then -+ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-1.0.cnf" -+ else set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-1.0.cnf" - fi +@@ -1683,16 +1683,31 @@ Note: using Easy-RSA configuration from: $vars" + set_var EASYRSA_TEMP_DIR "$EASYRSA_PKI" + set_var EASYRSA_REQ_CN ChangeMe + set_var EASYRSA_DIGEST sha256 +- set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" +- set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" + set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM" ++ if [ -f "$EASYRSA_PKI/safessl-easyrsa.conf" ]; then ++ set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" ++ elif [ -f "$EASYRSA/safessl-easyrsa.conf" ]; then ++ set_var EASYRSA_SAFE_CONF "$EASYRSA/safessl-easyrsa.cnf" ++ elif [ -f "@out@/share/easyrsa/safessl-easyrsa.cnf" ]; then ++ set_var EASYRSA_SAFE_CONF "@out@/share/easyrsa/safessl-easyrsa.cnf" ++ fi ++ ++ if [ -f "$EASYRSA_PKI/openssl-easyrsa.conf" ]; then ++ set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" ++ elif [ -f "$EASYRSA/openssl-easyrsa.conf" ]; then ++ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf" ++ elif [ -f "@out@/share/easyrsa/openssl-easyrsa.cnf" ]; then ++ set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-easyrsa.cnf" ++ fi ++ # Same as above for the x509-types extensions dir if [ -d "$EASYRSA_PKI/x509-types" ]; then set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/x509-types" -- else set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" +- else +- #TODO: This should be removed. Not really suitable for packaging. + elif [ -d "$EASYRSA/x509-types" ]; then -+ set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" -+ else set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types" + set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" ++ else ++ set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types" fi # EASYRSA_ALGO_PARAMS must be set depending on selected algo diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix index 452a9873bece..fdad966c81b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.0.11"; + version = "6.0.13"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "0yjf639ldfaxrw4pbg9avdkhhmcpnx58j3x70zskvgkajny8yqqr"; + sha256 = "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix index 8c9a877b8f1e..864b57a0c383 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/fastd/default.nix @@ -1,29 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, bison, pkgconfig +{ stdenv, fetchFromGitHub, bison, meson, ninja, pkgconfig , libuecc, libsodium, libcap, json_c, openssl }: stdenv.mkDerivation rec { pname = "fastd"; - version = "19"; + version = "21"; src = fetchFromGitHub { owner = "Neoraider"; repo = "fastd"; rev = "v${version}"; - sha256 = "1h3whjvy2n2cyvbkbg4y1z9vlrn790spzbdhj4glwp93xcykhz5i"; + sha256 = "1p4k50dk8byrghbr0fwmgwps8df6rlkgcd603r14i71m5g27z5gw"; }; - postPatch = '' - substituteInPlace src/crypto/cipher/CMakeLists.txt \ - --replace 'add_subdirectory(aes128_ctr)' "" - ''; - - nativeBuildInputs = [ pkgconfig bison cmake ]; + nativeBuildInputs = [ pkgconfig bison meson ninja ]; buildInputs = [ libuecc libsodium libcap json_c openssl ]; - cmakeFlags = [ - "-DENABLE_OPENSSL=true" - ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix index 2caf18d9a4b0..761e9eb4619b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "112w4x79zywy6i5vfr04057p9vschflhdhs7b2mhkcba5gigkrxx"; + sha256 = "0g0kw1b18kk9jhvw88hcxc04ccj8k22fdzky7l2dv3r37vndd91w"; }; - cargoSha256 = "1bfbg5fzwp8drm0vp16503qd5mgjfw7z9p292xgdx0i20s4wfrkk"; + cargoSha256 = "0cmp4w86qnzd2b2w4s3w019857pxysgikkl1g7ldkiylrsm5vlpn"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; @@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec { description = "The fastest and cross-platform subdomain enumerator"; homepage = "https://github.com/Edu4rdSHL/findomain"; license = licenses.gpl3; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/flannel/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/flannel/default.nix index 7ecfb559dcc7..86010f4adb91 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/flannel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "flannel"; - version = "0.12.0"; + version = "0.13.0"; rev = "v${version}"; goPackagePath = "github.com/coreos/flannel"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "flannel"; - sha256 = "04g7rzgyi3xs3sf5p1a9dmd08crdrz6y1b02ziv3444qk40jyswd"; + sha256 = "0mmswnaybwpf18h832haapcs5b63wn5w2hax0smm3inldiggsbw8"; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/frp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/frp/default.nix index 6bc05139f8b2..7ba943e338d1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.34.0"; + version = "0.34.3"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "1f0cr7211wkam1204x6gsflhw7gc995lia3jq4v6n3ijfwy5vyvm"; + sha256 = "1c5337yv7m4ad1mr73a38lbxg6b7sk8pxqkzws01jxrry2jahb35"; }; - vendorSha256 = "1ym4qcqgbbj6pa4cgmxmny7krxwjfl8l02hb3r5jh9qj886fwhdr"; + vendorSha256 = "0srkvd1kvjabf3r391n6spv5n77r7dw4y982ynqsv5grp5f4zmm1"; doCheck = false; @@ -27,6 +27,6 @@ buildGoModule rec { ''; homepage = "https://github.com/fatedier/frp"; license = licenses.asl20; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix index f739e80be1fe..8d7d2392dfb7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix @@ -1,12 +1,12 @@ -{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}: +{ stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, makeWrapper }: let -version = "2.4"; +version = "2.5"; apk = stdenv.mkDerivation { pname = "gnirehtet.apk"; inherit version; src = fetchzip { url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; - sha256 = "13gsh5982v961j86j5y71pgas94g2d1v1fgnbslbqw4h69fbf48g"; + sha256 = "1db0gkg5z8lighhkyqfsr9jiacrck89zmfnmp74vj865hhxgjzgq"; }; installPhase = '' mkdir $out @@ -22,19 +22,18 @@ rustPlatform.buildRustPackage { owner = "Genymobile"; repo = "gnirehtet"; rev = "v${version}"; - sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl"; + sha256 = "0wk6n082gnj9xk46n542h1012h8gyhldca23bs7vl73g0534g878"; }; sourceRoot = "source/relay-rust"; - cargoSha256 = "0rb5xcqg5ikgrxpmzrql5n298j50aqgkkp45znbfv2x2n40dywad"; + cargoSha256 = "0i7f52r697gjw30m8k60hd3y6wsn5lpz419r083a1rhpbinzd26q"; - patchFlags = [ "-p2" ]; - patches = [ - (substituteAll { - src = ./paths.patch; - adb = "${androidenv.androidPkgs_9_0.platform-tools}/bin/adb"; - inherit apk; - }) - ]; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/gnirehtet \ + --set GNIREHTET_APK ${apk}/gnirehtet.apk \ + --set ADB ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb + ''; meta = with stdenv.lib; { description = "Reverse tethering over adb for Android"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch deleted file mode 100644 index e5df4b8e4fe7..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: gnirehtet/relay-rust/src/main.rs -=================================================================== ---- gnirehtet.orig/relay-rust/src/main.rs -+++ gnirehtet/relay-rust/src/main.rs -@@ -299,7 +299,7 @@ impl Command for RelayCommand { - - fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> { - info!(target: TAG, "Installing gnirehtet client..."); -- exec_adb(serial, vec!["install", "-r", "gnirehtet.apk"]) -+ exec_adb(serial, vec!["install", "-r", "@apk@/gnirehtet.apk"]) - } - - fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> { -@@ -464,8 +464,8 @@ fn exec_adb<S: Into<String>>( - args: Vec<S>, - ) -> Result<(), CommandExecutionError> { - let adb_args = create_adb_args(serial, args); -- debug!(target: TAG, "Execute: adb {:?}", adb_args); -- match process::Command::new("adb").args(&adb_args[..]).status() { -+ debug!(target: TAG, "Execute: @adb@ {:?}", adb_args); -+ match process::Command::new("@adb@").args(&adb_args[..]).status() { - Ok(exit_status) => { - if exit_status.success() { - Ok(()) -@@ -487,8 +487,8 @@ fn must_install_client(serial: Option<&S - serial, - vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"], - ); -- debug!(target: TAG, "Execute: adb {:?}", args); -- match process::Command::new("adb").args(&args[..]).output() { -+ debug!(target: TAG, "Execute: @adb@ {:?}", args); -+ match process::Command::new("@adb@").args(&args[..]).output() { - Ok(output) => { - if output.status.success() { - // the "regex" crate makes the binary far bigger, so just parse the versionCode -Index: gnirehtet/relay-rust/src/adb_monitor.rs -=================================================================== ---- gnirehtet.orig/relay-rust/src/adb_monitor.rs -+++ gnirehtet/relay-rust/src/adb_monitor.rs -@@ -206,7 +206,7 @@ impl AdbMonitor { - - fn start_adb_daemon() -> bool { - info!(target: TAG, "Restarting adb daemon"); -- match process::Command::new("adb") -+ match process::Command::new("@adb@") - .args(&["start-server"]) - .status() { - Ok(exit_status) => { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix index fb64ff65cc15..4232a5a4fedd 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; - rev = "${version}"; + rev = version; sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/goreplay/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/goreplay/default.nix index 86548bf99597..0859472a446f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/goreplay/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/goreplay/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { homepage = "https://github.com/buger/goreplay"; license = stdenv.lib.licenses.lgpl3Only; - description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic"; + description = "Open-source tool for capturing and replaying live HTTP traffic"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/gping/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/gping/default.nix index 092f3611abb7..fdf5c9ad704b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -1,32 +1,25 @@ { lib -, iputils -, python3 -, python3Packages +, rustPlatform +, fetchFromGitHub }: -python3Packages.buildPythonApplication rec { +rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.1"; + version = "1.1.0"; - propagatedBuildInputs = with python3Packages; [ colorama ]; - - src = python3Packages.fetchPypi { - inherit version; - pname = "pinggraph"; - sha256 = "0q5ma98457zb6vxsnhmrr3p38j1vg0gl155y0adzfg67wlniac92"; + src = fetchFromGitHub { + owner = "orf"; + repo = "gping"; + rev = "v${version}"; + sha256 = "10hvzgn98qbzs7mmql9wlbll814mkki29lvg71lbvr81wlbdn6mr"; }; - # Make path to ping explicit - postFixup = '' - substituteInPlace $out/${python3.sitePackages}/gping/pinger.py \ - --replace 'subprocess.getoutput("ping ' 'subprocess.getoutput("${iputils}/bin/ping ' \ - --replace 'args = ["ping"]' 'args = ["${iputils}/bin/ping"]' - ''; + cargoSha256 = "0kkfrdzyy5068k8nz08pfc4cl1dvn0vd6i01gax5dblk122ybbag"; meta = with lib; { description = "Ping, but with a graph"; homepage = "https://github.com/orf/gping"; - license = licenses.gpl2; + license = licenses.mit; maintainers = with maintainers; [ andrew-d ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/grpcui/default.nix index be3ed2ea2c65..a9fb7c823f9e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "0b6rc294v8jagk79hcjbaldfi7y7idx8bknsbdi3djym5rspdg6s"; + sha256 = "1l8ldx7nx2pa2ac5znss0j0dhapn3syj02xqys4jz22hr5gvfj6m"; }; - vendorSha256 = "0wih9xvpgqqd82v1pxy5rslrsd6wsl0ys1bi1mf373dnfq5vh5a9"; + vendorSha256 = "15qgpbsl41swifw8w1lx0pbniwv3rf35127ald7h1r157vfa0r8b"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 91112a2628e2..9f01962250dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -1,7 +1,7 @@ { useLua ? !stdenv.isDarwin , usePcre ? true , withPrometheusExporter ? true -, stdenv, lib, fetchurl +, stdenv, lib, fetchurl, nixosTests , openssl, zlib , lua5_3 ? null, pcre ? null, systemd ? null }: @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.2.2"; + version = "2.3.2"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1mjld865p4f7i465fcc5c4jclih1c3345a3ylriql8668rd7071r"; + sha256 = "1mcg0d6qiwl3xps65ir2sv5sc868zla5wnfhk24d2b0sg6xp7jwr"; }; buildInputs = [ openssl zlib ] @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.haproxy = nixosTests.haproxy; + meta = with lib; { description = "Reliable, high performance TCP/HTTP load balancer"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/hey/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/hey/default.nix index 22f933a4b654..edf91dd311d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/hey/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/hey/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hey"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "rakyll"; repo = pname; rev = "v${version}"; - sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv"; + sha256 = "0gsdksrzlwpba14a43ayyy41l1hxpw4ayjpvqyd4ycakddlkvgzb"; }; vendorSha256 = null; @@ -19,6 +19,6 @@ buildGoModule rec { description = "HTTP load generator, ApacheBench (ab) replacement"; homepage = "https://github.com/rakyll/hey"; license = licenses.asl20; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/httpstat/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/httpstat/default.nix index 29bd4c331eb8..e9987a51eaec 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/httpstat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/httpstat/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { pname = "httpstat"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "reorx"; repo = pname; rev = version; - sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6"; + sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1"; }; doCheck = false; # No tests buildInputs = [ glibcLocales ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2p/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2p/default.nix index 4371d37391be..5c209393978f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -2,11 +2,11 @@ let wrapper = stdenv.mkDerivation rec { pname = "wrapper"; - version = "3.5.43"; + version = "3.5.44"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b"; + sha256 = "1iq4j7srzy5p8q3nci9316bnwx4g71jyvzd1i5hp3s8v1k61910g"; }; buildInputs = [ jdk ]; @@ -32,11 +32,11 @@ in stdenv.mkDerivation rec { pname = "i2p"; - version = "0.9.47"; + version = "0.9.48"; src = fetchurl { url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2"; - sha256 = "0krcdm73qing7z918wpml9sk6dn0284wps2ghkmlrdaklfkavk6v"; + sha256 = "0cnm4bwl1gqcx89i96j2qlq6adphy4l72h5whamqwv86n8bmpig8"; }; buildInputs = [ jdk ant gettext which ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 08c40a4ac827..8bf90293a8ec 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.33.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1zsp4pml5pq8p1ipvarnlcfwcscch13iz1gzza5qm0yl01dl9qpk"; + sha256 = "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix new file mode 100644 index 000000000000..83b35c098669 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "igmpproxy"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "pali"; + repo = "igmpproxy"; + rev = version; + sha256 = "13zn4q24drbhpqmcmqh1jg7ind5iqn11wj3xvczlc8w35vyqssyf"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A daemon that routes multicast using IGMP forwarding"; + homepage = "https://github.com/pali/igmpproxy/"; + changelog = "https://github.com/pali/igmpproxy/releases/tag/${version}"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sdier ]; + # The maintainer is using this on linux, but if you test it on other platforms + # please add them here! + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/inadyn/default.nix index 2a551c56768c..f01bffa76da5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/inadyn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/inadyn/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://troglobit.com/project/inadyn/"; + homepage = "https://troglobit.com/project/inadyn/"; description = "Free dynamic DNS client"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/iperf/3.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/iperf/3.nix index 4910ff21da62..2ca924731466 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/iperf/3.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/iperf/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iperf"; - version = "3.8.1"; + version = "3.9"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; - sha256 = "15pdgnan9krf3dijan9in73ir8rcmhk3iw8085d732is4zrq1c75"; + sha256 = "0f601avdmzpwsa3lbi0ppjhkrdipm5wifhhxy5czf99370k3mdi4"; }; buildInputs = [ openssl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix index 11ebe228be88..b773e116d8be 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.1.3"; + version = "2.1.5"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "1zdfvicpll7a5iw6p12pmdcg8y30mr0j5miycn0nhjp8yzi9hdc5"; + sha256 = "0zdh3g491mlc0x4g8q09vq62a7pb8n13a39jnfdgrm9k29khn0sj"; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix index 8462d907a1f6..229f261c8c3e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd"; + sha256 = "1qc7k83zpcq27hpjv1lmgrj4la2zy1gspwk5jas43j49siwr3xqx"; }; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix index adcd2f1dc131..ff7d4176bd2e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -3,13 +3,12 @@ , python3, gss, libmysqlclient, system-sendmail }: stdenv.mkDerivation rec { - name = "${project}-${version}"; - project = "mailutils"; - version = "3.9"; + pname = "mailutils"; + version = "3.10"; src = fetchurl { - url = "mirror://gnu/${project}/${name}.tar.xz"; - sha256 = "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; + sha256 = "17smrxjdgbbzbzakik30vj46q4iib85ksqhb82jr4vjp57akszh9"; }; postPatch = '' @@ -32,6 +31,18 @@ stdenv.mkDerivation rec { patches = [ ./fix-build-mb-len-max.patch ./path-to-cat.patch + # mailquota.c:277: undefined reference to `get_size' + # https://lists.gnu.org/archive/html/bug-mailutils/2020-08/msg00002.html + (fetchpatch { + url = "http://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=37713b42a501892469234b90454731d8d8b7a3e6"; + sha256 = "1mwj77nxvf4xvqf26yjs59jyksnizj0lmbymbzg4kmqynzq3zjny"; + }) + # Fix cross-compilation + # https://lists.gnu.org/archive/html/bug-mailutils/2020-11/msg00038.html + (fetchpatch { + url = "https://lists.gnu.org/archive/html/bug-mailutils/2020-11/txtiNjqcNpqOk.txt"; + sha256 = "0ghzqb8qx2q8cffbvqzw19mivv7r5f16whplzhm7hdj0j2i6xf6s"; + }) ]; enableParallelBuilding = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/maxscale/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/maxscale/default.nix index 48590a9e3059..9036e07e7f3f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/maxscale/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/maxscale/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = ''MaxScale database proxy extends MariaDB Server's high availability''; + description = "MaxScale database proxy extends MariaDB Server's high availability"; homepage = "https://mariadb.com/products/technology/maxscale"; license = licenses.bsl11; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/minidlna/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/minidlna/default.nix index 6a14b5f1c82d..d425e16782b3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/minidlna/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/minidlna/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: -let version = "1.2.1"; in +let version = "1.3.0"; in stdenv.mkDerivation { pname = "minidlna"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz"; - sha256 = "1v1ffhmaqxpvf2vv4yyvjsks4skr9y088853awsh7ixh7ai8nf37"; + sha256 = "0qrw5ny82p5ybccw4pp9jma8nwl28z927v0j2561m0289imv1na7"; }; preConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 505ecc4c2224..e452719a494a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-08-08T02-33-58Z"; + version = "2020-11-25T23-04-07Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "15bkl3q0jidrwy04l0cdmha43r9wlxmlqkhmwz98b57rjrq6grql"; + sha256 = "0r4za7jnwmh2wna5l4iv5pz6s5c62f7v4hmbv7misff9qbk4p4k7"; }; - vendorSha256 = "1fsx8zl2qkyf1gx3s6giccd86xawx9d1h4jdnyn1m36clsq9jkpc"; + vendorSha256 = "0zracgqwhqs3gabrqqm8fm3hyicaadcinsjp5qgprjwd9a3c1zfv"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/modem-manager/default.nix index c3981b902f2b..7bad593e4dfa 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.12.10"; + version = "1.14.8"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj"; + sha256 = "15cjy7zzsxagx649vz0990avin47vpgdmm4ss2msggdla6x2c6py"; }; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix index 26c9035cd79b..dba75400f6fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -3,10 +3,11 @@ , libutempter ? null, withUtempter ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "mosh-1.3.2"; + pname = "mosh"; + version = "1.3.2"; src = fetchurl { - url = "https://mosh.org/${name}.tar.gz"; + url = "https://mosh.org/mosh-${version}.tar.gz"; sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/mozwire/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/mozwire/default.nix index 3f50ed41f49c..58afc833ea0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/mozwire/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/mozwire/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "MozWire"; - version = "0.5.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "NilsIrl"; repo = pname; rev = "v${version}"; - sha256 = "0r3x8y1qxxkkac9lqgd0s339zbrm9zmir1f6qs0r5f0bw3ngzqc4"; + sha256 = "01bj3c34x9ywxygsz4rdyw5gc9cz8x6zzl5fd7db8qy8bx2lhlr9"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0hyps2wi4wmpllfams3p59jpccwa0ylgzxq7qdn6g6zvf0cajpc0"; + cargoSha256 = "0yxnpnxwis46wz4j5rjzyyzrvh94hn8vzxmmrcmrdz3gkakg77hg"; meta = with stdenv.lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/nebula/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/nebula/default.nix index b3cd0d830245..61f0a00a9b81 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { ''; homepage = "https://github.com/slackhq/nebula"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/default.nix index f5b12a6cf373..c02275ef5b81 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/default.nix @@ -62,6 +62,13 @@ in stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch + + # Fix build + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/620 + (fetchpatch { + url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/54e25f23f53af889703dfc50d51a8afeeea8a439.patch"; + sha256 = "oy/AZhOC15anWeIMYJfDBcITqJ7CiU715he68XvPRxk="; + }) ]; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix index 4b46d63ced5b..e17d4ebc0719 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; - rev = "${version}"; + rev = version; sha256 = "1liidqh8c33pxyb07qyj0jkd0fdak73g9r2iwiq62vfzrpik09k0"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix index 7d7889f9a5bc..d50ccc6517b4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix @@ -19,6 +19,7 @@ , gcr , glib , substituteAll +, lib }: stdenv.mkDerivation rec { @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgcr=${if withGnome then "true" else "false"}" + "-Dgcr=${lib.boolToString withGnome}" ]; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/sstp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/sstp/default.nix new file mode 100644 index 000000000000..d5195cba3453 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/network-manager/sstp/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, autoreconfHook +, fetchFromGitHub +, fetchpatch +, file +, glib +, gnome3 +, gtk3 +, intltool +, libnma +, libsecret +, networkmanager +, pkgconfig +, ppp +, sstp +, substituteAll +, withGnome ? true }: + +let + pname = "NetworkManager-sstp"; + version = "unstable-2020-04-20"; +in stdenv.mkDerivation { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + + src = fetchFromGitHub { + owner = "enaess"; + repo = "network-manager-sstp"; + rev = "735d8ca078f933e085029f60a737e3cf1d8c29a8"; + sha256 = "0aahfhy2ch951kzj6gnd8p8hv2s5yd5y10wrmj68djhnx2ml8cd3"; + }; + + buildInputs = [ sstp networkmanager glib ppp ] + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + + nativeBuildInputs = [ file intltool autoreconfHook pkgconfig ]; + + postPatch = '' + sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c + sed -i 's#/sbin/sstpc#${sstp}/bin/sstpc#' src/nm-sstp-service.c + ''; + + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + + preConfigure = "intltoolize"; + configureFlags = [ + "--without-libnm-glib" + "--with-gnome=${if withGnome then "yes" else "no"}" + "--enable-absolute-paths" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanager-sstp"; + }; + }; + + meta = with stdenv.lib; { + description = "NetworkManager's sstp plugin"; + inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/nfdump/default.nix index 11ba442393dd..0c9bc41099f2 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/nfdump/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, yacc }: -let version = "1.6.21"; in +let version = "1.6.22"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "1ifxnpyzyn8nd6n44pjcw0rwck392nzj1gwa4zzqvvgzj477m6ha"; + sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj"; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/nfstrace/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/nfstrace/default.nix index 2cb819caee98..6377f276af3f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/nfstrace/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/nfstrace/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "epam"; repo = "nfstrace"; - rev = "${version}"; + rev = version; sha256 = "1djsyn7i3xp969rnmsdaf5vwjiik9wylxxrc5nm7by00i76c1vsg"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix index d9c1acc374c0..3c1e0f498fba 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix @@ -35,10 +35,7 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; meta = { - description = "ngrok"; - longDescription = '' - Allows you to expose a web server running on your local machine to the internet. - ''; + description = "Allows you to expose a web server running on your local machine to the internet"; homepage = "https://ngrok.com/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/nxdomain/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/nxdomain/default.nix new file mode 100644 index 000000000000..073ac48b8d34 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/nxdomain/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonApplication, fetchPypi, dnspython, pytestCheckHook }: + +buildPythonApplication rec { + pname = "nxdomain"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z9iffggqq2kw6kpnj30shi98cg0bkvkwpglmhnkgwac6g55n2zn"; + }; + + propagatedBuildInputs = [ dnspython ]; + + checkInputs = [ pytestCheckHook ]; + + postCheck = '' + echo example.org > simple.list + python -m nxdomain --format dnsmasq --out dnsmasq.conf --simple ./simple.list + grep -q 'address=/example.org/' dnsmasq.conf + ''; + + meta = with lib; { + homepage = "https://github.com/zopieux/nxdomain"; + description = "A domain (ad) block list creator"; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zopieux ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/oneshot/default.nix index f02370ab69d5..0f886fda03c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oneshot"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "11xmvqj7md970rjhkg1zj2w6yqpw6cj83aw37a82sfdn90kyhg9d"; + sha256 = "047mncv9abs4xj7bh9lhc3wan37cldjjyrpkis7pvx6zhzml74kf"; }; vendorSha256 = "1cxr96yrrmz37r542mc5376jll9lqjqm18k8761h9jqfbzmh9rkp"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 2b09fe901d07..4630342cf8ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.3.1"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1pafv432ll3pp52580pbnk0gnrm6byl5fkrf1rarhxfkpkr82yif"; + sha256 = "1h9infspwbij9ahb376vc4ijakrqb7xww573ccrqvchxphbcsf7l"; }; phases = [ "installPhase" ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.shou ]; }; } - diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index 0a1680bfdb56..a8ce80f98382 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds"; + sha256 = "1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2"; }; # we cannot write the config file to /etc and as we don't need the file, so drop it diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/default.nix index 64e6757891e3..f8a518ca4dce 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -19,13 +19,13 @@ let - version = "8.3p1"; + version = "8.4p1"; # **please** update this patch when you update to a new openssh release. gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; - url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-1/debian/patches/gssapi.patch"; - sha256 = "0j22ccg6msyi88mpsb6x0il5cg8v2b7qdah57ninbwx5isyld80l"; + url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch"; + sha256 = "1z1ckzimlkm1dmr9f5fqjnjg28gsqcwx6xka0klak857548d2lp2"; }; in @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { src = if hpnSupport then fetchurl { url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "1ssdwgdxnvjwigisqi8c053znps5a4jf7bzsi99y0xyfzbw0x55k"; + sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540"; } else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; - sha256 = "1cl74ghi9y21dc3f4xa0qamb7dhwacbynh1ks9syprrg8zhgpgpj"; + sha256 = "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as"; }; patches = @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { ./dont_create_privsep_path.patch ./ssh-keysign.patch + + # See https://github.com/openssh/openssh-portable/pull/206 + ./ssh-copy-id-fix-eof.patch ] ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch new file mode 100644 index 000000000000..4ba2b562f556 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openssh/ssh-copy-id-fix-eof.patch @@ -0,0 +1,21 @@ +diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id +index 392f64f..a769077 100644 +--- a/contrib/ssh-copy-id ++++ b/contrib/ssh-copy-id +@@ -247,7 +247,7 @@ installkeys_sh() { + # the -z `tail ...` checks for a trailing newline. The echo adds one if was missing + # the cat adds the keys we're getting via STDIN + # and if available restorecon is used to restore the SELinux context +- INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF) ++ INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF + cd; + umask 077; + mkdir -p $(dirname "${AUTH_KEY_FILE}") && +@@ -258,6 +258,7 @@ installkeys_sh() { + restorecon -F .ssh ${AUTH_KEY_FILE}; + fi + EOF ++ ) + + # to defend against quirky remote shells: use 'exec sh -c' to get POSIX; + printf "exec sh -c '%s'" "${INSTALLKEYS_SH}" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/default.nix index c5a15c2f87a8..04ac97003102 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -1,14 +1,23 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, makeWrapper -, iproute, lzo, openssl, pam -, useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null -, pkcs11Support ? false, pkcs11helper ? null, +{ stdenv +, fetchurl +, pkg-config +, makeWrapper +, runtimeShell +, iproute ? null +, lzo +, openssl +, pam +, useSystemd ? stdenv.isLinux +, systemd ? null +, util-linux ? null +, pkcs11Support ? false +, pkcs11helper ? null }: assert useSystemd -> (systemd != null); assert pkcs11Support -> (pkcs11helper != null); with stdenv.lib; - let # Check if the script needs to have other binaries wrapped when changing this. update-resolved = fetchurl { @@ -16,49 +25,68 @@ let sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc"; }; -in stdenv.mkDerivation rec { - pname = "openvpn"; - version = "2.4.9"; + generic = { version, sha256 }: + let + withIpRoute = stdenv.isLinux && (versionOlder version "2.5"); + in + stdenv.mkDerivation + rec { + pname = "openvpn"; + inherit version; - src = fetchurl { - url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; - sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"; - }; + src = fetchurl { + url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; + inherit sha256; + }; + + nativeBuildInputs = [ makeWrapper pkg-config ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ lzo openssl ] + ++ optional stdenv.isLinux pam + ++ optional withIpRoute iproute + ++ optional useSystemd systemd + ++ optional pkcs11Support pkcs11helper; - buildInputs = [ lzo openssl ] - ++ optionals stdenv.isLinux [ pam iproute ] - ++ optional useSystemd systemd - ++ optional pkcs11Support pkcs11helper; + configureFlags = optionals withIpRoute [ + "--enable-iproute2" + "IPROUTE=${iproute}/sbin/ip" + ] + ++ optional useSystemd "--enable-systemd" + ++ optional pkcs11Support "--enable-pkcs11" + ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; - configureFlags = optionals stdenv.isLinux [ - "--enable-iproute2" - "IPROUTE=${iproute}/sbin/ip" ] - ++ optional useSystemd "--enable-systemd" - ++ optional pkcs11Support "--enable-pkcs11" - ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; + postInstall = '' + mkdir -p $out/share/doc/openvpn/examples + cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples + cp -r sample/sample-keys/ $out/share/doc/openvpn/examples + cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples + '' + optionalString useSystemd '' + install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved + wrapProgram $out/libexec/update-systemd-resolved \ + --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]} + ''; - postInstall = '' - mkdir -p $out/share/doc/openvpn/examples - cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples - cp -r sample/sample-keys/ $out/share/doc/openvpn/examples - cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples - '' + optionalString useSystemd '' - install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved - wrapProgram $out/libexec/update-systemd-resolved \ - --prefix PATH : ${makeBinPath [ stdenv.shell iproute systemd utillinux ]} - ''; + enableParallelBuilding = true; - enableParallelBuilding = true; + meta = with stdenv.lib; { + description = "A robust and highly flexible tunneling application"; + downloadPage = "https://openvpn.net/community-downloads/"; + homepage = "https://openvpn.net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ viric peterhoeg ]; + platforms = platforms.unix; + }; + }; + +in +{ + openvpn_24 = generic { + version = "2.4.9"; + sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"; + }; - meta = with stdenv.lib; { - description = "A robust and highly flexible tunneling application"; - downloadPage = "https://openvpn.net/community-downloads/"; - homepage = "https://openvpn.net/"; - license = licenses.gpl2; - maintainers = with maintainers; [ viric ]; - platforms = platforms.unix; - updateWalker = true; + openvpn = generic { + version = "2.5.0"; + sha256 = "sha256-AppCbkTWVstOEYkxnJX+b8mGQkdyT1WZ2Z35xMNHj70="; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index d73b8e911b9d..f50d17eaf7de 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }: +{ stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: stdenv.mkDerivation { name = "openvpn-learnaddress-19b03c3"; @@ -9,13 +9,13 @@ stdenv.mkDerivation { sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42"; }; - buildInputs = [ makeWrapper coreutils gawk utillinux ]; + buildInputs = [ makeWrapper coreutils gawk util-linux ]; installPhase = '' install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress wrapProgram $out/libexec/openvpn/openvpn-learnaddress \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk util-linux ]} ''; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index 4d18372363b6..1a192ce6688a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , makeWrapper -, iproute, systemd, coreutils, utillinux }: +, iproute, systemd, coreutils, util-linux }: stdenv.mkDerivation rec { pname = "update-systemd-resolved"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' wrapProgram $out/libexec/openvpn/update-systemd-resolved \ - --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils utillinux ]} + --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]} ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/pdsh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/pdsh/default.nix index 9dd1a5581c55..3f00964bfd35 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/pdsh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/pdsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, readline, rsh, ssh }: +{ stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: stdenv.mkDerivation rec { name = "pdsh-2.34"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl"; }; - buildInputs = [ perl readline ssh ]; + buildInputs = [ perl readline ssh ] + ++ (stdenv.lib.optional slurmSupport slurm); preConfigure = '' configureFlagsArray=( @@ -18,6 +19,7 @@ stdenv.mkDerivation rec { ${if readline == null then "--without-readline" else "--with-readline"} ${if ssh == null then "--without-ssh" else "--with-ssh"} ${if rsh == false then "--without-rsh" else "--with-rsh"} + ${if slurmSupport then "--with-slurm" else "--without-slurm"} "--with-dshgroups" "--with-xcpu" "--disable-debug" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/photon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/photon/default.nix index 22da1320803e..db6917ef0b76 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/photon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/photon/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { installPhase = '' mkdir -p "$out"/{bin,share/photon} cp -R photon.py core plugins $out/share/photon - + makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \ --set PYTHONPATH "$PYTHONPATH:$out/share/photon" \ --add-flags "-O $out/share/photon/photon.py" @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec { description = "a lightning fast web crawler which extracts URLs, files, intel & endpoints from a target"; homepage = "https://github.com/s0md3v/Photon"; license = licenses.gpl3; - maintainers = with maintainers; [ genesis ]; + maintainers = with maintainers; [ ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/pmacct/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/pmacct/default.nix index 2bb6f373727d..4ef3cd6345e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/pmacct/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/pmacct/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ++ optional withMysql "--enable-mysql"; meta = with stdenv.lib; { - description = "pmacct is a small set of multi-purpose passive network monitoring tools"; + description = "A small set of multi-purpose passive network monitoring tools"; longDescription = '' pmacct is a small set of multi-purpose passive network monitoring tools [NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry] diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix index 10a25d5bf8b2..8346c862fc6e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "3.0.28"; + version = "3.0.29"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "0jl2yav1qzqnaqnnx8i6i53ayckkimcrs3l6ryvv7bda6v08rmxm"; + sha256 = "17a8fbdyb0ixc0wwq68fg7xn7l6n7jq67njpq93psmxgzng0dii5"; }; hardeningEnable = [ "pie" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix index 6f00c7fc8b74..6ace8e139e13 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { # Temporary work-around; most likely fixed by next upstream release sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl' ''; + postInstall = '' + cp src/proxychains.conf $out/etc + ''; meta = { description = "Proxifier for SOCKS proxies"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/rcon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/rcon/default.nix new file mode 100644 index 000000000000..f7cd08e197e8 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/rcon/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libbsd, check, pcre }: + +stdenv.mkDerivation rec { + pname = "rcon"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "n0la"; + repo = "rcon"; + rev = version; + sha256 = "1jsnmsm2qkiv8dan1yncx0qp6zfkcbyvf81c7xwpv6r499ijw1nb"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + glib + libbsd + check + pcre + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/n0la/rcon"; + description = "Source RCON client for command line"; + maintainers = with maintainers; [ f4814n ]; + platforms = with platforms; linux ++ darwin; + license = licenses.bsd2; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index 9726cde61e54..ed793a50cb8f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.18"; + version = "1.8.23"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1kxf0qcyg5mhddrzwv0hd1fy901wl0ydmxi6b1k2217xmgiyi2s6"; + sha256 = "1ylasv33478cgwmr8wrd4705azfzrw495w629ncynamv7z17w3k3"; }; - cargoSha256 = "0vmd4sjagyhrc7q7fszwcjh4nhhmhckmx48i1h2xhr68bwncmyif"; + cargoSha256 = "060k2dil38bx4zb5nnkr3mj6aayginbhr3aqjv0h071q0vlvp05p"; SODIUM_USE_PKG_CONFIG = 1; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/shorewall/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/shorewall/default.nix index 67f81b821053..c56f0eac7ff8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/shorewall/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/shorewall/default.nix @@ -10,7 +10,7 @@ , perlPackages , stdenv , tree -, utillinux +, util-linux }: let PATH = stdenv.lib.concatStringsSep ":" @@ -19,7 +19,7 @@ let "${iptables}/bin" "${ipset}/bin" "${ebtables}/bin" - "${utillinux}/bin" + "${util-linux}/bin" "${gnugrep}/bin" "${gnused}/bin" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ipset iptables ebtables - utillinux + util-linux gnugrep gnused perl diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 60cb34132537..c0c64405c0d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.4"; + version = "1.1.8"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "13hlljkqss9abjpwaa5gcn6qnax0ws03zzh45c4rv1if7rwk6nbl"; + sha256 = "06813k8a1gpakgykz5h75qpdlhrci9r39309n3qqh34ynbjil468"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/ssldump/default.nix index b492b5a226ba..d7578c4adda8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/ssldump/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/ssldump/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { "--with-openssl-lib=${openssl}/lib" "--with-openssl-inc=${openssl}/include" ]; meta = { - description = "ssldump is an SSLv3/TLS network protocol analyzer"; + description = "An SSLv3/TLS network protocol analyzer"; homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/sstp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/sstp/default.nix index 4d05b478ab40..22ef9102ef85 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/sstp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/sstp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sstp-client"; - version = "1.0.12"; + version = "1.0.13"; src = fetchurl { - url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz"; - sha256 = "1zv7rx6wh9rhbyg9pg6759by8hc6n4162zrrw0y812cnaw3b8zj8"; + url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz"; + sha256 = "06rjyncmgdy212xf9l9z6mfh4gdmgk7l4y841gb8lpbrl3y5h4ln"; }; patchPhase = diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/subfinder/default.nix index 70820ea03208..f812f7ffa91f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/subfinder/default.nix @@ -24,6 +24,6 @@ buildGoPackage rec { ''; homepage = "https://github.com/projectdiscovery/subfinder"; license = licenses.mit; - maintainers = with maintainers; [ fpletz filalex77 ]; + maintainers = with maintainers; [ fpletz Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index b40df721c83e..fdf7965311d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, tcpdump }: +{ stdenv, fetchurl, libpcap, tcpdump, Carbon, CoreServices }: stdenv.mkDerivation rec { pname = "tcpreplay"; @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d"; }; - buildInputs = [ libpcap ]; + buildInputs = [ libpcap ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + Carbon CoreServices + ]; + configureFlags = [ "--disable-local-libopts" @@ -26,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "http://tcpreplay.appneta.com/"; license = with licenses; [ bsd3 gpl3 ]; maintainers = with maintainers; [ eleanor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix index 285a3764e038..a077ddb3de46 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix @@ -3,7 +3,7 @@ , iptables, bash }: let - sshuttle-telepresence = + sshuttle-telepresence = let sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269"; in @@ -22,13 +22,13 @@ let }); in pythonPackages.buildPythonPackage rec { pname = "telepresence"; - version = "0.105"; + version = "0.108"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = version; - sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg"; + sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g="; }; buildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 4ca5529bdc60..2fedae4b7a79 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.33.8"; + version = "0.34.0"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "1dcr60gmbkb6833n49mjmlr082ahlv7alaqycl8g3d4f93kdm5c3"; + sha256 = "1fnykdk35937ld8dyzjs571klz187jr8wlj8ljn78pajx1cd84k6"; }; - vendorSha256 = "0i0n89lal99fqnzva51kp9f7wzqsfmncpshwxhq26kvykp7ji7sw"; + vendorSha256 = "19qx7ab6ar609cxxdsb9i2c3h7icqgf5bhi28lnsdk3bdjxr27vz"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tgt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tgt/default.nix index 478c1ed35f29..d9d8478e9856 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tgt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tgt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages -, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, utillinux +, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux }: stdenv.mkDerivation rec { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix index f0d2cd9a0df6..1ebd8d8be6a2 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.20.1"; + version = "1.20.3"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "108zx2x5q23cq0fzxmix31xcw62k3r1wlb55612c15ilz9c5xm32"; + sha256 = "064cl9m4hdv69q1af0xjcf2rf30n3pvz6ym2l53w90aq3217amps"; }; sourceRoot = "source/native"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tunnelto/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tunnelto/default.nix index c0dce98c4447..4bf251be81fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tunnelto/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tunnelto/default.nix @@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec { description = "Expose your local web server to the internet with a public URL"; homepage = "https://tunnelto.dev"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix index 9b33d53e54f1..b6d9eb3448f5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -1,17 +1,37 @@ -{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }: +{ stdenv +, lib +, fetchurl +, openssl +, nettle +, expat +, libevent +, dns-root-data +, pkg-config + # + # By default unbound will not be built with systemd support. Unbound is a very + # commmon dependency. The transitive dependency closure of systemd also + # contains unbound. + # Since most (all?) (lib)unbound users outside of the unbound daemon usage do + # not need the systemd integration it is likely best to just default to no + # systemd integration. + # For the daemon use-case, that needs to notify systemd, use `unbound-with-systemd`. + # +, withSystemd ? false +, systemd ? null +}: stdenv.mkDerivation rec { pname = "unbound"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "1xqywn2qdmjjq0csrqxh9p2rnizdrr1f99zdx87z7f3fyyc0fbwz"; + sha256 = "0daqxzvknvcz7sgag3wcrxhp4a39ik93lsrfpwcl9whjg2lm74jv"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - buildInputs = [ openssl nettle expat libevent ]; + buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ]; configureFlags = [ "--with-ssl=${openssl.dev}" @@ -25,6 +45,8 @@ stdenv.mkDerivation rec { "--enable-relro-now" ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [ "--disable-flto" + ] ++ lib.optionals withSystemd [ + "--enable-systemd" ]; installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; @@ -33,7 +55,7 @@ stdenv.mkDerivation rec { make unbound-event-install ''; - preFixup = stdenv.lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit + preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. # There was some problem with this on Darwin; let's not complicate non-Linux. @@ -43,17 +65,17 @@ stdenv.mkDerivation rec { buildPhase installPhase '' - # get rid of runtime dependencies on $dev outputs + # get rid of runtime dependencies on $dev outputs + ''substituteInPlace "$lib/lib/libunbound.la" '' - + stdenv.lib.concatMapStrings - (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") - buildInputs; + + lib.concatMapStrings + (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") + (builtins.filter (p: p != null) buildInputs); - meta = with stdenv.lib; { + meta = with lib; { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; homepage = "https://www.unbound.net"; maintainers = with maintainers; [ ehmry fpletz globin ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/urlwatch/default.nix index f23aed3707be..e4b821be1f46 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/urlwatch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.19"; + version = "2.21"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "05vxs0x8gnsv2r9cy0brqny1y5jnj2mw11lqc8lqahx84xcs2m00"; + sha256 = "1s6bigkwymxdp9bkgvwg3lbf465i6k8kmak2w7czf4mhwavcfq63"; }; propagatedBuildInputs = with python3Packages; [ @@ -20,12 +20,13 @@ python3Packages.buildPythonApplication rec { pycodestyle pyyaml requests + pyppeteer ]; meta = with stdenv.lib; { description = "A tool for monitoring webpages for updates"; homepage = "https://thp.io/2008/urlwatch/"; license = licenses.bsd3; - maintainers = with maintainers; [ tv ]; + maintainers = with maintainers; [ kmein tv ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/default.nix index 1165f0bd7e0b..ecc2c2438414 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -3,33 +3,33 @@ }: let - version = "4.31.0"; + version = "4.32.1"; src = fetchFromGitHub { - owner = "v2ray"; + owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "0s0blc05nrqm78qslv5xb42pjlx5v8qqwg0pwbzhxn9s71x2669m"; + sha256 = "1mlrl5fz1v3bcb83pczqp859d8w9mi7jj600a2yw7xm372w2irk8"; }; - vendorSha256 = "0n2mf19fvgk5x0j2wwm4zk9xikzvl6cdvw26qar91wzcsraf5z2d"; + vendorSha256 = "1mz1acdj8ailgyqrr1v47n36qc24ggzw5rmj4p2awfwz3gp2yz6z"; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202009300006"; - geoipSha256 = "1ss2izqlmrp5b5kpw804jk6c1nyimwlccbkikix3bwfaz4vlv1nc"; + geoipRev = "202011050012"; + geoipSha256 = "1d2n3hskgdmcfk1nl7a8lxxz325p84i7gz44cs77z1m9r7c2vsjy"; in fetchurl { - url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; + url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; }; # MIT licensed "geosite.dat" = let - geositeRev = "20201010021828"; - geositeSha256 = "0gpfhcf4iyx7ip7rlkb0l1q64w84zvmcah52qyjwljs6l4p3hrj9"; + geositeRev = "20201102141726"; + geositeSha256 = "0sn2f5vd6w94ryh845mnbfyjzycg7cvb66rkzh37pg9l7fvgs4jh"; in fetchurl { - url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; + url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; }; @@ -59,20 +59,23 @@ let installPhase = '' install -Dm755 v2ray v2ctl -t $out/bin ''; + + meta = { + homepage = "https://www.v2ray.com/en/index.html"; + description = "A platform for building proxies to bypass network restrictions"; + # The license of the dependency `https://github.com/XTLS/Go` doesn't allowed user to modify its source code, + # which made it unfree. + license = with lib.licenses; [ mit unfree ]; + maintainers = with lib.maintainers; [ servalcatty ]; + }; }; in runCommand "v2ray-${version}" { inherit version; + inherit (core) meta; nativeBuildInputs = [ makeWrapper ]; - meta = { - homepage = "https://www.v2ray.com/en/index.html"; - description = "A platform for building proxies to bypass network restrictions"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ servalcatty ]; - }; - passthru = { updateScript = ./update.sh; tests = { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/update.sh b/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/update.sh index 56a148444c71..08062b1e9969 100755 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/update.sh +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/v2ray/update.sh @@ -14,7 +14,7 @@ echo "Current version:" >&2 echo "core: $old_core_rev, geoip: $old_geoip_rev, geosite: $old_geosite_rev" >&2 function fetch_latest_rev { - curl "https://api.github.com/repos/v2ray/$1/releases" | + curl "https://api.github.com/repos/v2fly/$1/releases" | jq '.[0].tag_name' --raw-output } @@ -28,7 +28,7 @@ echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2 if [[ $core_rev != $old_core_rev ]]; then echo "Prefetching core..." >&2 { read hash; read store_path; } < <( - nix-prefetch-url --unpack --print-path "https://github.com/v2ray/v2ray-core/archive/v$core_rev.zip" + nix-prefetch-url --unpack --print-path "https://github.com/v2fly/v2ray-core/archive/v$core_rev.zip" ) sed --in-place \ @@ -40,7 +40,7 @@ fi if [[ $geoip_rev != $old_geoip_rev ]]; then echo "Prefetching geoip..." >&2 - hash=$(nix-prefetch-url "https://github.com/v2ray/geoip/releases/download/$geoip_rev/geoip.dat") + hash=$(nix-prefetch-url "https://github.com/v2fly/geoip/releases/download/$geoip_rev/geoip.dat") sed --in-place \ -e "s/\bgeoipRev = \".*\"/geoipRev = \"$geoip_rev\"/" \ -e "s/\bgeoipSha256 = \".*\"/geoipSha256 = \"$hash\"/" \ @@ -49,7 +49,7 @@ fi if [[ $geosite_rev != $old_geosite_rev ]]; then echo "Prefetching geosite..." >&2 - hash=$(nix-prefetch-url "https://github.com/v2ray/domain-list-community/releases/download/$geosite_rev/dlc.dat") + hash=$(nix-prefetch-url "https://github.com/v2fly/domain-list-community/releases/download/$geosite_rev/dlc.dat") sed --in-place \ -e "s/\bgeositeRev = \".*\"/geositeRev = \"$geosite_rev\"/" \ -e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/default.nix index cb7cbd677431..16abe8c60335 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vegeta"; - version = "12.7.0"; + version = "12.8.4"; src = fetchFromGitHub { - owner = "tsenart"; - repo = pname; - rev = "v${version}"; - sha256 = "1wzx9588hjzxq65fxi1zz9xpsw33qq41hpl0j2f077g4m8yxahv5"; + owner = "tsenart"; + repo = pname; + rev = "v${version}"; + sha256 = "0sw10k4g370c544dgw2c1sqdnxryld8lf6c1wnyknrm3zsfzn1hl"; }; goPackagePath = "github.com/tsenart/${pname}"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/deps.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/deps.nix index d0637dbeaef8..1a06ad178ec4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/deps.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/vegeta/deps.nix @@ -243,4 +243,13 @@ sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; }; } + { + goPackagePath = "pgregory.net/rapid"; + fetch = { + type = "git"; + url = "https://github.com/flyingmutant/rapid"; + rev = "v0.3.3"; + sha256 = "04w4dmx753b2xp5z5br5wxalgkkgag8qpbxics2gdcksqgi85vg3"; + }; + } ] diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/default.nix new file mode 100644 index 000000000000..cc28455d06a5 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/default.nix @@ -0,0 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "waitron-unstable-${version}"; + version = "2020-01-24"; + rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; + + goPackagePath = "github.com/ns1/waitron"; + + src = fetchgit { + inherit rev; + url = "https://github.com/ns1/waitron"; + sha256 = "0lgw37iq1cvg3mqc94nzf0027mvv721ay8x6dw3fc814ww8a2hb6"; + }; + + patches = [ + ./staticfiles-directory.patch + ]; + + goDeps = ./deps.nix; + + meta = { + description = "A tool to manage network booting of machines"; + homepage = "https://github.com/ns1/waitron"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ guibert ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/deps.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/deps.nix new file mode 100644 index 000000000000..46369c783184 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/flosch/pongo2"; + fetch = { + type = "git"; + url = "https://github.com/flosch/pongo2"; + rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00"; + sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; + }; + } + { + goPackagePath = "github.com/gorilla/handlers"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/handlers"; + rev = "f08afc1876ad882db8074bcb8a4cc96107d3a5f4"; + sha256 = "1ysm6sw3jqa3h8pb5qpqgh44g91c23n3as277sh0vyp7282290jq"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "d42613fe1ab9e303fc850e7a19fda2e8eeb6516e"; + sha256 = "0qggzzvh9lzlfk8ixlyw8bw645rh0lrjrd367505hhl6cg18v8yf"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "8c9f31f047a304abedb5614d4a18a843cd5f4a40"; + sha256 = "00f5ja1yslrjclx3sf29mzpcsrpfd15kkw5ygv7n4jsyb4v3xgj6"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b"; + sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "53403b58ad1b561927d19068c655246f2db79d48"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + }; + } +] diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch new file mode 100644 index 000000000000..b1096487fac1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch @@ -0,0 +1,13 @@ +diff --git a/main.go b/main.go +index 4046911..a126bae 100644 +--- a/main.go ++++ b/main.go +@@ -411,7 +411,7 @@ func main() { + + if configuration.StaticFilesPath != "" { + fs := http.FileServer(http.Dir(configuration.StaticFilesPath)) +- r.Handler("GET", "/files/:filename", http.StripPrefix("/files/", fs)) ++ r.Handler("GET", "/files/*filepath", http.StripPrefix("/files/", fs)) + log.Println("Serving static files from " + configuration.StaticFilesPath) + } + diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/wavemon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/wavemon/default.nix index dab52720a029..8549495e8f82 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/wavemon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/wavemon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }: stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; baseName = "wavemon"; name = "${baseName}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "109ycwnjjqc2vpnd8b86njfifczlxglnyv4rh2qmbn2i5nw2wryg"; + sha256 = "0y984wm03lzqf7bk06a07mw7d1fzjsp9x7zxcvlx4xqmv7wlgb29"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/ytcc/default.nix index dc38648c369c..2d474159359f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -19,11 +19,11 @@ python3Packages.buildPythonApplication rec { # Disable tests that touch network or shell out to commands checkPhase = '' - pytest . -k 'not get_channels \ + pytest . -k "not get_channels \ and not play_video \ and not download_videos \ and not update_all \ - and not add_channel_duplicate' + and not add_channel_duplicate" ''; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index 666b30d2c8e7..1413ca72a105 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -2,22 +2,16 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.4.6"; + version = "1.6.2"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "1f8hh05wx59dc0fbzdzwq05x0gmrdfl4v103wbcyjmzsbazaw6p3"; + sha256 = "0lky68fjrqjsd62g97jkn5a9hzj53g8wb6d2ncx8s21rknpncdar"; }; preConfigure = '' - substituteInPlace ./osdep/ManagedRoute.cpp \ - --replace '/usr/sbin/ip' '${iproute}/bin/ip' - - substituteInPlace ./osdep/ManagedRoute.cpp \ - --replace '/sbin/ip' '${iproute}/bin/ip' - patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ |