From 17177b551fdadd712f861876c47aefedc0f3b4b2 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 8 Mar 2021 16:28:44 +0100 Subject: [PATCH] networkmanager: fix path and pname --- .../0.9.8/default.nix | 2 +- .../0.9.8/libnl-3.2.25.patch | 0 .../0.9.8/nixos-purity.patch | 0 .../applet/default.nix | 0 .../default.nix | 2 +- .../dmenu/default.nix | 0 .../fix-install-paths.patch | 0 .../fix-paths.patch | 0 .../fortisslvpn/default.nix | 0 .../fortisslvpn/fix-paths.patch | 0 .../iodine/default.nix | 0 .../iodine/fix-paths.patch | 0 .../l2tp/default.nix | 0 .../l2tp/fix-paths.patch | 0 .../libnma/default.nix | 0 .../libnma/hardcode-gsettings.patch | 0 .../openconnect/default.nix | 0 .../openconnect/fix-paths.patch | 0 .../openvpn/default.nix | 0 .../openvpn/fix-paths.patch | 0 .../sstp/default.nix | 0 .../strongswan/default.nix | 0 .../tray.nix | 0 .../vpnc/default.nix | 0 .../vpnc/fix-paths.patch | 0 pkgs/top-level/all-packages.nix | 28 +++++++++---------- 26 files changed, 16 insertions(+), 16 deletions(-) rename pkgs/tools/networking/{network-manager => networkmanager}/0.9.8/default.nix (98%) rename pkgs/tools/networking/{network-manager => networkmanager}/0.9.8/libnl-3.2.25.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/0.9.8/nixos-purity.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/applet/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/default.nix (99%) rename pkgs/tools/networking/{network-manager => networkmanager}/dmenu/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/fix-install-paths.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/fix-paths.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/fortisslvpn/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/fortisslvpn/fix-paths.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/iodine/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/iodine/fix-paths.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/l2tp/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/l2tp/fix-paths.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/libnma/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/libnma/hardcode-gsettings.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/openconnect/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/openconnect/fix-paths.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/openvpn/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/openvpn/fix-paths.patch (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/sstp/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/strongswan/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/tray.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/vpnc/default.nix (100%) rename pkgs/tools/networking/{network-manager => networkmanager}/vpnc/fix-paths.patch (100%) diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/networkmanager/0.9.8/default.nix similarity index 98% rename from pkgs/tools/networking/network-manager/0.9.8/default.nix rename to pkgs/tools/networking/networkmanager/0.9.8/default.nix index d7dd99b58fa6..757c886fdf3f 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 similarity index 100% rename from pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/applet/default.nix rename to pkgs/tools/networking/networkmanager/applet/default.nix diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/networkmanager/default.nix similarity index 99% rename from pkgs/tools/networking/network-manager/default.nix rename to pkgs/tools/networking/networkmanager/default.nix index 6ff2cf2ad918..ba172a3922d8 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 similarity index 100% rename from pkgs/tools/networking/network-manager/dmenu/default.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/fix-install-paths.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/fix-paths.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/fortisslvpn/default.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/iodine/default.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/iodine/fix-paths.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/l2tp/default.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/l2tp/fix-paths.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/libnma/default.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/openconnect/default.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/openconnect/fix-paths.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/openvpn/default.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/openvpn/fix-paths.patch rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/sstp/default.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/strongswan/default.nix rename to pkgs/tools/networking/networkmanager/strongswan/default.nix diff --git a/pkgs/tools/networking/network-manager/tray.nix b/pkgs/tools/networking/networkmanager/tray.nix similarity index 100% rename from pkgs/tools/networking/network-manager/tray.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/vpnc/default.nix rename to 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 similarity index 100% rename from pkgs/tools/networking/network-manager/vpnc/fix-paths.patch rename to 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 118613ad421d..4fb2bc37bdf2 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;