diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking')
10 files changed, 15 insertions, 138 deletions
diff --git a/nixpkgs/pkgs/tools/networking/crackle/default.nix b/nixpkgs/pkgs/tools/networking/crackle/default.nix index 00d0acd2aa94..ea42e7a0b320 100644 --- a/nixpkgs/pkgs/tools/networking/crackle/default.nix +++ b/nixpkgs/pkgs/tools/networking/crackle/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Crack and decrypt BLE encryption"; homepage = "https://github.com/mikeryan/crackle"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.bsd2; }; } diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index e37ecc3578e4..b603c9a25c79 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -18,11 +18,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-nsxv/mepd9HtJ5EHu9q3kNc64qYmvDju4j+h9nhqdZ4="; + hash = "sha256-gbrL9Q7G0Pfsqq18A+WZeLADIvva1u1KmJ3TF1S28l0="; }; buildInputs = [ openssl zlib libxcrypt ] diff --git a/nixpkgs/pkgs/tools/networking/hp2p/default.nix b/nixpkgs/pkgs/tools/networking/hp2p/default.nix index 52f3455ed4d5..9e2b5d639049 100644 --- a/nixpkgs/pkgs/tools/networking/hp2p/default.nix +++ b/nixpkgs/pkgs/tools/networking/hp2p/default.nix @@ -2,20 +2,19 @@ stdenv.mkDerivation rec { pname = "hp2p"; - version = "3.3"; + version = "unstable-2023-10-25"; src = fetchFromGitHub { owner = "cea-hpc"; repo = "hp2p"; - rev = version; - sha256 = "0zvlwb941rlp3vrf9yzv7njgpj3mh4671ch7qvxfa4hq2ivd52br"; + rev = "711f6cc5b4e552d969c2436ad77afd35d31bfd05"; + sha256 = "sha256-mBTJZb3DPmIlL7N+PfjlWmBw0WfFF2DesImVZlbDQKc="; }; - patches = [ ./python3.patch ]; enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake python3Packages.wrapPython ]; - buildInputs = [ mpi ] ++ (with python3Packages; [ python numpy matplotlib plotly mpldatacursor ]) ; - pythonPath = (with python3Packages; [ numpy matplotlib plotly mpldatacursor ]) ; + buildInputs = [ mpi ] ++ (with python3Packages; [ python plotly ]) ; + pythonPath = (with python3Packages; [ plotly ]) ; preConfigure = '' patchShebangs autogen.sh diff --git a/nixpkgs/pkgs/tools/networking/hp2p/python3.patch b/nixpkgs/pkgs/tools/networking/hp2p/python3.patch deleted file mode 100644 index 13043d9f09f1..000000000000 --- a/nixpkgs/pkgs/tools/networking/hp2p/python3.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -u -r source.orig/src/vizhp2p source/src/vizhp2p ---- source.orig/src/vizhp2p 1970-01-01 01:00:01.000000000 +0100 -+++ source/src/vizhp2p 2021-08-24 10:41:42.926881770 +0200 -@@ -94,25 +94,25 @@ - with open(hostfile) as fd: - for line in fd: - if line.startswith(motif_rank): -- print line -+ print(line) - c,v = line[len(motif_rank)+1:-1].split(separator) - nodes[c] = v - - # display k worst nodes indices -- print "\nTop %d bad mean:" % k -+ print("\nTop %d bad mean:" % k) - mean_order = np.argsort(a_mean) -- print [nodes[str(c)] for c in mean_order[:k]] -+ print([nodes[str(c)] for c in mean_order[:k]]) - mean_st = "Top nodes with bad mean:\n" - for i in range(0, k, hostname_per_line): - mean_st += repr([nodes[str(c)] for c - in mean_order[i:i + hostname_per_line]]) + "\n" - -- print "Top %d bad std:" % k -- print [nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]] -+ print("Top %d bad std:" % k) -+ print([nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]]) - -- print "Top %d bad mean/std:" % k -+ print("Top %d bad mean/std:" % k) - pen_order = np.argsort(a_mean / a_std) -- print [nodes[str(c)] for c in pen_order[:k]] -+ print([nodes[str(c)] for c in pen_order[:k]]) - pen_st = "Top nodes with bad mean/std:\n" - for i in range(0, k, hostname_per_line): - pen_st += repr([nodes[str(c)] for c -@@ -293,9 +293,9 @@ - # and 'p' (snapshot) - def onrefresh(event): - if event.key == 'r': -- print "refreshing...", -+ print("refreshing...", end=' ') - loop() -- print "ok" -+ print("ok") - elif event.key == 'q': - exit() - elif event.key == 'p': -@@ -303,9 +303,9 @@ - fig1.savefig(snapfile) - snapfile = outputname + "_snapshot_time.png" - fig2.savefig(snapfile) -- print 'snapshot saved (%s)' % snapfile -+ print('snapshot saved (%s)' % snapfile) - else: -- print "The answer to %s is 42." % event.key -+ print("The answer to %s is 42." % event.key) - - - if __name__ == "__main__": -@@ -356,11 +356,11 @@ - countfile = outputname + ".count.bin" - - print("visu_hp2p configuration:") -- print(" DATAFILE : %s"%resfile) -- print(" BIN_TIMER_FILE : %s"%resfile_time) -- print(" HOSTFILE : %s"%hostfile) -- print(" Bad nodes to display: %d"%k) -- print(" GUI resolution : %s"%resolution) -+ print((" DATAFILE : %s"%resfile)) -+ print((" BIN_TIMER_FILE : %s"%resfile_time)) -+ print((" HOSTFILE : %s"%hostfile)) -+ print((" Bad nodes to display: %d"%k)) -+ print((" GUI resolution : %s"%resolution)) - - hostname_per_line = 4 # for GUI layout - refresh_in_sec = 60 -@@ -377,7 +377,7 @@ - # wait for resfile - while not os.path.exists(resfile) : - time.sleep(5) -- print "Waiting for input files..." -+ print("Waiting for input files...") - - # add callback on key press event - cid1 = fig1.canvas.mpl_connect('key_press_event', onrefresh) -Only in source/src: vizhp2p.bak -diff -u -r source.orig/src/vizhp2p_html source/src/vizhp2p_html ---- source.orig/src/vizhp2p_html 1970-01-01 01:00:01.000000000 +0100 -+++ source/src/vizhp2p_html 2021-08-24 10:41:54.799946303 +0200 -@@ -118,7 +118,7 @@ - hostfile = args.hostfile - clustername = args.clustername - if len(args.OutputName) == 0: -- print "No DATAFILE given! Please provide Hp2p output files name !" -+ print("No DATAFILE given! Please provide Hp2p output files name !") - exit(0) - else: - outputname = args.OutputName.split('.')[0] -@@ -134,13 +134,13 @@ - else: - outfile = args.outfile - -- print "%s configuration:"%commandname -- print " DATAFILE : %s"%resfile -- print " HOSTFILE : %s"%hostfile -- print " CLUSTER : %s"%clustername -- print " OUTPUTFILE : %s"%outfile -+ print("%s configuration:"%commandname) -+ print(" DATAFILE : %s"%resfile) -+ print(" HOSTFILE : %s"%hostfile) -+ print(" CLUSTER : %s"%clustername) -+ print(" OUTPUTFILE : %s"%outfile) - if not os.path.exists(resfile): -- print "%s doesn't exist...Exiting"%resfile -+ print("%s doesn't exist...Exiting"%resfile) - exit(0) - - # Data management -Only in source/src: vizhp2p_html.bak diff --git a/nixpkgs/pkgs/tools/networking/mdk4/default.nix b/nixpkgs/pkgs/tools/networking/mdk4/default.nix index 903504633ac8..979584db432d 100644 --- a/nixpkgs/pkgs/tools/networking/mdk4/default.nix +++ b/nixpkgs/pkgs/tools/networking/mdk4/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A tool that injects data into wireless networks"; homepage = "https://github.com/aircrack-ng/mdk4"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix index a968191b05f1..20f5d52ff688 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix @@ -18,7 +18,7 @@ , gobject-introspection , python3 , gtk3 -, libappindicator-gtk3 +, libayatana-appindicator , glib }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { jansson glib glib-networking - libappindicator-gtk3 + libayatana-appindicator gnome.adwaita-icon-theme ]; diff --git a/nixpkgs/pkgs/tools/networking/norouter/default.nix b/nixpkgs/pkgs/tools/networking/norouter/default.nix index c3fdd57a592e..e76cc4544e32 100644 --- a/nixpkgs/pkgs/tools/networking/norouter/default.nix +++ b/nixpkgs/pkgs/tools/networking/norouter/default.nix @@ -31,7 +31,5 @@ buildGoModule rec { homepage = "https://github.com/norouter/norouter"; license = licenses.asl20; maintainers = with maintainers; [ blaggacao ]; - # out is empty - broken = true; }; } diff --git a/nixpkgs/pkgs/tools/networking/redfang/default.nix b/nixpkgs/pkgs/tools/networking/redfang/default.nix index 8e799b7d41fd..a4ba12b29489 100644 --- a/nixpkgs/pkgs/tools/networking/redfang/default.nix +++ b/nixpkgs/pkgs/tools/networking/redfang/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "A small proof-of-concept application to find non discoverable bluetooth devices"; homepage = "https://gitlab.com/kalilinux/packages/redfang"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/rosenpass/default.nix b/nixpkgs/pkgs/tools/networking/rosenpass/default.nix index 9467904fe698..790d1d9cecdf 100644 --- a/nixpkgs/pkgs/tools/networking/rosenpass/default.nix +++ b/nixpkgs/pkgs/tools/networking/rosenpass/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nixosTests , rustPlatform -, targetPlatform +, hostPlatform , installShellFiles , cmake , libsodium @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { # nix defaults to building for aarch64 _without_ the armv8-a # crypto extensions, but liboqs depends on these - preBuild = lib.optionalString targetPlatform.isAarch64 '' + preBuild = lib.optionalString hostPlatform.isAarch64 '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto" ''; diff --git a/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix b/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix index 8a71f6d99fd4..6c690fe4064e 100644 --- a/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -15,6 +15,6 @@ fetchFromGitHub { description = "Unified hosts file with base extensions"; homepage = "https://github.com/StevenBlack/hosts"; license = licenses.mit; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } |