ec0ae17 · typeable/nixpkgs

nixos/modules/programs/nm-applet.nix+1−1

compare with master

unifiedsplit

@@ -23,7 +23,7 @@

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"}";

26+ serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";

27 };

28

29 services.dbus.packages = [ pkgs.gcr ];

nixos/modules/services/x11/desktop-managers/cinnamon.nix+1−1

@@ -136,7 +136,7 @@ in

136 # session requirements

137 cinnamon-screensaver

138 # 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

140

141 # For a polkit authentication agent

142 polkit_gnome

pkgs/applications/networking/firewalld/default.nix+2−2

@@ -12,7 +12,7 @@

12, libnotify

13, libxml2

14, libxslt

15−, networkmanager-applet

15+, networkmanagerapplet

16, pkg-config

17, python3

18, wrapGAppsNoGuiHook

@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {

54 done

55 '' + lib.optionalString withGui ''

56 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"

58 '';

59

60 nativeBuildInputs = [

pkgs/desktops/gnome/core/gnome-control-center/default.nix+2−3

@@ -42,7 +42,7 @@

42, modemmanager

43, mutter

44, networkmanager

45−, networkmanager-applet

45+, networkmanagerapplet

46, libnma-gtk4

47, ninja

48, pkg-config

@@ -76,9 +76,8 @@ stdenv.mkDerivation rec {

76 src = ./paths.patch;

77 gcm = gnome-color-manager;

78 gnome_desktop = gnome-desktop;

79− networkmanagerapplet = networkmanager-applet;

80 inherit glibc libgnomekbd tzdata;

79 inherit glibc libgnomekbd tzdata;

81− inherit cups;

80+ inherit cups networkmanagerapplet;

82 })

81 })

83

82

84 # Fix Online Accounts configuration on X11

83 # Fix Online Accounts configuration on X11

pkgs/desktops/gnome/default.nix+1−1

@@ -379,7 +379,7 @@ lib.makeScope pkgs.newScope (self: with self; {

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

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

pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix+2−2

@@ -11,7 +11,7 @@

11, granite

12, gtk3

13, networkmanager

14−, networkmanager-applet

14+, networkmanagerapplet

15, libnma

16, switchboard

17}:

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

30 patches = [

31 (substituteAll {

32 src = ./fix-paths.patch;

33− networkmanagerapplet = networkmanager-applet;

33+ inherit networkmanagerapplet;

34 })

35 ];

36

pkgs/tools/networking/networkmanager/applet/default.nix+1−1

@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {

74 passthru = {

75 updateScript = gnome.updateScript {

76 packageName = pname;

77− attrPath = "networkmanager-applet";

77+ attrPath = "networkmanagerapplet";

78 versionPolicy = "odd-unstable";

79 };

80 };

pkgs/top-level/aliases.nix−1

@@ -850,7 +850,6 @@ mapAliases ({

850 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12

851 netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22

852 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

854 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22

853 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22

855 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22

854 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22

856 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22

855 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;

8562

8563 networkmanager = callPackage ../tools/networking/networkmanager { };

8564

8565− networkmanager-applet = callPackage ../tools/networking/networkmanager/applet { };

8566−

8567 networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };

8565 networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };

8568

8566

8569 networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };

8567 networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };

@@ -8580,6 +8578,8 @@ with pkgs;

8580

8578

8581 networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };

8579 networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };

8582

8580

8581+ networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };

8582+

8583 libnma = callPackage ../tools/networking/networkmanager/libnma { };

8584

8585 libnma-gtk4 = libnma.override { withGtk4 = true; };