From 5f316d1cc065f9286a24dd3956d6c0f98d7bcd63 Mon Sep 17 00:00:00 2001 From: whispers Date: Fri, 29 May 2026 15:19:10 -0400 Subject: [PATCH] libgdata: drop due to upstream archival libgdata was archived upstream, as can be seen in the GitLab repository: https://gitlab.gnome.org/Archive/libgdata. Additionally, it relies on libsoup 2.4, which is known to be insecure. The only effort to migrate stalled out for years in https://gitlab.gnome.org/Archive/libgdata/-/merge_requests/49, even before the archival. Since there are no in-tree dependents, this seems harmless to drop. --- doc/release-notes/rl-2611.section.md | 2 + nixos/tests/installed-tests/default.nix | 1 - nixos/tests/installed-tests/libgdata.nix | 11 --- pkgs/by-name/gr/grilo-plugins/package.nix | 1 - .../li/libgdata/installed-tests-path.patch | 94 ------------------- pkgs/by-name/li/libgdata/package.nix | 93 ------------------ pkgs/top-level/aliases.nix | 1 + 7 files changed, 3 insertions(+), 200 deletions(-) delete mode 100644 nixos/tests/installed-tests/libgdata.nix delete mode 100644 pkgs/by-name/li/libgdata/installed-tests-path.patch delete mode 100644 pkgs/by-name/li/libgdata/package.nix diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 7aa7fd8f5b6c..8a6f62892387 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -13,6 +13,8 @@ - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details. - `python3Packages.django-health-check` has been updated to major version 4. See its [migration guide](https://codingjoe.dev/django-health-check/migrate-to-v4/) and [changelog](https://github.com/codingjoe/django-health-check/releases/tag/4.0.0) for breaking changes. +- `libgdata` has been removed, as it was archived upstream and relied on the insecure libsoup 2.4. + - `requireFile` now sets `meta.license = lib.licenses.unfree` by default. Users of `requireFile`-based derivations that preserve this default will need to explicitly allow their evaluation as described in [](#sec-allow-unfree). ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index 5741f23d11b0..d8468fcf2e1b 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -107,7 +107,6 @@ in gsconnect = callInstalledTest ./gsconnect.nix { }; json-glib = callInstalledTest ./json-glib.nix { }; ibus = callInstalledTest ./ibus.nix { }; - libgdata = callInstalledTest ./libgdata.nix { }; glib-testing = callInstalledTest ./glib-testing.nix { }; libjcat = callInstalledTest ./libjcat.nix { }; libxmlb = callInstalledTest ./libxmlb.nix { }; diff --git a/nixos/tests/installed-tests/libgdata.nix b/nixos/tests/installed-tests/libgdata.nix deleted file mode 100644 index b0d39c042be4..000000000000 --- a/nixos/tests/installed-tests/libgdata.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, makeInstalledTest, ... }: - -makeInstalledTest { - tested = pkgs.libgdata; - - testConfig = { - # # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’ - # Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0) - services.gnome.glib-networking.enable = true; - }; -} diff --git a/pkgs/by-name/gr/grilo-plugins/package.nix b/pkgs/by-name/gr/grilo-plugins/package.nix index 2a42cab78ecf..af0d83e3ca44 100644 --- a/pkgs/by-name/gr/grilo-plugins/package.nix +++ b/pkgs/by-name/gr/grilo-plugins/package.nix @@ -82,7 +82,6 @@ stdenv.mkDerivation rec { buildInputs = [ grilo libxml2 - # libgdata lua5_4 liboauth sqlite diff --git a/pkgs/by-name/li/libgdata/installed-tests-path.patch b/pkgs/by-name/li/libgdata/installed-tests-path.patch deleted file mode 100644 index f8c0a1293a1f..000000000000 --- a/pkgs/by-name/li/libgdata/installed-tests-path.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/gdata/tests/meson.build b/gdata/tests/meson.build -index 05184deb..3a9392d4 100644 ---- a/gdata/tests/meson.build -+++ b/gdata/tests/meson.build -@@ -1,5 +1,12 @@ --tests_execdir = gdata_libexecdir / 'installed-tests' / gdata_name --tests_metadir = gdata_datadir / 'installed-tests' / gdata_name -+tests_bindir = get_option('installed_test_bindir') / 'installed-tests' / gdata_name -+if tests_bindir == '' -+ test_bindir = gdata_libexecdir / 'installed-tests' / gdata_name -+endif -+ -+tests_datadir = get_option('installed_test_datadir') / 'installed-tests' / gdata_name -+if tests_datadir == '' -+ tests_datadir = gdata_datadir / 'installed-tests' / gdata_name -+endif - - tests_sources = files( - 'common.c', -@@ -49,7 +56,7 @@ foreach test_name, extra_args: tests - dependencies: common_deps + extra_args.get('dependencies', []), - sources: tests_sources, - install: install_tests and not should_fail, -- install_dir: tests_execdir, -+ install_dir: tests_bindir, - ) - - test( -@@ -65,7 +72,7 @@ if install_tests - should_fail = extra_args.get('should_fail', false) - tests_conf = { - 'TEST_TYPE': 'session', -- 'TEST_ABS_PATH': gdata_prefix / tests_execdir / test_name, -+ 'TEST_ABS_PATH': tests_bindir / test_name, - } - - configure_file ( -@@ -73,13 +80,13 @@ if install_tests - output: test_name + '.test', - configuration: tests_conf, - install: not should_fail, -- install_dir: tests_metadir, -+ install_dir: tests_datadir, - ) - endforeach - - install_subdir( - 'traces', -- install_dir: tests_execdir, -+ install_dir: tests_bindir, - ) - - test_data = [ -@@ -98,6 +105,6 @@ if install_tests - - install_data( - test_data, -- install_dir: tests_execdir, -+ install_dir: tests_bindir, - ) - endif -diff --git a/meson.build b/meson.build -index 50441abb..5fc773b1 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,9 +20,9 @@ gdata_api_version_minor = 0 - - # Define the install directories - gdata_prefix = get_option('prefix') --gdata_datadir = get_option('datadir') --gdata_libexecdir = get_option('libexecdir') --gdata_includedir = get_option('includedir') -+gdata_datadir = gdata_prefix / get_option('datadir') -+gdata_libexecdir = gdata_prefix / get_option('libexecdir') -+gdata_includedir = gdata_prefix / get_option('includedir') - - gdata_include_subdir = gdata_name / 'gdata' - -diff --git a/meson_options.txt b/meson_options.txt -index 25cc6b55..6fc2cfa3 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -43,3 +43,11 @@ option('vapi', - type: 'boolean', - value: true, - description: 'Enable creation of vapi files') -+ -+option('installed_test_datadir', type: 'string', -+ value: '', -+ description: 'Installation directory for data files in tests') -+ -+option('installed_test_bindir', type: 'string', -+ value: '', -+ description: 'Installation directory for binary files in tests') diff --git a/pkgs/by-name/li/libgdata/package.nix b/pkgs/by-name/li/libgdata/package.nix deleted file mode 100644 index 636eccc96891..000000000000 --- a/pkgs/by-name/li/libgdata/package.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - meson, - ninja, - nixosTests, - vala, - gettext, - libxml2, - glib, - json-glib, - gcr, - gnome-online-accounts, - gobject-introspection, - gnome, - p11-kit, - openssl, - uhttpmock, - libsoup_2_4, -}: - -stdenv.mkDerivation rec { - pname = "libgdata"; - version = "0.18.1"; - - outputs = [ - "out" - "dev" - "installedTests" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3YWS7rZRKtCoz1yL6McudvdL/msj5N2T8HVu4HFoBMc="; - }; - - patches = [ - ./installed-tests-path.patch - ]; - - nativeBuildInputs = [ - gettext - gobject-introspection - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - gcr - openssl - p11-kit - uhttpmock - ]; - - propagatedBuildInputs = [ - glib - libsoup_2_4 - libxml2 - gnome-online-accounts - json-glib - ]; - - mesonFlags = [ - "-Dgtk_doc=false" - "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" - "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" - "-Dinstalled_tests=true" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; # Stable version has not been updated for a long time. - }; - - tests = { - installedTests = nixosTests.installed-tests.libgdata; - }; - }; - - meta = { - description = "GData API library"; - homepage = "https://gitlab.gnome.org/GNOME/libgdata"; - maintainers = with lib.maintainers; [ raskin ]; - teams = [ lib.teams.gnome ]; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl21Plus; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d4c509b845b..e1605272fb84 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1122,6 +1122,7 @@ mapAliases { libFS = libfs; # Added 2026-02-04 libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17 libgda = throw "'libgda' has been renamed to/replaced by 'libgda5'"; # Converted to throw 2025-10-27 + libgdata = throw "'libgdata' has been removed due to being archived upstream."; # Added 2026-05-29 libGDSII = libgdsii; # Added 2026-02-08 libgestures = throw "'libgestures' has been removed as it was broken and unmaintained upstream"; # Added 2026-05-09 libgme = throw "'libgme' has been renamed to/replaced by 'game-music-emu'"; # Converted to throw 2025-10-27