From cb65c8cae2edf1df502ff07d505503ee29afe56a Mon Sep 17 00:00:00 2001 From: whispers Date: Fri, 29 May 2026 22:22:29 -0400 Subject: [PATCH] librest: drop unused 0.8 release, rename from librest_1_0 `librest` in Nixpkgs currently refers to the old 0.8 release. The current release version is 0.10, which is in Nixpkgs as `librest_1_0` (since both needed to coexist for some time while dependents were migrated). Since the old librest version was dependent on insecure libraries (libsoup 2.4) and has no in-tree dependents, we drop it. We also rename `librest_1_0` to `librest`, as that's the most straightforward name, and migrate it to `pkgs/by-name` for cleanliness. --- doc/release-notes/rl-2611.section.md | 2 + pkgs/by-name/gn/gnome-maps/package.nix | 4 +- .../gn/gnome-online-accounts/package.nix | 4 +- pkgs/by-name/gr/grilo-plugins/package.nix | 4 +- pkgs/by-name/li/libgovirt/package.nix | 4 +- .../li/librest/package.nix} | 7 +- .../development/libraries/librest/default.nix | 77 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 9 files changed, 14 insertions(+), 93 deletions(-) rename pkgs/{development/libraries/librest/1.0.nix => by-name/li/librest/package.nix} (93%) delete mode 100644 pkgs/development/libraries/librest/default.nix diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 7aa7fd8f5b6c..b25956c13327 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -15,6 +15,8 @@ - `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). +- `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias. + ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index c44e9313cb15..6d57cc4ee73d 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -12,7 +12,7 @@ gtk4, gobject-introspection, gdk-pixbuf, - librest_1_0, + librest, libgweather, geoclue2, wrapGAppsHook4, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { libshumate libgweather libadwaita - librest_1_0 + librest libsecret libsoup_3 ]; diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index 5057c8686831..f30a4e5074c3 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -13,7 +13,7 @@ json-glib, keyutils, libadwaita, - librest_1_0, + librest, libxml2, libsecret, gobject-introspection, @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { gvfs # OwnCloud, Google Drive json-glib libkrb5 - librest_1_0 + librest libxml2 libsecret libsoup_3 diff --git a/pkgs/by-name/gr/grilo-plugins/package.nix b/pkgs/by-name/gr/grilo-plugins/package.nix index 2a42cab78ecf..9369fcda147d 100644 --- a/pkgs/by-name/gr/grilo-plugins/package.nix +++ b/pkgs/by-name/gr/grilo-plugins/package.nix @@ -14,7 +14,7 @@ libarchive, libdmapsharing, libsoup_3, - librest_1_0, + librest, gnome, libxml2, lua5_4, @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { libarchive libdmapsharing libsoup_3 - librest_1_0 + librest gmime gom json-glib diff --git a/pkgs/by-name/li/libgovirt/package.nix b/pkgs/by-name/li/libgovirt/package.nix index 6fc3b73ee788..649c4f1149e4 100644 --- a/pkgs/by-name/li/libgovirt/package.nix +++ b/pkgs/by-name/li/libgovirt/package.nix @@ -8,7 +8,7 @@ gobject-introspection, ninja, glib, - librest_1_0, + librest, }: stdenv.mkDerivation rec { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib - librest_1_0 + librest ]; passthru = { diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/by-name/li/librest/package.nix similarity index 93% rename from pkgs/development/libraries/librest/1.0.nix rename to pkgs/by-name/li/librest/package.nix index 4510f999c27f..ea8ad63afad8 100644 --- a/pkgs/development/libraries/librest/1.0.nix +++ b/pkgs/by-name/li/librest/package.nix @@ -14,7 +14,7 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librest"; version = "0.10.2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/librest/${lib.versions.majorMinor version}/librest-${version}.tar.xz"; + url = "mirror://gnome/sources/librest/${lib.versions.majorMinor finalAttrs.version}/librest-${finalAttrs.version}.tar.xz"; sha256 = "e2y5Ers6Is+n3PAFkl3LYogwJNsMCQmUhufWhRGFybg="; }; @@ -64,7 +64,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "librest"; - attrPath = "librest_1_0"; versionPolicy = "odd-unstable"; }; }; @@ -76,4 +75,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.gnome ]; }; -} +}) diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix deleted file mode 100644 index ac64dc7d13f9..000000000000 --- a/pkgs/development/libraries/librest/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - glib, - libsoup_2_4, - libxml2, - gobject-introspection, - gtk-doc, - docbook-xsl-nons, - docbook_xml_dtd_412, - gnome, -}: - -stdenv.mkDerivation rec { - pname = "rest"; - version = "0.8.1"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/rest/${lib.versions.majorMinor version}/rest-${version}.tar.xz"; - sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; - }; - - nativeBuildInputs = [ - pkg-config - gobject-introspection - ] - ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 - ]; - - propagatedBuildInputs = [ - glib - libsoup_2_4 - libxml2 - ]; - - strictDeps = true; - - configureFlags = [ - (lib.enableFeature (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "gtk-doc") - # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. - "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" - ]; - - postPatch = '' - # pkg-config doesn't look in $PATH if strictDeps is on - substituteInPlace ./configure \ - --replace-fail 'have_gtk_doc=no' "echo gtk-doc is present" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "rest"; - attrPath = "librest"; - versionPolicy = "odd-unstable"; - freeze = true; - }; - }; - - meta = { - description = "Helper library for RESTful services"; - homepage = "https://gitlab.gnome.org/GNOME/librest"; - license = lib.licenses.lgpl21Only; - platforms = lib.platforms.unix; - teams = [ lib.teams.gnome ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d4c509b845b..584fe653a6ba 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1159,6 +1159,7 @@ mapAliases { libreoffice-qt6-still = libreoffice-qt-still; # Added 2025-08-30 libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; # Added 2025-08-30 libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30 + librest_1_0 = warnAlias "'librest_1_0' has been renamed to/replaced by 'librest'" librest; # Added 2026-05-30 librewolf-wayland = throw "'librewolf-wayland' has been renamed to/replaced by 'librewolf'"; # Converted to throw 2025-10-27 librtlsdr = throw "'librtlsdr' has been renamed to/replaced by 'rtl-sdr'"; # Converted to throw 2025-10-27 libsForQt515 = throw "'libsForQt515' has been renamed to/replaced by 'libsForQt5'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b248a673f435..b067f3e88c53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2742,10 +2742,6 @@ with pkgs; libportal-qt5 = libportal.override { variant = "qt5"; }; libportal-qt6 = libportal.override { variant = "qt6"; }; - librest = callPackage ../development/libraries/librest { }; - - librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { }; - licensee = callPackage ../tools/package-management/licensee { }; linux-gpib = callPackage ../applications/science/electronics/linux-gpib/user.nix { };