Compare commits

...

77 Commits

Author SHA1 Message Date
Adam C. Stephens
cc598dfd09 [Backport release-26.05] dexter: 0.6.0 -> 0.7.0 (#528130) 2026-06-04 23:13:20 +00:00
Martin Weinelt
5bd4198393 [Backport release-26.05] python3Packages.django_6: 6.0.5 -> 6.0.6] (#528045) 2026-06-04 23:05:52 +00:00
nixpkgs-ci[bot]
d3c462ac49 [Backport release-26.05] redis: 8.6.3 -> 8.8.0 (#524824) 2026-06-04 22:48:17 +00:00
Martin Weinelt
ec3a9fca7c pretix: relax diango-formtools constraint 2026-06-05 00:37:26 +02:00
Michele Guerini Rocco
fa9f5ebead [Backport release-26.05] nixos/wireless: restrict chown /etc/wpa_supplicant scope (#528087) 2026-06-04 21:34:53 +00:00
Adam C. Stephens
bfff353b19 dexter: 0.6.0 -> 0.7.0
Diff: https://github.com/remoteoss/dexter/compare/v0.6.0...v0.7.0

Changelog: https://github.com/remoteoss/dexter/blob/refs/tags/v0.7.0/CHANGELOG.md
(cherry picked from commit c5ebd4868c)
2026-06-04 20:55:46 +00:00
Emily
0fb5349b52 [Backport release-26.05] ungoogled-chromium: 148.0.7778.215-1 -> 149.0.7827.53-1 (#528125) 2026-06-04 20:53:23 +00:00
emilylange
ee250790b6 ungoogled-chromium: 148.0.7778.215-1 -> 149.0.7827.53-1
https://developer.chrome.com/blog/new-in-chrome-149

https://developer.chrome.com/release-notes/149

https://chromereleases.googleblog.com/2026/06/stable-channel-update-for-desktop.html
(cherry picked from commit 193479f2bb)
2026-06-04 20:45:41 +00:00
Adam C. Stephens
07970dac16 [Backport release-26.05] beamMinimal27Packages.erlang: use upstream doc target patch (#527837) 2026-06-04 20:30:23 +00:00
Leona Maroni
631eaabe38 [Backport release-26.05] keycloak: 26.6.2 -> 26.6.3 (#528084) 2026-06-04 20:08:30 +00:00
nixpkgs-ci[bot]
c267482b1b [Backport release-26.05] kimai: 2.57.0 -> 2.58.0 (#528082) 2026-06-04 19:59:21 +00:00
Felix Bargfeldt
54514c3bb9 [Backport release-26.05] glance: 0.8.4 -> 0.8.5 (#528090) 2026-06-04 19:33:18 +00:00
Marcin Serwin
d8c71d9bad [Backport release-26.05] polyml: move to by-name and various fixes (#527988) 2026-06-04 19:27:09 +00:00
jaredmontoya
bd0cdc7b33 glance: 0.8.4 -> 0.8.5
(cherry picked from commit 397879d831)
2026-06-04 19:25:36 +00:00
rnhmjoj
1459fad584 nixos/wireless: restrict chown /etc/wpa_supplicant scope
Otherwise the recursive chown can fail, hence wpa_supplicant doesn't
start, if some read-only file has been bind-mounted into
/etc/wpa_supplicant.

This can happen if one uses `extraConfigFile` to add a file that is
under /etc/wpa_supplicant.

(cherry picked from commit 197a055a02)
2026-06-04 19:23:36 +00:00
transcaffeine
a010a9b728 keycloak: 26.6.2 -> 26.6.3
Release notes: https://github.com/keycloak/keycloak/releases/tag/26.6.3
Full changelog: https://github.com/keycloak/keycloak/compare/26.6.2...26.6.3

(cherry picked from commit 8e6c666e62)
2026-06-04 19:19:57 +00:00
R. Ryantm
284fa832b1 kimai: 2.57.0 -> 2.58.0
(cherry picked from commit a8b0f5bbe8)
2026-06-04 19:13:53 +00:00
Nick Cao
20042a1ebc [Backport release-26.05] python3Packages.stanza: 1.12.0 -> 1.12.1 (#527485) 2026-06-04 18:42:51 +00:00
Marcus Ramberg
d030f73856 [Backport release-26.05] vivaldi: 8.0.4033.34 -> 8.0.4033.42 (#528025) 2026-06-04 18:36:25 +00:00
Felix Bargfeldt
202285dc76 [Backport release-26.05] zipline: 4.6.1 -> 4.6.2 (#528040) 2026-06-04 17:41:42 +00:00
Martin Weinelt
7a7d7e916b pretalx: relax django-formtools
(cherry picked from commit 6f40befa55)
2026-06-04 19:16:23 +02:00
R. Ryantm
c61baa7a41 zipline: 4.6.1 -> 4.6.2
(cherry picked from commit cf904205a0)
2026-06-04 17:14:25 +00:00
Felix Bargfeldt
e8f678b675 [Backport release-26.05] go-httpbin: 2.22.1 -> 2.23.0 (#528022) 2026-06-04 16:33:28 +00:00
R. Ryantm
61f430b101 vivaldi: 8.0.4033.34 -> 8.0.4033.42
(cherry picked from commit 24d2bb0745)
2026-06-04 16:25:07 +00:00
R. Ryantm
35e137381f go-httpbin: 2.22.1 -> 2.23.0
(cherry picked from commit c98e3d885f)
2026-06-04 16:20:18 +00:00
Adam C. Stephens
dd7dff5d6e [Backport release-26.05] halloy: 2026.7 -> 2026.7.1 (#527961) 2026-06-04 15:43:18 +00:00
K900
67cb061248 [Backport release-26.05] kdePackages: Gear 26.04.1 -> 26.04.2 (#527996) 2026-06-04 15:33:10 +00:00
Sandro
1da52465f4 [Backport release-26.05] music-assistant-desktop: 0.3.6 -> 0.3.7 (#527986) 2026-06-04 15:22:19 +00:00
K900
2e9f2f88d7 kdePackages: Gear 26.04.1 -> 26.04.2
(cherry picked from commit a3535141d3)
2026-06-04 15:15:38 +00:00
Sandro
6ef42fce24 [Backport release-26.05] bitwarden-desktop: 2026.3.1 -> 2026.5.0 (#526974) 2026-06-04 14:41:06 +00:00
Sandro Jäckel
59e0073312 music-assistant-desktop: 0.3.6 -> 0.3.7
Diff: https://github.com/music-assistant/desktop-app/compare/0.3.6...0.3.7
(cherry picked from commit 49e5f32275)
2026-06-04 14:25:19 +00:00
sempiternal-aurora
23f75822bd polyml: Fix polyc linking script
polyc linking script hardcodes the linker to be the value of `$CXX` at
compile time. This is bad for environments without `g++` in path. Fix
this by patching the correct path into the script.

Co-Authored-By: Ricardo Correia <someplaceguy@wizy.org>
Co-Authored-By: Ivan Trubach <mr.trubach@icloud.com>
(cherry picked from commit 3a717e7522)
2026-06-05 00:24:17 +10:00
sempiternal-aurora
19e44e2608 polyml: replace kovirobi with sempiternal-aurora as maintainer
(cherry picked from commit d9bf2ea7ea)
2026-06-05 00:24:17 +10:00
sempiternal-aurora
d9611a2cd7 polyml: cleanup and mark cross broken
Compilation requires running one of the make build targets, so cross
compilation isn't possible
Also remove old design patterns in favour of newer ones.

(cherry picked from commit 6e36170c0f)
2026-06-05 00:24:17 +10:00
sempiternal-aurora
e5eb5cbed4 polyml: migrate to by-name
(cherry picked from commit f418e625da)
2026-06-05 00:24:14 +10:00
Martin Weinelt
4a5860b8f8 python3Packages.django_6: fix flaky test on aarch64-linux
(cherry picked from commit 83f160689f)
2026-06-04 15:48:58 +02:00
Martin Weinelt
a37b229b12 python3Packages.django-formtools: disable failing test
(cherry picked from commit d8bfa35843)
2026-06-04 15:48:58 +02:00
Martin Weinelt
ac986b65d9 python3Packages.django_6: 6.0.5 -> 6.0.6
https://docs.djangoproject.com/en/6.0/releases/6.0.6/
https://www.djangoproject.com/weblog/2026/jun/03/security-releases/

Fixes:
CVE-2026-6873, CVE-2026-7666, CVE-2026-8404, CVE-2026-35193,
CVE-2026-48587

(cherry picked from commit 2dc12f9e90)
2026-06-04 15:48:58 +02:00
Martin Weinelt
575805ab84 python3Packages.django-formtools: 2.5.1 -> 2.6.1
https://github.com/jazzband/django-formtools/blob/2.6.1/docs/changelog.rst
(cherry picked from commit 752218e127)
2026-06-04 15:48:55 +02:00
Markus Kowalewski
0aedccd6c4 [Backport release-26.05] saunafs: 5.9.0 -> 5.10.0 (#527900) 2026-06-04 12:58:41 +00:00
Peder Bergebakken Sundt
f7d2605d78 [Backport release-26.05] appflowy: update license (#527668) 2026-06-04 12:49:45 +00:00
Adam C. Stephens
620f6399ab halloy: 2026.7 -> 2026.7.1
Changelog: https://github.com/squidowl/halloy/blob/2026.7.1/CHANGELOG.md
(cherry picked from commit b8a2a2bd70)
2026-06-04 12:44:54 +00:00
nixpkgs-ci[bot]
a7bfeab6d3 [Backport release-26.05] noriskclient-launcher-unwrapped: 0.6.21 -> 0.6.22 (#527929) 2026-06-04 12:34:43 +00:00
nixpkgs-ci[bot]
5a1f71b5c1 [Backport release-26.05] github-desktop: link libexec/git-core into git wrapper (#527690) 2026-06-04 12:34:20 +00:00
R. Ryantm
215542fe4b noriskclient-launcher-unwrapped: 0.6.21 -> 0.6.22
(cherry picked from commit 30a7851fef)
2026-06-04 11:38:00 +00:00
StepBroBD
78a58a1587 [Backport release-26.05] caddy: 2.11.3 -> 2.11.4 (#527915) 2026-06-04 11:28:21 +00:00
whispers
96d8886cd7 caddy: 2.11.3 -> 2.11.4
https://github.com/caddyserver/caddy/releases/tag/v2.11.4

Fixes: GHSA-vcc4-2c75-vc9v (https://github.com/caddyserver/caddy/pull/7785)
(cherry picked from commit e7e7984e94)
2026-06-04 10:51:23 +00:00
Ramses
f458088f51 [Backport release-26.05] nixos/preSwitchChecks: actually set errexit inside check bodies (#527909) 2026-06-04 10:22:38 +00:00
r-vdp
69dfbb74c9 nixos/preSwitchChecks: actually set errexit inside check bodies
The previous `if ! ( ... )` wrapper put the check body in a context
where bash ignores `set -e`, so a failing command in the middle of a
check would not abort it and the switch would proceed. Run the
subshell outside any conditional and capture $? explicitly instead.

(cherry picked from commit 69dc41f083)
2026-06-04 10:17:37 +00:00
R. Ryantm
007d830d1c saunafs: 5.9.0 -> 5.10.0
(cherry picked from commit b737ad4607)
2026-06-04 09:35:56 +00:00
rorosen
4b40aa9c82 [Backport release-26.05] k3s: update all packages (#526461) 2026-06-04 08:46:27 +00:00
nixpkgs-ci[bot]
8097a7e158 [Backport release-26.05] andcli: 2.6.2 -> 2.7.0 (#527701) 2026-06-04 07:27:34 +00:00
K900
6109681c1f [Backport release-26.05] libinput: 1.31.2 -> 1.31.3 (#527869) 2026-06-04 07:25:23 +00:00
K900
6fc02d06ed libinput: 1.31.2 -> 1.31.3
Diff: https://gitlab.freedesktop.org/libinput/libinput/-/compare/1.31.2...1.31.3

Changelog: https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.31.3
(cherry picked from commit 4064388abf)
2026-06-04 07:20:33 +00:00
K900
8f74d9a63e [Backport release-26.05] libinput: 1.31.1 -> 1.31.2 (#527862) 2026-06-04 07:05:08 +00:00
Sergei Trofimovich
4a083bdf0b libinput: 1.31.1 -> 1.31.2
Changes: https://gitlab.freedesktop.org/libinput/libinput/-/compare/1.31.1...1.31.2
(cherry picked from commit 27f3d1d435)
2026-06-04 07:00:14 +00:00
Thomas Gerbet
6e6fc34ecd [Backport release-26.05] apache-airflow: fix building on darwin (#527860) 2026-06-04 06:49:32 +00:00
Sergei Volkov
a88dd02589 apache-airflow: fix building on darwin
(cherry picked from commit 9148fd996c)
2026-06-04 06:44:20 +00:00
Thomas Gerbet
14a2a86280 [Backport release-26.05] apache-airflow: 3.2.1 -> 3.2.2 (#527488) 2026-06-04 06:36:44 +00:00
nixpkgs-ci[bot]
c9895f75bf [Backport release-26.05] ddhx: add meta.mainProgram (#527823) 2026-06-04 05:50:37 +00:00
Vincent Laporte
46753f85d4 [Backport release-26.05] prooftree: refactor (#527841) 2026-06-04 05:19:53 +00:00
Vincent Laporte
e5ccebb288 [Backport release-26.05] minizinc: 2.9.3 → 2.9.7 (#527840) 2026-06-04 05:14:00 +00:00
Vincent Laporte
a06bebb644 prooftree: refactor
Move to pkgs/by-name/
Build with default version of OCaml
Use finalAttrs pattern
Remove unused dependencies

(cherry picked from commit 23bee868d9)
2026-06-04 04:36:50 +00:00
Vincent Laporte
43ca50fc10 minizinc: 2.9.3 → 2.9.7
(cherry picked from commit f80d165041)
2026-06-04 04:36:00 +00:00
Adam C. Stephens
a6e7e9fdb6 beamMinimal27Packages.erlang: use upstream doc target patch
(cherry picked from commit 5be70b9564)
2026-06-04 04:27:21 +00:00
Ryan Omasta
9a2ae538fd ddhx: add meta.mainProgram
(cherry picked from commit 7a0d58a094)
2026-06-04 02:35:20 +00:00
Pascal Dietrich
3d4f0209d3 andcli: 2.6.2 -> 2.7.0
(cherry picked from commit e99f0b9274)
2026-06-03 19:22:51 +00:00
Tom Oostveen
1ce3eb2173 github-desktop: link libexec/git-core into git wrapper
needed so github-desktop's git wrapper (dugite) can find subcommands
like `git-submodule` etc. Retrieve the full list with `ls -l $(nix build
--print-out-paths nixpkgs#git)/libexec/git-core | grep -vE '( -> )?git$'
| awk '{ print $7 }'`.

Fixes #524797

(cherry picked from commit 3fd65b2bc8)
2026-06-03 18:56:41 +00:00
DarkOnion0
0c27613c79 appflowy: update license
(cherry picked from commit 58c0796598)
2026-06-03 17:47:34 +00:00
Ryan Omasta
af0ca98c62 apache-airflow: 3.2.1 -> 3.2.2
https://github.com/apache/airflow/releases/tag/3.2.2
Diff: https://github.com/apache/airflow/compare/3.2.1...3.2.2
(cherry picked from commit 07da0308d4)
2026-06-03 09:12:15 +00:00
R. Ryantm
2c18330c02 python3Packages.stanza: 1.12.0 -> 1.12.1
(cherry picked from commit 9b0958c0cb)
2026-06-03 09:01:03 +00:00
Robert Schütz
199600b191 bitwarden-desktop: 2026.3.1 -> 2026.5.0
Diff: https://github.com/bitwarden/clients/compare/desktop-v2026.3.1...desktop-v2026.5.0

Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2026.5.0
(cherry picked from commit fdf0dd13ad)
2026-06-02 04:40:56 +00:00
rorosen
743df204eb k3s_1_36: 1.36.0+k3s1 -> 1.36.1+k3s1
https://github.com/k3s-io/k3s/releases/tag/v1.36.1%2Bk3s1
(cherry picked from commit f1a7b5ea4b)
2026-05-31 19:09:43 +00:00
rorosen
743fc0361e k3s_1_35: 1.35.4+k3s1 -> 1.35.5+k3s1
https://github.com/k3s-io/k3s/releases/tag/v1.35.5%2Bk3s1
(cherry picked from commit 0ea2b9eddd)
2026-05-31 19:09:43 +00:00
rorosen
0a00d0dfc7 k3s_1_34: 1.34.7+k3s1 -> 1.34.8+k3s1
https://github.com/k3s-io/k3s/releases/tag/v1.34.8%2Bk3s1
(cherry picked from commit 4c6be6dbad)
2026-05-31 19:09:43 +00:00
rorosen
2bec9c3358 k3s_1_33: 1.33.11+k3s1 -> 1.33.12+k3s1
https://github.com/k3s-io/k3s/releases/tag/v1.33.12%2Bk3s1
(cherry picked from commit a20e8da678)
2026-05-31 19:09:42 +00:00
Hythera
da2bfff4b1 redis: 8.6.3 -> 8.8.0
changelog: https://github.com/redis/redis/releases/tag/8.8.0

diff: https://github.com/redis/redis/compare/8.6.3...8.8.0
(cherry picked from commit a18536590a)
2026-05-27 12:31:52 +00:00
47 changed files with 1239 additions and 1125 deletions

View File

@@ -123,7 +123,8 @@ let
# set up imperative config file
"+${pkgs.coreutils}/bin/touch /etc/wpa_supplicant/imperative.conf"
"+${pkgs.coreutils}/bin/chmod 664 /etc/wpa_supplicant/imperative.conf"
"+${pkgs.coreutils}/bin/chown -R wpa_supplicant:wpa_supplicant /etc/wpa_supplicant"
"+${pkgs.coreutils}/bin/chown wpa_supplicant:wpa_supplicant /etc/wpa_supplicant"
"+${pkgs.coreutils}/bin/chown wpa_supplicant:wpa_supplicant /etc/wpa_supplicant/imperative.conf"
]
++ lib.optionals cfg.userControlled [
# set up client sockets directory

View File

@@ -8,9 +8,18 @@ let
preSwitchCheckScript = lib.concatLines (
lib.mapAttrsToList (name: text: ''
# pre-switch check ${name}
if ! (
#
# Run with errexit in a subshell that is not part of an `if`/`||`
# condition, so that `set -e` is actually honoured inside the
# check body.
set +e
(
set -e
${text}
) >&2 ; then
) >&2
_rc=$?
set -e
if [ "$_rc" -ne 0 ]; then
echo "Pre-switch check '${name}' failed" >&2
exit 1
fi

View File

@@ -73,7 +73,7 @@
services.caddy = {
package = pkgs.caddy.withPlugins {
plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ];
hash = "sha256-kKWXpxEAn23yud8tcgw7FFOaxLjoodZ/cuM1239TRoY=";
hash = "sha256-0N/bQAM5yT6g9UAteWsfxofGcelmU/NDTroS2oL43Gs=";
};
configFile = pkgs.writeText "Caddyfile" ''
{

View File

@@ -788,6 +788,11 @@ in
echo this will fail
false
'';
specialisation.failingMidCheck.configuration.system.preSwitchChecks.failsInTheMiddle = ''
echo before
nonexistent-command
echo after
'';
};
};
@@ -888,6 +893,11 @@ in
machine.succeed("${stderrRunner} ${otherSystem}/bin/switch-to-configuration check")
out = switch_to_specialisation("${otherSystem}", "failingCheck", action="check", fail=True)
assert_contains(out, "this will fail")
# errexit must be honoured inside the check body
out = switch_to_specialisation("${otherSystem}", "failingMidCheck", action="check", fail=True)
assert_contains(out, "before")
assert_contains(out, "Pre-switch check 'failsInTheMiddle' failed")
assert_lacks(out, "after")
with subtest("switch inhibitors"):
# Start without any inhibitors

View File

@@ -823,44 +823,44 @@
}
},
"ungoogled-chromium": {
"version": "148.0.7778.215",
"version": "149.0.7827.53",
"deps": {
"depot_tools": {
"rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1",
"hash": "sha256-s9uvmYHCJKWnNhztmOPb+OHj/HbGo30PupwT4mHWjnM="
"rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90",
"hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4="
},
"gn": {
"version": "0-unstable-2026-04-01",
"rev": "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a",
"hash": "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ="
"version": "0-unstable-2026-05-01",
"rev": "1740f5c25bcac5a650ee3d1c1ec22bfa25fcd756",
"hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04="
},
"ungoogled-patches": {
"rev": "148.0.7778.215-1",
"hash": "sha256-Rp+PuyOQ26Cqiu+8sNlJkjp/3bO968NYNX1AgHOyYOA="
"rev": "149.0.7827.53-1",
"hash": "sha256-j4maEZiU38tqs57cTmg8OhIAAQcT+liWU0fDA7GMZHM="
},
"npmHash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8="
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "7c855c70efe3f6ade6663c1520913fa7f63a0b2b",
"hash": "sha256-uDVYgSjxQ+xw8DHVd5UNkqnUrJ6P5ZWxL2tZToBhgQg=",
"rev": "9d2c8156a72129edca4785abb98866fad60ea338",
"hash": "sha256-RPFeHTWAeJUzbWU7QyRPmT3sqf3bAEuJ7/IJ3TP40pA=",
"recompress": true
},
"src/third_party/clang-format/script": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git",
"rev": "c2725e0622e1a86d55f14514f2177a39efea4a0e",
"hash": "sha256-f+BbQ6xIubloSzx/MhPSZ8ymCskmS+9+epDGtPjZqXc="
"rev": "6eddfb5ec5f92127a531eda66c568d3a11e7ec11",
"hash": "sha256-Cm6BOOlEyD0kdYxMSmk6Fj1Dnfs3zCzXsm+BOXgBme0="
},
"src/third_party/compiler-rt/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
"rev": "76287b5da8e155135536c8e3a67432d97d74fe3a",
"hash": "sha256-q6syHriTR8TCQSqTWbbAkVVK0a/i4wojdEGN7sWGxUY="
"rev": "0408cce08083f3d81379ed7d9f5bd26c03e1495b",
"hash": "sha256-kR5osTmp2girvNRVHzEKMZDCelgux9RrRuMoXMCRSGM="
},
"src/third_party/libc++/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
"rev": "7ab65651aed6802d2599dcb7a73b1f82d5179d05",
"hash": "sha256-7O/X2JW8ghkPTjmFZmT9cgG3Ui5zk3gUb436KlPww34="
"rev": "be1c391acca009d8d80535ce924e3d285451cdfa",
"hash": "sha256-zKb9PUiiBvhVhWnbQwR8uOFJ9gt3uYmfJ4M9ijpgKRc="
},
"src/third_party/libc++abi/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
@@ -869,13 +869,13 @@
},
"src/third_party/libunwind/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
"rev": "6ca46ff28e3578c57cbead6f233969eb3dabc176",
"hash": "sha256-JW4kqpVTCFDN4WZE2S5gEkX1O7eDycl+adm3KGlUoTU="
"rev": "71192be150bbe04d87bb5298512d464e38d2f654",
"hash": "sha256-PxXemxdWZoEavKDOovi67IVWEr2YW8YK2F0LXM3LZPw="
},
"src/third_party/llvm-libc/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
"rev": "2a826f2fda3cf8d75b47cbc3bb1d9b244f13a6ab",
"hash": "sha256-OWe2lAT5XbADWuxHgg53lZiU0My/ys86FEXvn4zlVx0="
"rev": "deb95b5e48e875920a2eaae799c8dbcd76a6a4db",
"hash": "sha256-oAgIT3+vjBrX86jgi/Pb0SCyco0lozjBjXlrKm6i56M="
},
"src/chrome/test/data/perf/canvas_bench": {
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -894,8 +894,8 @@
},
"src/docs/website": {
"url": "https://chromium.googlesource.com/website.git",
"rev": "44319eca109f9678595924a90547c1f6650d8664",
"hash": "sha256-Trkan7bzRaLFlTkRfNGh7ssoZ3QpMh+mxQacsSM+d2I="
"rev": "c9a9ad55e9ec9934244e58a5a8cab9a295526010",
"hash": "sha256-2GKWEnlExrTzoIYMxeP4n2klLLT/phB5ZVJ5Nj3/aoY="
},
"src/media/cdm/api": {
"url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -904,8 +904,8 @@
},
"src/net/third_party/quiche/src": {
"url": "https://quiche.googlesource.com/quiche.git",
"rev": "21ffbe4c7b717d00d2d768c259b5b330fd754ac3",
"hash": "sha256-yKMmfdSBvbB3T042TJbZ1Mw+y0kyfHP0knQVFWAFPTg="
"rev": "fafc2fe9efc9f2e28a0815229fc14ca30c266ba8",
"hash": "sha256-4UmjE41MOFCBa3APDMyyJwkeV6LhHl5UsMxZpPRDsRY="
},
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -914,8 +914,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "a101e2d1db6da927325273566fe8f5404fa3a9bd",
"hash": "sha256-uIqodvHxEY9xNse2IHNns2Mz9zLAUZSSIN7pAXB8cPs="
"rev": "ded782bca9d5f165d1c4a70124cdc5384043a8b3",
"hash": "sha256-7+Hhx/V554hO3zzGuIZswkaRVDElz7ost7vbnf2wyZc="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -924,18 +924,18 @@
},
"src/third_party/angle/third_party/rapidjson/src": {
"url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson",
"rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
"hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk="
"rev": "24b5e7a8b27f42fa16b96fc70aade9106cf7102f",
"hash": "sha256-oHHLYRDMb7Y/k0CwsdsxPC5lglr2IChQi0AiOMiFn78="
},
"src/third_party/angle/third_party/VK-GL-CTS/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
"rev": "f52e89f885064b9109501bca16c813bb29389993",
"hash": "sha256-3jx4QVR9nB3WggfrORGJGifmJQhAYVSPusa7RlR16qg="
"rev": "3fe33a325af90c1c820b1e8109f11ea0f4b60c9b",
"hash": "sha256-JgOdlwtjC5HiCWBAaeM+Ffp9KlbI7+erT0ZRZBlWxXI="
},
"src/third_party/anonymous_tokens/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
"rev": "fdff40da0398d2c229308aed169345f6ff1a150f",
"hash": "sha256-eJP45x3vXOG1rWvRl/0H0c2IV7nQ/9dYjAzJGHHszdc="
"rev": "208ea23596884f6d86476ea88b64e7931cdec08a",
"hash": "sha256-HLUX0mUzA3xcXbw71sIxFBNEkL8x86urcdJH2Yuuy04="
},
"src/third_party/readability/src": {
"url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -949,28 +949,23 @@
},
"src/third_party/dav1d/libdav1d": {
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
"rev": "d69235dd804b24c04ed05639cffcc912cd6cfd75",
"hash": "sha256-iKq6TYscIBK4ydv+0msNV3tcs82Ljk5ZNr954Qv2lII="
"rev": "5cfc3832687e3229117203905faf5425ac6bc0d7",
"hash": "sha256-MWDDrb8P5AIFszY0u5gCrK+kZlbYffIt9Y1b/thXL7I="
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "78a9030d63048d832c4b822839bffe38ad4f20e5",
"hash": "sha256-ZknkLN64TYAN5j9WsgtKlRBrAc3iCM084zpc8Zui8Ts="
"rev": "1815a06195d9c74ac737a96f87c05111926e04f8",
"hash": "sha256-71KbW0w60VB67+HM48WpOo18hrVId4/4QBDl+xl5pgo="
},
"src/third_party/dawn/third_party/glfw3/src": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
"rev": "043378876a67b092f5d0d3d9748660121a336dd3",
"hash": "sha256-4QSD1/uxWfYZPMjShB0h639eqAfuBRXAVfOm6BbZCBs="
"rev": "b00e6a8a88ad1b60c0a045e696301deb92c9a13e",
"hash": "sha256-uVJOf+D3bgS/CyEL1y52gvkml6VUTtNPMTU6X5/XyS4="
},
"src/third_party/dawn/third_party/dxc": {
"src/third_party/dawn/third_party/directx-shader-compiler/src": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
"rev": "eb67a9085c758516d940e1ce3fed0acfb6518209",
"hash": "sha256-z+yIuVweIyLdOiZDRfSppjTRoYq8S93+JNUla4Umot8="
},
"src/third_party/dawn/third_party/dxheaders": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
"rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
"hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA="
"rev": "d73829d4e677ef00931e8e57de6d544396ab46cb",
"hash": "sha256-BIXNgVeF5x3BZWFWZ1Gz+zpNSOEl+hZWB0GgMEaNS2w="
},
"src/third_party/dawn/third_party/directx-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -979,33 +974,33 @@
},
"src/third_party/dawn/third_party/OpenGL-Registry/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry",
"rev": "5bae8738b23d06968e7c3a41308568120943ae77",
"hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE="
"rev": "9cb90ca4902d588bef3c830fbb1da484893bd5fb",
"hash": "sha256-mWVORjrbNFINr5WKAIDVnPs2T+96vkxWqZdJwp8oT9I="
},
"src/third_party/dawn/third_party/EGL-Registry/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry",
"rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
"hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A="
"rev": "3d7796b3721d93976b6bfe536aa97bbc4bce8667",
"hash": "sha256-csSV8Yp0p0UIrodbX5793uO5iZMjQfy+0D2wPif2+Fw="
},
"src/third_party/dawn/third_party/webgpu-cts": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
"rev": "09fdb847d90d0b5bfe57068ce2eb9283cb77fc7f",
"hash": "sha256-eTAwnTiAHq8rmbw7u9nAwSuAlS5adStUJKfITlYkcgU="
"rev": "5c6b119c4fa0d9059c45f7637df1fe26fc80a6e4",
"hash": "sha256-9DAdS2u2YtrCFJu0KTuwRJjTUNexFxdmnn7LkwQ+KiQ="
},
"src/third_party/dawn/third_party/webgpu-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
"rev": "7d3186c3dd2c708703524027b46b8703534ab3cc",
"hash": "sha256-yE3/mfhqc7YtVNg4f/nrUpuRUGRjOzdwl++vPvd+mvc="
"rev": "dc16b3e531cf4f31be54236d1a3e988ba5f295a2",
"hash": "sha256-tFn3OChLKsYz52Vml7WVgqyrK7SI6WR1Z2C2vvFfakI="
},
"src/third_party/highway/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
"rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d",
"hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI="
"rev": "2607d3b5b0113992fe84d3848859eae13b3b52c1",
"hash": "sha256-YUYZO9KLffczjwIz3mBBceD6oM1giLCFLDHgDCevdRA="
},
"src/third_party/google_benchmark/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git",
"rev": "188e8278990a9069ffc84441cb5a024fd0bede37",
"hash": "sha256-GfqY2d+Nd7ovNrXxzTRm/AYWj7GuxIO6FawzUEzwOVA="
"rev": "8abf1e701fbd88c8170f48fe0558247e2e5f8e7d",
"hash": "sha256-M8QkA8+bckoRjlcVneYXNetmPEWEvmWy/mca5JA40Ho="
},
"src/third_party/libpfm4/src": {
"url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git",
@@ -1014,13 +1009,13 @@
},
"src/third_party/boringssl/src": {
"url": "https://boringssl.googlesource.com/boringssl.git",
"rev": "d8be2b4a71155bf82da092ef543176351eeb59ff",
"hash": "sha256-fZc95YrREDbf0YcO6zahIjdX6TcRJANcH9MrkLIIIHw="
"rev": "65818adf16411ca394625f5747a1af28faf95d2c",
"hash": "sha256-tcTTzQnBp8Od1jdDMrFoCr9bnW0OCjGqUjH3QMnusmo="
},
"src/third_party/breakpad/breakpad": {
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
"rev": "8be0e3114685fcc1589561067282edf75ea1259a",
"hash": "sha256-igcX5XwacIwoGbqIcZKwlJYpRWl9Uc32WdpXyHO7UVA="
"rev": "afa2870e449ef33ad41545e7670c574cf70926a4",
"hash": "sha256-+N6FPtSiLQmNqf5+x5XDSksrRq/YDVSMVx5Rv1PGjfI="
},
"src/third_party/cast_core/public/src": {
"url": "https://chromium.googlesource.com/cast_core/public",
@@ -1029,13 +1024,13 @@
},
"src/third_party/catapult": {
"url": "https://chromium.googlesource.com/catapult.git",
"rev": "4f1d71f6841d210b3a06ab3ef2e2ed679af0ee56",
"hash": "sha256-aHlf8gw3KxbKoyyajP4w586iYybx7HSkcKtLcZIgiDE="
"rev": "6e4188cabb4f37314ea41e9adfcb2cf9b64e2641",
"hash": "sha256-/kleYYllR22KjxHT2gTMGf6LEUZ1Ud7j593fIIAgqAA="
},
"src/third_party/catapult/third_party/webpagereplay": {
"url": "https://chromium.googlesource.com/webpagereplay.git",
"rev": "be48b5e3387780790ecc7723434b6ea6733bcc33",
"hash": "sha256-KcFUlQMltsMm4WlTVMLzZXfrvu67ffkKjmBcruwZye0="
"rev": "b7ac48f52cd298e966a76eb054412915c3e445d4",
"hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE="
},
"src/third_party/ced/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -1054,13 +1049,13 @@
},
"src/third_party/cpu_features/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git",
"rev": "936b9ab5515dead115606559502e3864958f7f6e",
"hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA="
"rev": "d3b2440fcfc25fe8e6d0d4a85f06d68e98312f5b",
"hash": "sha256-IBJc1sHHh4G3oTzQm1RAHHahsEECC+BDl14DHJ8M1Ys="
},
"src/third_party/cpuinfo/src": {
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
"rev": "7607ca500436b37ad23fb8d18614bec7796b68a7",
"hash": "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg="
"rev": "3681f0ce1446167d01dfe125d6db96ba2ac31c3c",
"hash": "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw="
},
"src/third_party/crc32c/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1069,28 +1064,28 @@
},
"src/third_party/cros_system_api": {
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
"rev": "c27a09148de373889e5d2bf616c4e85a68050ae2",
"hash": "sha256-a/mAa1+if6B1FHe9crO8PDpc3o8M+CeIuXjXT0lwZOY="
"rev": "7ecd2b41460516ecd7b7d6e5c298db25e1436b6f",
"hash": "sha256-ehbAXv4DZStWDMC3iOjmWkAc4PhAamyI4C9bdXO7FfA="
},
"src/third_party/crossbench": {
"url": "https://chromium.googlesource.com/crossbench.git",
"rev": "c179f7919aade97c5cff64d14b9171736e7aaef9",
"hash": "sha256-Hxazf58z9imnGO1aj2NRtsQ+BYrfAuIuZscADpr1NVI="
"rev": "cecd70a5f49f777f603d38d11ac1f66c03c3e8af",
"hash": "sha256-zLwIY8fQVebkfN4KFMbitZODhmiN65JK2s9IG/5Cd+o="
},
"src/third_party/crossbench-web-tests": {
"url": "https://chromium.googlesource.com/chromium/web-tests.git",
"rev": "b19e4e52c33fb8a105c3fc99598b0b9b4bc59752",
"hash": "sha256-7vCQw91L2c97dnVdrJ53zL8hi0KZffDJJjk7GaG3b/U="
"rev": "baf176aadedccc44329231d5dd40346874c2a63e",
"hash": "sha256-oY1/uGB6ykePIklWe35rmJWsnpu/wjkER4TJeP4TTdw="
},
"src/third_party/depot_tools": {
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
"rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1",
"hash": "sha256-s9uvmYHCJKWnNhztmOPb+OHj/HbGo30PupwT4mHWjnM="
"rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90",
"hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4="
},
"src/third_party/devtools-frontend/src": {
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
"rev": "1fb83ff123c44ab59a480056c8c1ba3d33c2caf0",
"hash": "sha256-S6agM7HMZ2g2W6e9tYdLSXr0Lc6zeQF9hAYLIeImAYQ="
"rev": "33c2f401a9c8ddad2159eb0ab83aa244a5247361",
"hash": "sha256-M9aULI+HECgA0ptAG47OPK0QuB+xzmb29iOtJ3whpB0="
},
"src/third_party/dom_distiller_js/dist": {
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1104,8 +1099,8 @@
},
"src/third_party/eigen3/src": {
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
"rev": "a3074053a614df7a3896cb4edbcba40222a5f549",
"hash": "sha256-9AHpSqemqdwXoMiP3hH1YuEd3+nrudeVGTpInw+8BU4="
"rev": "2cf9891537250255f50df5109ffe9e700e2a73de",
"hash": "sha256-1bu1Y9itHIKcwY5J0sF08DSyfElLHiZ6SRsNZkFjz8o="
},
"src/third_party/farmhash/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1114,18 +1109,18 @@
},
"src/third_party/fast_float/src": {
"url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git",
"rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
"hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ="
"rev": "05087a303dad9c98768b33c829d398223a649bc6",
"hash": "sha256-ZQm8kDMYdwjKugc2vBG5mwTqXa01u6hODQc/Tai2I9A="
},
"src/third_party/federated_compute/src": {
"url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git",
"rev": "eb170f645b270c7979edb863fd2cf8edab2b2fd1",
"hash": "sha256-Cp0WQBbqWvPdrKCMQhH4Z6zl6YlIPLjafWZEwdkYWlc="
"rev": "3112513bf1a80872311e7718c5385f535a819b89",
"hash": "sha256-jnG3PCxjaYcClRgzOfIkHbbD3xU9TDLyQR3VZUwHIgU="
},
"src/third_party/ffmpeg": {
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
"rev": "b5e18fb9da84e26ceef30d4e4886696bf59337c0",
"hash": "sha256-JHAicFKBvtkwmZPRBKYPT6JVqYqF8hyXxU0H7kfgCBs="
"rev": "f45bab87ce4c5fafc67fd53fcde777578d01bfa0",
"hash": "sha256-fsZSqmG6vFOPJYuBgG6OSWkzRu27B3mv/PqAP8s4ARk="
},
"src/third_party/flac": {
"url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -1154,8 +1149,8 @@
},
"src/third_party/freetype/src": {
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
"rev": "6d9fc45fc4bca8aef0b8f65592520673638c3334",
"hash": "sha256-A21ONLz8HxoBkOL/jHfs5YwePmOnFyNdlNYSJa9wers="
"rev": "b6bcd2177f72bb4842c7701d7b7f633bb3fc951a",
"hash": "sha256-TUz3yUD9HxqUMCOpLk74rEf8J0tMTh4ZCuD94AD4+q4="
},
"src/third_party/fxdiv/src": {
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -1164,18 +1159,13 @@
},
"src/third_party/harfbuzz/src": {
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
"rev": "67bb413f586f36ba44d740319cb7a28b3d283ea6",
"hash": "sha256-WCPEkbiiU8dENM+ik0KokW9Uxmz0xlsRFVVPPOEOZXw="
"rev": "e6741e2205309752839da60ff075b7fa2e7cddd3",
"hash": "sha256-XjUuY17fcZi+dIZFojq+eDsDVrBxtAWRydPdudt56+8="
},
"src/third_party/ink/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
"rev": "9d5367423281a8fcf5bc1c418e20477a992b270a",
"hash": "sha256-uDaK/cDA52Cn+ioPW2bXAJze1eW8TK3xF7+bl/Ylh6Y="
},
"src/third_party/ink_stroke_modeler/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
"rev": "da42d439389c90ec7574f0381ec53e7f5be0c2eb",
"hash": "sha256-W5HgVe0v9O/EuhpKMHp83PLq4p6cuBul3QUGLYdF6rY="
"rev": "a988417b6d0b1ea03fb0b40269fbc42313acc6fd",
"hash": "sha256-6O+N/ULn8sqsdgFw7VZ7TMjWvCAZbYo398PruPScU/k="
},
"src/third_party/instrumented_libs": {
"url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
@@ -1239,8 +1229,8 @@
},
"src/third_party/fuzztest/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
"rev": "800c545cf9d6e9c01328a1974f93a7e6564a74fd",
"hash": "sha256-Pvz+CWTBcWE0N0yfNGZhXDgUrGeIaCNfEjP1jYmF6G0="
"rev": "e24a91020ab19c3d6f590bd0911b7acb492f81be",
"hash": "sha256-wFjuvJzGEaal+pIo5UtkdLHYTpoWxRE6Vf5OGLObGQk="
},
"src/third_party/domato/src": {
"url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1254,13 +1244,13 @@
},
"src/third_party/libaom/source/libaom": {
"url": "https://aomedia.googlesource.com/aom.git",
"rev": "343cee0a952f8c7d329e59ff3ac2c8bdbe70ec6a",
"hash": "sha256-H8Eu3BiUIiZcyReGDyFq9UvjdMJOX00ERjru8+I0zL8="
"rev": "33dba9e12a9f12e737eaa7c2624e8c580950a89a",
"hash": "sha256-01DbV0kQFg1yyFpVeo82KBoZHhizA7xnZ1qOuu4HTcs="
},
"src/third_party/crabbyavif/src": {
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
"rev": "7466a44ac80893803d4a7168b98dc6cd02d1fe2d",
"hash": "sha256-x1MRNtGLmwlRNenoQKz2Bgm3J5eHlNiJZtzhT9lttmk="
"rev": "c433c9a32320aed983e4106931596fbbae3f77ee",
"hash": "sha256-yw1cXB6s6biD2vj2K/3sVbKiaNK7bt+NkbQovbYlJ2Q="
},
"src/third_party/nearby/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
@@ -1314,8 +1304,8 @@
},
"src/third_party/cros-components/src": {
"url": "https://chromium.googlesource.com/external/google3/cros_components.git",
"rev": "fb512780dcc5ba4b5be9e8a3118919002077c760",
"hash": "sha256-7wx73HZ6aqXQvLxwX6XnJAPefi/t47gIhvDH3FRT1j4="
"rev": "e580888fcc1c108e25c218ccf8b7a4372de18d57",
"hash": "sha256-p0Wfvhg/j8v9xL9Pueo7xPVHBKowOLI00AeIZXPQw4k="
},
"src/third_party/libdrm/src": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -1342,20 +1332,20 @@
"rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
"hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY="
},
"src/third_party/libphonenumber/dist": {
"src/third_party/libphonenumber/src": {
"url": "https://chromium.googlesource.com/external/libphonenumber.git",
"rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
"hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4="
"rev": "ade546d8856475d0493863ee270eb3be9628106b",
"hash": "sha256-cLtsM35Ir3iG3j8+Cy2McL1ysRB0Y1PXealAKl05Twg="
},
"src/third_party/libprotobuf-mutator/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
"rev": "7bf98f78a30b067e22420ff699348f084f802e12",
"hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE="
"rev": "c1c950eae0440c3808f2b8bd7c57d0c6a42c1a90",
"hash": "sha256-Su1SPr/GEFi7/N8/HrFkVbGfWH0vYdcJ5/on8zLMcyU="
},
"src/third_party/libsrtp": {
"url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git",
"rev": "e8383771af8aa4096f5bcfe3743a5ea128f88a9a",
"hash": "sha256-xC//VEFrI94nCkyLnRa6uQ+hJQqe41v0Qjm4LJ7K84I="
"rev": "cd5d177bf1fde755ddb4c7f0d9ff7693f8b49e5e",
"hash": "sha256-6tIbthIcUw58AgaNzvSenZPp/e5vHVTp5K2bpPF+Zg0="
},
"src/third_party/libsync/src": {
"url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git",
@@ -1369,13 +1359,13 @@
},
"src/third_party/libvpx/source/libvpx": {
"url": "https://chromium.googlesource.com/webm/libvpx.git",
"rev": "47ac1ec7f3de7d7cb3d070844c427c8f1fa9d6fc",
"hash": "sha256-RyYnkLYafiS6kQKeOmzohtxFRXudDzgEmQkG+qKHozc="
"rev": "640d4ce27ba918783e28a0da46a8a37abe4a65b6",
"hash": "sha256-uCa/MEfw2s05kK91uubi/TqztHulwattzt1vfr0LR4E="
},
"src/third_party/libwebm/source": {
"url": "https://chromium.googlesource.com/webm/libwebm.git",
"rev": "b7a1e4767fbb02ad467f45ba378e858e897028da",
"hash": "sha256-Lzfs15Us8MDDQYvLRVf6xKg9A76aXPnTukx/A8Mf7rw="
"rev": "6184f4484a826724b5293837134ab9492261b941",
"hash": "sha256-zXPuisCv2KkGQq23qTNhHeXpyCClUIeyjHra08DHJIw="
},
"src/third_party/libwebp/src": {
"url": "https://chromium.googlesource.com/webm/libwebp.git",
@@ -1384,8 +1374,8 @@
},
"src/third_party/libyuv": {
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
"rev": "30809ff64a9ca5e45f86439c0d474c2d3eef3d05",
"hash": "sha256-DW7PuRqA1x0K8/uJbxBJ4Cn9YEPFhZ9vhuGVVyGKK98="
"rev": "a7849e8a5e9c996bef2332efae897e7301055a20",
"hash": "sha256-ftOTwWULKNplqjQQ9oM9t+PU3S6/ySDOBoE5E/HWuHg="
},
"src/third_party/lss": {
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1404,13 +1394,13 @@
},
"src/third_party/nasm": {
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
"rev": "45252858722aad12e545819b2d0f370eb865431b",
"hash": "sha256-0KsHYi76IaVNwk0dBhem2AnUXd9PpeS+jUsY+zPmeJ8="
"rev": "358842b6b7dd69b2ed635bef17f941e030a05e5f",
"hash": "sha256-YwjwubijMZ9OvYeMUVMSunWZ2VCuqUFEOyv/MK/oojc="
},
"src/third_party/neon_2_sse/src": {
"url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
"rev": "662a85912e8f86ec808f9b15ce77f8715ba53316",
"hash": "sha256-4OzG4wIPwnKbFD9LG+stxHt5O4qB85ZIXVeSrNqDAyM="
"rev": "ed59be8546632d5126ff69c87122ae5de20ffe4f",
"hash": "sha256-ydHSMPJS+axvW7KIR/9SLWNFq/lP67dpg9Yt7shLCng="
},
"src/third_party/openh264/src": {
"url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
@@ -1419,8 +1409,8 @@
},
"src/third_party/openscreen/src": {
"url": "https://chromium.googlesource.com/openscreen",
"rev": "448a19d1f24e0f8ce85ad0c1c6a50cf370ae69d7",
"hash": "sha256-hRDFnoqAH4HoWZ3oTWlzNge2nwlxpUC/GEq0MQVzBw8="
"rev": "684bcd767271a21f3e5d475b17a0fd862f16c65e",
"hash": "sha256-Yjz2E1/h+zp7L2x0zE0l+ktQIiSrJ4ZknXOhaVPKQVE="
},
"src/third_party/openscreen/src/buildtools": {
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -1434,13 +1424,13 @@
},
"src/third_party/pdfium": {
"url": "https://pdfium.googlesource.com/pdfium.git",
"rev": "72ea487e4399c44c3a53a48b104f9612ca772008",
"hash": "sha256-0VgmDPyF5k81nBXdo88CcIIbz6XRhaiADnG8gwDGZZk="
"rev": "74d747ce1d383caca3ec0e604d77bac35ccd1e58",
"hash": "sha256-qMY6L93hlnMgGZ5Blk5ldDnI/LUXYyuk+b7FXCiVV6s="
},
"src/third_party/perfetto": {
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
"rev": "46432bb2a7a60e10fcee516f1692e6846d098a8d",
"hash": "sha256-jVih4xWota4SZQi4yEtaIP+4qgD03OsELt2aaulIXik="
"rev": "846203c4b3b25f834a0bebc101fa8e1b8f9d0ca9",
"hash": "sha256-YOgOau9vNrOOqyUf6WylI/oQ2drCxoW7jnrHt7fAfQM="
},
"src/third_party/protobuf-javascript/src": {
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -1449,8 +1439,8 @@
},
"src/third_party/pthreadpool/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
"rev": "9003ee6c137cea3b94161bd5c614fb43be523ee1",
"hash": "sha256-Es9QNblzo5b+x4K7myQJwIiUKvqyP16QExWPhGqqDO8="
"rev": "a56dcd79c699366e7ac6466792c3025883ff7704",
"hash": "sha256-WfyuPfII4eSmLskZV0TAcu4K6OyW38TjkDHm+VUx5eY="
},
"src/third_party/pyelftools": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1479,13 +1469,13 @@
},
"src/third_party/search_engines_data/resources": {
"url": "https://chromium.googlesource.com/external/search_engines_data.git",
"rev": "2ecec7b3a56bcb5d7a4a1fc9bc71d7e1cda2a8d1",
"hash": "sha256-UPP47dgdXxr+LPvTcEc6gi89OxmvdKD3CdwV4wKXvwQ="
"rev": "2345fee6ce4ae24d9c365d5c0884ece593c55c67",
"hash": "sha256-5qkra6FURaMvEOk+ZKMRH1hc8ixEnk3u4rxNm0G8tuQ="
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "03c3234e64f9fbbbcf6a7b9c79e94059df49dbfe",
"hash": "sha256-e0MSCbqv4u4995nowzipKorkn6mPpO7tf8+ygj3/nFY="
"rev": "53348aa333da02b77c4b5797e2de722f5abde7d0",
"hash": "sha256-Qh0ytA45zP67VQE417iUtjPcJmJmDzcu4BAatyh6p0w="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1504,8 +1494,8 @@
},
"src/third_party/swiftshader": {
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
"rev": "89556131bf9d48af3c5c9fbb9a3322e706da89a3",
"hash": "sha256-h0utcwCnzwhFufggkBNeA674x2Kqwu4sz3jQ/9eoQv0="
"rev": "f9d5d49a3c599a315e3493dc1e9b5309cffb3305",
"hash": "sha256-kBfqgXXJeEPT80mu6CJ2Bwmdv/y8jVzM6TedMXbzo4o="
},
"src/third_party/text-fragments-polyfill/src": {
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1514,23 +1504,23 @@
},
"src/third_party/tflite/src": {
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
"rev": "de8d7f65b6eb670e4dad0225d0d6f99bebaab559",
"hash": "sha256-r2b+/VBffxsh1sRM2xcFiBx9K6GD6FsaQXpfFMBFUag="
"rev": "2216f531fb72119745382c62f232acf9790f4b6e",
"hash": "sha256-zySLNPmug5HS5pwJ/lEMAWjjZSOuxdTgup7Y90k7NZI="
},
"src/third_party/litert/src": {
"url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git",
"rev": "588075c77c6895cce6397d41d2890b1aa0a14372",
"hash": "sha256-rcEPZNSV0DiDrmoBCtJ07wFzzpmpM93jG4jYaEdNWvI="
"rev": "9b5418dd7a1a318eed20395743dcc868df17d8b0",
"hash": "sha256-80amwDPF3RrcoTaTQsunNmlvBGs6KCv369FW3J/Xcts="
},
"src/third_party/vulkan-deps": {
"url": "https://chromium.googlesource.com/vulkan-deps",
"rev": "0ced1107c62836f439f684a5696c4bd69e09fce3",
"hash": "sha256-VOyN618wzyyO2Wh18gCnw+FCr/NbegX3A/54MClyhwc="
"rev": "d234b7b29748c07ef389279dd24f533ebd04cadc",
"hash": "sha256-w49HOjPixSI/C5IGlxQMj/Ol9f/Lr2zI2oMhQzzu1zk="
},
"src/third_party/glslang/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
"rev": "715c8500e7cd67f2eba9e60e98852a1ed49d2f15",
"hash": "sha256-vSbMdTjlRVvYLi5ZvTVmfe76oAQ4AhqyD+ohvkvIYIs="
"rev": "458ff50a67cb69371850068a62b78f1990a1ff9a",
"hash": "sha256-2WauVjAEeZn16b4fE4ImKPX3wjDmeN92mqWi3NMiXSw="
},
"src/third_party/spirv-cross/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1539,38 +1529,38 @@
},
"src/third_party/spirv-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
"rev": "6dd7ba990830f7c15ac1345ff3b43ef6ffdad216",
"hash": "sha256-UKBVs2s05hP+paPq1dZFaUEQQ9Kx9acHxYUyJVx22eY="
"rev": "126038020c2bd47efaa942ccc364ca5353ffccde",
"hash": "sha256-QBX2M+ZSWgVvCx58NeDIdf6mIkdJbecDktBfUWGPvNc="
},
"src/third_party/spirv-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
"rev": "2d14d2e76aa7de72404b17078eda15c20a6a0389",
"hash": "sha256-8Xtzq8WOdFEw+uEJqMW39LLHt2m165K9OJsIFZuifoM="
"rev": "2ec8457ab33d539b6f1fecc998360c0b8b05ed4f",
"hash": "sha256-9TBb/gnDXgZRZXhF27KEQ0XQI5itRHKJQjLrkFDQq7Q="
},
"src/third_party/vulkan-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
"rev": "afe9eb980aa928a66d1c9c06f38c55dd59868720",
"hash": "sha256-/yolWlC7ruRiJ0gSdCoSlqL9+j2uJAh+o+H0OG37pq4="
"rev": "f6a6f7ab165cedbfa2a7d0c93fe27a2d01ce09c8",
"hash": "sha256-ZbjmxbRUiVJADNRWziCH0UIM09qKf+lm9PRnWOhZFhQ="
},
"src/third_party/vulkan-loader/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
"rev": "df84d2be47457a8dfd7eb66f8c2b031683bd1ba5",
"hash": "sha256-8ParcURRRU3eS9Oej/vHTwOwvYy3HsVJsKh2wQLKUgM="
"rev": "15a84652b94e465e9a7b25eb507193929863bc2f",
"hash": "sha256-pdC3YCM0Nzeabi5TPD+qR5PVdsxmWMnf2L9HsOcbv84="
},
"src/third_party/vulkan-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
"rev": "90bf5bc4fd8bea0d300f6564af256a51a34124b8",
"hash": "sha256-tmTD/waVX/duaKXvj0FNUS+ncL1agM73kK7pEfHEsSA="
"rev": "7c46da2b39036a80ce088576d5794bf39e667f56",
"hash": "sha256-nAyNVveeGg9sA0E37YiEPm+UdKsy48nAOjnUYHQnuqw="
},
"src/third_party/vulkan-utility-libraries/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
"rev": "48b1fd1a65e436bae806cb6180c9338846b9de97",
"hash": "sha256-B3GXmwJEvnGcER5DJt0FGrwqNi3t8iV6VgX8uOrExlU="
"rev": "2c909c1ab6f9c6caba39a84a4887186b3fafdead",
"hash": "sha256-k3xeKHQbd2rTQJsOZKXEMPrYjcHwoCC1N12F6AIP6Ho="
},
"src/third_party/vulkan-validation-layers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
"rev": "ac146eef210b6f52b842111c5d3419ab32a7293f",
"hash": "sha256-GqjVHxtda1a47+9G+nqh4qNMJmQaUdZNMUGQ8kAIIkk="
"rev": "b105d8ea361af258abed65efb5a1565c031dcf1c",
"hash": "sha256-GgznBGYgnCFMNaqAOQ15dlw2dOFfSp3mAV2KokVLzgk="
},
"src/third_party/vulkan_memory_allocator": {
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1609,23 +1599,23 @@
},
"src/third_party/webgpu-cts/src": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
"rev": "09fdb847d90d0b5bfe57068ce2eb9283cb77fc7f",
"hash": "sha256-eTAwnTiAHq8rmbw7u9nAwSuAlS5adStUJKfITlYkcgU="
"rev": "3b327ebc44f11212fd3872972a6dd394634fb9e3",
"hash": "sha256-RSZVKv2Z0pg2cGa3Elr2r5VZqdxlRJ+6mzm1Au1qg1I="
},
"src/third_party/webpagereplay": {
"url": "https://chromium.googlesource.com/webpagereplay.git",
"rev": "be48b5e3387780790ecc7723434b6ea6733bcc33",
"hash": "sha256-KcFUlQMltsMm4WlTVMLzZXfrvu67ffkKjmBcruwZye0="
"rev": "b7ac48f52cd298e966a76eb054412915c3e445d4",
"hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE="
},
"src/third_party/webrtc": {
"url": "https://webrtc.googlesource.com/src.git",
"rev": "e3ee86921c57b9f8921045e77f098604803cb66c",
"hash": "sha256-n39HENOXmatsZLF6jdYRsb+wl2cM0i6ngT4Zbyu5ayE="
"rev": "5a7e0ff57a52e12f834d64c57d040d1105ea17f2",
"hash": "sha256-V1accCSU6LV5Ixhd+HBOvqZ7GxT57ALsvaF8ABLIXxM="
},
"src/third_party/wuffs/src": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
"rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
"hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw="
"rev": "50869df0ea703b4f41b238bfe26aec6ec9c86889",
"hash": "sha256-V7inWJqH7Q4Ac/ZB//7XHrpgfAYUPBxWBerBem6Q/Kk="
},
"src/third_party/weston/src": {
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git",
@@ -1634,8 +1624,13 @@
},
"src/third_party/xnnpack/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
"rev": "1812bbe2928a32f26c5e48466712ba6460cf290c",
"hash": "sha256-xal21wjgeql3MjQXw6F1ezcRsnhVKod5jv0nYWroJ1o="
"rev": "2ad25fc09167df69c6c02eb8082a0b9658dd5e80",
"hash": "sha256-vBMGBXzJPCcsc2kMyGecjti68oZHWUwJKd7tkKub6kg="
},
"src/third_party/libei/src": {
"url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/libinput/libei.git",
"rev": "5d6d8e6590df210b75559a889baa9459c68d9366",
"hash": "sha256-lSrIC93Cke90/Xc8dqd3e/TU32tflYHYqc5fE8wglBI="
},
"src/third_party/zstd/src": {
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
@@ -1644,8 +1639,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "5e24a1fd6ffb840b93ee90a800897fcb4d60eeab",
"hash": "sha256-JcBGaXhqNRIA4NPPV4eANVM93wsQ9QxSLO/Ecz3wklU="
"rev": "5a39b146dd810a52812202fae891281d5dc4db7d",
"hash": "sha256-UbX88nE4VyWUm4PvFTOy3mC04MzSdgC006ZpQrEY8cQ="
}
}
}

View File

@@ -1,26 +1,26 @@
{
"airgap-images-amd64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "234a24f45c7d767cd850a7265257d4d2d7c2cc5ac3ca8e67a94f359766ec547d"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "6a29f795a718e0b7a11b81b4f8a342764a90b78a83a57ad6e1b90d81c3718290"
},
"airgap-images-amd64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "71cd029a49fae4893970132b0136b217b133de4dbb4ba0107f3b82ec4867734d"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "1ec9755fbe791b710b176c12f66160e19b31605345c92f3b5916176976f813a8"
},
"airgap-images-arm-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "41ceeb0249f8d53cbf3ead7ff70374c292c121f991af0e3a491ff66d48a99d41"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "893e395bbee35745e32aaa4e421aaf0c88e685739edc5658f9bf573a95a86782"
},
"airgap-images-arm-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "4d826c3f62a3d58f6da34e4369c4a64f0997b2c963423e1890e5bda70e55dc6b"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "1613727aaa8ae55a1a597a2914faf9ab909a710e175a26b4652754b25ab01337"
},
"airgap-images-arm64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "5c5f6d62105b620cda23099b63146d3cb8698e437a2c0c8e770a17578b174eeb"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "5fa48235a216c9dfcaefcd344597d221adf16aa583a0ca9d9b4094e4c9c1ef5f"
},
"airgap-images-arm64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "e4ca9bf05aab34f10fa792f894ab214aeaac30be31b6d91918b036216d753efa"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "ec56b324e405a3990b9ee16b5aa39bfb636ce88a127869685c042944caf38835"
}
}

View File

@@ -1,8 +1,8 @@
{
k3sVersion = "1.33.11+k3s1";
k3sCommit = "c532325bce6b1fa03be983cca3a8b4b84eea72a6";
k3sRepoSha256 = "1gzpazgi0bhqp4bqlp1s7gxqlh2wq2s8n31khy83kdhz22i6dipb";
k3sVendorHash = "sha256-rFH0Z66J6NHP+iscHDsr5rDkVLLkXeVuXTlT9hEhubw=";
k3sVersion = "1.33.12+k3s1";
k3sCommit = "35e4874312bcfd643320c7f7cb225f7063cb9e4e";
k3sRepoSha256 = "1md7w6n9iz3nk63rnf4ahs66d2vg3gfc5frksar2iw3kcv99bhmc";
k3sVendorHash = "sha256-O0HIcCzrKGR8NkMoDfaD1wPbAttHt0kEpVjr/kOLMu8=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.15.0";
@@ -17,5 +17,5 @@
flannelPluginVersion = "v1.9.0-flannel1";
kubeRouterVersion = "v2.6.3-k3s1";
criDockerdVersion = "v0.3.19-k3s2";
helmJobVersion = "v0.9.17-build20260422";
helmJobVersion = "v0.10.0-build20260513";
}

View File

@@ -1,26 +1,26 @@
{
"airgap-images-amd64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "4c81d96db507206816c341e79c113692d9f6c1515d0f2cd82f3c95376f09e7f3"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "2a5f910bb31b8674dff61f55a242b8dacb553894a50d66ea3c2dbf4ec8931345"
},
"airgap-images-amd64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "1d98b5f32c85ae41371851e6c14b81bdb8960177b28ccd1deda55c1a05586704"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "c1a261f664a58664aab975ba5c861d872c825d4f8ccc391c649283bf2c1663cf"
},
"airgap-images-arm-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "da9fb4db5e14d8ebaf173718f1df8ed68c80f56ea725e5c7b19c0c2b216f538a"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "a14b0421af4e4afe70010886cf66eb99b2cb48e1f810269bae47dad5c8bbc2c7"
},
"airgap-images-arm-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "9880d9f56c5ec9b61714aa27caab365b237f51ec272e27cfc3bfead5ae60eeee"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "b6dba85a8470f95ab2a57658bb5ac2adfcf3e3c0634501e7b87d6904f32308d6"
},
"airgap-images-arm64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "7702e62ebf167bdc9d8f4b3eda18544339c839f456746389d8fceea8be379d3e"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "dbb6f771024fbf07a85d57fb77d43a59a4cd712684e819dd31f9633088c3f99e"
},
"airgap-images-arm64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "4c9514a2874c592813285fac36ff6a9f7e65febc426af73a7ac3ececa1804d6d"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "984dc4a2050e1bde1b57ac8a07ce6639a56151a3b57cee0616220bc680c65041"
}
}

View File

@@ -1,8 +1,8 @@
{
k3sVersion = "1.34.7+k3s1";
k3sCommit = "757f14939dd335fb5d7a839a9980382da9cdedf7";
k3sRepoSha256 = "0f4mp23hnn5w5km0ymj66vpjjdh6m0xkrs87lfpm0gf2j9ba1vn5";
k3sVendorHash = "sha256-MrWZp43SVKWboUs3RasZXBmZD3dDYWWZewKbXkJvsiA=";
k3sVersion = "1.34.8+k3s1";
k3sCommit = "fb21251ee14ffbec9a2ba5d8ff25a7aa1221fbe3";
k3sRepoSha256 = "18f2mhhn7nz8lri1qbjja5nfjncsadra9wrqxxgprfg5lx7fi3a2";
k3sVendorHash = "sha256-jikPQgyQ4ApWPF+iHYjL7H6ccWcC1x/JEABluJyzmfs=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.15.0";
@@ -17,5 +17,5 @@
flannelPluginVersion = "v1.9.0-flannel1";
kubeRouterVersion = "v2.6.3-k3s1";
criDockerdVersion = "v0.3.19-k3s3";
helmJobVersion = "v0.9.17-build20260422";
helmJobVersion = "v0.10.0-build20260513";
}

View File

@@ -1,26 +1,26 @@
{
"airgap-images-amd64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "cb7609c41885b65452fd8e4b5ad4621e39ef31a1894c9b416e2ca369aea673bd"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "b25863ba596e81ee773b462edc1b7ee26e80ff8e675c983115464372713237ac"
},
"airgap-images-amd64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "2740585f773e1461b2a5b9976a1291a7a554b85f4538228e34cc67b03f690ca5"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "c1a261f664a58664aab975ba5c861d872c825d4f8ccc391c649283bf2c1663cf"
},
"airgap-images-arm-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "ef1366c55b9ee109a8452d9fdeb3d5cfc00927e0f24f227ff57ec0e54b34f7ae"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "5b9fc436d67f0ca941084c512715f2ea21e6c66732144145788f1403ffd6c082"
},
"airgap-images-arm-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "b09ebf9407e9c2901f13d4921304d83abf9bbd4e1222fb5a2a6d91ac9622a2e3"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "1613727aaa8ae55a1a597a2914faf9ab909a710e175a26b4652754b25ab01337"
},
"airgap-images-arm64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "6bba0489d0b1ac542a9fcca64a6cf367ae6423f6e17478cca40f0ea4cfd01d31"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "bc085e02004382b15413e98457079e2a0a3d8f18b3c9a4a58917f1bc6064ea29"
},
"airgap-images-arm64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "3ddac18185a554b42d53e79d80954ca7841ce48f511afe75fdf8485e0d88efe7"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "0bf33db3b0595166f1c36a6780ebd789343f50f23a4d61157519ada4d002919d"
}
}

View File

@@ -1,8 +1,8 @@
{
k3sVersion = "1.35.4+k3s1";
k3sCommit = "5dc8fe6894219e2156c2ba82b1bee84cad674694";
k3sRepoSha256 = "0ilsxhfnn30h0lfajn6awz396g7ygm9n2syzsf09k0g1mv741gib";
k3sVendorHash = "sha256-PzRBM5cSCF3cGIEdvUrQ4x4PyV7rBpMZVP+tYJDH6oo=";
k3sVersion = "1.35.5+k3s1";
k3sCommit = "6a4781ad53ee5cad273bedcd9462ae36ac97d798";
k3sRepoSha256 = "1m6sy7p5v3kkg66mzsna9c4d1f7ly843ii42zmb2a26vxa0dicx3";
k3sVendorHash = "sha256-czE0ZJ9yWc3VSuPqjy4V+ViBGPriluMPmUK5aTk4DmY=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.15.0";
@@ -17,5 +17,5 @@
flannelPluginVersion = "v1.9.0-flannel1";
kubeRouterVersion = "v2.6.3-k3s1";
criDockerdVersion = "v0.3.19-k3s3";
helmJobVersion = "v0.9.17-build20260422";
helmJobVersion = "v0.10.0-build20260513";
}

View File

@@ -1,26 +1,26 @@
{
"airgap-images-amd64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "1b6dbb5cebc30c3218a5910a6c0503d2cd9a92a8c494d323c12c181d8d90e525"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "8aad05e71764f08eae8d4db9e5d42d892dce39c9eb79206514c4ee03f4293db1"
},
"airgap-images-amd64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "1d98b5f32c85ae41371851e6c14b81bdb8960177b28ccd1deda55c1a05586704"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "72cf836bfcf8f9af2de88102b69129d297b77a60243895a7ac4bc47d77a65079"
},
"airgap-images-arm-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "d7ad1e1cb378e4638a92cee9358390b047adfc4c2d5f8fcb1247903c900255e2"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "639f155016f956764b212a1671a6e090100016505b34d3f45e76513fdd93cb5f"
},
"airgap-images-arm-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "9880d9f56c5ec9b61714aa27caab365b237f51ec272e27cfc3bfead5ae60eeee"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "4b16cc7a17bac0957db9df4ad937ce52792a696b0eb60944b52eb65447a0d1fa"
},
"airgap-images-arm64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "2807168a82c3f9657540ac272afa186e6cf360cb068c35e5cad2e9447a8947a1"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "bc84f7965ef5f3a7e45e9f79f1090ef066fdd9bdb96d476c5d37cb13d0c2935b"
},
"airgap-images-arm64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "65959cea20b4448096f6cd36e84b567dace2bf14f54c577de90c0b93ca559d2a"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "174e1e7cf8493ea8fb2550231de3e93fc2f3cec27f977236fd7ab90a18680eed"
}
}

View File

@@ -1,8 +1,8 @@
{
k3sVersion = "1.36.0+k3s1";
k3sCommit = "09347304fd829ba8e9378bb16fe20bacba939e27";
k3sRepoSha256 = "1qdwqbfngxxzfjcq263lfhrp8khv6mi2a9yw06v0jswh41r42m3c";
k3sVendorHash = "sha256-Qli3CgKlUBhc8fwIJVB/89QH/jYXHn2K7y491BEj0Sk=";
k3sVersion = "1.36.1+k3s1";
k3sCommit = "a9663261a7ff40522542485a6b2f81916b6d72f9";
k3sRepoSha256 = "0788034bw5pl8ikfb16fvdhl8a3dhhfasrbafir6s9fb8q9h3z4z";
k3sVendorHash = "sha256-jX/qoRhVLZy/25fdhp5NOiRSGEatV/acBbSpjhutAzU=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.15.0";
@@ -17,5 +17,5 @@
flannelPluginVersion = "v1.9.0-flannel1";
kubeRouterVersion = "v2.6.3-k3s1";
criDockerdVersion = "v0.3.19-k3s5";
helmJobVersion = "v0.9.17-build20260422";
helmJobVersion = "v0.10.0-build20260513";
}

View File

@@ -9,7 +9,7 @@
buildGoModule (finalAttrs: {
pname = "andcli";
version = "2.6.2";
version = "2.7.0";
subPackages = [ "cmd/andcli" ];
@@ -17,10 +17,10 @@ buildGoModule (finalAttrs: {
owner = "tjblackheart";
repo = "andcli";
tag = "v${finalAttrs.version}";
hash = "sha256-EtfsSLyZs5hADJRE5xvn2mu6A04Sz9e21Y4+VkopCY0=";
hash = "sha256-l+ZpAm+yHCKPalGib4OlIaGFsDHc3IFFlOvB1kXWZG0=";
};
vendorHash = "sha256-CHWypAA2BpHop5LGkjZVTBL4dGzWfrwDJcFrtGTBAb4=";
vendorHash = "sha256-S2JRkVy1iLGBqoOWukTQm80fVJ2YMNHTLfUUA2530GE=";
ldflags = [
"-s"

View File

@@ -473,6 +473,7 @@
"kerberos"
"marshmallow"
"msgpack"
"pyjwt"
"werkzeug"
"wtforms"
];
@@ -644,7 +645,10 @@
};
jdbc = {
deps = [ "jaydebeapi" ];
deps = [
"jaydebeapi"
"jpype1"
];
imports = [
"airflow.providers.jdbc"
"airflow.providers.jdbc.get_provider_info"
@@ -754,6 +758,7 @@
deps = [
"aiomysql"
"mysqlclient"
"pymysql"
];
imports = [
"airflow.providers.mysql"

View File

@@ -19,6 +19,7 @@
attrs,
babel,
buildPythonPackage,
cachetools,
cadwyn,
colorlog,
cron-descriptor,
@@ -88,13 +89,13 @@
enabledProviders,
}:
let
version = "3.2.1";
version = "3.2.2";
src = fetchFromGitHub {
owner = "apache";
repo = "airflow";
tag = version;
hash = "sha256-jwWxH9fTTCFdLAaAN18/FUAbN0cTCPkkk9+0ZMYNXek=";
hash = "sha256-nAFSLdcKmP2CNm3rx+/fwIsJnpju7wBl+fYWQV8p+sU=";
};
pnpm = pnpm_10;
@@ -104,6 +105,10 @@ let
inherit src version;
sourceRoot = "${src.name}/airflow-core/src/airflow/ui";
# vite build resolves "localhost" during the build, which the darwin
# sandbox blocks by default (getaddrinfo ENOTFOUND localhost).
__darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin;
nativeBuildInputs = [
nodejs
pnpm
@@ -119,7 +124,7 @@ let
pnpm
;
fetcherVersion = 3;
hash = "sha256-OkSDQoWsHQ6w1vIoX5W9zXHghV0obvL6Wji0HYN6CSs=";
hash = "sha256-wJ2u+y3umecL4IeVW/29/yDgYZ77ffOBQLHeplD3XlQ=";
};
buildPhase = ''
@@ -138,6 +143,8 @@ let
inherit src version;
sourceRoot = "${src.name}/airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui";
__darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin;
nativeBuildInputs = [
nodejs
pnpm
@@ -146,9 +153,14 @@ let
pnpmDeps = fetchPnpmDeps {
pname = "simple-auth-manager-ui";
inherit sourceRoot src version;
inherit
sourceRoot
src
version
pnpm
;
fetcherVersion = 3;
hash = "sha256-uQIVHzX0BcJuxgbPp6wqKhALbsfACSJjiMOdmrpuzOk=";
hash = "sha256-AKaafmDjIlg4eFJT1JGyelXVjcId8f0iXTR3JK4ZMq0=";
};
buildPhase = ''
@@ -212,6 +224,7 @@ let
sed -i -E 's/"GitPython==[^"]+"/"GitPython"/' pyproject.toml
sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml
sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
# Copy built UI assets
cp -r ${airflowUi}/share/airflow/ui/dist src/airflow/ui/
@@ -235,6 +248,7 @@ let
argcomplete
asgiref
attrs
cachetools
cadwyn
colorlog
cron-descriptor
@@ -291,6 +305,8 @@ let
uvicorn
]
++ (map buildProvider requiredProviders);
pythonRelaxDeps = [ "starlette" ];
};
taskSdk = buildPythonPackage {
@@ -308,6 +324,7 @@ let
sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
# task-sdk needs config.yml from core subpackage
mkdir -p src/airflow/config_templates
@@ -354,6 +371,7 @@ buildPythonPackage rec {
sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml
'';
nativeBuildInputs = [ writableTmpDirAsHomeHook ];

View File

@@ -126,7 +126,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
description = "Open-source alternative to Notion";
homepage = "https://www.appflowy.io/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.agpl3Only;
license = with lib.licenses; [
# The LICENSE file clearly claims the project is using AGPL-3.0
#
# c.f. https://github.com/AppFlowy-IO/AppFlowy/blob/main/LICENSE
agpl3Only
# But, the source code has not been synced with any major release since
# the end of 2025. One of the core team member said that they will "merge
# Flutter code back into this public repository at a later stage". However,
# 2 months later, nothing has changed.
#
# c.f. https://github.com/AppFlowy-IO/AppFlowy/issues/8479#issuecomment-4053301446
unfreeRedistributable
];
changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${finalAttrs.version}";
maintainers = with lib.maintainers; [ darkonion0 ];
platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;

View File

@@ -33,13 +33,13 @@ let
in
buildNpmPackage' rec {
pname = "bitwarden-desktop";
version = "2026.3.1";
version = "2026.5.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-ecaCHk04N9h0RP8gK0o+MLgYS6Linsqi7AaC86hwQ3U=";
hash = "sha256-R00wt5W4kKmFIODEaGoUqDwfGyHH/2PpiRaC8Gq3d88=";
};
patches = [
@@ -85,7 +85,7 @@ buildNpmPackage' rec {
npmWorkspace = "apps/desktop";
npmDepsFetcherVersion = 2;
npmDepsHash = "sha256-1t4CSd1NDC1medTTFHSzX9ZkgHqPG2L//yjaloH47z0=";
npmDepsHash = "sha256-xmb3zwE8/nWpRlUOgTz2UhNRaUA8KW9sHQHA97pjjfg=";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit
@@ -95,7 +95,7 @@ buildNpmPackage' rec {
cargoRoot
patches
;
hash = "sha256-d9Iv7OekHOteH1lyAuyj/EzfU/KSCW6ATx83foOW3IE=";
hash = "sha256-phvk4t1JKfSYGzm/vm1rT8A0fACHJF/C0WiZ2Lk3cV0=";
};
cargoRoot = "apps/desktop/desktop_native";

View File

@@ -11,12 +11,12 @@
versionCheckHook,
}:
let
version = "2.11.3";
version = "2.11.4";
dist = fetchFromGitHub {
owner = "caddyserver";
repo = "dist";
tag = "v${version}";
hash = "sha256-D1qI7TDJpSvtgpo1FsPZk6mpqRvRharFZ8soI7Mn3RE=";
hash = "sha256-oRQfQH1GKjAjVMj+dZo1f1+HOaOdJIyEfod0iGLYcc8=";
};
in
buildGoModule (finalAttrs: {
@@ -27,10 +27,10 @@ buildGoModule (finalAttrs: {
owner = "caddyserver";
repo = "caddy";
tag = "v${finalAttrs.version}";
hash = "sha256-7Hgmo7ldDtbwl/acEY/4RNhSGnK/NNcXn+eIm1I8HKg=";
hash = "sha256-wzk8KRZfDCbbjRlBwkoKAoMjOhV4xF3yuXUueqtl1xM=";
};
vendorHash = "sha256-QiZZxYsYFUneZ52TfFKQWJ42lmBofvUTZrHmDBuN2O4=";
vendorHash = "sha256-2GwSM7EKN9GwN6kte7CekpXIJ0vzHhhsnrs3TC6vTW4=";
ldflags = [
"-s"

View File

@@ -31,5 +31,6 @@ buildDubPackage (finalAttrs: {
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ryand56 ];
platforms = lib.platforms.unix;
mainProgram = "ddhx";
};
})

View File

@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "dexter";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "remoteoss";
repo = "dexter";
tag = "v${finalAttrs.version}";
hash = "sha256-BmWzrbC9ka8L1/mrPOXJqnoi1YVXxRcg6tSkb8tI88Q=";
hash = "sha256-MQ8LxSI2amecFUiNK6vED/nJKHgs5sRT7rJVi6cLdkc=";
};
vendorHash = "sha256-1mJ4HdDCsZl/g8F+L+NrW2ACuiHe2aSheJO/1XfKAb4=";

View File

@@ -101,9 +101,15 @@ stdenv.mkDerivation (finalAttrs: {
yarn --cwd app/node_modules/desktop-notifications run install
# use git from nixpkgs instead of an automatically downloaded one by dugite
makeWrapper ${lib.getExe git} app/node_modules/dugite/git/bin/git \
gitRoot=app/node_modules/dugite/git
makeWrapper ${lib.getExe git} "$gitRoot/bin/git" \
--prefix PATH : ${lib.makeBinPath [ git-lfs ]}
mkdir -p "$gitRoot/libexec/git-core"
for script in ${git}/libexec/git-core/*; do
ln -s "$script" "$gitRoot/libexec/git-core/$(basename "$script")"
done
# exception: printenvz needs `node-gyp` configure first for some reason
pushd node_modules/printenvz

View File

@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "glance";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "glanceapp";
repo = "glance";
tag = "v${finalAttrs.version}";
hash = "sha256-4su8CGtS4wqWcQ3yTvZiUHOnTMLICS3XIG8kS+bJ3LQ=";
hash = "sha256-2WFX1Gca7ign9i1zOQ9lRdtOSGq9QG33vIA5QTnq9E8=";
};
vendorHash = "sha256-Ek1LVCSEJzoI0nVu6zVsSbd/Jzv6/pyMIm991ebvkZY=";
vendorHash = "sha256-a92V/duqvrWEb8QSJLA5rHYYZCcJ4fBC962SEr4FJDA=";
ldflags = [
"-s"

View File

@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "go-httpbin";
version = "2.22.1";
version = "2.23.0";
src = fetchFromGitHub {
owner = "mccutchen";
repo = "go-httpbin";
tag = "v${finalAttrs.version}";
hash = "sha256-N0lq11tF5z+n7AlrOLdJ4eZvaZljSKafpkwma6jPW3k=";
hash = "sha256-BQf6G02BRtVGcPVEfHPWwBfEh8CCbHRkaLV2FX6SeJc=";
};
vendorHash = null;

View File

@@ -21,13 +21,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "halloy";
version = "2026.7";
version = "2026.7.1";
src = fetchFromGitHub {
owner = "squidowl";
repo = "halloy";
tag = finalAttrs.version;
hash = "sha256-kmz5m8k0vdqnK2NZTmPxYJ5GqB1O4aRaVjPyNZTWnrQ=";
hash = "sha256-AFDx4gmYWUMcvpJi+/2xd0s4gAygwss2XrmCFsd6uKs=";
};
cargoHash = "sha256-hrYWF5WNhLqKMFJJlir7tumxNZqgGm+gK+RI1iDPatM=";

View File

@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "keycloak";
version = "26.6.2";
version = "26.6.3";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
hash = "sha256-WhkSF/oqhBglKaw8/EwnEEjd+rX/da5LjP6mitecPLA=";
hash = "sha256-MlWWiTnQVB/JjBhEk3wUv/1WPWnEx9h2iULwzCxUKHU=";
};
nativeBuildInputs = [

View File

@@ -7,13 +7,13 @@
php.buildComposerProject2 (finalAttrs: {
pname = "kimai";
version = "2.57.0";
version = "2.58.0";
src = fetchFromGitHub {
owner = "kimai";
repo = "kimai";
tag = finalAttrs.version;
hash = "sha256-WbZivDI5xU/pM52yFvG6vMK3LaCjbLoJGNFP3Exb8qc=";
hash = "sha256-JS4Mjn8fUr9CCQiELnCVH1Arg7uk7KbRwYWF1ECuMRM=";
};
php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
'';
};
vendorHash = "sha256-6WthU0w8V69sDlBjtz2MIavkmyYXWQ+5NflZLGQCLJs=";
vendorHash = "sha256-bPEc/uOPorBo2EXNVBvvuy7yV3Poif2GrjD5jhY974M=";
composerNoPlugins = false;
postInstall = ''

View File

@@ -31,13 +31,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "minizinc";
version = "2.9.3";
version = "2.9.7";
src = fetchFromGitHub {
owner = "MiniZinc";
repo = "libminizinc";
rev = finalAttrs.version;
sha256 = "sha256-eu2yNRESypXWCn8INTjGwwRXTWdGYvah/hc2iqFKQmw=";
tag = finalAttrs.version;
hash = "sha256-k9imUrGn6VyQVvHU8Ef9wvBIOEHA3SSmEwIui3fW9JI=";
};
nativeBuildInputs = [

View File

@@ -30,13 +30,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "music-assistant-desktop";
version = "0.3.6";
version = "0.3.7";
src = fetchFromGitHub {
owner = "music-assistant";
repo = "desktop-app";
tag = finalAttrs.version;
hash = "sha256-GL9Cpk6NDhRV0npVXwGjR3Dm0H/uo9cD4ebaI751VLM=";
hash = "sha256-QhKc5GBUnI1ae6+XK14YRWEpWuVtL6s90sSuWKLwNpk=";
};
# hide update feature

View File

@@ -18,13 +18,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "noriskclient-launcher-unwrapped";
version = "0.6.21";
version = "0.6.22";
src = fetchFromGitHub {
owner = "NoRiskClient";
repo = "noriskclient-launcher";
tag = "v${finalAttrs.version}";
hash = "sha256-RiKFSKHnyeiIcSaOltr4qv0pEBX5wctfztZ+8yrHjnE=";
hash = "sha256-X6oc6DTwIseNvWHhHoHv1Ur2zoaaGCdxYVe4+5+zjvA=";
};
yarnOfflineCache = fetchYarnDeps {
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
'';
cargoHash = "sha256-FiM1FuWeGmfZlnKiIImGOsJnKt3qsLqvY6oRUvOSBWM=";
cargoHash = "sha256-dwGJKLO+3i5FUgv+Huu1ZD/hFg/KdyWofApwkIDFD1I=";
cargoRoot = "src-tauri";
buildAndTestSubdir = finalAttrs.cargoRoot;

View File

@@ -1,20 +1,24 @@
{
lib,
stdenv,
pkgsHostTarget,
fetchFromGitHub,
autoreconfHook,
gmp,
libffi,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "polyml";
version = "5.9.2";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "polyml";
repo = "polyml";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "sha256-dHP5XNoLcFIqASfZVWu3MtY3B3H66skEl8ohlwTGyyM=";
};
@@ -32,6 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libffi
gmp
pkgsHostTarget.stdenv.cc
];
nativeBuildInputs = [ autoreconfHook ];
@@ -42,14 +47,13 @@ stdenv.mkDerivation rec {
"--with-gmp"
];
doCheck = true;
checkPhase = ''
runHook preCheck
make check
runHook postCheck
preInstall = ''
substituteInPlace polyc \
--replace-fail "LINK=\"$CXX\"" "LINK=\"${lib.getExe' pkgsHostTarget.stdenv.cc "c++"}\""
'';
doCheck = true;
meta = {
description = "Standard ML compiler and interpreter";
longDescription = ''
@@ -58,8 +62,9 @@ stdenv.mkDerivation rec {
homepage = "https://www.polyml.org/";
license = lib.licenses.lgpl21;
platforms = with lib.platforms; (linux ++ darwin);
maintainers = with lib.maintainers; [
kovirobi
];
# Broken as make target `polyimport.o` requires running code
# compiled by the cross-compiler
broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
maintainers = with lib.maintainers; [ sempiternal-aurora ];
};
}
})

View File

@@ -95,6 +95,7 @@ python.pkgs.buildPythonApplication rec {
"django-csp"
"django-filter"
"django-formset-js-improved"
"django-formtools"
"django-i18nfield"
"djangorestframework"
"markdown"

View File

@@ -99,6 +99,7 @@ python.pkgs.buildPythonApplication rec {
"django-compressor"
"django-filter"
"django-formset-js-improved"
"django-formtools"
"django-i18nfield"
"django-localflavor"
"django-phonenumber-field"

View File

@@ -2,31 +2,25 @@
lib,
stdenv,
fetchurl,
pkg-config,
ncurses,
ocamlPackages,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "prooftree";
version = "0.14";
src = fetchurl {
url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz";
sha256 = "sha256-nekV2UnjibOk4h0jZ1jV7W5pE/hXWb3fUoLTJb3Jzc0=";
url = "https://askra.de/software/prooftree/releases/prooftree-${finalAttrs.version}.tar.gz";
hash = "sha256-nekV2UnjibOk4h0jZ1jV7W5pE/hXWb3fUoLTJb3Jzc0=";
};
strictDeps = true;
nativeBuildInputs = [
pkg-config
]
++ (with ocamlPackages; [
nativeBuildInputs = with ocamlPackages; [
ocaml
findlib
camlp5
]);
buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]);
];
buildInputs = with ocamlPackages; [ lablgtk ];
prefixKey = "--prefix ";
@@ -55,4 +49,4 @@ stdenv.mkDerivation rec {
maintainers = [ lib.maintainers.jwiegley ];
license = lib.licenses.gpl3;
};
}
})

View File

@@ -27,13 +27,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "redis";
version = "8.6.3";
version = "8.8.0";
src = fetchFromGitHub {
owner = "redis";
repo = "redis";
tag = finalAttrs.version;
hash = "sha256-Zg2bghU4uExwI1SWplYIGCeGRhgRxdh3Oy9k1DZPado=";
hash = "sha256-D9rhe5GC0axhKHoRfeegUIGYXbrcEsa9m9vYJVxwtCk=";
};
patches = lib.optional useSystemJemalloc (fetchpatch2 {
@@ -41,13 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-A9qp+PWQRuNy/xmv9KLM7/XAyL7Tzkyn0scpVCGngcc=";
});
postPatch = ''
# Using `yes` seems to be an invalid value and causes the test to fail. See
# https://github.com/redis/redis/blob/bd3b38d41070b478c58bc8b72d2af89cbccd1a40/redis.conf#L674-L688
substituteInPlace tests/integration/replication.tcl \
--replace-fail 'repl-diskless-load yes' ' repl-diskless-load on-empty-db'
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# The path `/Library/...` isn't available in the build sandbox. The package `apple-sdk`
# can provide that functionality for us.
substituteInPlace src/modules/Makefile modules/vector-sets/Makefile tests/modules/Makefile \

View File

@@ -23,13 +23,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "saunafs";
version = "5.9.0";
version = "5.10.0";
src = fetchFromGitHub {
owner = "leil-io";
repo = "saunafs";
rev = "v${finalAttrs.version}";
hash = "sha256-OMUW5JJziW3C9R5gsnFTGnxwmVoXRTtu4aIlXfnVdME=";
hash = "sha256-5FeuzL7JiCuR2l7PjYTtsesXS0RaJmAMrTUKtCwKZxE=";
};
patches = [

View File

@@ -67,7 +67,7 @@
stdenv.mkDerivation rec {
pname = "vivaldi";
version = "8.0.4033.34";
version = "8.0.4033.42";
suffix =
{
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
hash =
{
aarch64-linux = "sha256-K5R/h+BZ0thqejG/3VM12efeZwS4Mw3tq1iHr96HIHQ=";
x86_64-linux = "sha256-0sQQsiJLStBTzjrd6JRKzrZ/HUZpT68O3tLdLECl7IQ=";
aarch64-linux = "sha256-qHIUVfD+rVIrBse5xsmJwVjCAszieAJzuHAC/oKzCHA=";
x86_64-linux = "sha256-abaU3PiUQNhpliCnmih96pkU6CgW/S1GgxFKFo8PBmo=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

View File

@@ -36,13 +36,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "zipline";
version = "4.6.1";
version = "4.6.2";
src = fetchFromGitHub {
owner = "diced";
repo = "zipline";
tag = "v${finalAttrs.version}";
hash = "sha256-uLGa6ZIMJE2IWz5wF9H6yOICTeFvZerrpecLEja+PU4=";
hash = "sha256-U4Rl1WiOg9DVFEnghKOy/WabeXf3l3zpaxqAmjneil0=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git_head

View File

@@ -21,6 +21,7 @@
parallelBuild ? true,
fetchFromGitHub,
fetchpatch2,
gawk,
gnum4,
gnused,
@@ -111,14 +112,18 @@ stdenv.mkDerivation {
++ optionals javacSupport [ openjdk11 ]
++ optionals enableSystemd [ systemd ];
patches = lib.optionals (!wxSupport && major == "27") [
# https://github.com/erlang/otp/pull/11162
(fetchpatch2 {
name = "otp-27-doc-target-fix.patch";
url = "https://github.com/erlang/otp/commit/7ce587b61a2557fca79f1c130794abf834f37ee1.patch?full_index=1";
hash = "sha256-Ce6tWUzeF6TQMxus7ultxG2piFllw/xa5IPLCxSd024=";
})
];
# disksup requires a shell
postPatch = ''
substituteInPlace lib/os_mon/src/disksup.erl --replace-fail '"sh ' '"${runtimeShell} '
''
# https://github.com/erlang/otp/issues/11151
+ lib.optionalString (!wxSupport && major == "27") ''
substituteInPlace lib/wx/doc/Makefile \
--replace-fail $'ifneq ($(CAN_BUILD_DRIVER), true)\nDOC_TARGETS=\nendif\n' ""
'';
debugInfo = enableDebugInfo;

View File

@@ -53,7 +53,7 @@ in
stdenv.mkDerivation rec {
pname = "libinput";
version = "1.31.1";
version = "1.31.3";
outputs = [
"bin"
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
owner = "libinput";
repo = "libinput";
rev = version;
hash = "sha256-9Ko97vJyo4a9NUF7omqHTwzVV02sJ2EqpDIh+nPeLwk=";
hash = "sha256-2l+YGD1AFTwJRouMg0d3nQX+2me6A4yOB4g2WE2H//g=";
};
nativeBuildInputs = [

View File

@@ -2,41 +2,56 @@
lib,
buildPythonPackage,
django,
fetchPypi,
python,
fetchFromGitHub,
setuptools,
setuptools-scm,
pytestCheckHook,
pytest-django,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "django-formtools";
version = "2.5.1";
version = "2.6.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-R8s0VSxu/KCIhj1pMoTQT8NuqvNQ6yHhodk14N9SPJM=";
src = fetchFromGitHub {
owner = "jazzband";
repo = "django-formtools";
tag = finalAttrs.version;
hash = "sha256-cg6bl2KJL2aOES7vWqrR25Bd6t9vWGTZLWtbMUhkCkg=";
};
nativeBuildInputs = [ setuptools-scm ];
build-system = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [ django ];
dependencies = [ django ];
checkPhase = ''
runHook preCheck
nativeCheckInputs = [
pytestCheckHook
pytest-django
];
${python.interpreter} -m django test --settings=tests.settings
runHook postCheck
preCheck = ''
export DJANGO_SETTINGS_MODULE=tests.settings
'';
disabledTests = [
# mismatch between test collection of django and pytest-django
"TestStorage"
# Django 6.0.6/5.2.15 compat issue
# https://github.com/jazzband/django-formtools/issues/298
"test_reset_cookie"
];
pythonImportsCheck = [ "formtools" ];
meta = {
description = "Set of high-level abstractions for Django forms";
description = "High-level abstractions for Django forms";
homepage = "https://github.com/jazzband/django-formtools";
changelog = "https://github.com/jazzband/django-formtools/blob/master/docs/changelog.rst";
changelog = "https://github.com/jazzband/django-formtools/blob/${finalAttrs.src.tag}/docs/changelog.rst";
license = lib.licenses.bsd3;
maintainers = [
];
maintainers = [ ];
};
}
})

View File

@@ -42,7 +42,7 @@
buildPythonPackage (finalAttrs: {
pname = "django";
version = "6.0.5";
version = "6.0.6";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: {
owner = "django";
repo = "django";
tag = finalAttrs.version;
hash = "sha256-jII/aoJ75sS+ig4iVZmTcsEE76aC8Om/k2J+LnRj+cE=";
hash = "sha256-hLnTqY64PfaGJ1JJccrxYms41Jp4E4pVq6rmrtFpESE=";
};
patches = [
@@ -62,6 +62,9 @@ buildPythonPackage (finalAttrs: {
./6.x/pythonpath.patch
# test_incorrect_timezone should raise but doesn't
./6.x/disable-failing-test.patch
# https://code.djangoproject.com/ticket/36997
# https://github.com/django/django/pull/21019
./6.x/invalidate-importlib-cache.patch
]
++ lib.optionals withGdal [
(replaceVars ./6.x/gdal.patch {

View File

@@ -0,0 +1,54 @@
From 130ccbf51a5ad4810dcef46584661a818b7964d3 Mon Sep 17 00:00:00 2001
From: gghezext <gghezext@comgest.com>
Date: Sun, 29 Mar 2026 03:46:48 +0200
Subject: [PATCH 1/2] Fixed #36997 -- Invalidated importlib caches after
writing migration files.
---
django/core/management/commands/makemigrations.py | 3 +++
django/core/management/commands/squashmigrations.py | 2 ++
docs/releases/6.1.txt | 5 ++++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/django/core/management/commands/makemigrations.py b/django/core/management/commands/makemigrations.py
index 7f711ed7aec4..355d626ce2c4 100644
--- a/django/core/management/commands/makemigrations.py
+++ b/django/core/management/commands/makemigrations.py
@@ -1,3 +1,4 @@
+import importlib
import os
import sys
import warnings
@@ -395,6 +396,7 @@ def write_migration_files(self, changes, update_previous_migration_paths=None):
)
self.log(writer.as_string())
run_formatters(self.written_files, stderr=self.stderr)
+ importlib.invalidate_caches()
@staticmethod
def get_relative_path(path):
@@ -502,6 +504,7 @@ def all_items_equal(seq):
with open(writer.path, "w", encoding="utf-8") as fh:
fh.write(writer.as_string())
run_formatters([writer.path], stderr=self.stderr)
+ importlib.invalidate_caches()
if self.verbosity > 0:
self.log("\nCreated new merge migration %s" % writer.path)
if self.scriptable:
diff --git a/django/core/management/commands/squashmigrations.py b/django/core/management/commands/squashmigrations.py
index 9845b4d4567b..abc87717b66b 100644
--- a/django/core/management/commands/squashmigrations.py
+++ b/django/core/management/commands/squashmigrations.py
@@ -1,3 +1,4 @@
+import importlib
import os
import shutil
@@ -208,6 +209,7 @@ def handle(self, **options):
with open(writer.path, "w", encoding="utf-8") as fh:
fh.write(writer.as_string())
run_formatters([writer.path], stderr=self.stderr)
+ importlib.invalidate_caches()
if self.verbosity > 0:
self.stdout.write(

View File

@@ -20,14 +20,14 @@
buildPythonPackage (finalAttrs: {
pname = "stanza";
version = "1.12.0";
version = "1.12.1";
pyproject = true;
src = fetchFromGitHub {
owner = "stanfordnlp";
repo = "stanza";
tag = "v${finalAttrs.version}";
hash = "sha256-uarx5HY6sxm2Fr12Vti4IluqOhFosf8QYIP2WMxdFfI=";
hash = "sha256-e4f/Th9zCVBe05v7NI+IXiSbCfcKVZvDFAKq8ZrsQjA=";
};
build-system = [ setuptools ];

View File

@@ -26,16 +26,6 @@ in
mkKdeDerivation {
pname = "audiotube";
patches = [
# https://bugs.kde.org/show_bug.cgi?id=520142
# https://github.com/NixOS/nixpkgs/issues/520685
(fetchpatch {
name = "pybind11-ecm-6.26.patch";
url = "https://invent.kde.org/multimedia/audiotube/-/commit/273d9b926dfadb1b85a4a0d21c352bd5968ffa1f.patch";
hash = "sha256-V5HghJxKYMRZP4vqIhQZeRveOcfpGXwMMEgSM3ZDbUE=";
})
];
extraNativeBuildInputs = [
ps.pybind11
];

File diff suppressed because it is too large Load Diff

View File

@@ -4887,7 +4887,6 @@ with pkgs;
php85Extensions = recurseIntoAttrs php85.extensions;
php85Packages = recurseIntoAttrs php85.packages;
polyml = callPackage ../development/compilers/polyml { };
polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };
@@ -11149,10 +11148,6 @@ with pkgs;
inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml camlp4;
};
prooftree = callPackage ../applications/science/logic/prooftree {
ocamlPackages = ocaml-ng.ocamlPackages_4_12;
};
satallax = callPackage ../applications/science/logic/satallax {
inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
};