networkmanager-applet: rename from networkmanagerapplet
commitcecb014d5daeb8b0c75361ed8ba89d9e84279c8e
authorSandro Jäckel <sandro.jaeckel@gmail.com>
dateSat 30 Apr 2022, 02:03 (5 years ago)
parentd9da708
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.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";
26+ serviceConfig.ExecStart = "${pkgs.networkmanager-applet}/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− networkmanagerapplet # session requirement - also nm-applet not needed
139+ networkmanager-applet # session requirement - also nm-applet not needed
140140
141141 # For a polkit authentication agent
142142 polkit_gnome
pkgs/desktops/gnome/core/gnome-control-center/default.nix+3−2
@@ -42,7 +42,7 @@
4242, modemmanager
4343, mutter
4444, networkmanager
45−, networkmanagerapplet
45+, networkmanager-applet
4646, libnma-gtk4
4747, ninja
4848, pkg-config
@@ -76,8 +76,9 @@ stdenv.mkDerivation rec {
7676 src = ./paths.patch;
7777 gcm = gnome-color-manager;
7878 gnome_desktop = gnome-desktop;
79+ networkmanagerapplet = networkmanager-applet;
7980 inherit glibc libgnomekbd tzdata;
80− inherit cups networkmanagerapplet;
81+ inherit cups;
8182 })
8283
8384 # 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.networkmanagerapplet’ directly."; # added 2019-12-12
382+ networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanager-applet’ 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−, networkmanagerapplet
14+, networkmanager-applet
1515, libnma
1616, switchboard
1717}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 patches = [
3131 (substituteAll {
3232 src = ./fix-paths.patch;
33− inherit networkmanagerapplet;
33+ networkmanagerapplet = networkmanager-applet;
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 = "networkmanagerapplet";
77+ attrPath = "networkmanager-applet";
7878 versionPolicy = "odd-unstable";
7979 };
8080 };
pkgs/top-level/aliases.nix+1
@@ -847,6 +847,7 @@ mapAliases ({
847847 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
848848 netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22
849849 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
850+ networkmanagerapplet = networkmanager-applet; # Added 2022-04-30
850851 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22
851852 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22
852853 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
@@ -8514,6 +8514,8 @@ with pkgs;
85148514
85158515 networkmanager = callPackage ../tools/networking/networkmanager { };
85168516
8517+ networkmanager-applet = callPackage ../tools/networking/networkmanager/applet { };
8518+
85178519 networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };
85188520
85198521 networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };
@@ -8530,8 +8532,6 @@ with pkgs;
85308532
85318533 networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };
85328534
8533− networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };
8534−
85358535 libnma = callPackage ../tools/networking/networkmanager/libnma { };
85368536
85378537 libnma-gtk4 = libnma.override { withGtk4 = true; };