push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,92 @@
{
stdenv,
lib,
fetchurl,
meson,
ninja,
pkg-config,
gobject-introspection,
vala,
gi-docgen,
python3,
libsoup_3,
glib,
gnome,
gssdp-tools,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gssdp";
version = "1.6.4";
outputs = [
"out"
"dev"
"devdoc"
];
src = fetchurl {
url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor finalAttrs.version}/gssdp-${finalAttrs.version}.tar.xz";
hash = "sha256-/5f9+39WHT5oE7T2ohRSWefC7/Q8wOY/P9Ax0LYmYDI=";
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
vala
gi-docgen
python3
];
buildInputs = [
libsoup_3
];
propagatedBuildInputs = [
glib
];
mesonFlags = [
"-Dgtk_doc=true"
"-Dsniffer=false"
# This packages only has manpages for gssdp-device-sniffer, which we disabled above.
"-Dmanpages=false"
];
# On Darwin: Failed to bind socket, Operation not permitted
doCheck = !stdenv.hostPlatform.isDarwin;
postFixup = ''
# Move developer documentation to devdoc output.
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \
| while IFS= read -r -d ''' file; do
moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc"
done
'';
passthru = {
updateScript = gnome.updateScript {
attrPath = "gssdp_1_6";
packageName = "gssdp";
};
tests = {
inherit gssdp-tools;
};
};
meta = with lib; {
description = "GObject-based API for handling resource discovery and announcement over SSDP";
homepage = "http://www.gupnp.org/";
license = licenses.lgpl2Plus;
teams = [ teams.gnome ];
platforms = platforms.all;
};
})

View File

@@ -0,0 +1,110 @@
{
stdenv,
lib,
fetchpatch2,
fetchurl,
meson,
ninja,
pkg-config,
gobject-introspection,
vala,
gi-docgen,
python3,
libsoup_2_4,
glib,
gnome,
gssdp-tools,
buildPackages,
withIntrospection ?
lib.meta.availableOn stdenv.hostPlatform gobject-introspection
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
}:
stdenv.mkDerivation rec {
pname = "gssdp";
version = "1.4.1";
outputs = [
"out"
"dev"
]
++ lib.optionals withIntrospection [ "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/gssdp-${version}.tar.xz";
sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk=";
};
patches = [
(fetchpatch2 {
# https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/11
url = "https://gitlab.gnome.org/GNOME/gssdp/-/commit/db9d02c22005be7e5e81b43a3ab777250bd7b27b.diff";
hash = "sha256-DJQrg6MhzpX8R0QaNnqdwA1+v8xncDU8jcX+I3scW1M=";
})
];
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
glib
python3
]
++ lib.optionals withIntrospection [
gobject-introspection
vala
gi-docgen
];
buildInputs = [
libsoup_2_4
];
propagatedBuildInputs = [
glib
];
mesonFlags = [
"-Dsniffer=false"
(lib.mesonBool "gtk_doc" withIntrospection)
(lib.mesonBool "introspection" withIntrospection)
(lib.mesonBool "vapi" withIntrospection)
];
# Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed
doCheck = !stdenv.hostPlatform.isDarwin;
postFixup = lib.optionalString withIntrospection ''
# Move developer documentation to devdoc output.
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \
| while IFS= read -r -d ''' file; do
moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc"
done
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gssdp";
freeze = true;
};
tests = {
inherit gssdp-tools;
};
};
meta = with lib; {
description = "GObject-based API for handling resource discovery and announcement over SSDP";
homepage = "http://www.gupnp.org/";
license = licenses.lgpl2Plus;
teams = [ teams.gnome ];
platforms = platforms.all;
};
}

View File

@@ -0,0 +1,42 @@
diff --git a/libgssdp/gssdp-client-private.h b/libgssdp/gssdp-client-private.h
index ac31247..241c054 100644
--- a/libgssdp/gssdp-client-private.h
+++ b/libgssdp/gssdp-client-private.h
@@ -10,7 +10,11 @@
#ifndef GSSDP_CLIENT_PRIVATE_H
#define GSSDP_CLIENT_PRIVATE_H
+#ifdef GSSDP_TOOLS
+#include <libgssdp/gssdp-client.h>
+#else
#include "gssdp-client.h"
+#endif
G_BEGIN_DECLS
diff --git a/tools/meson.build b/tools/meson.build
index 40eb8e3..5db545b 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,3 +1,10 @@
+project('gssdp-tools', 'c', version: '@version@')
+gnome = import('gnome')
+
+gssdp = dependency('gssdp-1.6')
+gtk = dependency('gtk4', version : '>= 4')
+libsoup = dependency('libsoup-3.0', version : '>= 2.99.0')
+
resource = gnome.compile_resources(
'org.gupnp.GSSDP.DeviceSniffer',
'gssdp-device-sniffer.gresource.xml',
@@ -12,7 +19,9 @@ sniffer = executable(
'main-window.h',
resource
],
- dependencies : [gssdp, gtk],
+ dependencies : [gssdp, gtk, libsoup],
+ c_args: ['-DGSSDP_TOOLS'],
+ include_directories : [include_directories('..')],
install: true,
export_dynamic : true,
gui_app : true

View File

@@ -0,0 +1,51 @@
{
stdenv,
lib,
replaceVars,
meson,
ninja,
pkg-config,
wrapGAppsHook4,
gssdp_1_6,
gtk4,
libsoup_3,
}:
stdenv.mkDerivation rec {
pname = "gssdp-tools";
inherit (gssdp_1_6) version src;
patches = [
# Allow building tools separately from the library.
# This is needed to break the dependency cycle.
(replaceVars ./standalone-tools.patch {
inherit version;
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
wrapGAppsHook4
];
buildInputs = [
gssdp_1_6
gtk4
libsoup_3
];
preConfigure = ''
cd tools
'';
meta = with lib; {
description = "Device Sniffer tool based on GSSDP framework";
mainProgram = "gssdp-device-sniffer";
homepage = "http://www.gupnp.org/";
license = licenses.lgpl2Plus;
teams = gssdp_1_6.meta.teams;
platforms = platforms.all;
};
}