From d0ba6ac7267f9283de024dc9d3a859805e3b6607 Mon Sep 17 00:00:00 2001 From: whispers Date: Sat, 30 May 2026 14:48:09 -0400 Subject: [PATCH 1/2] uhttpmock: drop 0.0 abi The current uhttpmock package refers to the 0.5.x release series/0.0 ABI. This is outdated, relies on the insecure libsoup 2.4, and has no in-tree dependents. Thus, we drop it. --- doc/release-notes/rl-2611.section.md | 2 + pkgs/by-name/uh/uhttpmock/package.nix | 61 --------------------------- 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 pkgs/by-name/uh/uhttpmock/package.nix diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 8a6f62892387..2dabcfb3f3d6 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -15,6 +15,8 @@ - `libgdata` has been removed, as it was archived upstream and relied on the insecure libsoup 2.4. +- `uhttpmock` providing 0.0 ABI was removed. + - `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/pkgs/by-name/uh/uhttpmock/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix deleted file mode 100644 index d52050bb6cdc..000000000000 --- a/pkgs/by-name/uh/uhttpmock/package.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - mesonEmulatorHook, - ninja, - pkg-config, - gobject-introspection, - vala, - gtk-doc, - docbook-xsl-nons, - glib, - libsoup_2_4, -}: - -stdenv.mkDerivation rec { - pname = "uhttpmock"; - version = "0.5.5"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pwithnall"; - repo = "uhttpmock"; - rev = version; - sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; - }; - - strictDeps = true; - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - ] - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - libsoup_2_4 - ]; - - meta = { - description = "Project for mocking web service APIs which use HTTP or HTTPS"; - homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; - license = lib.licenses.lgpl21Plus; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} From 8ebdca12ce8a93d13b7d805f501ed790e3f931ab Mon Sep 17 00:00:00 2001 From: whispers Date: Sat, 30 May 2026 14:49:54 -0400 Subject: [PATCH 2/2] uhttpmock: rename from uhttpmock_1_0 Now that `uhttpmock` with the 0.0 ABI has been removed, we take the version with the 1.0 ABI and let it take the main name. --- doc/release-notes/rl-2611.section.md | 2 +- pkgs/by-name/li/libmsgraph/package.nix | 4 ++-- pkgs/by-name/uh/{uhttpmock_1_0 => uhttpmock}/package.nix | 0 pkgs/top-level/aliases.nix | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/by-name/uh/{uhttpmock_1_0 => uhttpmock}/package.nix (100%) diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 2dabcfb3f3d6..08d4ff31060f 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -15,7 +15,7 @@ - `libgdata` has been removed, as it was archived upstream and relied on the insecure libsoup 2.4. -- `uhttpmock` providing 0.0 ABI was removed. +- `uhttpmock` providing 0.0 ABI was removed. `uhttpmock_1_0` providing 1.0 ABI was renamed to `uhttpmock` and `uhttpmock_1_0` was kept as an alias. - `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). diff --git a/pkgs/by-name/li/libmsgraph/package.nix b/pkgs/by-name/li/libmsgraph/package.nix index ee212f31c957..52e4b01fc4bb 100644 --- a/pkgs/by-name/li/libmsgraph/package.nix +++ b/pkgs/by-name/li/libmsgraph/package.nix @@ -7,7 +7,7 @@ meson, ninja, pkg-config, - uhttpmock_1_0, + uhttpmock, libxml2, glib, gnome-online-accounts, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - uhttpmock_1_0 + uhttpmock libxml2 ]; diff --git a/pkgs/by-name/uh/uhttpmock_1_0/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix similarity index 100% rename from pkgs/by-name/uh/uhttpmock_1_0/package.nix rename to pkgs/by-name/uh/uhttpmock/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d6bb44d12231..8dfa01bacca4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2165,6 +2165,7 @@ mapAliases { udisks2 = udisks; # Added 2025-10-30 ue4demos = throw "'ue4demos' has been removed because it is unmaintained"; # Added 2026-02-07 ugarit-manifest-maker = throw "'ugarit-manifest-maker' has been removed because it is unmaintained"; # Added 2026-05-07 + uhttpmock_1_0 = warnAlias "'uhttpmock_1_0' has been renamed to 'uhttpmock'" uhttpmock; # Added 2026-05-30 unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17 unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27 unixODBC = warnAlias "'unixODBC' has been renamed to 'unixodbc'" unixodbc; # Added 2026-02-12