From 0ee528d2cc689dfdb639688ebe3ca73721768276 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 May 2025 22:25:23 +0200 Subject: [PATCH 1/4] gssdp_1_6: Unbreak on Darwin Only all the tests are broken: ERROR:../tests/test-functional.c:491:test_client_creation: assertion failed (error == NULL): Failed to bind socketError binding to address 169.254.192.89:1900: Operation not permitted (g-io-error-quark, 14) But we already disable them on the old `gssdp`. --- pkgs/development/libraries/gssdp/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index caab2b7c865d..0763e0586611 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -60,7 +60,8 @@ stdenv.mkDerivation rec { (lib.mesonBool "manpages" enableManpages) ]; - doCheck = true; + # On Darwin: Failed to bind socket, Operation not permitted + doCheck = !stdenv.hostPlatform.isDarwin; postFixup = '' # Move developer documentation to devdoc output. @@ -83,7 +84,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; From edd0dc6111a9c3f27dd53475471cb9dad72bec67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 May 2025 22:33:33 +0200 Subject: [PATCH 2/4] gssdp_1_6: Use finalAttrs --- pkgs/development/libraries/gssdp/1.6.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index 0763e0586611..6d59e165a3e6 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -17,7 +17,7 @@ gssdp-tools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gssdp"; version = "1.6.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor finalAttrs.version}/gssdp-${finalAttrs.version}.tar.xz"; sha256 = "L+21r9sizxTVSYo5p3PKiXiKJQ/PcBGHg9+CHh8/NEY="; }; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { attrPath = "gssdp_1_6"; - packageName = pname; + packageName = "gssdp"; }; tests = { @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { teams = [ teams.gnome ]; platforms = platforms.all; }; -} +}) From 0443142472dc445dbfebede45be0e764d5f1208e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 May 2025 22:32:07 +0200 Subject: [PATCH 3/4] gupnp_1_6: Unbreak on Darwin All the tests except `context-filter` are broken: ERROR:../tests/test-context.c:265:test_gupnp_context_error_when_bound: assertion failed (error == NULL): Error binding to address 127.0.0.1:0: Operation not permitted (g-io-error-quark, 14) ERROR:../tests/test-context-manager.c:42:test_context_manager_manage: assertion failed (error == NULL): Failed to find IP of interface lo (gssdp-error, 0) But we already disable them on the old `gupnp`. --- pkgs/development/libraries/gupnp/1.6.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 8cbe314e7d32..85e5b866e105 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - doCheck = true; + # On Darwin: Failed to bind socket, Operation not permitted + doCheck = !stdenv.hostPlatform.isDarwin; postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. @@ -73,6 +74,6 @@ stdenv.mkDerivation rec { description = "Implementation of the UPnP specification"; mainProgram = "gupnp-binding-tool-1.6"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 96aca7526abb7d1a6353d19fd18b3f8111f34ba4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 May 2025 22:39:32 +0200 Subject: [PATCH 4/4] gupnp_1_6: Use finalAttrs --- pkgs/development/libraries/gupnp/1.6.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 85e5b866e105..408305542cf5 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -15,7 +15,7 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gupnp"; version = "1.6.8"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor finalAttrs.version}/gupnp-${finalAttrs.version}.tar.xz"; hash = "sha256-cKADzr1oV3KT+z5q9J/5AiA7+HaLL8XWUd3B8PoeEek="; }; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { attrPath = "gupnp_1_6"; - packageName = pname; + packageName = "gupnp"; }; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.unix; }; -} +})