networkmanager-applet: rename from networkmanagerapplet

+12 -10
+1 -1
nixos/modules/programs/nm-applet.nix
··· 23 description = "Network manager applet"; 24 wantedBy = [ "graphical-session.target" ]; 25 partOf = [ "graphical-session.target" ]; 26 - serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}"; 27 }; 28 29 services.dbus.packages = [ pkgs.gcr ];
··· 23 description = "Network manager applet"; 24 wantedBy = [ "graphical-session.target" ]; 25 partOf = [ "graphical-session.target" ]; 26 + serviceConfig.ExecStart = "${pkgs.networkmanager-applet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}"; 27 }; 28 29 services.dbus.packages = [ pkgs.gcr ];
+1 -1
nixos/modules/services/x11/desktop-managers/cinnamon.nix
··· 136 # session requirements 137 cinnamon-screensaver 138 # cinnamon-killer-daemon: provided by cinnamon-common 139 - networkmanagerapplet # session requirement - also nm-applet not needed 140 141 # For a polkit authentication agent 142 polkit_gnome
··· 136 # session requirements 137 cinnamon-screensaver 138 # cinnamon-killer-daemon: provided by cinnamon-common 139 + networkmanager-applet # session requirement - also nm-applet not needed 140 141 # For a polkit authentication agent 142 polkit_gnome
+3 -2
pkgs/desktops/gnome/core/gnome-control-center/default.nix
··· 42 , modemmanager 43 , mutter 44 , networkmanager 45 - , networkmanagerapplet 46 , libnma-gtk4 47 , ninja 48 , pkg-config ··· 76 src = ./paths.patch; 77 gcm = gnome-color-manager; 78 gnome_desktop = gnome-desktop; 79 inherit glibc libgnomekbd tzdata; 80 - inherit cups networkmanagerapplet; 81 }) 82 83 # Fix Online Accounts configuration on X11
··· 42 , modemmanager 43 , mutter 44 , networkmanager 45 + , networkmanager-applet 46 , libnma-gtk4 47 , ninja 48 , pkg-config ··· 76 src = ./paths.patch; 77 gcm = gnome-color-manager; 78 gnome_desktop = gnome-desktop; 79 + networkmanagerapplet = networkmanager-applet; 80 inherit glibc libgnomekbd tzdata; 81 + inherit cups; 82 }) 83 84 # Fix Online Accounts configuration on X11
+1 -1
pkgs/desktops/gnome/default.nix
··· 379 380 dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30 381 382 - networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanagerapplet’ directly."; # added 2019-12-12 383 384 glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15 385
··· 379 380 dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30 381 382 + networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanager-applet’ directly."; # added 2019-12-12 383 384 glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15 385
+2 -2
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
··· 11 , granite 12 , gtk3 13 , networkmanager 14 - , networkmanagerapplet 15 , libnma 16 , switchboard 17 }: ··· 30 patches = [ 31 (substituteAll { 32 src = ./fix-paths.patch; 33 - inherit networkmanagerapplet; 34 }) 35 ]; 36
··· 11 , granite 12 , gtk3 13 , networkmanager 14 + , networkmanager-applet 15 , libnma 16 , switchboard 17 }: ··· 30 patches = [ 31 (substituteAll { 32 src = ./fix-paths.patch; 33 + networkmanagerapplet = networkmanager-applet; 34 }) 35 ]; 36
+1 -1
pkgs/tools/networking/networkmanager/applet/default.nix
··· 74 passthru = { 75 updateScript = gnome.updateScript { 76 packageName = pname; 77 - attrPath = "networkmanagerapplet"; 78 versionPolicy = "odd-unstable"; 79 }; 80 };
··· 74 passthru = { 75 updateScript = gnome.updateScript { 76 packageName = pname; 77 + attrPath = "networkmanager-applet"; 78 versionPolicy = "odd-unstable"; 79 }; 80 };
+1
pkgs/top-level/aliases.nix
··· 847 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 848 netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22 849 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 850 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 851 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 852 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22
··· 847 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 848 netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22 849 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 851 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 852 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 853 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22
+2 -2
pkgs/top-level/all-packages.nix
··· 8514 8515 networkmanager = callPackage ../tools/networking/networkmanager { }; 8516 8517 networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; 8518 8519 networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { }; ··· 8529 networkmanager_strongswan = callPackage ../tools/networking/networkmanager/strongswan { }; 8530 8531 networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { }; 8532 - 8533 - networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { }; 8534 8535 libnma = callPackage ../tools/networking/networkmanager/libnma { }; 8536
··· 8514 8515 networkmanager = callPackage ../tools/networking/networkmanager { }; 8516 8517 + networkmanager-applet = callPackage ../tools/networking/networkmanager/applet { }; 8518 + 8519 networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; 8520 8521 networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { }; ··· 8531 networkmanager_strongswan = callPackage ../tools/networking/networkmanager/strongswan { }; 8532 8533 networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { }; 8534 8535 libnma = callPackage ../tools/networking/networkmanager/libnma { }; 8536