diff options
author | Maxine Aubrey <maxeaubrey@gmail.com> | 2021-03-08 16:28:44 +0100 |
---|---|---|
committer | Maxine Aubrey <maxeaubrey@gmail.com> | 2021-03-15 20:20:41 +0100 |
commit | 17177b551fdadd712f861876c47aefedc0f3b4b2 (patch) | |
tree | b2d9df377f3ba7aae540d80d105afe15c163f4c4 | |
parent | b8a405153670ed4653a800b30ebda11cc7271ee3 (diff) |
networkmanager: fix path and pname
-rw-r--r-- | pkgs/tools/networking/networkmanager/0.9.8/default.nix (renamed from pkgs/tools/networking/network-manager/0.9.8/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch (renamed from pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch (renamed from pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/applet/default.nix (renamed from pkgs/tools/networking/network-manager/applet/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/default.nix (renamed from pkgs/tools/networking/network-manager/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/dmenu/default.nix (renamed from pkgs/tools/networking/network-manager/dmenu/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/fix-install-paths.patch (renamed from pkgs/tools/networking/network-manager/fix-install-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/fix-paths.patch (renamed from pkgs/tools/networking/network-manager/fix-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/fortisslvpn/default.nix (renamed from pkgs/tools/networking/network-manager/fortisslvpn/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch (renamed from pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/iodine/default.nix (renamed from pkgs/tools/networking/network-manager/iodine/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/iodine/fix-paths.patch (renamed from pkgs/tools/networking/network-manager/iodine/fix-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/l2tp/default.nix (renamed from pkgs/tools/networking/network-manager/l2tp/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch (renamed from pkgs/tools/networking/network-manager/l2tp/fix-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/libnma/default.nix (renamed from pkgs/tools/networking/network-manager/libnma/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch (renamed from pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/openconnect/default.nix (renamed from pkgs/tools/networking/network-manager/openconnect/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch (renamed from pkgs/tools/networking/network-manager/openconnect/fix-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/openvpn/default.nix (renamed from pkgs/tools/networking/network-manager/openvpn/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch (renamed from pkgs/tools/networking/network-manager/openvpn/fix-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/sstp/default.nix (renamed from pkgs/tools/networking/network-manager/sstp/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/strongswan/default.nix (renamed from pkgs/tools/networking/network-manager/strongswan/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/tray.nix (renamed from pkgs/tools/networking/network-manager/tray.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/vpnc/default.nix (renamed from pkgs/tools/networking/network-manager/vpnc/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch (renamed from pkgs/tools/networking/network-manager/vpnc/fix-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 28 |
26 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/networkmanager/0.9.8/default.nix index d7dd99b58fa6d..757c886fdf3fe 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/networkmanager/0.9.8/default.nix @@ -3,7 +3,7 @@ , libgcrypt, perl, libgudev, avahi, ppp, kmod }: stdenv.mkDerivation rec { - pname = "network-manager"; + pname = "networkmanager"; version = "0.9.8.10"; src = fetchurl { diff --git a/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch b/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch index 17c2966b7064b..17c2966b7064b 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch +++ b/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch diff --git a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch b/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch index 9ebc080ba96f1..9ebc080ba96f1 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch +++ b/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index f6c45fc074d46..f6c45fc074d46 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 6ff2cf2ad918b..ba172a3922d83 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -9,7 +9,7 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { - pname = "network-manager"; + pname = "networkmanager"; version = "1.30.0"; src = fetchurl { diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix index 9ea3dde19ab3b..9ea3dde19ab3b 100644 --- a/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix diff --git a/pkgs/tools/networking/network-manager/fix-install-paths.patch b/pkgs/tools/networking/networkmanager/fix-install-paths.patch index 4e80247cf1448..4e80247cf1448 100644 --- a/pkgs/tools/networking/network-manager/fix-install-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-install-paths.patch diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index cb9d3c3a0d209..cb9d3c3a0d209 100644 --- a/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index 20388f242ea4b..20388f242ea4b 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch b/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch index a1241b6738c23..a1241b6738c23 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index 87069d3c3c808..87069d3c3c808 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix diff --git a/pkgs/tools/networking/network-manager/iodine/fix-paths.patch b/pkgs/tools/networking/networkmanager/iodine/fix-paths.patch index d32dbfadbafa9..d32dbfadbafa9 100644 --- a/pkgs/tools/networking/network-manager/iodine/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/iodine/fix-paths.patch diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index bfcc2d8ae86e1..bfcc2d8ae86e1 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix diff --git a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch b/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch index 531672c393625..531672c393625 100644 --- a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch diff --git a/pkgs/tools/networking/network-manager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 3d97493322551..3d97493322551 100644 --- a/pkgs/tools/networking/network-manager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix diff --git a/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch b/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch index 9b2f5366950cb..9b2f5366950cb 100644 --- a/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch +++ b/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index 462eb3793d8f7..462eb3793d8f7 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix diff --git a/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch b/pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch index 9b342f5bd08b6..9b342f5bd08b6 100644 --- a/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index 4a9e508fcdc7d..4a9e508fcdc7d 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix diff --git a/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch b/pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch index b735da28dca18..b735da28dca18 100644 --- a/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch diff --git a/pkgs/tools/networking/network-manager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index d00c0e3e55f8a..d00c0e3e55f8a 100644 --- a/pkgs/tools/networking/network-manager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index c4cb79b4c8c34..c4cb79b4c8c34 100644 --- a/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix diff --git a/pkgs/tools/networking/network-manager/tray.nix b/pkgs/tools/networking/networkmanager/tray.nix index e8ce8ad342fdc..e8ce8ad342fdc 100644 --- a/pkgs/tools/networking/network-manager/tray.nix +++ b/pkgs/tools/networking/networkmanager/tray.nix diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix index 6ac71efc26038..6ac71efc26038 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/networkmanager/vpnc/default.nix diff --git a/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch b/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch index 98238ac01f76d..98238ac01f76d 100644 --- a/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 118613ad421d4..4fb2bc37bdf24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6574,33 +6574,33 @@ in }; # stripped down, needed by steam - networkmanager098 = callPackage ../tools/networking/network-manager/0.9.8 { }; + networkmanager098 = callPackage ../tools/networking/networkmanager/0.9.8 { }; - networkmanager = callPackage ../tools/networking/network-manager { }; + networkmanager = callPackage ../tools/networking/networkmanager { }; - networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine { }; + networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; - networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { }; + networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { }; - networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp { }; + networkmanager-l2tp = callPackage ../tools/networking/networkmanager/l2tp { }; - networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc { }; + networkmanager-vpnc = callPackage ../tools/networking/networkmanager/vpnc { }; - networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect { }; + networkmanager-openconnect = callPackage ../tools/networking/networkmanager/openconnect { }; - networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn { }; + networkmanager-fortisslvpn = callPackage ../tools/networking/networkmanager/fortisslvpn { }; - networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan { }; + networkmanager_strongswan = callPackage ../tools/networking/networkmanager/strongswan { }; - networkmanager-sstp = callPackage ../tools/networking/network-manager/sstp { }; + networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { }; - networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { }; + networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { }; - libnma = callPackage ../tools/networking/network-manager/libnma { }; + libnma = callPackage ../tools/networking/networkmanager/libnma { }; - networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu { }; + networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { }; - nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { }; + nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; newsboat = callPackage ../applications/networking/feedreaders/newsboat { inherit (darwin.apple_sdk.frameworks) Security Foundation; |