cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #171578 from jtojnar/revert-nm-applet-rename

Browse source
This commit is contained in:
Sandro 2022-05-05 00:19:15 +02:00 committed by GitHub
commit 6c4bc083e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/programs/nm-applet.nix
View file

@ -23,7 +23,7 @@
description = "Network manager applet"; description = "Network manager applet";
wantedBy = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ];
partOf = [ "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 ]; services.dbus.packages = [ pkgs.gcr ];

2
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View file

@ -136,7 +136,7 @@ in
# session requirements # session requirements
cinnamon-screensaver cinnamon-screensaver
# cinnamon-killer-daemon: provided by cinnamon-common # 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 # For a polkit authentication agent
polkit_gnome polkit_gnome

4
pkgs/applications/networking/firewalld/default.nix
View file

@ -12,7 +12,7 @@
, libnotify , libnotify
, libxml2 , libxml2
, libxslt , libxslt
, networkmanager-applet , networkmanagerapplet
, pkg-config , pkg-config
, python3 , python3
, wrapGAppsNoGuiHook , wrapGAppsNoGuiHook
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
done done
'' + lib.optionalString withGui '' '' + lib.optionalString withGui ''
substituteInPlace src/firewall-applet.in \ 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 = [ nativeBuildInputs = [

5
pkgs/desktops/gnome/core/gnome-control-center/default.nix
View file

@ -42,7 +42,7 @@
, modemmanager , modemmanager
, mutter , mutter
, networkmanager , networkmanager
, networkmanager-applet , networkmanagerapplet
, libnma-gtk4 , libnma-gtk4
, ninja , ninja
, pkg-config , pkg-config
@ -76,9 +76,8 @@ stdenv.mkDerivation rec {
src = ./paths.patch; src = ./paths.patch;
gcm = gnome-color-manager; gcm = gnome-color-manager;
gnome_desktop = gnome-desktop; gnome_desktop = gnome-desktop;
networkmanagerapplet = networkmanager-applet;
inherit glibc libgnomekbd tzdata; inherit glibc libgnomekbd tzdata;
inherit cups; inherit cups networkmanagerapplet;
}) })
# Fix Online Accounts configuration on X11 # Fix Online Accounts configuration on X11

2
pkgs/desktops/gnome/default.nix
View file

@ -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 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 glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15

4
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
View file

@ -11,7 +11,7 @@
, granite , granite
, gtk3 , gtk3
, networkmanager , networkmanager
, networkmanager-applet , networkmanagerapplet
, libnma , libnma
, switchboard , switchboard
}: }:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
networkmanagerapplet = networkmanager-applet; inherit networkmanagerapplet;
}) })
]; ];

2
pkgs/tools/networking/networkmanager/applet/default.nix
View file

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
attrPath = "networkmanager-applet"; attrPath = "networkmanagerapplet";
versionPolicy = "odd-unstable"; versionPolicy = "odd-unstable";
}; };
}; };

1
pkgs/top-level/aliases.nix
View file

@ -850,7 +850,6 @@ mapAliases ({
neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 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 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 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_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_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 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22

4
pkgs/top-level/all-packages.nix
View file

@ -8562,8 +8562,6 @@ with pkgs;
networkmanager = callPackage ../tools/networking/networkmanager { }; networkmanager = callPackage ../tools/networking/networkmanager { };
networkmanager-applet = callPackage ../tools/networking/networkmanager/applet { };
networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };
networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { }; networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };
@ -8580,6 +8578,8 @@ with pkgs;
networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { }; networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };
networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };
libnma = callPackage ../tools/networking/networkmanager/libnma { }; libnma = callPackage ../tools/networking/networkmanager/libnma { };
libnma-gtk4 = libnma.override { withGtk4 = true; }; libnma-gtk4 = libnma.override { withGtk4 = true; };