From ec0ae174f8b273e024341d2ffbf2e9e58d30c706 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 23:24:13 +0200 Subject: [PATCH] Revert "networkmanager-applet: rename from networkmanagerapplet" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit network-manager-applet uses differrent naming scheme from the VPN plug-ins. Let’s revert to the previous state, for now, to fix eval. We can do the rename later. This reverts commit cecb014d5daeb8b0c75361ed8ba89d9e84279c8e. --- nixos/modules/programs/nm-applet.nix | 2 +- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +- pkgs/applications/networking/firewalld/default.nix | 4 ++-- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 5 ++--- pkgs/desktops/gnome/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/network/default.nix | 4 ++-- pkgs/tools/networking/networkmanager/applet/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 4 ++-- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix index db03ea67975..5bcee30125b 100644 --- a/nixos/modules/programs/nm-applet.nix +++ b/nixos/modules/programs/nm-applet.nix @@ -23,7 +23,7 @@ description = "Network manager applet"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; - serviceConfig.ExecStart = "${pkgs.networkmanager-applet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}"; + serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}"; }; services.dbus.packages = [ pkgs.gcr ]; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index d75fdc0fa0c..705dbec5e74 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -136,7 +136,7 @@ in # session requirements cinnamon-screensaver # cinnamon-killer-daemon: provided by cinnamon-common - networkmanager-applet # session requirement - also nm-applet not needed + networkmanagerapplet # session requirement - also nm-applet not needed # For a polkit authentication agent polkit_gnome diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index 825222783e3..b937c35a3f9 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -12,7 +12,7 @@ , libnotify , libxml2 , libxslt -, networkmanager-applet +, networkmanagerapplet , pkg-config , python3 , wrapGAppsNoGuiHook @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { done '' + lib.optionalString withGui '' substituteInPlace src/firewall-applet.in \ - --replace "/usr/bin/nm-connection-editor" "${networkmanager-applet}/bin/nm-conenction-editor" + --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor" ''; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 1d2597c02db..c7da1e43a15 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -42,7 +42,7 @@ , modemmanager , mutter , networkmanager -, networkmanager-applet +, networkmanagerapplet , libnma-gtk4 , ninja , pkg-config @@ -76,9 +76,8 @@ stdenv.mkDerivation rec { src = ./paths.patch; gcm = gnome-color-manager; gnome_desktop = gnome-desktop; - networkmanagerapplet = networkmanager-applet; inherit glibc libgnomekbd tzdata; - inherit cups; + inherit cups networkmanagerapplet; }) # Fix Online Accounts configuration on X11 diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 1b5c452288f..a0561ca0030 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -379,7 +379,7 @@ lib.makeScope pkgs.newScope (self: with self; { dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30 - networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanager-applet’ directly."; # added 2019-12-12 + networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanagerapplet’ directly."; # added 2019-12-12 glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15 diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 0f93d30b19b..fbad5aa7a01 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -11,7 +11,7 @@ , granite , gtk3 , networkmanager -, networkmanager-applet +, networkmanagerapplet , libnma , switchboard }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - networkmanagerapplet = networkmanager-applet; + inherit networkmanagerapplet; }) ]; diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index 51205881091..cca96577ad4 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "networkmanager-applet"; + attrPath = "networkmanagerapplet"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3387d0b3683..2ae688dc1b8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -850,7 +850,6 @@ mapAliases ({ neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 - networkmanagerapplet = networkmanager-applet; # Added 2022-04-30 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d30f0a6e41..b025c14caaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8562,8 +8562,6 @@ with pkgs; networkmanager = callPackage ../tools/networking/networkmanager { }; - networkmanager-applet = callPackage ../tools/networking/networkmanager/applet { }; - networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { }; @@ -8580,6 +8578,8 @@ with pkgs; networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { }; + networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { }; + libnma = callPackage ../tools/networking/networkmanager/libnma { }; libnma-gtk4 = libnma.override { withGtk4 = true; };