From 2b77be7cd7c8e4712e7a0f0cd2ec653ff8fd0085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 15 Mar 2020 15:50:26 +0100 Subject: [PATCH 01/16] libnma: init at 1.8.28 Upstream have pulled out libnma from networkmanagerapplet. --- .../network-manager/libnma/default.nix | 89 +++++++++++++++++++ .../libnma/hardcode-gsettings.patch | 26 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 117 insertions(+) create mode 100644 pkgs/tools/networking/network-manager/libnma/default.nix create mode 100644 pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch diff --git a/pkgs/tools/networking/network-manager/libnma/default.nix b/pkgs/tools/networking/network-manager/libnma/default.nix new file mode 100644 index 00000000000..727c18e92c1 --- /dev/null +++ b/pkgs/tools/networking/network-manager/libnma/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchurl +, meson +, ninja +, gettext +, gtk-doc +, pkg-config +, vala +, networkmanager +, gnome3 +, isocodes +, libxml2 +, docbook_xsl +, docbook_xml_dtd_43 +, mobile-broadband-provider-info +, gobject-introspection +, gtk3 +, withGnome ? true +, gcr +, glib +, substituteAll +}: + +stdenv.mkDerivation rec { + pname = "libnma"; + version = "1.8.28"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"; + }; + + patches = [ + # Needed for wingpanel-indicator-network and switchboard-plug-network + ./hardcode-gsettings.patch + ]; + + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + libxml2 + vala + ]; + + buildInputs = [ + gtk3 + networkmanager + isocodes + mobile-broadband-provider-info + ] ++ stdenv.lib.optionals withGnome [ + # advanced certificate chooser + gcr + ]; + + mesonFlags = [ + "-Dgcr=${if withGnome then "true" else "false"}" + ]; + + postPatch = '' + substituteInPlace src/nma-ws/nma-eap.c --subst-var-by \ + NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$out" "${pname}-${version}"} + ''; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/libnma"; + description = "NetworkManager UI utilities (libnm version)"; + license = licenses.gpl2Plus; # Mix of GPL and LPGL 2+ + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch b/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch new file mode 100644 index 00000000000..9b2f5366950 --- /dev/null +++ b/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch @@ -0,0 +1,26 @@ +--- a/src/nma-ws/nma-eap.c ++++ b/src/nma-ws/nma-eap.c +@@ -248,11 +248,16 @@ nma_eap_ca_cert_ignore_get (NMAEap *method, NMConnection *connection) + static GSettings * + _get_ca_ignore_settings (NMConnection *connection) + { ++ g_autoptr (GSettingsSchemaSource) *schema_source; ++ g_autoptr (GSettingsSchema) *schema; + GSettings *settings; + char *path = NULL; + const char *uuid; + + g_return_val_if_fail (connection, NULL); + ++ schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL); ++ schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE); ++ + uuid = nm_connection_get_uuid (connection); + g_return_val_if_fail (uuid && *uuid, NULL); + + path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid); +- settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path); ++ settings = g_settings_new_full (schema, NULL, path); + g_free (path); + + return settings; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da01b5135e9..540fd6e0b2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5339,6 +5339,8 @@ in networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { }; + libnma = callPackage ../tools/networking/network-manager/libnma { }; + networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu { }; nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { }; From f07bad3201edb6a23b2e01a82f312e0786859a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 15 Mar 2020 16:44:08 +0100 Subject: [PATCH 02/16] networkmanagerapplet: format --- .../network-manager/applet/default.nix | 70 ++++++++++++++++--- 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 69b454ea72e..9de462bbe55 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix @@ -1,8 +1,34 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 -, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 -, libappindicator-gtk3, withGnome ? true, gcr, glib }: +{ stdenv +, fetchurl +, meson +, ninja +, intltool +, gtk-doc +, pkg-config +, networkmanager +, gnome3 +, libnotify +, libsecret +, polkit +, isocodes +, modemmanager +, libxml2 +, docbook_xsl +, docbook_xml_dtd_43 +, mobile-broadband-provider-info +, glib-networking +, gsettings-desktop-schemas +, libgudev +, jansson +, wrapGAppsHook +, gobject-introspection +, python3 +, gtk3 +, libappindicator-gtk3 +, withGnome ? true +, gcr +, glib +}: let pname = "network-manager-applet"; @@ -25,13 +51,35 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "devdoc" "man" ]; buildInputs = [ - gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas - polkit isocodes mobile-broadband-provider-info libgudev - modemmanager jansson glib-networking - libappindicator-gtk3 gnome3.adwaita-icon-theme + gtk3 + networkmanager + libnotify + libsecret + gsettings-desktop-schemas + polkit + isocodes + mobile-broadband-provider-info + libgudev + modemmanager + jansson + glib-networking + libappindicator-gtk3 + gnome3.adwaita-icon-theme ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser - nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; + nativeBuildInputs = [ + meson + ninja + intltool + pkg-config + wrapGAppsHook + gobject-introspection + python3 + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + libxml2 + ]; # Needed for wingpanel-indicator-network and switchboard-plug-network patches = [ ./hardcode-gsettings.patch ]; @@ -40,7 +88,7 @@ in stdenv.mkDerivation rec { chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py - substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" name} + substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" "${pname}-${version}"} ''; passthru = { From 50438bd5b1589dfd3a4dfa407b81441ed42fc8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 15 Mar 2020 16:49:22 +0100 Subject: [PATCH 03/16] networkmanagerapplet: 1.8.24 -> 1.16.0 No longer carries libnma, so we can drop a bunch of dependencies and simplify a bit. --- .../network-manager/applet/default.nix | 42 +++++-------------- .../applet/hardcode-gsettings.patch | 32 -------------- 2 files changed, 11 insertions(+), 63 deletions(-) delete mode 100644 pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 9de462bbe55..109c4c8cce1 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix @@ -2,19 +2,15 @@ , fetchurl , meson , ninja -, intltool -, gtk-doc +, gettext , pkg-config , networkmanager , gnome3 , libnotify , libsecret , polkit -, isocodes , modemmanager -, libxml2 -, docbook_xsl -, docbook_xml_dtd_43 +, libnma , mobile-broadband-provider-info , glib-networking , gsettings-desktop-schemas @@ -25,70 +21,54 @@ , python3 , gtk3 , libappindicator-gtk3 -, withGnome ? true -, gcr , glib }: -let +stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.8.24"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.16.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1gzvz4wfqfsfclqg56y954al8x6fmz71cnxlx1i4nqr7a25bp2qi"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"; }; mesonFlags = [ - "-Dlibnm_gtk=false" # It is deprecated "-Dselinux=false" "-Dappindicator=yes" - "-Dgcr=${if withGnome then "true" else "false"}" ]; - outputs = [ "out" "lib" "dev" "devdoc" "man" ]; + outputs = [ "out" "man" ]; buildInputs = [ + libnma gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas polkit - isocodes - mobile-broadband-provider-info libgudev modemmanager jansson glib-networking libappindicator-gtk3 gnome3.adwaita-icon-theme - ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser + ]; nativeBuildInputs = [ meson ninja - intltool + gettext pkg-config wrapGAppsHook gobject-introspection python3 - gtk-doc - docbook_xsl - docbook_xml_dtd_43 - libxml2 ]; - # Needed for wingpanel-indicator-network and switchboard-plug-network - patches = [ ./hardcode-gsettings.patch ]; - postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py - - substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" "${pname}-${version}"} ''; passthru = { @@ -99,7 +79,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/NetworkManager; + homepage = "https://gitlab.gnome.org/GNOME/network-manager-applet/"; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom ]; diff --git a/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch b/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch deleted file mode 100644 index a480fd6d91e..00000000000 --- a/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c -index 2e9daa23..6663b3ce 100644 ---- a/src/wireless-security/eap-method.c -+++ b/src/wireless-security/eap-method.c -@@ -265,8 +265,11 @@ eap_method_ca_cert_ignore_get (EAPMethod *method, NMConnection *connection) - static GSettings * - _get_ca_ignore_settings (NMConnection *connection) - { -+ GSettingsSchemaSource *schema_source; -+ g_autoptr (GSettingsSchema) *schema; - GSettings *settings; -- char *path = NULL; -+ -+ g_autofree char *path = NULL; - const char *uuid; - - g_return_val_if_fail (connection, NULL); -@@ -274,9 +277,12 @@ _get_ca_ignore_settings (NMConnection *connection) - uuid = nm_connection_get_uuid (connection); - g_return_val_if_fail (uuid && *uuid, NULL); - -+ schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL); -+ schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE); -+ g_settings_schema_source_unref (schema_source); -+ - path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid); -- settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path); -- g_free (path); -+ settings = g_settings_new_full (schema, NULL, path); - - return settings; - } From 691ddf1a8ecc6f475be2a448cfbc07241ac2ebee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:09:39 +0100 Subject: [PATCH 04/16] gnome3.gnome-control-center: use libnma --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index ea38ed88320..4e66a16bf7c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -48,6 +48,7 @@ , mutter , networkmanager , networkmanagerapplet +, libnma , ninja , pkgconfig , polkit @@ -126,7 +127,7 @@ stdenv.mkDerivation rec { modemmanager mutter # schemas for the keybindings networkmanager - networkmanagerapplet + libnma polkit samba tracker From ea4b4c41baa1192a85f9597789d45e84a2bab174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:11:30 +0100 Subject: [PATCH 05/16] gnome3.gnome-shell: use libnma --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 71d47a338a7..26e96b5a338 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -3,7 +3,7 @@ , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils , libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr -, accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop +, accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon , gnome-autoar, asciidoc-full }: @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { gnome-autoar # not declared at build time, but typelib is needed at runtime - libgweather networkmanagerapplet + libgweather libnma ]; patches = [ From ac7d843413c3891ca0fcf0ced9f8ff3ed050cad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:14:00 +0100 Subject: [PATCH 06/16] pantheon.switchboard-plug-network: use libnma --- .../pantheon/apps/switchboard-plugs/network/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 6e050c92d80..1ff1068119b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -11,6 +11,7 @@ , gtk3 , networkmanager , networkmanagerapplet +, libnma , switchboard }: @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 libgee networkmanager - networkmanagerapplet + libnma switchboard ]; From dd48e9b58c991f6006745fca7c86c099ea7e679f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:17:13 +0100 Subject: [PATCH 07/16] networkmanager-openvpn: use libnma --- pkgs/tools/networking/network-manager/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 2762b12a364..13f7eab5cc7 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, networkmanagerapplet }: +, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, libnma }: let pname = "NetworkManager-openvpn"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; From 5e19d8a4bbd324541ba9c3eee46a6980bebab661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:18:44 +0100 Subject: [PATCH 08/16] networkmanager-iodine: use libnma --- pkgs/tools/networking/network-manager/iodine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 9042605caf1..47e5a2f4181 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }: +, withGnome ? true, gnome3, fetchpatch, libnma }: let pname = "NetworkManager-iodine"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ iodine networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool autoreconfHook pkgconfig ]; From e2affc51a0e31a2d53ead9acc966db3c97dbf4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:19:52 +0100 Subject: [PATCH 09/16] networkmanager_strongswan: use libnma --- pkgs/tools/networking/network-manager/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix index 843985bfa3e..4f0a516b420 100644 --- a/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM -, gtk3, gnome3, libsecret, networkmanagerapplet }: +, gtk3, gnome3, libsecret, libnma }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; }; - buildInputs = [ networkmanager strongswanNM libsecret gtk3 networkmanagerapplet ]; + buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; nativeBuildInputs = [ intltool pkgconfig ]; From f8000839dfc8350d3fb055a990b035718f4fc189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:20:55 +0100 Subject: [PATCH 10/16] networkmanager-vpnc: use libnma --- pkgs/tools/networking/network-manager/vpnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index 66392325574..9c1d046e4fb 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, networkmanagerapplet }: +, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ vpnc networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file ]; From 59c82bcecaf358101814d01b6b37cae9e91d7d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:22:11 +0100 Subject: [PATCH 11/16] networkmanager-fortisslvpn: use libnma --- pkgs/tools/networking/network-manager/fortisslvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 94a4c4b362a..0ce50a3b2d4 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3, -networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }: +networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, libnma }: let pname = "NetworkManager-fortisslvpn"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ openfortivpn networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file ]; From f9f5ab3c88277f18a07c2e45780f822383b8b19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:22:55 +0100 Subject: [PATCH 12/16] networkmanager-l2tp: use libnma --- pkgs/tools/networking/network-manager/l2tp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index e4ab74f08e3..09fb0c5977b 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig , file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret -, withGnome ? true, networkmanagerapplet }: +, withGnome ? true, libnma }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ]; From 31ffa73dd897fab9d4124076fbd9125c466ebc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:23:56 +0100 Subject: [PATCH 13/16] pantheon.wingpanel-indicator-network: use libnma --- .../pantheon/desktop/wingpanel-indicators/network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index fd22de25d63..cd04e6287b7 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -8,7 +8,7 @@ , gtk3 , granite , networkmanager -, networkmanagerapplet +, libnma , wingpanel , libgee }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gtk3 libgee networkmanager - networkmanagerapplet + libnma wingpanel ]; From 142916e4f8285420e6ac6fcff6698398d2606a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:27:13 +0100 Subject: [PATCH 14/16] cinnamon.cjs: remove networkmanagerapplet This doesn't seem to be in use. --- pkgs/desktops/cinnamon/cjs/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 9dbab8fd767..d67a5d8386a 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -17,7 +17,6 @@ , libffi , gtk3 , readline -, networkmanagerapplet }: let @@ -46,7 +45,6 @@ stdenv.mkDerivation rec { keybinder3 upower xapps - networkmanagerapplet ]; nativeBuildInputs = [ From e0ec9581c97baf0804265ed6a3132e9455b95757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:32:39 +0100 Subject: [PATCH 15/16] cinnamon.cinnamon-control-center: use libnma --- pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index e8fa7c7b4e3..454d6533554 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -33,7 +33,7 @@ , wrapGAppsHook , tzdata , glibc -, networkmanagerapplet +, libnma , modemmanager , xorg , gdk-pixbuf @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { gnome-online-accounts tzdata networkmanager - networkmanagerapplet + libnma modemmanager xorg.libXxf86misc xorg.libxkbfile From b6445d30a1c85ca9ae5a15528afcac5f0dabf0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Mar 2020 01:37:46 +0100 Subject: [PATCH 16/16] gnome3.gnome-initial-setup: use libnma --- pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 4423755f71c..47d06ddac31 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -28,7 +28,7 @@ , polkit , webkitgtk , systemd -, networkmanagerapplet +, libnma , tzdata , yelp , libgnomekbd @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { pango polkit webkitgtk - networkmanagerapplet + libnma ]; patches = [