diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 1b42cc2311fe..c6a3fa595a63 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 d84e0b0e42bd..1af06cdb0ba8 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 8b803b5839ad..672cb738f4a9 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 f1646152955a..74c2fbe5a527 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 e438351f1906..eef78986d452 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 05a53714a961..0e3b8efc1b7a 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 1f05ff540cee..c97bf204e483 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 72c1768cf5b8..a4bab7b7b626 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 8d607bc77787..6fd1e7301e56 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 8e652f2b1f89..de3bc91aeaa9 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 8bf9c5806541..83018c009f95 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 b0a5136311d6..d9bd14d19e2f 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 4c5c9f69a8cd..d3c94cb671ea 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 42d0f5ab2914..88adbe8526e6 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 d2c418761f1b..3d6c8ec08104 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 fff8bb0c2ab9..5bbb87b125c5 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 4a369c142f02..4c49f79d5246 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 8668a70dbed3..2c6178c8fc0c 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 6c1aab02df9b..5f826a8c2802 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 ecdc61aebd4b..a6423ebb1a7e 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 131bd375418b..020788f0cc30 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 c5bcfc5e08ba..51ede958a4c4 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 5cac0666f863..3d35d5e0dba7 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 816d6b483503..101d3693c129 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 516bf9c903aa..31cdba5fd795 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 22c4e096f3de..3aed9d81f845 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 ff96d89d7d92..3b5ae22e2e00 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 98cf154ec1e6..68e8ede9b10a 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 566278b9fa07..45ad78c4f236 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 1dc141cee531..9e73c6a52567 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 d0347a62e785..90a4fc36e7d5 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+=(