summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-01-10 10:34:04 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-01-10 10:34:04 +0100
commit5ad16cb27fd81cb67db4da80283e147bea4e1c25 (patch)
treead648118454028113d3b5236b27754151dc498b5 /pkgs/tools/networking
parenteb1369670b5a4e616ff0cf4100616479b1fa3064 (diff)
parent773494d0ea6fdf3a40561b44b805b90ae1949292 (diff)
downloadnixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar
nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.gz
nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.bz2
nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.lz
nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.xz
nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.zst
nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/bandwhich/default.nix8
-rw-r--r--pkgs/tools/networking/ocserv/default.nix4
-rw-r--r--pkgs/tools/networking/ppp/default.nix2
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix
index f1b9a87dd5a..cfccefab351 100644
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/pkgs/tools/networking/bandwhich/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bandwhich";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "imsnif";
     repo = pname;
     rev = version;
-    sha256 = "1qrxxy6vhac1g6jzg30lqwcpjffyk2297jkd9j4rmwwf5cgip58a";
+    sha256 = "1pd0hy17knalq4m5517ymbg95fa141843ir9283djlh3iqfgkm37";
   };
 
-  cargoSha256 = "1rixpljqddwhryddzni5l6m4sjyn1krrj0ig0rzc701am7srhg3a";
+  cargoSha256 = "14mb6rbjxv3r8awvy0rjc23lyhg92q1q1dik6q1za1aq9w8yipwf";
 
   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 ];
+    maintainers = with maintainers; [ filalex77 ma27 ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix
index c0535794cc6..8d4b340ea2b 100644
--- a/pkgs/tools/networking/ocserv/default.nix
+++ b/pkgs/tools/networking/ocserv/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ocserv";
-  version = "0.12.5";
+  version = "0.12.6";
 
   src = fetchFromGitLab {
     owner = "openconnect";
     repo = "ocserv";
     rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "01md7r7myaxp614bm2bmbpraxjjjhs0zr5h6k3az3y3ix0r7zi69";
+    sha256 = "0k7sx9sg8akxwfdl51cvdqkdrx9qganqddgri2yhcgznc3f3pz5b";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 987960c9c50..0efef74f6c3 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
     description = "Point-to-point implementation for Linux and Solaris";
     license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ];
     platforms = platforms.linux;
-    maintainers = [ maintainers.falsifian ];
+    maintainers = [ ];
   };
 }