From dcb7c76f94d93e23bd989842d7ef49c81fd8eaa3 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sun, 13 Apr 2025 18:31:11 +0200 Subject: [PATCH 1/7] wxGTK32: update to libsoup_3 --- pkgs/by-name/wx/wxGTK32/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix index 84da8dc7f019a..32d7c9489df98 100644 --- a/pkgs/by-name/wx/wxGTK32/package.nix +++ b/pkgs/by-name/wx/wxGTK32/package.nix @@ -28,7 +28,7 @@ unicode ? true, withMesa ? !stdenv.hostPlatform.isDarwin, withWebKit ? true, - webkitgtk_4_0, + webkitgtk_4_1, }: let catch = fetchFromGitHub { @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0 + ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_1 ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat ]; From a09ad8e2029bbc94cfe73e3ad641488ee56b9f13 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sun, 13 Apr 2025 18:31:35 +0200 Subject: [PATCH 2/7] python3Packages.wxpython: update to libsoup_3 --- pkgs/development/python-modules/wxpython/4.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index b830a638da9f2..9edee34105d92 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -30,7 +30,7 @@ libglvnd, libgbm, pango, - webkitgtk_4_0, + webkitgtk_4_1, wxGTK, xorgproto, @@ -92,7 +92,7 @@ buildPythonPackage rec { libXxf86vm libglvnd libgbm - webkitgtk_4_0 + webkitgtk_4_1 xorgproto ]; From 7466f164975459466e3b7d20bc900ed36f4aa66c Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Mon, 14 Apr 2025 12:08:47 +0200 Subject: [PATCH 3/7] prusa-slicer: build against webkitgtk_4_1 and mainline wxGTK32 --- .../misc/prusa-slicer/default.nix | 23 +++--------- .../fix-ambiguous-constructors.patch | 37 +++++++++++++++++++ 2 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index da47982cf58b9..1144a0924cc2b 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -36,27 +36,14 @@ libbgcode, heatshrink, catch2, - webkitgtk_4_0, + webkitgtk_4_1, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, wxGTK-override ? null, opencascade-override ? null, }: let - wxGTK-prusa = wxGTK32.overrideAttrs (old: { - pname = "wxwidgets-prusa3d-patched"; - version = "3.2.0"; - configureFlags = old.configureFlags ++ [ "--disable-glcanvasegl" ]; - patches = [ ./wxWidgets-Makefile.in-fix.patch ]; - src = fetchFromGitHub { - owner = "prusa3d"; - repo = "wxWidgets"; - rev = "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26"; - hash = "sha256-rYvmNmvv48JSKVT4ph9AS+JdstnLSRmcpWz1IdgBzQo="; - fetchSubmodules = true; - }; - }); - nanosvg-fltk = nanosvg.overrideAttrs (old: rec { + nanosvg-fltk = nanosvg.overrideAttrs (old: { pname = "nanosvg-fltk"; version = "unstable-2022-12-22"; @@ -68,7 +55,7 @@ let }; }); openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; }; - wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override; + wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override; opencascade-override' = if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override; in @@ -89,6 +76,8 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/prusa3d/PrusaSlicer/commit/cdc3db58f9002778a0ca74517865527f50ade4c3.patch"; hash = "sha256-zgpGg1jtdnCBaWjR6oUcHo5sGuZx5oEzpux3dpRdMAM="; }) + # https://github.com/prusa3d/PrusaSlicer/pull/11769 + ./fix-ambiguous-constructors.patch ]; # required for GCC 14 @@ -138,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { libbgcode heatshrink catch2 - webkitgtk_4_0 + webkitgtk_4_1 ] ++ lib.optionals withSystemd [ systemd diff --git a/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch b/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch new file mode 100644 index 0000000000000..209a0d1a08a97 --- /dev/null +++ b/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch @@ -0,0 +1,37 @@ +From 910328f3131e24e330808f5d4cb814454dbe201d Mon Sep 17 00:00:00 2001 +From: Gregor Riepl +Date: Mon, 27 Nov 2023 13:01:55 +0100 +Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString + overloads + +--- + src/slic3r/GUI/PhysicalPrinterDialog.cpp | 2 +- + src/slic3r/GUI/Plater.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp +index 849e987c731..7d0c628c23f 100644 +--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp ++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp +@@ -607,7 +607,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr + // Always fill in the "printhost_port" combo box from the config and select it. + { + Choice* choice = dynamic_cast(m_optgroup->get_field("printhost_port")); +- choice->set_values({ m_config->opt_string("printhost_port") }); ++ choice->set_values(std::vector({ m_config->opt_string("printhost_port") })); + choice->set_selection(); + } + +diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp +index debfe625fd4..4d61e29a2dc 100644 +--- a/src/slic3r/GUI/Plater.cpp ++++ b/src/slic3r/GUI/Plater.cpp +@@ -4420,7 +4420,7 @@ void Plater::load_project(const wxString& filename) + s_multiple_beds.set_loading_project_flag(true); + ScopeGuard guard([](){ s_multiple_beds.set_loading_project_flag(false);}); + +- if (! load_files({ into_path(filename) }).empty()) { ++ if (! load_files(std::vector({ into_path(filename) })).empty()) { + // At least one file was loaded. + p->set_project_filename(filename); + // Save the names of active presets and project specific config into ProjectDirtyStateManager. From 13c92dea43ae95270592ce05eb7a3fde09fd5a93 Mon Sep 17 00:00:00 2001 From: Niko Cantero <97130632+nyabinary@users.noreply.github.com> Date: Sun, 13 Apr 2025 15:30:50 -0400 Subject: [PATCH 4/7] =?UTF-8?q?gupnp-igd:=20refactor;=20gupnp-igd:=201.2.0?= =?UTF-8?q?=20=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/gu/gupnp-igd/package.nix | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/gu/gupnp-igd/package.nix b/pkgs/by-name/gu/gupnp-igd/package.nix index 7d26c68a68bc9..245f9bbcb4d92 100644 --- a/pkgs/by-name/gu/gupnp-igd/package.nix +++ b/pkgs/by-name/gu/gupnp-igd/package.nix @@ -11,13 +11,13 @@ docbook_xsl, docbook_xml_dtd_412, glib, - gupnp, + gupnp_1_6, gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gupnp-igd"; - version = "1.2.0"; + version = "1.6.0"; outputs = [ "out" @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-S1EgCYqhPt0ngYup7k1/6WG/VAv1DQVv9wPGFUXgK+E="; + url = "mirror://gnome/sources/gupnp-igd/${lib.versions.majorMinor finalAttrs.version}/gupnp-igd-${finalAttrs.version}.tar.xz"; + hash = "sha256-QJmXgzmrIhJtSWjyozK20JT8RMeHl4YHgfH8LxF3G3Q="; }; depsBuildBuild = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib - gupnp + gupnp_1_6 ]; mesonFlags = [ @@ -56,20 +56,19 @@ stdenv.mkDerivation rec { # Seems to get stuck sometimes. # https://github.com/NixOS/nixpkgs/issues/119288 - #doCheck = true; + # doCheck = true; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gupnp-igd"; versionPolicy = "odd-unstable"; - freeze = true; }; }; - meta = with lib; { + meta = { description = "Library to handle UPnP IGD port mapping"; homepage = "http://www.gupnp.org/"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; }; -} +}) From 399845afd6f4292dda288ff0b2e089a55b4b7620 Mon Sep 17 00:00:00 2001 From: Niko Cantero <97130632+nyabinary@users.noreply.github.com> Date: Sun, 13 Apr 2025 15:31:12 -0400 Subject: [PATCH 5/7] libnice: refactor; add patch for gupnp-igd 1.6.0 --- pkgs/by-name/li/libnice/gupnp-igd-bump.patch | 33 ++++++++++++++++++++ pkgs/by-name/li/libnice/package.nix | 23 ++++++-------- 2 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/li/libnice/gupnp-igd-bump.patch diff --git a/pkgs/by-name/li/libnice/gupnp-igd-bump.patch b/pkgs/by-name/li/libnice/gupnp-igd-bump.patch new file mode 100644 index 0000000000000..90a8f618968bd --- /dev/null +++ b/pkgs/by-name/li/libnice/gupnp-igd-bump.patch @@ -0,0 +1,33 @@ +From 7255d6376fad2c88eaadf1278ee8947181230866 Mon Sep 17 00:00:00 2001 +From: Your Name +Date: Sun, 16 Apr 2023 19:52:38 +0000 +Subject: [PATCH] Update for gupnp-igd-1.6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +New gupnp-igd has been released. +No significant changed in API so pkgconfig dependency can be simple +bumped. + +Signed-off-by: Tomasz Kłoczko +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6a733b73..c42fa138 100644 +--- a/meson.build ++++ b/meson.build +@@ -285,7 +285,7 @@ gst_dep = dependency('gstreamer-base-1.0', version: gst_req, + cdata.set('HAVE_GSTREAMER', gst_dep.found(), description: 'Build GStreamer plugin') + + # GUPnP IGD +-gupnp_igd_dep = dependency('gupnp-igd-1.0', version: gupnp_igd_req, required: get_option('gupnp')) ++gupnp_igd_dep = dependency('gupnp-igd-1.6', version: gupnp_igd_req, required: get_option('gupnp')) + cdata.set('HAVE_GUPNP', gupnp_igd_dep.found(), description: 'Use the GUPnP IGD library') + + libm = cc.find_library('m', required: false) +-- +GitLab + diff --git a/pkgs/by-name/li/libnice/package.nix b/pkgs/by-name/li/libnice/package.nix index 7cc8166bf6d79..cdb839c464b03 100644 --- a/pkgs/by-name/li/libnice/package.nix +++ b/pkgs/by-name/li/libnice/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, meson, ninja, pkg-config, @@ -18,7 +17,7 @@ graphviz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnice"; version = "0.1.22"; @@ -29,18 +28,14 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { - url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz"; + url = "https://libnice.freedesktop.org/releases/libnice-${finalAttrs.version}.tar.gz"; hash = "sha256-pfckzwnq5QxBp1FxQdidpKYeyerKMtpKAHP67VQXrX4="; }; patches = [ - # Fix generating data - # Note: upstream is not willing to merge our fix - # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35#note_98871 - (fetchpatch { - url = "https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch"; - sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg"; - }) + # Bumps the gupnp_igd_dep version requested to 1.6 + # https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/255 + ./gupnp-igd-bump.patch ]; nativeBuildInputs = [ @@ -78,7 +73,7 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295 doCheck = false; - meta = with lib; { + meta = { description = "GLib ICE implementation"; longDescription = '' Libnice is an implementation of the IETF's Interactice Connectivity @@ -88,10 +83,10 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; homepage = "https://libnice.freedesktop.org/"; - platforms = platforms.unix; - license = with licenses; [ + platforms = lib.platforms.unix; + license = with lib.licenses; [ lgpl21 mpl11 ]; }; -} +}) From acac22aafcfba3a891f7a5d24e50bd207f498b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Apr 2025 23:17:10 +0200 Subject: [PATCH 6/7] dino: 0.4.5 -> 0.5.0 --- .../instant-messengers/dino/default.nix | 64 +++++++------------ 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 0c3e2b095c03d..b730bb4eb176a 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromGitHub, - buildPackages, vala, - cmake, ninja, wrapGAppsHook4, pkg-config, @@ -15,17 +13,17 @@ gtk4, glib-networking, libadwaita, + libcanberra, libnotify, - libsoup_2_4, + libsoup_3, libgee, - libsignal-protocol-c, + libomemo-c, libgcrypt, + meson, sqlite, gpgme, - pcre2, qrencode, icu, - gspell, srtp, libnice, gnutls, @@ -34,30 +32,28 @@ gst-plugins-good, gst-plugins-bad, gst-vaapi, - webrtc-audio-processing, + webrtc-audio-processing_1, }: stdenv.mkDerivation (finalAttrs: { pname = "dino"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-lF2cUalCrVD6274Ey8wggEXNvKXydlRjvX+815geL1c="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y3MGKpfhjmqnIvmt4mXnkmpjF/riXPDXyUiSrsceY6o="; }; postPatch = '' - # don't overwrite manually set version information - substituteInPlace CMakeLists.txt \ - --replace "include(ComputeVersion)" "" + echo ${finalAttrs.version} > VERSION ''; nativeBuildInputs = [ vala - cmake - ninja # https://github.com/dino/dino/issues/230 + meson + ninja pkg-config wrapGAppsHook4 gettext @@ -76,11 +72,10 @@ stdenv.mkDerivation (finalAttrs: { libnotify gpgme libgcrypt - libsoup_2_4 - pcre2 + libsoup_3 icu - libsignal-protocol-c - gspell + libcanberra + libomemo-c srtp libnice gnutls @@ -89,35 +84,22 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-good # contains rtpbin, required for VP9 gst-plugins-bad # required for H264, MSDK gst-vaapi # required for VAAPI - webrtc-audio-processing + webrtc-audio-processing_1 ]; - cmakeFlags = [ - "-DBUILD_TESTS=true" - "-DRTP_ENABLE_H264=true" - "-DRTP_ENABLE_MSDK=true" - "-DRTP_ENABLE_VAAPI=true" - "-DRTP_ENABLE_VP9=true" - "-DVERSION_FOUND=true" - "-DVERSION_IS_RELEASE=true" - "-DVERSION_FULL=${finalAttrs.version}" - "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" - "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" - "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" - "-DSOUP_VERSION=${lib.versions.major libsoup_2_4.version}" + doCheck = true; + + mesonFlags = [ + "-Dplugin-notification-sound=enabled" + "-Dplugin-rtp-h264=enabled" + "-Dplugin-rtp-msdk=enabled" + "-Dplugin-rtp-vaapi=enabled" + "-Dplugin-rtp-vp9=enabled" ]; # Undefined symbols for architecture arm64: "_gpg_strerror" NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lgpg-error"; - doCheck = true; - checkPhase = '' - runHook preCheck - ./xmpp-vala-test - ./signal-protocol-vala-test - runHook postCheck - ''; - # Dino looks for plugins with a .so filename extension, even on macOS where # .dylib is appropriate, and despite the fact that it builds said plugins with # that as their filename extension From cd062f040e60c0330fe0ca810b3ddda71398b5ab Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 15 Apr 2025 23:58:33 +0200 Subject: [PATCH 7/7] treewide: update to webkitgtk_4_1 where possible Methodology: - `sed` to find and replace in pkgs/* - exclude pkgs/top-level - nixpkgs-review on x86_64-linux and aarch64-linux - revert everything that doesn't build - revert everything that doesn't launch [x86_64-linux] - check upstream source whether the change makes sense [free software only] --- pkgs/applications/editors/eclipse/build-eclipse.nix | 6 +++--- pkgs/applications/editors/eclipse/default.nix | 4 ++-- pkgs/applications/editors/formiko/default.nix | 4 ++-- pkgs/applications/editors/rednotebook/default.nix | 4 ++-- pkgs/applications/misc/lutris/default.nix | 4 ++-- pkgs/applications/misc/lutris/fhsenv.nix | 2 +- pkgs/applications/networking/browsers/nyxt/default.nix | 4 ++-- .../applications/video/obs-studio/plugins/obs-webkitgtk.nix | 4 ++-- pkgs/by-name/ap/apache-directory-studio/package.nix | 4 ++-- pkgs/by-name/ap/apvlv/package.nix | 4 ++-- pkgs/by-name/ar/archi/package.nix | 4 ++-- pkgs/by-name/be/bespokesynth/package.nix | 4 ++-- pkgs/by-name/bi/bitcomet/package.nix | 4 ++-- pkgs/by-name/cl/claws-mail/package.nix | 4 ++-- pkgs/by-name/db/dbeaver-bin/package.nix | 4 ++-- pkgs/by-name/ec/eclipse-mat/package.nix | 6 +++--- pkgs/by-name/en/ente-auth/package.nix | 4 ++-- pkgs/by-name/ex/exaile/package.nix | 4 ++-- pkgs/by-name/gi/giara/package.nix | 4 ++-- pkgs/by-name/mi/mihomo-party/package.nix | 4 ++-- pkgs/by-name/mi/minigalaxy/package.nix | 4 ++-- pkgs/by-name/os/osmo/package.nix | 4 ++-- pkgs/by-name/pl/plugdata/package.nix | 6 ++---- pkgs/by-name/po/portfolio/package.nix | 4 ++-- pkgs/by-name/so/socalabs-sid/package.nix | 6 ++---- pkgs/by-name/ul/ulauncher/package.nix | 4 ++-- pkgs/by-name/wa/wasistlos/package.nix | 4 ++-- pkgs/development/libraries/rnnoise-plugin/default.nix | 4 ++-- pkgs/development/lisp-modules/ql.nix | 2 +- pkgs/development/misc/juce/default.nix | 4 ++-- pkgs/tools/networking/gp-saml-gui/default.nix | 4 ++-- 31 files changed, 62 insertions(+), 66 deletions(-) diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 1b42cc2311fe6..c6a3fa595a631 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -14,7 +14,7 @@ libXtst, libsecret, gsettings-desktop-schemas, - webkitgtk_4_0, + webkitgtk_4_1, makeWrapper, perl, ... @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libXtst libsecret zlib - ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0; + ] ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1; buildCommand = '' # Unpack tarball. @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { libXtst libsecret ] - ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0 + ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1 ) } \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index d84e0b0e42bd7..1af06cdb0ba86 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -16,7 +16,7 @@ jdk, jdk8, gsettings-desktop-schemas, - webkitgtk_4_0 ? null, # for internal web browser + webkitgtk_4_1 ? null, # for internal web browser buildEnv, runCommand, callPackage, @@ -64,7 +64,7 @@ let gtk libXtst gsettings-desktop-schemas - webkitgtk_4_0 + webkitgtk_4_1 makeWrapper ; }; diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/applications/editors/formiko/default.nix index 8b803b5839ad3..672cb738f4a92 100644 --- a/pkgs/applications/editors/formiko/default.nix +++ b/pkgs/applications/editors/formiko/default.nix @@ -10,7 +10,7 @@ gtkspell3, librsvg, pygobject3, - webkitgtk_4_0, + webkitgtk_4_1, }: buildPythonApplication rec { @@ -37,7 +37,7 @@ buildPythonApplication rec { gtkspell3 librsvg pygobject3 - webkitgtk_4_0 + webkitgtk_4_1 ]; # Needs a display diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index f1646152955a2..74c2fbe5a5276 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -8,7 +8,7 @@ gtk3, gtksourceview, pango, - webkitgtk_4_0, + webkitgtk_4_1, pygobject3, pyyaml, setuptools, @@ -39,7 +39,7 @@ buildPythonApplication rec { gtk3 gtksourceview pango - webkitgtk_4_0 + webkitgtk_4_1 pygobject3 pyyaml ]; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index e438351f1906a..eef78986d452e 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -14,7 +14,7 @@ gtk3, libnotify, pango, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, # check inputs @@ -96,7 +96,7 @@ buildPythonApplication rec { gtk3 libnotify pango - webkitgtk_4_0 + webkitgtk_4_1 ] ++ (with gst_all_1; [ gst-libav diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 05a53714a9612..0e3b8efc1b7a7 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -21,7 +21,7 @@ let gtksourceview gnome-desktop libgnome-keyring - webkitgtk_4_0 + webkitgtk_4_1 ]; xorgDeps = pkgs: with pkgs.xorg; [ diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 1f05ff540cee5..c97bf204e4834 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -15,7 +15,7 @@ gdk-pixbuf, cairo, pango, - webkitgtk_4_0, + webkitgtk_4_1, openssl, gstreamer, gst-libav, @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { cairo pango gtk3 - webkitgtk_4_0 + webkitgtk_4_1 openssl libfixposix ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix index 72c1768cf5b8a..a4bab7b7b6260 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, obs-studio, - webkitgtk_4_0, + webkitgtk_4_1, glib-networking, meson, cmake, @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ obs-studio - webkitgtk_4_0 + webkitgtk_4_1 glib-networking ]; diff --git a/pkgs/by-name/ap/apache-directory-studio/package.nix b/pkgs/by-name/ap/apache-directory-studio/package.nix index 8d607bc777873..6fd1e7301e568 100644 --- a/pkgs/by-name/ap/apache-directory-studio/package.nix +++ b/pkgs/by-name/ap/apache-directory-studio/package.nix @@ -8,7 +8,7 @@ makeDesktopItem, glib, libsecret, - webkitgtk_4_0, + webkitgtk_4_1, }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ glib - webkitgtk_4_0 + webkitgtk_4_1 ] } \ --run "mkdir -p /tmp/SWT-GDBusServer" diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix index 8e652f2b1f894..de3bc91aeaa91 100644 --- a/pkgs/by-name/ap/apvlv/package.nix +++ b/pkgs/by-name/ap/apvlv/package.nix @@ -20,7 +20,7 @@ poppler, stdenv, testers, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, }: @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { libxshmfence # otherwise warnings in compilation pcre poppler - webkitgtk_4_0 + webkitgtk_4_1 ]; installPhase = '' diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix index 8bf9c58065410..83018c009f953 100644 --- a/pkgs/by-name/ar/archi/package.nix +++ b/pkgs/by-name/ar/archi/package.nix @@ -7,7 +7,7 @@ jdk, libsecret, glib, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, _7zz, nixosTests, @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath ([ glib - webkitgtk_4_0 + webkitgtk_4_1 ]) } \ --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index b0a5136311d6d..d9bd14d19e2f7 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -28,7 +28,7 @@ xcbutilkeysyms, xcb-util-cursor, gtk3, - webkitgtk_4_0, + webkitgtk_4_1, python3, curl, pcre, @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { libXScrnSaver curl gtk3 - webkitgtk_4_0 + webkitgtk_4_1 freetype libGL libusb1 diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix index 4c5c9f69a8cd8..d3c94cb671ead 100644 --- a/pkgs/by-name/bi/bitcomet/package.nix +++ b/pkgs/by-name/bi/bitcomet/package.nix @@ -2,7 +2,7 @@ lib, fetchurl, appimageTools, - webkitgtk_4_0, + webkitgtk_4_1, }: let pname = "bitcomet"; @@ -20,7 +20,7 @@ appimageTools.wrapType2 { pkgs: with pkgs; [ libxml2 libpng - webkitgtk_4_0 + webkitgtk_4_1 ]; extraInstallCommands = '' diff --git a/pkgs/by-name/cl/claws-mail/package.nix b/pkgs/by-name/cl/claws-mail/package.nix index 42d0f5ab2914d..88adbe8526e69 100644 --- a/pkgs/by-name/cl/claws-mail/package.nix +++ b/pkgs/by-name/cl/claws-mail/package.nix @@ -55,7 +55,7 @@ enablePluginClamd ? true, enablePluginDillo ? true, enablePluginFancy ? true, - webkitgtk_4_0, + webkitgtk_4_1, enablePluginFetchInfo ? true, enablePluginKeywordWarner ? true, enablePluginLibravatar ? enablePluginRavatar, @@ -147,7 +147,7 @@ let { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; - deps = [ webkitgtk_4_0 ]; + deps = [ webkitgtk_4_1 ]; } { flags = [ "fetchinfo-plugin" ]; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index d2c418761f1b9..3d6c8ec081046 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -10,7 +10,7 @@ wrapGAppsHook3, gtk3, glib, - webkitgtk_4_0, + webkitgtk_4_1, glib-networking, override_xmx ? "1024m", }: @@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { lib.makeLibraryPath [ gtk3 glib - webkitgtk_4_0 + webkitgtk_4_1 glib-networking ] }" diff --git a/pkgs/by-name/ec/eclipse-mat/package.nix b/pkgs/by-name/ec/eclipse-mat/package.nix index fff8bb0c2ab95..5bbb87b125c5b 100644 --- a/pkgs/by-name/ec/eclipse-mat/package.nix +++ b/pkgs/by-name/ec/eclipse-mat/package.nix @@ -15,7 +15,7 @@ shared-mime-info, stdenv, unzip, - webkitgtk_4_0, + webkitgtk_4_1, zlib, }: @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { glib gtk3 libXtst - webkitgtk_4_0 + webkitgtk_4_1 ]) } \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { libXtst zlib shared-mime-info - webkitgtk_4_0 + webkitgtk_4_1 ]; dontBuild = true; diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 4a369c142f02d..4c49f79d52463 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -2,7 +2,7 @@ lib, flutter324, fetchFromGitHub, - webkitgtk_4_0, + webkitgtk_4_1, sqlite, libayatana-appindicator, makeDesktopItem, @@ -48,7 +48,7 @@ flutter324.buildFlutterApplication rec { ]; buildInputs = [ - webkitgtk_4_0 + webkitgtk_4_1 sqlite libayatana-appindicator ]; diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix index 8668a70dbed30..2c6178c8fc0ca 100644 --- a/pkgs/by-name/ex/exaile/package.nix +++ b/pkgs/by-name/ex/exaile/package.nix @@ -16,7 +16,7 @@ librsvg, streamripper, udisks, - webkitgtk_4_0, + webkitgtk_4_1, iconTheme ? adwaita-icon-theme, deviceDetectionSupport ? true, documentationSupport ? true, @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ++ lib.optional multimediaKeySupport keybinder3 ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs ++ lib.optional podcastSupport python3.pkgs.feedparser - ++ lib.optional wikipediaSupport webkitgtk_4_0; + ++ lib.optional wikipediaSupport webkitgtk_4_1; nativeCheckInputs = with python3.pkgs; [ pytest diff --git a/pkgs/by-name/gi/giara/package.nix b/pkgs/by-name/gi/giara/package.nix index 6c1aab02df9b9..5f826a8c28020 100644 --- a/pkgs/by-name/gi/giara/package.nix +++ b/pkgs/by-name/gi/giara/package.nix @@ -9,7 +9,7 @@ wrapGAppsHook4, gtk4, gdk-pixbuf, - webkitgtk_4_0, + webkitgtk_4_1, gtksourceview5, glib-networking, libadwaita, @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk4 gdk-pixbuf - webkitgtk_4_0 + webkitgtk_4_1 gtksourceview5 glib-networking libadwaita diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index ecdc61aebd4bd..a6423ebb1a7ec 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -8,7 +8,7 @@ nspr, alsa-lib, openssl, - webkitgtk_4_0, + webkitgtk_4_1, udev, libayatana-appindicator, libGL, @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nspr alsa-lib openssl - webkitgtk_4_0 + webkitgtk_4_1 (lib.getLib stdenv.cc.cc) ]; diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix index 131bd375418b3..020788f0cc306 100644 --- a/pkgs/by-name/mi/minigalaxy/package.nix +++ b/pkgs/by-name/mi/minigalaxy/package.nix @@ -10,7 +10,7 @@ steam-run, replaceVars, unzip, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, }: @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ python3Packages.pygobject3 python3Packages.requests - webkitgtk_4_0 + webkitgtk_4_1 ]; dontWrapGApps = true; diff --git a/pkgs/by-name/os/osmo/package.nix b/pkgs/by-name/os/osmo/package.nix index c5bcfc5e08ba4..51ede958a4c49 100644 --- a/pkgs/by-name/os/osmo/package.nix +++ b/pkgs/by-name/os/osmo/package.nix @@ -10,7 +10,7 @@ libnotify, libarchive, gspell, - webkitgtk_4_0, + webkitgtk_4_1, libgringotts, wrapGAppsHook3, }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libnotify libarchive gspell - webkitgtk_4_0 + webkitgtk_4_1 libgringotts ]; diff --git a/pkgs/by-name/pl/plugdata/package.nix b/pkgs/by-name/pl/plugdata/package.nix index 5cac0666f8639..3d35d5e0dba75 100644 --- a/pkgs/by-name/pl/plugdata/package.nix +++ b/pkgs/by-name/pl/plugdata/package.nix @@ -9,7 +9,7 @@ pkg-config, alsa-lib, freetype, - webkitgtk_4_0, + webkitgtk_4_1, zenity, curl, xorg, @@ -23,7 +23,6 @@ libxkbcommon, libdatrie, libepoxy, - libsoup_2_4, libGL, libjack2, lerc, @@ -60,7 +59,7 @@ stdenv.mkDerivation { alsa-lib curl freetype - webkitgtk_4_0 + webkitgtk_4_1 xorg.libX11 xorg.libXcursor xorg.libXext @@ -80,7 +79,6 @@ stdenv.mkDerivation { libxkbcommon libdatrie libepoxy - libsoup_2_4 lerc libjack2 expat diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 816d6b4835033..101d3693c1294 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -9,7 +9,7 @@ makeDesktopItem, openjdk21, stdenvNoCC, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, gitUpdater, }: @@ -28,7 +28,7 @@ let glib-networking gtk3 libsecret - webkitgtk_4_0 + webkitgtk_4_1 ]; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/so/socalabs-sid/package.nix b/pkgs/by-name/so/socalabs-sid/package.nix index 516bf9c903aae..31cdba5fd7951 100644 --- a/pkgs/by-name/so/socalabs-sid/package.nix +++ b/pkgs/by-name/so/socalabs-sid/package.nix @@ -13,7 +13,7 @@ libGL, libjack2, curl, - webkitgtk_4_0, + webkitgtk_4_1, libsysprof-capture, pcre2, util-linux, @@ -23,7 +23,6 @@ libxkbcommon, libdatrie, libepoxy, - libsoup_2_4, lerc, sqlite, ninja, @@ -89,11 +88,10 @@ stdenv.mkDerivation { libxkbcommon libdatrie libepoxy - libsoup_2_4 lerc freetype curl - webkitgtk_4_0 + webkitgtk_4_1 pcre2 util-linux sqlite diff --git a/pkgs/by-name/ul/ulauncher/package.nix b/pkgs/by-name/ul/ulauncher/package.nix index 22c4e096f3de6..3aed9d81f845f 100644 --- a/pkgs/by-name/ul/ulauncher/package.nix +++ b/pkgs/by-name/ul/ulauncher/package.nix @@ -9,7 +9,7 @@ gobject-introspection, gtk3, wrapGAppsHook3, - webkitgtk_4_0, + webkitgtk_4_1, libnotify, keybinder3, libappindicator, @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec { libappindicator libnotify librsvg - webkitgtk_4_0 + webkitgtk_4_1 wmctrl ]; diff --git a/pkgs/by-name/wa/wasistlos/package.nix b/pkgs/by-name/wa/wasistlos/package.nix index ff96d89d7d921..3b5ae22e2e00c 100644 --- a/pkgs/by-name/wa/wasistlos/package.nix +++ b/pkgs/by-name/wa/wasistlos/package.nix @@ -21,7 +21,7 @@ pcre, pcre2, pkg-config, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, xorg, }: @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { pcre pcre2 sqlite - webkitgtk_4_0 + webkitgtk_4_1 xorg.libXdmcp xorg.libXtst ]; diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index 98cf154ec1e68..68e8ede9b10a4 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -7,7 +7,7 @@ gtk3-x11, pcre, pkg-config, - webkitgtk_4_0, + webkitgtk_4_1, xorg, WebKit, MetalKit, @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - webkitgtk_4_0 + webkitgtk_4_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 566278b9fa077..45ad78c4f236f 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -75,7 +75,7 @@ let nativeLibs = [ pkgs.sqlite ]; }); cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: { - nativeLibs = [ pkgs.webkitgtk_4_0 ]; + nativeLibs = [ pkgs.webkitgtk_4_1 ]; }); dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: { nativeLibs = [ pkgs.mariadb.client ]; diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index 1dc141cee5317..9e73c6a525677 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -13,7 +13,7 @@ freetype, curl, libglvnd, - webkitgtk_4_0, + webkitgtk_4_1, pcre2, libsysprof-capture, util-linuxMinimal, @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so libglvnd # libGL.so - webkitgtk_4_0 # webkit2gtk-4.0 + webkitgtk_4_1 # webkit2gtk-4.0 util-linuxMinimal libselinux libsepol diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix index d0347a62e785f..90a4fc36e7d55 100644 --- a/pkgs/tools/networking/gp-saml-gui/default.nix +++ b/pkgs/tools/networking/gp-saml-gui/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, buildPythonPackage, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, glib-networking, gobject-introspection, @@ -34,7 +34,7 @@ buildPythonPackage rec { requests pygobject3 openconnect - ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_0; + ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; preFixup = '' gappsWrapperArgs+=(