From 696dfc991b1a980164849bbad98a55acbcba6049 Mon Sep 17 00:00:00 2001 From: Aiden Schembri Date: Fri, 5 Jun 2026 09:33:20 +0200 Subject: [PATCH] ladybird: 0-unstable-2026-05-04 -> 0-unstable-2026-06-05 --- pkgs/by-name/la/ladybird/package.nix | 42 ++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 47d584108578..9d0bb1d819af 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, + fetchurl, unicode-emoji, unicode-character-database, unicode-idna, @@ -14,6 +15,7 @@ libavif, angle, # libEGL libjxl, + libedit, libpulseaudio, libwebp, libxcrypt, @@ -34,26 +36,34 @@ skia, nixosTests, unstableGitUpdater, + _experimental-update-script-combinators, + common-updater-scripts, libtommath, sdl3, icu78, simdjson, }: +let + hstsPreloadData = fetchurl { + url = "https://raw.githubusercontent.com/chromium/chromium/aa04f175415addb04bb78936b0d8b973fbd8ea61/net/http/transport_security_state_static.json"; + hash = "sha256-TKcPBRVxoZgka8M3vTV/dZ+4+f3t2+ZrZZYJl1QO4WM="; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2026-05-04"; + version = "0-unstable-2026-06-05"; src = fetchFromGitHub { owner = "LadybirdBrowser"; repo = "ladybird"; - rev = "90b790f8702a5d5c5a66ef02f8669da2838ca6e3"; - hash = "sha256-BdJ24YtKMv8B6Vvequf9b5qr0S3FfFuphFo78mCIaN4="; + rev = "02b205361dd239e134f434e484b609d1fa5f1938"; + hash = "sha256-+CVJjrL1kqT2A7r89F+riiHpMa39rcggqG9SByidUY4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-sbNYOdY56+waCVQHbGuvV5jT9EawV2IiGmL1e/O6ZRc="; + hash = "sha256-n0ACVH8NXwe7SIaGFoJ20WIGGR3XjcuLTwPSKGJpT5s="; }; postPatch = '' @@ -85,6 +95,9 @@ stdenv.mkDerivation (finalAttrs: { mkdir build/Caches/PublicSuffix cp ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat build/Caches/PublicSuffix + + mkdir build/Caches/HSTSPreload + cp ${hstsPreloadData} build/Caches/HSTSPreload/transport_security_state_static.json ''; nativeBuildInputs = [ @@ -109,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { libavif angle # libEGL libjxl + libedit libwebp libxcrypt mimalloc @@ -176,7 +190,25 @@ stdenv.mkDerivation (finalAttrs: { nixosTest = nixosTests.ladybird; }; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = + let + updateSource = unstableGitUpdater { + hardcodeZeroVersion = true; + }; + + updateCargoDeps = { + command = [ + (lib.getExe' common-updater-scripts "update-source-version") + "ladybird" + "--ignore-same-version" + "--source-key=cargoDeps.vendorStaging" + ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateCargoDeps + ]; meta = { description = "Browser using the SerenityOS LibWeb engine with a Qt or Cocoa GUI";