Revert "networkmanager-applet: rename from networkmanagerapplet"
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.
commitec0ae174f8b273e024341d2ffbf2e9e58d30c706
authorJan Tojnar <jtojnar@gmail.com>
dateWed 4 May 2022, 23:24 (5 years ago)
parentab0bd3a
nixos/modules/programs/nm-applet.nix+1−1
@@ -23,7 +23,7 @@
2323 description = "Network manager applet";
2424 wantedBy = [ "graphical-session.target" ];
2525 partOf = [ "graphical-session.target" ];
26− serviceConfig.ExecStart = "${pkgs.networkmanager-applet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";
26+ serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";
2727 };
2828
2929 services.dbus.packages = [ pkgs.gcr ];
nixos/modules/services/x11/desktop-managers/cinnamon.nix+1−1
@@ -136,7 +136,7 @@ in
136136 # session requirements
137137 cinnamon-screensaver
138138 # cinnamon-killer-daemon: provided by cinnamon-common
139− networkmanager-applet # session requirement - also nm-applet not needed
139+ networkmanagerapplet # session requirement - also nm-applet not needed
140140
141141 # For a polkit authentication agent
142142 polkit_gnome
pkgs/applications/networking/firewalld/default.nix+2−2
@@ -12,7 +12,7 @@
1212, libnotify
1313, libxml2
1414, libxslt
15−, networkmanager-applet
15+, networkmanagerapplet
1616, pkg-config
1717, python3
1818, wrapGAppsNoGuiHook
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
5454 done
5555 '' + lib.optionalString withGui ''
5656 substituteInPlace src/firewall-applet.in \
57− --replace "/usr/bin/nm-connection-editor" "${networkmanager-applet}/bin/nm-conenction-editor"
57+ --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor"
5858 '';
5959
6060 nativeBuildInputs = [
pkgs/desktops/gnome/core/gnome-control-center/default.nix+2−3
@@ -42,7 +42,7 @@
4242, modemmanager
4343, mutter
4444, networkmanager
45−, networkmanager-applet
45+, networkmanagerapplet
4646, libnma-gtk4
4747, ninja
4848, pkg-config
@@ -76,9 +76,8 @@ stdenv.mkDerivation rec {
7676 src = ./paths.patch;
7777 gcm = gnome-color-manager;
7878 gnome_desktop = gnome-desktop;
79− networkmanagerapplet = networkmanager-applet;
8079 inherit glibc libgnomekbd tzdata;
81− inherit cups;
80+ inherit cups networkmanagerapplet;
8281 })
8382
8483 # Fix Online Accounts configuration on X11
pkgs/desktops/gnome/default.nix+1−1
@@ -379,7 +379,7 @@ lib.makeScope pkgs.newScope (self: with self; {
379379
380380 dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30
381381
382− networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanager-applet’ directly."; # added 2019-12-12
382+ networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanagerapplet’ directly."; # added 2019-12-12
383383
384384 glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15
385385
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix+2−2
@@ -11,7 +11,7 @@
1111, granite
1212, gtk3
1313, networkmanager
14−, networkmanager-applet
14+, networkmanagerapplet
1515, libnma
1616, switchboard
1717}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 patches = [
3131 (substituteAll {
3232 src = ./fix-paths.patch;
33− networkmanagerapplet = networkmanager-applet;
33+ inherit networkmanagerapplet;
3434 })
3535 ];
3636
pkgs/tools/networking/networkmanager/applet/default.nix+1−1
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
7474 passthru = {
7575 updateScript = gnome.updateScript {
7676 packageName = pname;
77− attrPath = "networkmanager-applet";
77+ attrPath = "networkmanagerapplet";
7878 versionPolicy = "odd-unstable";
7979 };
8080 };
pkgs/top-level/aliases.nix−1
@@ -850,7 +850,6 @@ mapAliases ({
850850 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
851851 netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22
852852 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
853− networkmanagerapplet = networkmanager-applet; # Added 2022-04-30
854853 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22
855854 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22
856855 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22
pkgs/top-level/all-packages.nix+2−2
@@ -8562,8 +8562,6 @@ with pkgs;
85628562
85638563 networkmanager = callPackage ../tools/networking/networkmanager { };
85648564
8565− networkmanager-applet = callPackage ../tools/networking/networkmanager/applet { };
8566−
85678565 networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };
85688566
85698567 networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };
@@ -8580,6 +8578,8 @@ with pkgs;
85808578
85818579 networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };
85828580
8581+ networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };
8582+
85838583 libnma = callPackage ../tools/networking/networkmanager/libnma { };
85848584
85858585 libnma-gtk4 = libnma.override { withGtk4 = true; };