summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-04-06 13:20:53 +0200
committerVladimír Čunát <v@cunat.cz>2019-04-06 13:20:53 +0200
commit526c4292ae62e63b5711f8d112290fcd2613d8b3 (patch)
tree6173d194e626d9f23d530cdbaaadd9df674ce506 /pkgs/tools/networking
parent6fe989eaed7d283bbde7a58e42ce36c676870aee (diff)
parent6b9afd8991899e3b115cb8af5702706eb0db1933 (diff)
downloadnixpkgs-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar
nixpkgs-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.gz
nixpkgs-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.bz2
nixpkgs-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.lz
nixpkgs-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.xz
nixpkgs-526c4292ae62e63b5711f8d112290fcd2613d8b3.tar.zst
nixpkgs-526c4292ae62e63b5711f8d112290fcd2613d8b3.zip
Merge branch 'staging-next'
This iteration was long, about five weeks (2fcb11a2), I think.
Darwin: it's missing a few thousand binaries and there's a make-netbsd
regression, but I suppose these aren't merge blockers.
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/network-manager/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 48848c0ead7..f18e8ad9f5c 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -9,11 +9,11 @@ let
   pname = "NetworkManager";
 in stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "1.14.4";
+  version = "1.14.6";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm";
+    sha256 = "0p9s6b1z9bdmzdjw2gnjsar1671vvcyy9inb0rxg1izf2nnwsfv9";
   };
 
   outputs = [ "out" "dev" ];