From 7cef973e9542f28d7fa330ea55d52c45243d2761 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 17 Apr 2025 11:03:14 +0200 Subject: [PATCH] gsignond, gsignondPlugins: remove --- .../development/libraries/gsignond/conf.patch | 12 --- .../libraries/gsignond/default.nix | 93 ------------------- .../libraries/gsignond/plugin-load-env.patch | 35 ------- .../libraries/gsignond/plugins/lastfm.nix | 51 ---------- .../libraries/gsignond/plugins/mail.nix | 47 ---------- .../libraries/gsignond/plugins/oauth.nix | 65 ------------- .../libraries/gsignond/plugins/sasl.nix | 61 ------------ .../libraries/gsignond/wrapper.nix | 30 ------ pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 11 --- 10 files changed, 2 insertions(+), 405 deletions(-) delete mode 100644 pkgs/development/libraries/gsignond/conf.patch delete mode 100644 pkgs/development/libraries/gsignond/default.nix delete mode 100644 pkgs/development/libraries/gsignond/plugin-load-env.patch delete mode 100644 pkgs/development/libraries/gsignond/plugins/lastfm.nix delete mode 100644 pkgs/development/libraries/gsignond/plugins/mail.nix delete mode 100644 pkgs/development/libraries/gsignond/plugins/oauth.nix delete mode 100644 pkgs/development/libraries/gsignond/plugins/sasl.nix delete mode 100644 pkgs/development/libraries/gsignond/wrapper.nix diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch deleted file mode 100644 index 0aa2034e3996..000000000000 --- a/pkgs/development/libraries/gsignond/conf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index cb1e0df..d90c85c 100644 ---- a/meson.build -+++ b/meson.build -@@ -95,6 +95,6 @@ endif - configure_file( - input: 'gsignond.conf.in', - configuration: conf_data, -- install_dir: sysconf_dir, -+ install_dir: 'etc/', - output: 'gsignond.conf' - ) diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix deleted file mode 100644 index f3f992ea8dac..000000000000 --- a/pkgs/development/libraries/gsignond/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - pkg-config, - meson, - ninja, - glib, - glib-networking, - sqlite, - gobject-introspection, - vala, - gtk-doc, - libsecret, - docbook_xsl, - docbook_xml_dtd_43, - docbook_xml_dtd_45, - glibcLocales, - makeWrapper, - symlinkJoin, - gsignondPlugins, - plugins, -}: - -let - unwrapped = stdenv.mkDerivation rec { - pname = "gsignond"; - version = "1.2.0"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchFromGitLab { - owner = "accounts-sso"; - repo = pname; - rev = version; - sha256 = "17cpil3lpijgyj2z5c41vhb7fpk17038k5ggyw9p6049jrlf423m"; - }; - - nativeBuildInputs = [ - docbook_xml_dtd_43 - docbook_xml_dtd_45 - docbook_xsl - glibcLocales - gobject-introspection - gtk-doc - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - glib - glib-networking - libsecret - ]; - - propagatedBuildInputs = [ sqlite ]; - - mesonFlags = [ - "-Dbus_type=session" - "-Dextension=desktop" - ]; - - LC_ALL = "en_US.UTF-8"; - - patches = [ - ./conf.patch - ./plugin-load-env.patch - ]; - - meta = with lib; { - description = "D-Bus service which performs user authentication on behalf of its clients"; - mainProgram = "gsignond"; - homepage = "https://gitlab.com/accounts-sso/gsignond"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; - }; - -in -if plugins == [ ] then - unwrapped -else - import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; - gsignond = unwrapped; - } diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/pkgs/development/libraries/gsignond/plugin-load-env.patch deleted file mode 100644 index 5da2b4c157e8..000000000000 --- a/pkgs/development/libraries/gsignond/plugin-load-env.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c -index 5497b32..979e1b4 100644 ---- a/src/gplugind/gsignond-plugin-loader.c -+++ b/src/gplugind/gsignond-plugin-loader.c -@@ -38,11 +38,10 @@ gsignond_load_plugin ( - gchar *plugin_filename; - GSignondPlugin *plugin; - --# ifdef ENABLE_DEBUG - const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); - if (env_val) - plugin_path = env_val; --# endif -+ - plugin_filename = g_module_build_path (plugin_path, plugin_type); - plugin = gsignond_load_plugin_with_filename (plugin_type, - plugin_filename); -diff --git a/src/gplugind/main.c b/src/gplugind/main.c -index 1c6cdb6..c85c623 100644 ---- a/src/gplugind/main.c -+++ b/src/gplugind/main.c -@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop) - static const gchar* _plugin_path(void) - { - const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR; --# ifdef ENABLE_DEBUG -+ - const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); - if (env_val) - plugin_path = env_val; --# endif -+ - return plugin_path; - } - diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix deleted file mode 100644 index 9f55e89e32b6..000000000000 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - pkg-config, - meson, - ninja, - vala, - glib, - gsignond, - json-glib, - libsoup_2_4, - gobject-introspection, -}: - -stdenv.mkDerivation { - pname = "gsignond-plugin-lastfm"; - version = "2018-05-07"; - - src = fetchFromGitLab { - owner = "accounts-sso"; - repo = "gsignond-plugin-lastfm"; - rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c"; - sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f"; - }; - - nativeBuildInputs = [ - gobject-introspection - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - glib - gsignond - json-glib - libsoup_2_4 - ]; - - PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - - meta = with lib; { - description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials"; - homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix deleted file mode 100644 index 610f3e100de2..000000000000 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - pkg-config, - meson, - ninja, - vala, - glib, - gsignond, - gobject-introspection, -}: - -stdenv.mkDerivation rec { - pname = "gsignond-plugin-mail"; - version = "0.3.0"; - - src = fetchFromGitLab { - owner = "accounts-sso"; - repo = "gsignond-plugin-mail"; - rev = version; - sha256 = "0x8jcl0ra9kacm80f1im5wpxp9r9wxayjwnk6dkv7fhjbl2p4nh0"; - }; - - nativeBuildInputs = [ - gobject-introspection - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - glib - gsignond - ]; - - PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - - meta = with lib; { - description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials"; - homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix deleted file mode 100644 index a26ce6caa1c6..000000000000 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - pkg-config, - meson, - ninja, - glib, - gsignond, - check, - json-glib, - libsoup_2_4, - gnutls, - gtk-doc, - docbook_xml_dtd_43, - docbook_xml_dtd_45, - docbook_xsl, - glibcLocales, - gobject-introspection, -}: - -stdenv.mkDerivation { - pname = "gsignond-plugin-oauth"; - version = "2018-10-15"; - - src = fetchFromGitLab { - owner = "accounts-sso"; - repo = "gsignond-plugin-oa"; - rev = "d471cebfd7c50567b1244277a9559f18f8d58691"; - sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx"; - }; - - nativeBuildInputs = [ - check - docbook_xml_dtd_43 - docbook_xml_dtd_45 - docbook_xsl - glibcLocales - gobject-introspection - gtk-doc - meson - ninja - pkg-config - ]; - - buildInputs = [ - glib - gnutls - gsignond - json-glib - libsoup_2_4 - ]; - - LC_ALL = "en_US.UTF-8"; - - PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - - meta = with lib; { - description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols"; - homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix deleted file mode 100644 index 5a89d996743a..000000000000 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - pkg-config, - meson, - ninja, - glib, - gsignond, - gsasl, - check, - gtk-doc, - docbook_xml_dtd_43, - docbook_xml_dtd_45, - docbook_xsl, - glibcLocales, - gobject-introspection, -}: - -stdenv.mkDerivation { - pname = "gsignond-plugin-sasl"; - version = "2018-10-15"; - - src = fetchFromGitLab { - owner = "accounts-sso"; - repo = "gsignond-plugin-sasl"; - rev = "b304c70b7dad9368b23b1205122d10de684c896a"; - sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va"; - }; - - nativeBuildInputs = [ - check - docbook_xml_dtd_43 - docbook_xml_dtd_45 - docbook_xsl - glibcLocales - gobject-introspection - gtk-doc - meson - ninja - pkg-config - ]; - - buildInputs = [ - glib - gsasl - gsignond - ]; - - LC_ALL = "en_US.UTF-8"; - - PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - - meta = with lib; { - description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol"; - homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix deleted file mode 100644 index ab7f6b9817df..000000000000 --- a/pkgs/development/libraries/gsignond/wrapper.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - makeWrapper, - symlinkJoin, - gsignond, - plugins, -}: - -symlinkJoin { - name = "gsignond-with-plugins-${gsignond.version}"; - - paths = [ gsignond ] ++ plugins; - - nativeBuildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/gsignond \ - --set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins" - - rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service - rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service - - substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \ - --replace ${gsignond} $out - - substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \ - --replace ${gsignond} $out - ''; - - inherit (gsignond) meta; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6671271001d2..a78e2fde394b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -793,6 +793,8 @@ mapAliases { gringo = clingo; # added 2022-11-27 grub2_full = grub2; # Added 2022-11-18 grun = throw "grun has been removed due to lack of maintenance upstream and depending on gtk2"; # Added 2025-03-29 + gsignond = throw "'gsignond' and its plugins have been removed due to lack of maintenance upstream"; # added 2025-04-17 + gsignondPlugins = throw "'gsignondPlugins' have been removed alongside 'gsignond' due to lack of maintenance upstream and depending on libsoup_2"; # added 2025-04-17 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtk-engine-bluecurve = "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04 gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20b63e41d2b4..cf7a25e7dd25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11518,17 +11518,6 @@ with pkgs; aroccStdenv = if stdenv.cc.isArocc then stdenv else lowPrio arocc.cc.passthru.stdenv; - gsignond = callPackage ../development/libraries/gsignond { - plugins = [ ]; - }; - - gsignondPlugins = recurseIntoAttrs { - sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { }; - oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { }; - lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { }; - mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { }; - }; - ### DEVELOPMENT / LIBRARIES / DARWIN SDKS apple-sdk_11 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "11"; };