diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-01 19:16:00 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-01 19:16:00 -0500 |
commit | 50ac34e3e9c06af617cc6e46d9a037a528500aba (patch) | |
tree | 6a92039f129809954ed101b00466c5a7afacc393 /pkgs | |
parent | 5ff1a53a32b332e3b1a1e295e12e184c65833d13 (diff) | |
parent | f025935dc60d69fa735a4707af2ccb2d7890f999 (diff) | |
download | nixlib-50ac34e3e9c06af617cc6e46d9a037a528500aba.tar nixlib-50ac34e3e9c06af617cc6e46d9a037a528500aba.tar.gz nixlib-50ac34e3e9c06af617cc6e46d9a037a528500aba.tar.bz2 nixlib-50ac34e3e9c06af617cc6e46d9a037a528500aba.tar.lz nixlib-50ac34e3e9c06af617cc6e46d9a037a528500aba.tar.xz nixlib-50ac34e3e9c06af617cc6e46d9a037a528500aba.tar.zst nixlib-50ac34e3e9c06af617cc6e46d9a037a528500aba.zip |
Merge pull request #78997 from worldofpeace/nm-1.22.6
networkmanager: 1.22.4 -> 1.22.6
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/networking/network-manager/applet/default.nix (renamed from pkgs/tools/networking/network-manager/applet.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch (renamed from pkgs/tools/networking/network-manager/hardcode-gsettings.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/dmenu/default.nix (renamed from pkgs/tools/networking/network-manager/dmenu.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/strongswan/default.nix (renamed from pkgs/tools/networking/network-manager/strongswan.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
6 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 69b454ea72ee..69b454ea72ee 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix diff --git a/pkgs/tools/networking/network-manager/hardcode-gsettings.patch b/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch index a480fd6d91e7..a480fd6d91e7 100644 --- a/pkgs/tools/networking/network-manager/hardcode-gsettings.patch +++ b/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 1a33a735cfe4..571b907ee2f1 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -10,11 +10,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "network-manager"; - version = "1.22.4"; + version = "1.22.6"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "0682hm5l3ix8cq35yl5pxidri4kxbdnvj9llf8vg9mcg5abdaslv"; + sha256 = "0r65hk7nw44jq4k6h91wrprr0x9410ibd1n7mpmlh4f4kgy276dw"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix index 93a169a3fb0f..93a169a3fb0f 100644 --- a/pkgs/tools/networking/network-manager/dmenu.nix +++ b/pkgs/tools/networking/network-manager/dmenu/default.nix diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix index 843985bfa3e4..843985bfa3e4 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e3e48c43783..e5ae392149ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5254,11 +5254,11 @@ in networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn { }; - networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; + networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan { }; - networkmanagerapplet = callPackage ../tools/networking/network-manager/applet.nix { }; + networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { }; - networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { }; + networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu { }; newsboat = callPackage ../applications/networking/feedreaders/newsboat { inherit (darwin.apple_sdk.frameworks) Security; |