diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index e1508824a8d3..789e9a9b17d7 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. `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). - `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. 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/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix index d52050bb6cdc..8e75049d775c 100644 --- a/pkgs/by-name/uh/uhttpmock/package.nix +++ b/pkgs/by-name/uh/uhttpmock/package.nix @@ -11,12 +11,12 @@ gtk-doc, docbook-xsl-nons, glib, - libsoup_2_4, + libsoup_3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uhttpmock"; - version = "0.5.5"; + version = "0.11.0"; outputs = [ "out" @@ -28,11 +28,12 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "pwithnall"; repo = "uhttpmock"; - rev = version; - sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; + rev = finalAttrs.version; + hash = "sha256-itJhiPpAF5dwLrVF2vuNznABqTwEjVj6W8mbv1aEmE4="; }; strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -46,16 +47,16 @@ stdenv.mkDerivation rec { mesonEmulatorHook ]; - buildInputs = [ + propagatedBuildInputs = [ glib - libsoup_2_4 + libsoup_3 ]; 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 = [ ]; + teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/uh/uhttpmock_1_0/package.nix b/pkgs/by-name/uh/uhttpmock_1_0/package.nix deleted file mode 100644 index 8e75049d775c..000000000000 --- a/pkgs/by-name/uh/uhttpmock_1_0/package.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - mesonEmulatorHook, - ninja, - pkg-config, - gobject-introspection, - vala, - gtk-doc, - docbook-xsl-nons, - glib, - libsoup_3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "uhttpmock"; - version = "0.11.0"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pwithnall"; - repo = "uhttpmock"; - rev = finalAttrs.version; - hash = "sha256-itJhiPpAF5dwLrVF2vuNznABqTwEjVj6W8mbv1aEmE4="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - ] - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - propagatedBuildInputs = [ - glib - libsoup_3 - ]; - - meta = { - description = "Project for mocking web service APIs which use HTTP or HTTPS"; - homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; - license = lib.licenses.lgpl21Plus; - teams = [ lib.teams.gnome ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 45ac3ca16a9c..6e724d605ade 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2167,6 +2167,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