mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge release-26.05 into staging-nixos-26.05
This commit is contained in:
commit
12703384d2
46 changed files with 639 additions and 310 deletions
|
|
@ -176,22 +176,32 @@ in
|
|||
StartLimitBurst = 10;
|
||||
};
|
||||
|
||||
preStart = lib.optionalString (settings != null) ''
|
||||
if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \
|
||||
&& [ "${toString cfg.mutableSettings}" = "1" ]; then
|
||||
# First run a schema_version update on the existing configuration
|
||||
# This ensures that both the new config and the existing one have the same schema_version
|
||||
# Note: --check-config has the side effect of modifying the file at rest!
|
||||
${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config
|
||||
preStart =
|
||||
let
|
||||
installFresh = ''
|
||||
cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
'';
|
||||
in
|
||||
lib.optionalString (settings != null) (
|
||||
if cfg.mutableSettings then
|
||||
''
|
||||
if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ]; then
|
||||
# First run a schema_version update on the existing configuration
|
||||
# This ensures that both the new config and the existing one have the same schema_version
|
||||
# Note: --check-config has the side effect of modifying the file at rest!
|
||||
${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config
|
||||
|
||||
# Writing directly to AdGuardHome.yaml results in empty file
|
||||
${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp"
|
||||
mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
else
|
||||
cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
fi
|
||||
'';
|
||||
# Writing directly to AdGuardHome.yaml results in empty file
|
||||
${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp"
|
||||
mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
else
|
||||
${installFresh}
|
||||
fi
|
||||
''
|
||||
else
|
||||
installFresh
|
||||
);
|
||||
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
};
|
||||
|
||||
nodes.machine = {
|
||||
services.mongodb.package = pkgs.mongodb-ce;
|
||||
services.your_spotify = {
|
||||
enable = true;
|
||||
spotifySecretFile = pkgs.writeText "spotifySecretFile" "deadbeef";
|
||||
|
|
|
|||
|
|
@ -838,28 +838,28 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "149.0.7827.200",
|
||||
"version": "150.0.7871.46",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90",
|
||||
"hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4="
|
||||
"rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
|
||||
"hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY="
|
||||
},
|
||||
"gn": {
|
||||
"version": "0-unstable-2026-05-01",
|
||||
"rev": "1740f5c25bcac5a650ee3d1c1ec22bfa25fcd756",
|
||||
"hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04="
|
||||
"version": "0-unstable-2026-05-27",
|
||||
"rev": "3357c4f51b1a9e676378c695dd9c7e9911c35ee6",
|
||||
"hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "149.0.7827.200-1",
|
||||
"hash": "sha256-D7c1ToAoUzAMpXoe60YPimRqe6/LRe0T95TduXUeTFo="
|
||||
"rev": "150.0.7871.46-1",
|
||||
"hash": "sha256-SuZTPUpv7onrHvDrwZO0Xo/mxLVcGUSxf2xb+OC//L8="
|
||||
},
|
||||
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "c35c164b1b6d1adca9eddf914ed6d0d0743dba6a",
|
||||
"hash": "sha256-b2gBRUzRjqVZEb/tWUL1JF6Afq5gHJ3aOM02My1FyYU=",
|
||||
"rev": "5b586c06e0d27582900f17e2d59c5370d8d6e0bb",
|
||||
"hash": "sha256-OAZNyZtR5WFWW42r74RSy9fT7Eb7CNZwzoIHhuoqR28=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
|
@ -869,13 +869,13 @@
|
|||
},
|
||||
"src/third_party/compiler-rt/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
|
||||
"rev": "0408cce08083f3d81379ed7d9f5bd26c03e1495b",
|
||||
"hash": "sha256-kR5osTmp2girvNRVHzEKMZDCelgux9RrRuMoXMCRSGM="
|
||||
"rev": "03641f7a5b05e48e318d64369057db577cafc594",
|
||||
"hash": "sha256-KnWESGG6aI0S+fkJ3/T1x4QSiIYaOOvWUAm6l6l9iME="
|
||||
},
|
||||
"src/third_party/libc++/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
|
||||
"rev": "be1c391acca009d8d80535ce924e3d285451cdfa",
|
||||
"hash": "sha256-zKb9PUiiBvhVhWnbQwR8uOFJ9gt3uYmfJ4M9ijpgKRc="
|
||||
"rev": "5abc7f839700f0f17338434e1c1c6a8c87c00c11",
|
||||
"hash": "sha256-vT1km7JgVpotDoNK+ae1gplSHcwrVNLsv/QAFUrDsIM="
|
||||
},
|
||||
"src/third_party/libc++abi/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
|
||||
|
|
@ -884,13 +884,13 @@
|
|||
},
|
||||
"src/third_party/libunwind/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
|
||||
"rev": "71192be150bbe04d87bb5298512d464e38d2f654",
|
||||
"hash": "sha256-PxXemxdWZoEavKDOovi67IVWEr2YW8YK2F0LXM3LZPw="
|
||||
"rev": "d6c7a21e978f0adaa43accaad53bc64f0b64f6ec",
|
||||
"hash": "sha256-EuaVSYiR7qrlYqBR0UqdWCvwdzJSn0RS2wC/lnP19AE="
|
||||
},
|
||||
"src/third_party/llvm-libc/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
|
||||
"rev": "deb95b5e48e875920a2eaae799c8dbcd76a6a4db",
|
||||
"hash": "sha256-oAgIT3+vjBrX86jgi/Pb0SCyco0lozjBjXlrKm6i56M="
|
||||
"rev": "6e5ec6f78d8b9f2e8a50fcc5692d1fc8b2964bde",
|
||||
"hash": "sha256-qrkx8Z1fc088Ja32obIUPxDwklI7i1wdEw051UZ08u8="
|
||||
},
|
||||
"src/chrome/test/data/perf/canvas_bench": {
|
||||
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
|
||||
|
|
@ -909,8 +909,8 @@
|
|||
},
|
||||
"src/docs/website": {
|
||||
"url": "https://chromium.googlesource.com/website.git",
|
||||
"rev": "c9a9ad55e9ec9934244e58a5a8cab9a295526010",
|
||||
"hash": "sha256-2GKWEnlExrTzoIYMxeP4n2klLLT/phB5ZVJ5Nj3/aoY="
|
||||
"rev": "3da515a67f412be05ea1ea6b39832a69aef8f54e",
|
||||
"hash": "sha256-wrkFsPX7jrsjD/Ow1gna/xLvk0E49m5GVxP1G7Vx7HM="
|
||||
},
|
||||
"src/media/cdm/api": {
|
||||
"url": "https://chromium.googlesource.com/chromium/cdm.git",
|
||||
|
|
@ -919,8 +919,8 @@
|
|||
},
|
||||
"src/net/third_party/quiche/src": {
|
||||
"url": "https://quiche.googlesource.com/quiche.git",
|
||||
"rev": "fafc2fe9efc9f2e28a0815229fc14ca30c266ba8",
|
||||
"hash": "sha256-4UmjE41MOFCBa3APDMyyJwkeV6LhHl5UsMxZpPRDsRY="
|
||||
"rev": "997d654308b6a1a17435e472ef5190aecb12e3eb",
|
||||
"hash": "sha256-xgDgW2foZZEWpr0ibSG21kf028FN07/1ecOqFCkNj/I="
|
||||
},
|
||||
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
|
||||
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
|
||||
|
|
@ -929,8 +929,8 @@
|
|||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "355cc61af2aadd8f0494800325b2bf9908138108",
|
||||
"hash": "sha256-fgaCyO0oaz90aTaWMHH8ocySA0hXDHsPEl6vtMj4BY0="
|
||||
"rev": "bbf3d8a4755268f016087be2f56099fa5a5f3f6e",
|
||||
"hash": "sha256-8iuHtNgHumlMXeXj2k0ZPcvnTeJ00di298+789OjScs="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
|
|
@ -944,13 +944,18 @@
|
|||
},
|
||||
"src/third_party/angle/third_party/VK-GL-CTS/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
|
||||
"rev": "3fe33a325af90c1c820b1e8109f11ea0f4b60c9b",
|
||||
"hash": "sha256-JgOdlwtjC5HiCWBAaeM+Ffp9KlbI7+erT0ZRZBlWxXI="
|
||||
"rev": "01471f4b3846c97eceb5b16b8acad950808791b2",
|
||||
"hash": "sha256-SrL+G3osTtJGQslfCBEYbslb2kWtHRrwO87PHi+5o6E="
|
||||
},
|
||||
"src/third_party/anonymous_tokens/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
|
||||
"rev": "208ea23596884f6d86476ea88b64e7931cdec08a",
|
||||
"hash": "sha256-HLUX0mUzA3xcXbw71sIxFBNEkL8x86urcdJH2Yuuy04="
|
||||
"rev": "92d1fdf881a932e7aa2a9b20e006136a659c7a20",
|
||||
"hash": "sha256-llPt+UR8hY0yaJkYmq+A3ZfRRReuaXN09qpap6C28jc="
|
||||
},
|
||||
"src/third_party/aria-practices/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/w3c/aria-practices.git",
|
||||
"rev": "7b134ce6d19497cce8a67db4a9f59980baf853dc",
|
||||
"hash": "sha256-POnvoO1KfzJj4CbcMPI0pUTRk5EtHLTOyKKmJCZdXOc="
|
||||
},
|
||||
"src/third_party/readability/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
|
||||
|
|
@ -964,13 +969,13 @@
|
|||
},
|
||||
"src/third_party/dav1d/libdav1d": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
|
||||
"rev": "5cfc3832687e3229117203905faf5425ac6bc0d7",
|
||||
"hash": "sha256-MWDDrb8P5AIFszY0u5gCrK+kZlbYffIt9Y1b/thXL7I="
|
||||
"rev": "62501cc7db378532d7e85ea434b70d57e1ba2cb0",
|
||||
"hash": "sha256-5cpKTUnhR+QzQJR4KbAvdvqsWnT1fpH0g9MObv8Nx0c="
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "54b4153cfef88e048f365f99b962478f0087dfe8",
|
||||
"hash": "sha256-Bv30zz/pCNVzUl+mKCpusWc94poytv9ZFelZIcs+2B8="
|
||||
"rev": "01249a97332468dbdd6cf5edb8dd7bae77875de5",
|
||||
"hash": "sha256-tzomo+GTec2zixxk61gtlma/sjcBImgbLMwA+mIp1LM="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
|
|
@ -979,8 +984,8 @@
|
|||
},
|
||||
"src/third_party/dawn/third_party/directx-shader-compiler/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
|
||||
"rev": "d73829d4e677ef00931e8e57de6d544396ab46cb",
|
||||
"hash": "sha256-BIXNgVeF5x3BZWFWZ1Gz+zpNSOEl+hZWB0GgMEaNS2w="
|
||||
"rev": "35c1b99e9e552267da5efaea07c003e322d65777",
|
||||
"hash": "sha256-pzBk+jUp/FUV8ahHquE0942Qw/DjAUemSM9fxdFJ0JA="
|
||||
},
|
||||
"src/third_party/dawn/third_party/directx-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
|
||||
|
|
@ -989,8 +994,8 @@
|
|||
},
|
||||
"src/third_party/dawn/third_party/OpenGL-Registry/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry",
|
||||
"rev": "9cb90ca4902d588bef3c830fbb1da484893bd5fb",
|
||||
"hash": "sha256-mWVORjrbNFINr5WKAIDVnPs2T+96vkxWqZdJwp8oT9I="
|
||||
"rev": "a30033d3e812c9bf10094f1010374a6b15e192eb",
|
||||
"hash": "sha256-xLacUOSy783bCtv+wUnjVnNLwTQ3eLwUJtYXmELqekY="
|
||||
},
|
||||
"src/third_party/dawn/third_party/EGL-Registry/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry",
|
||||
|
|
@ -999,8 +1004,8 @@
|
|||
},
|
||||
"src/third_party/dawn/third_party/webgpu-cts": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
|
||||
"rev": "5c6b119c4fa0d9059c45f7637df1fe26fc80a6e4",
|
||||
"hash": "sha256-9DAdS2u2YtrCFJu0KTuwRJjTUNexFxdmnn7LkwQ+KiQ="
|
||||
"rev": "f08551b0fc4d6cfa5ba582a0235b571aa363102d",
|
||||
"hash": "sha256-f5kWMnaod/Ved1Fz/vTkdL0ihSUnNM8XN5Ht3Vs1YpU="
|
||||
},
|
||||
"src/third_party/dawn/third_party/webgpu-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
|
||||
|
|
@ -1024,8 +1029,8 @@
|
|||
},
|
||||
"src/third_party/boringssl/src": {
|
||||
"url": "https://boringssl.googlesource.com/boringssl.git",
|
||||
"rev": "65818adf16411ca394625f5747a1af28faf95d2c",
|
||||
"hash": "sha256-tcTTzQnBp8Od1jdDMrFoCr9bnW0OCjGqUjH3QMnusmo="
|
||||
"rev": "3a9254f16eda7a4c5d2260039ff23456a0a34de4",
|
||||
"hash": "sha256-JuMnNppWhIFHYfk6ANIZLC7ABhqMseoV5LYV7slevBE="
|
||||
},
|
||||
"src/third_party/breakpad/breakpad": {
|
||||
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
|
||||
|
|
@ -1039,13 +1044,8 @@
|
|||
},
|
||||
"src/third_party/catapult": {
|
||||
"url": "https://chromium.googlesource.com/catapult.git",
|
||||
"rev": "6e4188cabb4f37314ea41e9adfcb2cf9b64e2641",
|
||||
"hash": "sha256-/kleYYllR22KjxHT2gTMGf6LEUZ1Ud7j593fIIAgqAA="
|
||||
},
|
||||
"src/third_party/catapult/third_party/webpagereplay": {
|
||||
"url": "https://chromium.googlesource.com/webpagereplay.git",
|
||||
"rev": "b7ac48f52cd298e966a76eb054412915c3e445d4",
|
||||
"hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE="
|
||||
"rev": "2852bb7e91e4995502ffb72b7ed21412ee157914",
|
||||
"hash": "sha256-XYufVvzOXD4voZUWUvumQQqLNsx9sy0QmQzNzrgNEWg="
|
||||
},
|
||||
"src/third_party/ced/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
|
||||
|
|
@ -1064,13 +1064,13 @@
|
|||
},
|
||||
"src/third_party/cpu_features/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git",
|
||||
"rev": "d3b2440fcfc25fe8e6d0d4a85f06d68e98312f5b",
|
||||
"hash": "sha256-IBJc1sHHh4G3oTzQm1RAHHahsEECC+BDl14DHJ8M1Ys="
|
||||
"rev": "81d13c49649f0714dd41fb56bb246398b6584085",
|
||||
"hash": "sha256-TrC1WMLAhko57rAyDCiAC/IJ0unAqVhyjkh7gKibyi4="
|
||||
},
|
||||
"src/third_party/cpuinfo/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
|
||||
"rev": "3681f0ce1446167d01dfe125d6db96ba2ac31c3c",
|
||||
"hash": "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw="
|
||||
"rev": "ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d",
|
||||
"hash": "sha256-/QsOjDik0TnH3FnK7LOwsJkvX+O+2DRFX4eF3MxD3fc="
|
||||
},
|
||||
"src/third_party/crc32c/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
|
||||
|
|
@ -1079,28 +1079,28 @@
|
|||
},
|
||||
"src/third_party/cros_system_api": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
|
||||
"rev": "7ecd2b41460516ecd7b7d6e5c298db25e1436b6f",
|
||||
"hash": "sha256-ehbAXv4DZStWDMC3iOjmWkAc4PhAamyI4C9bdXO7FfA="
|
||||
"rev": "1c69e700a01a7fd3dd331f526c8a31ac1e5e49d0",
|
||||
"hash": "sha256-qIwUs0KVU9xYFLN3UUayPLfz0ObA+EN6owKPW61J/5w="
|
||||
},
|
||||
"src/third_party/crossbench": {
|
||||
"url": "https://chromium.googlesource.com/crossbench.git",
|
||||
"rev": "cecd70a5f49f777f603d38d11ac1f66c03c3e8af",
|
||||
"hash": "sha256-zLwIY8fQVebkfN4KFMbitZODhmiN65JK2s9IG/5Cd+o="
|
||||
"rev": "7d52b4ffbc319a7d5a0e0a0ebff744e5281d60c5",
|
||||
"hash": "sha256-iwwvvIOuRMo/ZEu8Gk0lZaS4P5uGt8zpnYMChpZPcUo="
|
||||
},
|
||||
"src/third_party/crossbench-web-tests": {
|
||||
"url": "https://chromium.googlesource.com/chromium/web-tests.git",
|
||||
"rev": "baf176aadedccc44329231d5dd40346874c2a63e",
|
||||
"hash": "sha256-oY1/uGB6ykePIklWe35rmJWsnpu/wjkER4TJeP4TTdw="
|
||||
"rev": "7b3de17542cc613aaddbfc72c6e12be37eed7b73",
|
||||
"hash": "sha256-7ly4vaK+Pj4y91t6Q+igQ0890CqKyu9jNBhJnxbNGjI="
|
||||
},
|
||||
"src/third_party/depot_tools": {
|
||||
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
|
||||
"rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90",
|
||||
"hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4="
|
||||
"rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
|
||||
"hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY="
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "33c2f401a9c8ddad2159eb0ab83aa244a5247361",
|
||||
"hash": "sha256-M9aULI+HECgA0ptAG47OPK0QuB+xzmb29iOtJ3whpB0="
|
||||
"rev": "1d67dc0dafa344bbd6ca75c124e2d6d9d53074d8",
|
||||
"hash": "sha256-VBXch2YwnKm+lMcZ5L0SlW+vAYeaSwgZvcOhg1TE5/A="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
|
|
@ -1114,8 +1114,8 @@
|
|||
},
|
||||
"src/third_party/eigen3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
|
||||
"rev": "2cf9891537250255f50df5109ffe9e700e2a73de",
|
||||
"hash": "sha256-1bu1Y9itHIKcwY5J0sF08DSyfElLHiZ6SRsNZkFjz8o="
|
||||
"rev": "662ba79d796a2851b10cdafc6668e45b65b1120f",
|
||||
"hash": "sha256-6bZFDeo7TqWNunkkQv8OJ+7/hfKwoIUtqZoXaeLp6M8="
|
||||
},
|
||||
"src/third_party/farmhash/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
|
||||
|
|
@ -1124,18 +1124,18 @@
|
|||
},
|
||||
"src/third_party/fast_float/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git",
|
||||
"rev": "05087a303dad9c98768b33c829d398223a649bc6",
|
||||
"hash": "sha256-ZQm8kDMYdwjKugc2vBG5mwTqXa01u6hODQc/Tai2I9A="
|
||||
"rev": "cfd12ebcf1f82c4fd44a950b1815dd0549bc8d89",
|
||||
"hash": "sha256-hzoB+Mmok3oe6B494uLc5ReWpUcB89zCGPYw4gvanK0="
|
||||
},
|
||||
"src/third_party/federated_compute/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git",
|
||||
"rev": "3112513bf1a80872311e7718c5385f535a819b89",
|
||||
"hash": "sha256-jnG3PCxjaYcClRgzOfIkHbbD3xU9TDLyQR3VZUwHIgU="
|
||||
"rev": "8de5837b817f28abc54a387a9417631b905ba90a",
|
||||
"hash": "sha256-GZYo0FjgW8XCplAi6jzzruwDlIzsWjNEVQuCwXBCPz8="
|
||||
},
|
||||
"src/third_party/ffmpeg": {
|
||||
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
|
||||
"rev": "f45bab87ce4c5fafc67fd53fcde777578d01bfa0",
|
||||
"hash": "sha256-fsZSqmG6vFOPJYuBgG6OSWkzRu27B3mv/PqAP8s4ARk="
|
||||
"rev": "ad41607c61898cf7150e0fb20fe4bbabd44922a3",
|
||||
"hash": "sha256-41qpsOTedB51WMzzHXDiXA19OIzA7wG/Qgbz6IkmWpk="
|
||||
},
|
||||
"src/third_party/flac": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/flac.git",
|
||||
|
|
@ -1164,8 +1164,8 @@
|
|||
},
|
||||
"src/third_party/freetype/src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
|
||||
"rev": "b6bcd2177f72bb4842c7701d7b7f633bb3fc951a",
|
||||
"hash": "sha256-TUz3yUD9HxqUMCOpLk74rEf8J0tMTh4ZCuD94AD4+q4="
|
||||
"rev": "b08a2eb0dd37f4a6c886fa5b0ecf5b3e1d27aac7",
|
||||
"hash": "sha256-xnYeUAJx5n8LSg04AknfiudonfmlUdlj8nzHzSZi65I="
|
||||
},
|
||||
"src/third_party/fxdiv/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
|
||||
|
|
@ -1174,13 +1174,13 @@
|
|||
},
|
||||
"src/third_party/harfbuzz/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "e6741e2205309752839da60ff075b7fa2e7cddd3",
|
||||
"hash": "sha256-XjUuY17fcZi+dIZFojq+eDsDVrBxtAWRydPdudt56+8="
|
||||
"rev": "d639197ed529b05c27f38ebaab365a621d5edad5",
|
||||
"hash": "sha256-uT4zK2hwHzEH6Nrd2rAeyzpQA1TmwtrdcujKYEUbLsY="
|
||||
},
|
||||
"src/third_party/ink/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
|
||||
"rev": "a988417b6d0b1ea03fb0b40269fbc42313acc6fd",
|
||||
"hash": "sha256-6O+N/ULn8sqsdgFw7VZ7TMjWvCAZbYo398PruPScU/k="
|
||||
"rev": "0f9c6172b2ccc6b830ae313d522caf09e6933e06",
|
||||
"hash": "sha256-LF+OcqNeg+KRuYmGuMZb4tmnr53sZHn/ZW1jg9ArPfc="
|
||||
},
|
||||
"src/third_party/instrumented_libs": {
|
||||
"url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
|
||||
|
|
@ -1204,8 +1204,8 @@
|
|||
},
|
||||
"src/third_party/libgav1/src": {
|
||||
"url": "https://chromium.googlesource.com/codecs/libgav1.git",
|
||||
"rev": "40f58ed32ff39071c3f2a51056dbc49a070af0dc",
|
||||
"hash": "sha256-gisU0p0HDL7Po/ZXIIZVOTnxnOuVvSE/FYo9DaEUFfo="
|
||||
"rev": "66ac17620652635392f6ab24065c77b035e281c9",
|
||||
"hash": "sha256-6/zMaX2DPSKpsaqirhrgi3nL/88Qr2VXacmyL5IyJ3U="
|
||||
},
|
||||
"src/third_party/googletest/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
|
||||
|
|
@ -1229,8 +1229,8 @@
|
|||
},
|
||||
"src/third_party/jsoncpp/source": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
|
||||
"rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
|
||||
"hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q="
|
||||
"rev": "d4d072177213b117fb81d4cfda140de090616161",
|
||||
"hash": "sha256-q+DOwkjRlHacgfWf5UVY02aqfnKK9M/1YRBX6aMce9g="
|
||||
},
|
||||
"src/third_party/leveldatabase/src": {
|
||||
"url": "https://chromium.googlesource.com/external/leveldb.git",
|
||||
|
|
@ -1244,8 +1244,8 @@
|
|||
},
|
||||
"src/third_party/fuzztest/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
|
||||
"rev": "e24a91020ab19c3d6f590bd0911b7acb492f81be",
|
||||
"hash": "sha256-wFjuvJzGEaal+pIo5UtkdLHYTpoWxRE6Vf5OGLObGQk="
|
||||
"rev": "da27bcae1a8902af1ae6a5c55d3674f22709bbf5",
|
||||
"hash": "sha256-317zRhJPc0D9A58W8fdCGFmpNZ5vACfd/tlZOsp/Cvw="
|
||||
},
|
||||
"src/third_party/domato/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
|
||||
|
|
@ -1254,18 +1254,18 @@
|
|||
},
|
||||
"src/third_party/libaddressinput/src": {
|
||||
"url": "https://chromium.googlesource.com/external/libaddressinput.git",
|
||||
"rev": "e20690c8d5178bb282641d5eb06ef0298ff4cbc5",
|
||||
"hash": "sha256-rX7LQNUgk5ZljUrayD1a/SUrBrvpomW0Cs0KBw3lYu4="
|
||||
"rev": "81eb9628382b07d371d8ea0b11badf7de3857fd5",
|
||||
"hash": "sha256-6yDZpZ+CwxGqNO4+lZLFB6ESREeVku1BoOMtR+hKQ3I="
|
||||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"url": "https://aomedia.googlesource.com/aom.git",
|
||||
"rev": "33dba9e12a9f12e737eaa7c2624e8c580950a89a",
|
||||
"hash": "sha256-01DbV0kQFg1yyFpVeo82KBoZHhizA7xnZ1qOuu4HTcs="
|
||||
"rev": "137bcff61e73fdd2836dc04e8258bfb49cef595e",
|
||||
"hash": "sha256-oDubKvgqMk3w0luM//rR3NnCOk1h/WVTyRkuCmYASrw="
|
||||
},
|
||||
"src/third_party/crabbyavif/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
||||
"rev": "c433c9a32320aed983e4106931596fbbae3f77ee",
|
||||
"hash": "sha256-yw1cXB6s6biD2vj2K/3sVbKiaNK7bt+NkbQovbYlJ2Q="
|
||||
"rev": "5e140b5abb9a91eb25b5ef66d29f6ee784ab7eab",
|
||||
"hash": "sha256-tN+2YH2O9FTV50o4OVhKcKdwRwTI8NuNA0WqljUcrmo="
|
||||
},
|
||||
"src/third_party/nearby/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
|
||||
|
|
@ -1279,8 +1279,8 @@
|
|||
},
|
||||
"src/third_party/jetstream/main": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
|
||||
"rev": "de88e36ae91d5bd13126fa4cc4b0e0346d779842",
|
||||
"hash": "sha256-ZpU0ONqIVmY2VR0MxqtYj8KPNlK0L21gLJuT/Ff7KI8="
|
||||
"rev": "b7babdf323e64e69bd2f6c376189c15825f5c73a",
|
||||
"hash": "sha256-s6UMdUYWZqk/MbhyCi2zdQNgni98gGsYxcuUh/5AUy0="
|
||||
},
|
||||
"src/third_party/jetstream/v2.2": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
|
||||
|
|
@ -1319,8 +1319,8 @@
|
|||
},
|
||||
"src/third_party/cros-components/src": {
|
||||
"url": "https://chromium.googlesource.com/external/google3/cros_components.git",
|
||||
"rev": "e580888fcc1c108e25c218ccf8b7a4372de18d57",
|
||||
"hash": "sha256-p0Wfvhg/j8v9xL9Pueo7xPVHBKowOLI00AeIZXPQw4k="
|
||||
"rev": "0abb2efaa3d16db861c9710b193c39e657ac3bdf",
|
||||
"hash": "sha256-viuntf6umyLZwDR9BXG+ZOakp9f8rvpZYDBYAUkKzL4="
|
||||
},
|
||||
"src/third_party/libdrm/src": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
|
||||
|
|
@ -1329,8 +1329,8 @@
|
|||
},
|
||||
"src/third_party/expat/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
|
||||
"rev": "f31adfd584b7f6c50bbf4d22eb928538ffc9145a",
|
||||
"hash": "sha256-tLz4RejYQ/kFXhsWTduuGcinfUkqxYKPCpsou+WlvBc="
|
||||
"rev": "9bdfbc77e3355405ceefbe59420abed953a5657e",
|
||||
"hash": "sha256-veGg5/QjtBSmxYa8IyHF0NxEdJzlcJSZfzw8ay3ASVU="
|
||||
},
|
||||
"src/third_party/libipp/libipp": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git",
|
||||
|
|
@ -1339,8 +1339,8 @@
|
|||
},
|
||||
"src/third_party/libjpeg_turbo": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
|
||||
"rev": "d1f5f2393e0d51f840207342ae86e55a86443288",
|
||||
"hash": "sha256-KGeB/lTjhm8DQBDZVSPENvZEGSHeLTkviJrYsFh5vEM="
|
||||
"rev": "640f254ad0fa03f6b1f29f89b7dd9366f2f6e533",
|
||||
"hash": "sha256-wor4RTF3/5BFL9EWcGEofY+M4HN2+/KJUaOY+u86K5Q="
|
||||
},
|
||||
"src/third_party/liblouis/src": {
|
||||
"url": "https://chromium.googlesource.com/external/liblouis-github.git",
|
||||
|
|
@ -1349,8 +1349,8 @@
|
|||
},
|
||||
"src/third_party/libphonenumber/src": {
|
||||
"url": "https://chromium.googlesource.com/external/libphonenumber.git",
|
||||
"rev": "ade546d8856475d0493863ee270eb3be9628106b",
|
||||
"hash": "sha256-cLtsM35Ir3iG3j8+Cy2McL1ysRB0Y1PXealAKl05Twg="
|
||||
"rev": "c25558e39e2bcc9f26f7a2a1ef804324169eaf8f",
|
||||
"hash": "sha256-Lr/gB5Em+TE092McPwJdOU0Ab4zyP4/2ZxlavMZMm+s="
|
||||
},
|
||||
"src/third_party/libprotobuf-mutator/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
|
||||
|
|
@ -1374,8 +1374,8 @@
|
|||
},
|
||||
"src/third_party/libvpx/source/libvpx": {
|
||||
"url": "https://chromium.googlesource.com/webm/libvpx.git",
|
||||
"rev": "d1268a5f3f3553ad7735911c614e8548381ca3cd",
|
||||
"hash": "sha256-6IZTDhtjVWiqTv+jUC6Wr/tSqvql3thi9+mt+M3ixt4="
|
||||
"rev": "5f00413667d19ad683674524a9d03543d86d188b",
|
||||
"hash": "sha256-uTteQ+z7t5KOtPuBoZazmonRHd8jGS1/YZAq+RAvhX4="
|
||||
},
|
||||
"src/third_party/libwebm/source": {
|
||||
"url": "https://chromium.googlesource.com/webm/libwebm.git",
|
||||
|
|
@ -1389,8 +1389,8 @@
|
|||
},
|
||||
"src/third_party/libyuv": {
|
||||
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
|
||||
"rev": "644251f252a84bf8ce91ff0aca86a9b16b069ab8",
|
||||
"hash": "sha256-DsoOY8bg0sPOF8tF67Gk7fRqdQzG1hc9fVMlZVjKWU4="
|
||||
"rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272",
|
||||
"hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI="
|
||||
},
|
||||
"src/third_party/lss": {
|
||||
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
|
||||
|
|
@ -1409,8 +1409,8 @@
|
|||
},
|
||||
"src/third_party/nasm": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
|
||||
"rev": "358842b6b7dd69b2ed635bef17f941e030a05e5f",
|
||||
"hash": "sha256-YwjwubijMZ9OvYeMUVMSunWZ2VCuqUFEOyv/MK/oojc="
|
||||
"rev": "525a09a813be0f75b646ee93fc2a31c27b87d722",
|
||||
"hash": "sha256-uC6bGxSdz1V2SXIQjMsDd6555b3gAPN1Y0ZQtWoqDww="
|
||||
},
|
||||
"src/third_party/neon_2_sse/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
|
||||
|
|
@ -1424,8 +1424,8 @@
|
|||
},
|
||||
"src/third_party/openscreen/src": {
|
||||
"url": "https://chromium.googlesource.com/openscreen",
|
||||
"rev": "684bcd767271a21f3e5d475b17a0fd862f16c65e",
|
||||
"hash": "sha256-Yjz2E1/h+zp7L2x0zE0l+ktQIiSrJ4ZknXOhaVPKQVE="
|
||||
"rev": "37ff938a93cb04c6b77e019b52328c8e9b320317",
|
||||
"hash": "sha256-M57un/TVQPfTnKScVHS1VK1cUs8F/YPT3TwMVdo+mhM="
|
||||
},
|
||||
"src/third_party/openscreen/src/buildtools": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
|
||||
|
|
@ -1439,13 +1439,13 @@
|
|||
},
|
||||
"src/third_party/pdfium": {
|
||||
"url": "https://pdfium.googlesource.com/pdfium.git",
|
||||
"rev": "be702d63baba7507bb1f6f6ff2d35be9c133c08c",
|
||||
"hash": "sha256-hXqSJn1C0ISLWx68UicggiL8xzgQX2Y8l75vtpJgHeU="
|
||||
"rev": "c052afb72a08d79a26bcf3103d11f344981b09f1",
|
||||
"hash": "sha256-zqfErp0pDXHXIvRpZ1TJu2UGXNZjATRbPgQWTniKTJs="
|
||||
},
|
||||
"src/third_party/perfetto": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
|
||||
"rev": "97c58a94bb6495c4e202467fb1c55eaa22b5670f",
|
||||
"hash": "sha256-qtClkWAluLDRZn7yrHLU7qp9szP+/WsiG5JZZzRKd38="
|
||||
"rev": "9ede949f025303868fa0c42418f122ac47312539",
|
||||
"hash": "sha256-IRzEqgunO4Nfz+FkYir8G/Ht+Zsn6wpzncgkEFpsC+k="
|
||||
},
|
||||
"src/third_party/protobuf-javascript/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
|
||||
|
|
@ -1454,8 +1454,8 @@
|
|||
},
|
||||
"src/third_party/pthreadpool/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
|
||||
"rev": "a56dcd79c699366e7ac6466792c3025883ff7704",
|
||||
"hash": "sha256-WfyuPfII4eSmLskZV0TAcu4K6OyW38TjkDHm+VUx5eY="
|
||||
"rev": "02460584c6092e527c8b89f7df4de143d70e801f",
|
||||
"hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw="
|
||||
},
|
||||
"src/third_party/pyelftools": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
|
||||
|
|
@ -1484,13 +1484,18 @@
|
|||
},
|
||||
"src/third_party/search_engines_data/resources": {
|
||||
"url": "https://chromium.googlesource.com/external/search_engines_data.git",
|
||||
"rev": "2345fee6ce4ae24d9c365d5c0884ece593c55c67",
|
||||
"hash": "sha256-5qkra6FURaMvEOk+ZKMRH1hc8ixEnk3u4rxNm0G8tuQ="
|
||||
"rev": "1aab872af8d44dcf59362d7ba8255922f74fafde",
|
||||
"hash": "sha256-5/XnNx6Pyk4KBb9krVo9u6i7LWNrsLLOIi4qhEY2PZc="
|
||||
},
|
||||
"src/third_party/sframe/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/cisco/sframe",
|
||||
"rev": "b14090904433bed0d4ec3f875b9b39f3e0555930",
|
||||
"hash": "sha256-bw+6ycUpnFZJhtXFUzr7XTOljNrs+7oFdVY+LN0Rqek="
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "75c589e1f436688fca8f5b7f7a8affeafaa4f923",
|
||||
"hash": "sha256-x0jEek7iJv7WBNdkOUPc5VvIYJw9QPzzTChFUofqErM="
|
||||
"rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0",
|
||||
"hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
|
|
@ -1504,13 +1509,13 @@
|
|||
},
|
||||
"src/third_party/sqlite/src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
|
||||
"rev": "508ab21dc25702ed6690c4dd77da209a6bcd1239",
|
||||
"hash": "sha256-SfvLfBKdPjFvZ7CzUeFMcyoHdCzQgNRQwZyzb6MRtJg="
|
||||
"rev": "fc121d7d03cd6cbf499ec06a5112b263471b1181",
|
||||
"hash": "sha256-hf9PxQhXEKT49GbkFYCvRPBT0Qu+hDnDpebI92yO1Oo="
|
||||
},
|
||||
"src/third_party/swiftshader": {
|
||||
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
|
||||
"rev": "f9d5d49a3c599a315e3493dc1e9b5309cffb3305",
|
||||
"hash": "sha256-kBfqgXXJeEPT80mu6CJ2Bwmdv/y8jVzM6TedMXbzo4o="
|
||||
"rev": "fce27a96526f54c6d31fdccf57629788e3712220",
|
||||
"hash": "sha256-bmXZLpz3wv7eQWoqTjZmjwnnILWSIjZ8iqo8CeLk5fw="
|
||||
},
|
||||
"src/third_party/text-fragments-polyfill/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
|
||||
|
|
@ -1519,23 +1524,23 @@
|
|||
},
|
||||
"src/third_party/tflite/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
|
||||
"rev": "2216f531fb72119745382c62f232acf9790f4b6e",
|
||||
"hash": "sha256-zySLNPmug5HS5pwJ/lEMAWjjZSOuxdTgup7Y90k7NZI="
|
||||
"rev": "999d49c10046e240cd5366d349d3a5f6af16a0d4",
|
||||
"hash": "sha256-eSqaWXtzZ4Bi9ilaJYGdZamzUjmo+AtDZ9KeZhsc/fY="
|
||||
},
|
||||
"src/third_party/litert/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git",
|
||||
"rev": "9b5418dd7a1a318eed20395743dcc868df17d8b0",
|
||||
"hash": "sha256-80amwDPF3RrcoTaTQsunNmlvBGs6KCv369FW3J/Xcts="
|
||||
"rev": "09b4b05203fd7a9402ffcce9cc736d887ff7e3fc",
|
||||
"hash": "sha256-skMOzpsn67mmOAp7Mf6UrJdi2lbiQQ8b6kBy4Ik2ED8="
|
||||
},
|
||||
"src/third_party/vulkan-deps": {
|
||||
"url": "https://chromium.googlesource.com/vulkan-deps",
|
||||
"rev": "d234b7b29748c07ef389279dd24f533ebd04cadc",
|
||||
"hash": "sha256-w49HOjPixSI/C5IGlxQMj/Ol9f/Lr2zI2oMhQzzu1zk="
|
||||
"rev": "669a28b1f31f89bfc46b74791f127bcc5e5b2f06",
|
||||
"hash": "sha256-lsR+sh+XQP/wKgkBbie6Gp+kQNFnnC8TeNWpiWTdevw="
|
||||
},
|
||||
"src/third_party/glslang/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
|
||||
"rev": "458ff50a67cb69371850068a62b78f1990a1ff9a",
|
||||
"hash": "sha256-2WauVjAEeZn16b4fE4ImKPX3wjDmeN92mqWi3NMiXSw="
|
||||
"rev": "f6d9303ddaf2e879b9155f7186cd234f5a79079c",
|
||||
"hash": "sha256-ru3QVyyyqxZRcvSpy9pYhHHhkjuLVhQbgOT/vQJ/oIw="
|
||||
},
|
||||
"src/third_party/spirv-cross/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
|
||||
|
|
@ -1544,43 +1549,43 @@
|
|||
},
|
||||
"src/third_party/spirv-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
|
||||
"rev": "126038020c2bd47efaa942ccc364ca5353ffccde",
|
||||
"hash": "sha256-QBX2M+ZSWgVvCx58NeDIdf6mIkdJbecDktBfUWGPvNc="
|
||||
"rev": "1e770e7de8373a8dd49f23416cf7ca4001d01040",
|
||||
"hash": "sha256-t8Shkoa90TJt1MbTOefnLaguW4eYKsRFO1Jd0AUc70Y="
|
||||
},
|
||||
"src/third_party/spirv-tools/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
|
||||
"rev": "2ec8457ab33d539b6f1fecc998360c0b8b05ed4f",
|
||||
"hash": "sha256-9TBb/gnDXgZRZXhF27KEQ0XQI5itRHKJQjLrkFDQq7Q="
|
||||
"rev": "b38c4f83024546d4000b2db8e2294cf81b7f26e0",
|
||||
"hash": "sha256-q5G4B75xBIXl1aG/vzbIDrc3Hs/MFoQ4nwh4ozb8hys="
|
||||
},
|
||||
"src/third_party/vulkan-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
|
||||
"rev": "f6a6f7ab165cedbfa2a7d0c93fe27a2d01ce09c8",
|
||||
"hash": "sha256-ZbjmxbRUiVJADNRWziCH0UIM09qKf+lm9PRnWOhZFhQ="
|
||||
"rev": "015e25c3c91b70eb1a754d36fb14c4ba6ad9b0b9",
|
||||
"hash": "sha256-pUxPwFGbOzP8ymTooeA1slFWEFsRoqUROSnndVtLiY8="
|
||||
},
|
||||
"src/third_party/vulkan-loader/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
|
||||
"rev": "15a84652b94e465e9a7b25eb507193929863bc2f",
|
||||
"hash": "sha256-pdC3YCM0Nzeabi5TPD+qR5PVdsxmWMnf2L9HsOcbv84="
|
||||
"rev": "cf0cf82ea16c0ff0be75940f282540d6085b2d3b",
|
||||
"hash": "sha256-uyoysS7lSBNDRfvcwPT+gQqhE20UxiYUEw1UXnYS3fY="
|
||||
},
|
||||
"src/third_party/vulkan-tools/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
|
||||
"rev": "7c46da2b39036a80ce088576d5794bf39e667f56",
|
||||
"hash": "sha256-nAyNVveeGg9sA0E37YiEPm+UdKsy48nAOjnUYHQnuqw="
|
||||
"rev": "e3d18f90c0b8ef1f52539e0674a42f0adfe30381",
|
||||
"hash": "sha256-Hs9N0FM3eWWjLm4BrDJoZIrsPDVFx0iRAJeQ4gHTM7o="
|
||||
},
|
||||
"src/third_party/vulkan-utility-libraries/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
|
||||
"rev": "2c909c1ab6f9c6caba39a84a4887186b3fafdead",
|
||||
"hash": "sha256-k3xeKHQbd2rTQJsOZKXEMPrYjcHwoCC1N12F6AIP6Ho="
|
||||
"rev": "8383c46b129c2b3a5f3833e602d946d2fcc57e39",
|
||||
"hash": "sha256-ZBie5uDTVEehxRQW1GZY5Ki/bnp82LoW3jfMUFL0O9A="
|
||||
},
|
||||
"src/third_party/vulkan-validation-layers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
|
||||
"rev": "b105d8ea361af258abed65efb5a1565c031dcf1c",
|
||||
"hash": "sha256-GgznBGYgnCFMNaqAOQ15dlw2dOFfSp3mAV2KokVLzgk="
|
||||
"rev": "044eaba8a34a6e3bfb1d6aafac7c01068813a2b6",
|
||||
"hash": "sha256-i3hochkK0LZPg8CsZMFkAL+8tf8QuuwtApAc4FDd0RM="
|
||||
},
|
||||
"src/third_party/vulkan_memory_allocator": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
|
||||
"rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50",
|
||||
"hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo="
|
||||
"rev": "7e55b011e16182fc349149abbd3aaf3b1db46421",
|
||||
"hash": "sha256-fOnFkcQDEGIe5yB507qnP9nA1LBBPFblncNiJ8JxAwI="
|
||||
},
|
||||
"src/third_party/wayland/src": {
|
||||
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
|
||||
|
|
@ -1614,18 +1619,23 @@
|
|||
},
|
||||
"src/third_party/webgpu-cts/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
|
||||
"rev": "3b327ebc44f11212fd3872972a6dd394634fb9e3",
|
||||
"hash": "sha256-RSZVKv2Z0pg2cGa3Elr2r5VZqdxlRJ+6mzm1Au1qg1I="
|
||||
"rev": "b507bd117e53db86f2fb52d0d858d3ae7d684a85",
|
||||
"hash": "sha256-6Y5Z0ErtsZdbuWTHa+PEiOxcZSbjBcnuOHbgtI1/+80="
|
||||
},
|
||||
"src/third_party/webpagereplay": {
|
||||
"url": "https://chromium.googlesource.com/webpagereplay.git",
|
||||
"rev": "b7ac48f52cd298e966a76eb054412915c3e445d4",
|
||||
"hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE="
|
||||
"rev": "b2b856131e36c99e9de9c419fe8ca02f857082ba",
|
||||
"hash": "sha256-+hcaP7C5Eh3SLl5B8mRgOVdM/tvnFnb/oqUIWPoe0NA="
|
||||
},
|
||||
"src/third_party/webpagereplay/third_party/clang-format/script": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git",
|
||||
"rev": "6eddfb5ec5f92127a531eda66c568d3a11e7ec11",
|
||||
"hash": "sha256-Cm6BOOlEyD0kdYxMSmk6Fj1Dnfs3zCzXsm+BOXgBme0="
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "28311abc149a9bb7e6761a3d54f362a8d77e6793",
|
||||
"hash": "sha256-WuaxKrbISJ1nwyoj2sPAhGCNz33xEYSX1WlDiM+zxpw="
|
||||
"rev": "1f975dfd761af6e5d76d28333191973b258d82a8",
|
||||
"hash": "sha256-ucH+9HBkFyOKEItAWVoYmEzyU7h/UgWIvp/eC/JqGWU="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
|
|
@ -1639,8 +1649,8 @@
|
|||
},
|
||||
"src/third_party/xnnpack/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
|
||||
"rev": "2ad25fc09167df69c6c02eb8082a0b9658dd5e80",
|
||||
"hash": "sha256-vBMGBXzJPCcsc2kMyGecjti68oZHWUwJKd7tkKub6kg="
|
||||
"rev": "56ac34b3f45fae2eca1f32584f7f0b279be2cf1f",
|
||||
"hash": "sha256-uw3r5g5rWamlFubBkXDb4KRx3hkOAoQyFo8l95GYGZI="
|
||||
},
|
||||
"src/third_party/libei/src": {
|
||||
"url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/libinput/libei.git",
|
||||
|
|
@ -1649,13 +1659,18 @@
|
|||
},
|
||||
"src/third_party/zstd/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
|
||||
"rev": "3ae099b48dfcfe02b1b3ba81ab85457f8a922e9f",
|
||||
"hash": "sha256-futF0sM6z9HAl6AMJwUULBRByN92FTBjRIzYb2vBFGg="
|
||||
"rev": "5233c58e6ca0b1c4c6b353ad79649191ed195bdc",
|
||||
"hash": "sha256-vEl0s7Mjh+5rciOMxm99PNWiamtCk+sTN4lRYKCIZ+8="
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "933ce636c562cd54d68e7f7c93ab5cdffd685fca",
|
||||
"hash": "sha256-zYArO6QS9nDIVWPINRVaDN1uX8X/wchBDeZHPZnwHYk="
|
||||
"rev": "968f19a8970f8d91702d86f0ec1522f3909781b7",
|
||||
"hash": "sha256-x3rCWvC3hEjyJq6PNThhZEp4oRF9Y1JJEPnZTqVNVrY="
|
||||
},
|
||||
"src/agents/shared": {
|
||||
"url": "https://chromium.googlesource.com/chromium/agents.git",
|
||||
"rev": "e75efa515896f6bf1dea92eaffbcf8ee711a65d8",
|
||||
"hash": "sha256-z2GrzF8jDkdfBdq1HP3gTgQpoqjmhc80kEZBmlue0os="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
libtorrent-rasterbar,
|
||||
python3Packages,
|
||||
gtk3,
|
||||
libappindicator-gtk3,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
librsvg,
|
||||
|
|
@ -54,6 +55,7 @@ let
|
|||
gtk3
|
||||
gobject-introspection
|
||||
pygobject3
|
||||
libappindicator-gtk3
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
# overridable. This is useful when the upstream archive was replaced
|
||||
# and nixpkgs is not in sync yet.
|
||||
officeVersion ? {
|
||||
version = "1220";
|
||||
version = "1234";
|
||||
edition = "2024";
|
||||
hash = "sha256-F1Srm3/4UPifYls21MhjbpxSyLaT0gEVzEMQF0gIzi0=";
|
||||
hash = "sha256-q5QUevkSxdh622ZMhwbO44HLJowpg0vwv9de7hdOUQQ=";
|
||||
},
|
||||
|
||||
...
|
||||
|
|
|
|||
|
|
@ -80,12 +80,13 @@ pnpmConfigHook() {
|
|||
fi
|
||||
|
||||
echo "Installing dependencies"
|
||||
if [[ -n "$pnpmWorkspaces" ]]; then
|
||||
local IFS=" "
|
||||
for ws in $pnpmWorkspaces; do
|
||||
pnpmInstallFlags+=("--filter=$ws")
|
||||
done
|
||||
fi
|
||||
|
||||
local -a pnpmWorkspacesArray
|
||||
concatTo pnpmWorkspacesArray pnpmWorkspaces
|
||||
|
||||
for ws in "${pnpmWorkspacesArray[@]}"; do
|
||||
pnpmInstallFlags+=("--filter=$ws")
|
||||
done
|
||||
|
||||
runHook prePnpmInstall
|
||||
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bottom";
|
||||
version = "0.13.0";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClementTsang";
|
||||
repo = "bottom";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-UlkdYrfIjZU6N9W3KSZj4Au333DdejQG3TPRu5CjuBE=";
|
||||
hash = "sha256-0RaMkTmX6figTBjAxoH57330pHpVJJP8br33FxezqB0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bQOhLlnMHFq5O5OUPWGmt00miKJTycBdhDUnfuUWPVk=";
|
||||
cargoHash = "sha256-wCcc0t8MA0koeGdqVcz4uYKChU7gtHTQ8yqZGNigSxA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoAddDriverRunpath
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "filebeat";
|
||||
version = "8.19.16";
|
||||
version = "8.19.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OBPaSbPAp7SvhEi2yycgT70yRfCtIEdkL4/GSR2YrO4=";
|
||||
hash = "sha256-Xpth1SoXMXCUh/DFf3wA+Ql6SedtUB7tCYzDElpX5Lc=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
||||
vendorHash = "sha256-aCoXzWnNsctxJmsfeUyVSLkUY59adtIn2JxxGKPBob8=";
|
||||
vendorHash = "sha256-Wxk+eI0XfBpQqqUNuskyr+/bTRqT38hszdkz/LJweQo=";
|
||||
|
||||
subPackages = [ "filebeat" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,15 +11,19 @@
|
|||
|
||||
let
|
||||
inherit (stdenv.hostPlatform.uname) processor;
|
||||
version = "6.4.0";
|
||||
version = "6.7.1";
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
|
||||
hash = "sha256-Q4MwU3dIFheKKSMxzCBZI8XoForaN41BuRGVMhJaUKw=";
|
||||
hash = "sha256-Ddypd9622dtL2GZIX5QI5y4oadDeoHN7GNS/5HKFis4=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz";
|
||||
hash = "sha256-PZ95w2X4sqTLZGZ5wygt7WjSK4Gfgtdh/UCPo+8Ysc8=";
|
||||
hash = "sha256-blmsuD5t6jZx4uKVNl/DfED90oDNvd1QrPJIkQ4UoOM=";
|
||||
};
|
||||
"riscv64-linux" = {
|
||||
url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxRISCVPreview.tar.gz";
|
||||
hash = "sha256-TByNeLqqHrnrLcX/meXNy6Evvebf0/xWnUohd/TwiAk=";
|
||||
};
|
||||
};
|
||||
geekbench_avx2 = lib.optionalString stdenv.hostPlatform.isx86_64 "geekbench_avx2";
|
||||
|
|
@ -13,11 +13,21 @@
|
|||
libmpc,
|
||||
gnutar,
|
||||
makeWrapper,
|
||||
backend ? "mcode",
|
||||
backend ? if stdenv.hostPlatform.isAarch64 then "llvm-jit" else "mcode",
|
||||
}:
|
||||
|
||||
assert backend == "mcode" || backend == "llvm" || backend == "gcc";
|
||||
assert lib.asserts.assertOneOf "backend" backend [
|
||||
"mcode"
|
||||
"llvm"
|
||||
"llvm-jit"
|
||||
"gcc"
|
||||
];
|
||||
|
||||
let
|
||||
backendIsLLVM = backend == "llvm";
|
||||
backendIsLLVMJit = backend == "llvm-jit";
|
||||
backendIsGCC = backend == "gcc";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghdl-${backend}";
|
||||
version = "6.0.0";
|
||||
|
|
@ -37,17 +47,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
gnat
|
||||
]
|
||||
++ lib.optionals (backend == "llvm" || backend == "gcc") [
|
||||
++ lib.optionals (backendIsLLVM || backendIsGCC) [
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals (backend == "gcc") [
|
||||
++ lib.optionals backendIsGCC [
|
||||
texinfo
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals (backend == "gcc") [
|
||||
++ lib.optionals backendIsGCC [
|
||||
gmp
|
||||
mpfr
|
||||
libmpc
|
||||
|
|
@ -57,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# If llvm 7.0 works, 7.x releases should work too.
|
||||
sed -i 's/check_version 7.0/check_version 7/g' configure
|
||||
''
|
||||
+ lib.optionalString (backend == "gcc") ''
|
||||
+ lib.optionalString backendIsGCC ''
|
||||
${gnutar}/bin/tar -xf ${gcc13.cc.src}
|
||||
'';
|
||||
|
||||
|
|
@ -66,14 +76,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"--disable-werror"
|
||||
"--enable-synth"
|
||||
]
|
||||
++ lib.optionals (backend == "llvm") [
|
||||
++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [
|
||||
"--with-llvm-config=${llvm.dev}/bin/llvm-config"
|
||||
]
|
||||
++ lib.optionals (backend == "gcc") [
|
||||
++ lib.optionals backendIsLLVMJit [
|
||||
"--with-llvm-jit"
|
||||
]
|
||||
++ lib.optionals backendIsGCC [
|
||||
"--with-gcc=gcc-${gcc13.cc.version}"
|
||||
];
|
||||
|
||||
buildPhase = lib.optionalString (backend == "gcc") ''
|
||||
buildPhase = lib.optionalString backendIsGCC ''
|
||||
make copy-sources
|
||||
mkdir gcc-objs
|
||||
cd gcc-objs
|
||||
|
|
@ -93,14 +106,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--with-mpfr-include=${mpfr.dev}/include \
|
||||
--with-mpfr-lib=${mpfr.out}/lib \
|
||||
--with-mpc=${libmpc} \
|
||||
--enable-default-pie=${if stdenv.targetPlatform.hasSharedLibraries then "yes" else "no"}
|
||||
--enable-default-pie=${lib.boolToYesNo stdenv.targetPlatform.hasSharedLibraries}
|
||||
make -j $NIX_BUILD_CORES
|
||||
make install
|
||||
cd ../
|
||||
make -j $NIX_BUILD_CORES ghdllib
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (backend == "llvm" || backend == "gcc") ''
|
||||
postFixup = lib.optionalString (backendIsLLVM || backendIsGCC) ''
|
||||
wrapProgram $out/bin/ghdl \
|
||||
--set LIBRARY_PATH ${lib.makeLibraryPath [ zlib ]} \
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
|
||||
|
|
@ -108,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
hardeningDisable = [
|
||||
]
|
||||
++ lib.optionals (backend == "gcc") [
|
||||
++ lib.optionals backendIsGCC [
|
||||
# GCC compilation fails with format errors
|
||||
"format"
|
||||
];
|
||||
|
|
@ -135,7 +148,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
thoughtpolice
|
||||
sempiternal-aurora
|
||||
];
|
||||
platforms =
|
||||
lib.platforms.linux ++ lib.optionals (backend == "mcode" || backend == "llvm") [ "x86_64-darwin" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
]
|
||||
++ lib.optionals (backendIsLLVM || backendIsLLVMJit || backendIsGCC) [ "aarch64-linux" ]
|
||||
++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "aarch64-darwin" ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
ghdl-llvm,
|
||||
ghdl-llvm-jit,
|
||||
ghdl-mcode,
|
||||
ghdl-gcc,
|
||||
backend,
|
||||
|
|
@ -10,12 +11,14 @@ let
|
|||
ghdl =
|
||||
if backend == "llvm" then
|
||||
ghdl-llvm
|
||||
else if backend == "llvm-jit" then
|
||||
ghdl-llvm-jit
|
||||
else if backend == "gcc" then
|
||||
ghdl-gcc
|
||||
else
|
||||
ghdl-mcode;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "ghdl-test-simple";
|
||||
meta.timeout = 300;
|
||||
nativeBuildInputs = [ ghdl ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pnpm_10_29_2,
|
||||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
nodejs,
|
||||
|
|
@ -13,39 +13,57 @@
|
|||
makeWrapper,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gitify";
|
||||
version = "6.17.0";
|
||||
version = "6.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitify-app";
|
||||
repo = "gitify";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-A9LeitceqDGictQbB7OYOI/pggrW9u8A7TUMblK/LHM=";
|
||||
hash = "sha256-zKvI9uwKiKKbHTzM/LIhCzUCcM104UNReRJb51iQonc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_10_29_2
|
||||
pnpm
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-0iTvrIe5PVj99ePWt8rn+laikdJ5TaNQ8GZGHyUTTQI=";
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-KjRcUVeByCXetX7skJoxt6LU6EZcOG+5U2y3sr3XP7A=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace config/electron-builder.js \
|
||||
substituteInPlace electron-builder.js \
|
||||
--replace-fail "'Adam Setch (5KD23H9729)'" "null" \
|
||||
--replace-fail "'scripts/afterSign.js'" "null"
|
||||
|
||||
# With a nixpkgs electron wrapper, app.isPackaged always returns false,
|
||||
# so isDevMode() is always true. This causes the config.ts getter for
|
||||
# indexHtml to return VITE_DEV_SERVER_URL (which is empty) instead of the
|
||||
# packaged file:// URL, resulting in a blank white window.
|
||||
# Patch isDevMode() to false so the file:// path is always used.
|
||||
substituteInPlace src/main/config.ts \
|
||||
--replace-fail "isDevMode()" "false"
|
||||
|
||||
# Disable auto-updater; updates are handled via nixpkgs.
|
||||
substituteInPlace src/main/updater.ts \
|
||||
--replace-fail "if (!this.menubar.app.isPackaged)" "if (true)"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
|
@ -57,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
pnpm build
|
||||
pnpm exec electron-builder \
|
||||
--config config/electron-builder.js \
|
||||
--config electron-builder.js \
|
||||
--dir \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion="${electron.version}" \
|
||||
|
|
|
|||
126
pkgs/by-name/kr/krunkit/boot-test.nix
Normal file
126
pkgs/by-name/kr/krunkit/boot-test.nix
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
{
|
||||
krunkit,
|
||||
lib,
|
||||
nixos,
|
||||
pkgs,
|
||||
runCommand,
|
||||
}:
|
||||
|
||||
let
|
||||
linuxPkgs = import pkgs.path {
|
||||
system = "aarch64-linux";
|
||||
};
|
||||
|
||||
nixosConfig =
|
||||
(nixos {
|
||||
nixpkgs.pkgs = linuxPkgs;
|
||||
|
||||
imports = [ "${pkgs.path}/nixos/modules/profiles/qemu-guest.nix" ];
|
||||
|
||||
boot = {
|
||||
kernelParams = [ "console=hvc0" ];
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = false;
|
||||
systemd-boot.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
documentation.enable = false;
|
||||
environment.defaultPackages = [ ];
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.krunkit-boot-ok = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "multi-user.target" ];
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = ''
|
||||
echo krunkit-boot-ok >/dev/hvc0
|
||||
'';
|
||||
};
|
||||
|
||||
system.stateVersion = lib.trivial.release;
|
||||
}).config;
|
||||
|
||||
image = import "${pkgs.path}/nixos/lib/make-disk-image.nix" {
|
||||
inherit lib;
|
||||
config = nixosConfig;
|
||||
pkgs = linuxPkgs;
|
||||
|
||||
additionalSpace = "64M";
|
||||
baseName = "krunkit-nixos";
|
||||
bootSize = "128M";
|
||||
copyChannel = false;
|
||||
format = "raw";
|
||||
partitionTableType = "efi";
|
||||
};
|
||||
in
|
||||
runCommand "krunkit-nixos-boot-test"
|
||||
{
|
||||
requiredSystemFeatures = [ "apple-virt" ];
|
||||
|
||||
meta.platforms = [ "aarch64-darwin" ];
|
||||
}
|
||||
''
|
||||
image=${image}/krunkit-nixos.img
|
||||
disk=$TMPDIR/disk.img
|
||||
console=$TMPDIR/console.log
|
||||
log=$TMPDIR/krunkit.log
|
||||
|
||||
cp "$image" "$disk"
|
||||
chmod u+w "$disk"
|
||||
touch "$console" "$log"
|
||||
|
||||
cleanup() {
|
||||
set +e
|
||||
if [ -n "''${pid:-}" ]; then
|
||||
kill "$pid" >/dev/null 2>&1
|
||||
for _ in $(seq 1 20); do
|
||||
kill -0 "$pid" >/dev/null 2>&1 || break
|
||||
sleep 1
|
||||
done
|
||||
kill -KILL "$pid" >/dev/null 2>&1
|
||||
fi
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
${krunkit}/bin/krunkit \
|
||||
--cpus 1 \
|
||||
--memory 1024 \
|
||||
--log-file "$log" \
|
||||
--device "virtio-blk,path=$disk,format=raw" \
|
||||
--device "virtio-serial,logFilePath=$console" &
|
||||
pid=$!
|
||||
|
||||
for _ in $(seq 1 120); do
|
||||
if grep -q krunkit-boot-ok "$console"; then
|
||||
touch "$out"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if ! kill -0 "$pid" >/dev/null 2>&1; then
|
||||
echo "krunkit exited before the guest reached multi-user.target"
|
||||
wait "$pid"
|
||||
cat "$log"
|
||||
cat "$console"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
done
|
||||
|
||||
echo "timed out waiting for krunkit guest boot marker"
|
||||
cat "$log"
|
||||
cat "$console"
|
||||
exit 1
|
||||
''
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
callPackage,
|
||||
cargo,
|
||||
darwin,
|
||||
pkg-config,
|
||||
|
|
@ -43,10 +44,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 edk2/KRUN_EFI.silent.fd $out/share/krunkit/KRUN_EFI.silent.fd
|
||||
'';
|
||||
|
||||
# This is necessary in order for the binary to keep its entitlements
|
||||
dontStrip = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
tests.boot = callPackage ./boot-test.nix {
|
||||
krunkit = finalAttrs.finalPackage;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Launch configurable virtual machines with libkrun";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm_10_29_2,
|
||||
pnpm_10,
|
||||
nodejs,
|
||||
electron,
|
||||
makeWrapper,
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pnpmConfigHook
|
||||
pnpm_10_29_2
|
||||
pnpm_10
|
||||
nodejs
|
||||
# we use a script wrapper here for environment variable expansion at runtime
|
||||
# https://github.com/NixOS/nixpkgs/issues/172583
|
||||
|
|
@ -47,9 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-ME74yxVwH4W9gE0XbtwDhR8g9QulN2eeOB1eekaHmG8=";
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-a0FvNwEAEAltQltgUf4tX0IGSdcYHkSodx4b9v5QQcg=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -47,14 +47,14 @@ in
|
|||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "12.3.3";
|
||||
version = "12.4.0";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-8aUp2lzVClyje6WHMTOnuOclhLEn1zMf6U5VTl5gEvc=";
|
||||
hash = "sha256-fDTQuY+WYhyJl5AqP4ZoJ1T7WXgCca35pXHAv/8CjlA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
electron_40,
|
||||
electron_41,
|
||||
makeWrapper,
|
||||
testers,
|
||||
mattermost-desktop,
|
||||
|
|
@ -10,21 +10,21 @@
|
|||
}:
|
||||
|
||||
let
|
||||
electron = electron_40;
|
||||
electron = electron_41;
|
||||
in
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mattermost-desktop";
|
||||
version = "6.1.2";
|
||||
version = "6.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EI1bDSiWdLCXlhUk1CmbUyYU7giey366cZLuhs0qtqY=";
|
||||
hash = "sha256-KSyFJrYy+pueSrX20SPBoudWfiHmy5L2O8TdzLJRiYk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-7XUZ2rt2fZiQNpW8iHnNDbCSuK4/srWqIEKOKM6xty8=";
|
||||
npmDepsHash = "sha256-70TBP4iDKuF4X9Tf0tsbUQ3N7bluoPn65OdfdcWin4Y=";
|
||||
npmBuildScript = "build-prod";
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ buildNpmPackage rec {
|
|||
chmod -R u+w electron-dist
|
||||
|
||||
npm exec electron-builder -- \
|
||||
--config electron-builder.json \
|
||||
--config electron-builder.ts \
|
||||
--dir \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
|
|
|||
|
|
@ -21,13 +21,16 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "peertube";
|
||||
version = "8.1.8";
|
||||
version = "8.2.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chocobozzz";
|
||||
repo = "PeerTube";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ei7MgEyHDJyLXnjI8mT7S7pLno+pTmFWZHc6oEZaTcM=";
|
||||
hash = "sha256-huyuaCWJ3w1KHCcQFjH2ZcofPjqwjLpLt+dg6auD/dQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
@ -40,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-fQ0FyBPZ3v3lCSoWYz1ccbOSrfgnzwQvOyE7Dp3ZGRY=";
|
||||
hash = "sha256-qrx8JtIAmn0JEsFwptrHlOL0IaYPJPLzjuDWNs7XFfc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -49,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
jq
|
||||
pnpmConfigHook
|
||||
pnpm_10
|
||||
nodejs_24
|
||||
which
|
||||
];
|
||||
|
||||
|
|
@ -69,8 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$PWD
|
||||
|
||||
# Build PeerTube server
|
||||
npm run build:server
|
||||
|
||||
|
|
@ -79,22 +81,22 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
# Build PeerTube cli
|
||||
npm run build:peertube-cli
|
||||
patchShebangs ~/apps/peertube-cli/dist/peertube.mjs
|
||||
patchShebangs ./apps/peertube-cli/dist/peertube.mjs
|
||||
|
||||
# Build PeerTube runner
|
||||
npm run build:peertube-runner
|
||||
patchShebangs ~/apps/peertube-runner/dist/peertube-runner.mjs
|
||||
patchShebangs ./apps/peertube-runner/dist/peertube-runner.mjs
|
||||
|
||||
# Clean up declaration files
|
||||
find \
|
||||
~/dist/ \
|
||||
~/packages/core-utils/dist/ \
|
||||
~/packages/ffmpeg/dist/ \
|
||||
~/packages/models/dist/ \
|
||||
~/packages/node-utils/dist/ \
|
||||
~/packages/server-commands/dist/ \
|
||||
~/packages/transcription/dist/ \
|
||||
~/packages/typescript-utils/dist/ \
|
||||
./dist/ \
|
||||
./packages/core-utils/dist/ \
|
||||
./packages/ffmpeg/dist/ \
|
||||
./packages/models/dist/ \
|
||||
./packages/node-utils/dist/ \
|
||||
./packages/server-commands/dist/ \
|
||||
./packages/transcription/dist/ \
|
||||
./packages/typescript-utils/dist/ \
|
||||
\( -name '*.d.ts' -o -name '*.d.ts.map' \) -type f -delete
|
||||
|
||||
runHook postBuild
|
||||
|
|
@ -104,21 +106,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
runHook preInstall
|
||||
|
||||
mkdir -p $out/dist
|
||||
mv ~/dist $out
|
||||
mv ~/node_modules $out/node_modules
|
||||
mv ./dist $out
|
||||
mv ./node_modules $out/node_modules
|
||||
|
||||
mkdir $out/client
|
||||
mv ~/client/{dist,node_modules,package.json} $out/client
|
||||
mv ./client/{dist,node_modules,package.json} $out/client
|
||||
|
||||
mkdir -p $out/packages/{core-utils,ffmpeg,models,node-utils,server-commands,transcription,typescript-utils}
|
||||
mv ~/packages/core-utils/{dist,package.json} $out/packages/core-utils
|
||||
mv ~/packages/ffmpeg/{dist,package.json} $out/packages/ffmpeg
|
||||
mv ~/packages/models/{dist,package.json} $out/packages/models
|
||||
mv ~/packages/node-utils/{dist,package.json} $out/packages/node-utils
|
||||
mv ~/packages/server-commands/{dist,package.json} $out/packages/server-commands
|
||||
mv ~/packages/transcription/{dist,package.json} $out/packages/transcription
|
||||
mv ~/packages/typescript-utils/{dist,package.json} $out/packages/typescript-utils
|
||||
mv ~/{config,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,pnpm-lock.yaml} $out
|
||||
mv ./packages/core-utils/{dist,package.json} $out/packages/core-utils
|
||||
mv ./packages/ffmpeg/{dist,package.json} $out/packages/ffmpeg
|
||||
mv ./packages/models/{dist,package.json} $out/packages/models
|
||||
mv ./packages/node-utils/{dist,package.json} $out/packages/node-utils
|
||||
mv ./packages/server-commands/{dist,package.json} $out/packages/server-commands
|
||||
mv ./packages/transcription/{dist,package.json} $out/packages/transcription
|
||||
mv ./packages/typescript-utils/{dist,package.json} $out/packages/typescript-utils
|
||||
mv ./{config,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,pnpm-lock.yaml} $out
|
||||
|
||||
# Remove broken symlinks in node_modules from workspace packages that aren't needed
|
||||
# by the built artifact. If any new packages break the check for broken symlinks,
|
||||
|
|
@ -129,11 +131,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
rm $out/client/node_modules/@peertube/player
|
||||
|
||||
mkdir -p $cli/bin
|
||||
mv ~/apps/peertube-cli/{dist,node_modules,package.json} $cli
|
||||
mv ./apps/peertube-cli/{dist,node_modules,package.json} $cli
|
||||
ln -s $cli/dist/peertube.mjs $cli/bin/peertube-cli
|
||||
|
||||
mkdir -p $runner/bin
|
||||
mv ~/apps/peertube-runner/{dist,node_modules,package.json} $runner
|
||||
mv ./apps/peertube-runner/{dist,node_modules,package.json} $runner
|
||||
ln -s $runner/dist/peertube-runner.mjs $runner/bin/peertube-runner
|
||||
|
||||
# Create static gzip and brotli files
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
|
||||
pname = "pgdog";
|
||||
version = "0.1.46";
|
||||
version = "0.1.47";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgdogdev";
|
||||
repo = "pgdog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9NW/LL6GaiYF2p/4MoGXGRS2jv9bLi+dmRDPPNPhnVw=";
|
||||
hash = "sha256-+YHn3gkKqrZuOZreItSXBjbn4A78wmf8r+dSRUD2at8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qt7CD4rTDt5DrQSSYvmheD+ib+JgM1IjbkKFKm6wXBE=";
|
||||
cargoHash = "sha256-W4XbcsFUk8g86zpPgYb/WztVoeCklIQmEhylQSE2a8E=";
|
||||
|
||||
# Hardcoded paths for C compiler and linker
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
makeWrapper,
|
||||
electron_40,
|
||||
electron_42,
|
||||
}:
|
||||
let
|
||||
electron = electron_40;
|
||||
electron = electron_42;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "pocket-casts";
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
jq,
|
||||
gnugrep,
|
||||
podman,
|
||||
krunkit,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -120,7 +121,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
installPhase =
|
||||
let
|
||||
commonWrapperArgs = "--prefix PATH : ${lib.makeBinPath [ podman ]}";
|
||||
prefixPackages = lib.makeBinPath (
|
||||
[ podman ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform krunkit) krunkit
|
||||
);
|
||||
commonWrapperArgs = "--prefix PATH : ${prefixPackages}";
|
||||
in
|
||||
(
|
||||
''
|
||||
|
|
|
|||
|
|
@ -78,8 +78,6 @@
|
|||
"@rollup/rollup-win32-ia32-msvc@npm:4.60.0": "0362713f7cfeb0b3deeedc11fabd551ec309cf21952735c2e2b76caf083331aef6701a11d2ad7a3824c439a9ff0d0c305aa12ef62f4f0a540eba2e952a18b00c",
|
||||
"@rollup/rollup-win32-x64-gnu@npm:4.60.0": "1400b3aace00dc90638bfd39d68275bb5f16143d240b9c36eb70f242ed2080c26fe14192fd3375120308ff94a7da1e169a8e0e56efbe41483f59731602d3be84",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.60.0": "c948b3a8ed6e73f2382dc41ffab3e9928f95c4a0e3481272b26ad04a5f73084ca13fd5c253887f9077c37cb1c91bd8494b4a45a7764c874aa105684e8424289a",
|
||||
"dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7",
|
||||
"iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43",
|
||||
"lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d",
|
||||
"lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06",
|
||||
"lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e",
|
||||
|
|
|
|||
|
|
@ -13,19 +13,19 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "r2modman";
|
||||
version = "3.2.17";
|
||||
version = "3.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebkr";
|
||||
repo = "r2modmanPlus";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DXGgTezCcMl37Vu7R+2dwWJmuqsXXtlWRYMX9gqm7+w=";
|
||||
hash = "sha256-QGs3kF2GkHlISmRb0cIYOKts1b1RvBj5qkc2cUPawwE=";
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src patches missingHashes;
|
||||
hash = "sha256-RAQgaxcQl15JqZsLA9ISfOiGgob4yYuc4bhjZFzW8xk=";
|
||||
hash = "sha256-6CwayFhy0ZwdL1ZOZVtCJLlchCv5raX7WF1V4TvVpq4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "radicle-desktop";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromRadicle {
|
||||
seed = "seed.radicle.dev";
|
||||
repo = "z4D5UCArafTzTQpDZNQRuqswh3ury";
|
||||
tag = "releases/${finalAttrs.version}";
|
||||
hash = "sha256-lbLBtLOBLf+w2Oq56JwXtouDykNrRZyrMxYX9131lf8=";
|
||||
hash = "sha256-XpzOzyUwAGLF/klXXbBFX5oLRSURB+AsL8n9WWv5x7s=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git_head
|
||||
|
|
@ -53,10 +53,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-7dXQ7wRJ2ZzuSplFdZTlfMetYPYA6/GODkuYjFRWfu0=";
|
||||
hash = "sha256-EigvRDUmiuz/wt5vZ3NSxovxjvxHVGrHdA9HIod/fO8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UOk9v6tNshe6pNYU2djz50Ep7BEdUd4bLkGadO5VUb0=";
|
||||
cargoHash = "sha256-HInTwQYuLVFnRCbQq2hNRPGJP1I9gBRQZQ9ul3DWtBQ=";
|
||||
|
||||
twemojiAssets = fetchFromGitHub {
|
||||
owner = "twitter";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
electron_40,
|
||||
electron_42,
|
||||
cacert,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
commandLineArgs ? [ ],
|
||||
|
|
@ -17,20 +18,20 @@
|
|||
}:
|
||||
|
||||
let
|
||||
electron = electron_40;
|
||||
electron = electron_42;
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "shogihome";
|
||||
version = "1.27.3";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunfish-shogi";
|
||||
repo = "shogihome";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-25Iu/bKUCotJdQESxPPOiYehwn+D3RYnZiJfMWJ4cn0=";
|
||||
hash = "sha256-icFWpyfdnm0wIkTVa2ijcnBcDmxrutV38vN3/8AY4cg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-gWI21dPha7yX367r50U3C9wpX5/6oBzHGJNtFmG/GQ8=";
|
||||
npmDepsHash = "sha256-SSpw8bBbf6saWwR3ZpqMrbrdjDJTCeARBAlHO65O+Zc=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json \
|
||||
|
|
@ -50,6 +51,11 @@ buildNpmPackage (finalAttrs: {
|
|||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
npm_config_build_from_source = "true";
|
||||
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# Prevent "unable to get local issuer certificate" error
|
||||
NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "spaceship-prompt";
|
||||
version = "4.22.4";
|
||||
version = "4.22.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denysdovhan";
|
||||
repo = "spaceship-prompt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BqdD6WwFW8Dtyyh81bQ66jZsJwq7Ck9kCwJpU9+xHtw=";
|
||||
sha256 = "sha256-GRFgCvOSwRYHgs7SbXJwyqpwPjD7xS4eZss3sVkBiYE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "steam-devices-udev-rules";
|
||||
version = "1.0.0.61-unstable-2026-06-11";
|
||||
version = "1.0.0.61-unstable-2026-06-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValveSoftware";
|
||||
repo = "steam-devices";
|
||||
rev = "bbf6cf03104aed5f73ac2798bdb09dc63ea3adf8";
|
||||
hash = "sha256-22blCo0NpPE39BevFsj/Xtz2K59eyPW1xjhJMXAoR/k=";
|
||||
rev = "22ec85e5ff5ea2e15c56d71a41bcbef46356cd60";
|
||||
hash = "sha256-nHPvyZlafkN1K0pKY2DsdOT0QviPg0rXmXrc+Wm6qio=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "temporal";
|
||||
version = "1.30.4";
|
||||
version = "1.30.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qC4SMy8ypeSJlqqTtMb27d869bLP1dcGilqU50Fen60=";
|
||||
hash = "sha256-Uw1E1GcLtIo1XZea/tb1TnbIk9O4Mf2NaCpDwUIfSak=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YJbovD2woypOiYfn9axO8lshIg/6gO9Sa8a3DIt8QFg=";
|
||||
vendorHash = "sha256-5++ETJgWDVveUxb2QZL5AUQG8/8QNVx5iS/NBjoacCY=";
|
||||
|
||||
overrideModAttrs = old: {
|
||||
# netdb.go allows /etc/protocols and /etc/services to not exist and happily proceeds, but it panic()s if they exist but return permission denied.
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "veilid";
|
||||
version = "0.5.3";
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "veilid";
|
||||
repo = "veilid";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qPV5kVp/1ZTLzo8i3DkGLxuoOaMJxZJUEzYGNReJyHY=";
|
||||
hash = "sha256-14jRIs2iE5JH1ZmC/1DGcg6cejsnmhUTkquXNmOEuQA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LjysGZihXoE82224nXNrRWIMe6/POXDqjMO29zg+MMI=";
|
||||
cargoHash = "sha256-xuIw/RRKydanStS7dw1jK96bgEH0U5TDbayaBZq/OCg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
capnproto
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vips";
|
||||
version = "8.18.2";
|
||||
version = "8.18.3";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
|
|
@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "libvips";
|
||||
repo = "libvips";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-w42igzcvnCBoGHAvyb27Z6IciSuGeHctgSsZY30TtWo=";
|
||||
hash = "sha256-P8qjbCcpWNgKthZrXd+GykfPoU2x6avMNoYX1I+YE+k=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
pnpmDeps,
|
||||
apiEndpoint ? "http://localhost:3000",
|
||||
pnpmConfigHook,
|
||||
pnpm_9,
|
||||
pnpm_11,
|
||||
nodejs,
|
||||
}:
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_11
|
||||
nodejs
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,36 +4,35 @@
|
|||
fetchFromGitHub,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm_9,
|
||||
pnpm_11,
|
||||
nodejs,
|
||||
makeWrapper,
|
||||
callPackage,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "your_spotify_server";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yooooomi";
|
||||
repo = "your_spotify";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zyvTahfOq7KXgVqD178hrlqO7YjsjLyuw+pm6PMhJt0=";
|
||||
hash = "sha256-0XGq4UVaNN1gTJLta0o9DnQwGwJ+S7HlGFY6DPAdGKY=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-KI5ZFU8u1R4QKTXn6mGVi+ziAocgOyyutKqmUOIn+dI=";
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-eUAzQ+LV+RZs/QEb5r7l9cisBjjWU8eGMm2r9ZNXmX8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_11
|
||||
nodejs
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,13 @@ let
|
|||
# Based on https://gitlab.gnome.org/GNOME/libxml2/-/commit/19549c61590c1873468c53e0026a2fbffae428ef.patch
|
||||
# There are only whitespace differences from upstream.
|
||||
./2.13-CVE-2026-0989.patch
|
||||
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-11979.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/c2e233fc1b341685fc99621b2768b503f777a72e.patch";
|
||||
hash = "sha256-DcPZl6rOuP6aycK+1EHUgPX4YWDAH+ctAZtOI48QO2Q=";
|
||||
excludes = [ "test/catalogs/test.sh" ];
|
||||
})
|
||||
];
|
||||
freezeUpdateScript = true;
|
||||
extraMeta = {
|
||||
|
|
|
|||
|
|
@ -59,13 +59,6 @@ stdenv.mkDerivation {
|
|||
./opencl.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Darwin only installs `swrast_dri.so`. It is symlinked to `libdril_dri.dylib`, but the script never terminates
|
||||
# checking for `swrast_dri.dylib`, which isn’t what will be created.
|
||||
substituteInPlace bin/install_megadrivers.py \
|
||||
--replace-fail " while ext != '.' + args.libname_suffix" " while ext != '.so'"
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ callPackage }:
|
||||
{ callPackage, lib }:
|
||||
{
|
||||
pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { };
|
||||
pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { };
|
||||
pnpm-workspaces = lib.recurseIntoAttrs (callPackage ./pnpm-workspaces { });
|
||||
pnpm_11_v3 = callPackage ./pnpm_11_v3 { };
|
||||
pnpm_11_v4 = callPackage ./pnpm_11_v4 { };
|
||||
}
|
||||
|
|
|
|||
57
pkgs/test/pnpm/pnpm-workspaces/default.nix
Normal file
57
pkgs/test/pnpm/pnpm-workspaces/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchPnpmDeps,
|
||||
pnpm,
|
||||
pnpmConfigHook,
|
||||
testers,
|
||||
}:
|
||||
let
|
||||
mkTest =
|
||||
{ structuredAttrs }:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "pnpm-workspaces-${if structuredAttrs then "structured" else "legacy"}";
|
||||
|
||||
src = ./src;
|
||||
|
||||
pnpmDeps = testers.invalidateFetcherByDrvHash fetchPnpmDeps {
|
||||
pname = "pnpm-workspaces";
|
||||
inherit (finalAttrs) src pnpmWorkspaces;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-dIp6CNh1Kn4aqJWku1G/FUdn/u+epzhqlqwnAkB2uW0=";
|
||||
};
|
||||
|
||||
pnpmWorkspaces = [
|
||||
"@pnpm-workspaces-test/a"
|
||||
"@pnpm-workspaces-test/b"
|
||||
];
|
||||
|
||||
__structuredAttrs = structuredAttrs;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pnpm
|
||||
pnpmConfigHook
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
for package in a b; do
|
||||
if [ -e "packages/$package/node_modules/@pnpm-workspaces-test/$package-dep" ]; then
|
||||
echo "$package was installed (its dependency $package-dep is linked)"
|
||||
else
|
||||
echo "ERROR: $package was not installed"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
touch $out
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
});
|
||||
in
|
||||
{
|
||||
legacy = mkTest { structuredAttrs = false; };
|
||||
structured = mkTest { structuredAttrs = true; };
|
||||
}
|
||||
5
pkgs/test/pnpm/pnpm-workspaces/src/package.json
Normal file
5
pkgs/test/pnpm/pnpm-workspaces/src/package.json
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"name": "pnpm-workspaces-test",
|
||||
"version": "0.0.0",
|
||||
"private": true
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
{
|
||||
"name": "@pnpm-workspaces-test/a-dep",
|
||||
"version": "0.0.0"
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"name": "@pnpm-workspaces-test/a",
|
||||
"version": "0.0.0",
|
||||
"dependencies": {
|
||||
"@pnpm-workspaces-test/a-dep": "workspace:*"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
{
|
||||
"name": "@pnpm-workspaces-test/b-dep",
|
||||
"version": "0.0.0"
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"name": "@pnpm-workspaces-test/b",
|
||||
"version": "0.0.0",
|
||||
"dependencies": {
|
||||
"@pnpm-workspaces-test/b-dep": "workspace:*"
|
||||
}
|
||||
}
|
||||
25
pkgs/test/pnpm/pnpm-workspaces/src/pnpm-lock.yaml
generated
Normal file
25
pkgs/test/pnpm/pnpm-workspaces/src/pnpm-lock.yaml
generated
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
lockfileVersion: '9.0'
|
||||
|
||||
settings:
|
||||
autoInstallPeers: true
|
||||
excludeLinksFromLockfile: false
|
||||
|
||||
importers:
|
||||
|
||||
.: {}
|
||||
|
||||
packages/a:
|
||||
dependencies:
|
||||
'@pnpm-workspaces-test/a-dep':
|
||||
specifier: workspace:*
|
||||
version: link:../a-dep
|
||||
|
||||
packages/a-dep: {}
|
||||
|
||||
packages/b:
|
||||
dependencies:
|
||||
'@pnpm-workspaces-test/b-dep':
|
||||
specifier: workspace:*
|
||||
version: link:../b-dep
|
||||
|
||||
packages/b-dep: {}
|
||||
2
pkgs/test/pnpm/pnpm-workspaces/src/pnpm-workspace.yaml
Normal file
2
pkgs/test/pnpm/pnpm-workspaces/src/pnpm-workspace.yaml
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
packages:
|
||||
- 'packages/*'
|
||||
|
|
@ -1711,10 +1711,9 @@ with pkgs;
|
|||
|
||||
inherit (go-containerregistry) crane gcrane;
|
||||
|
||||
geekbench_4 = callPackage ../tools/misc/geekbench/4.nix { };
|
||||
geekbench_5 = callPackage ../tools/misc/geekbench/5.nix { };
|
||||
geekbench_6 = callPackage ../tools/misc/geekbench/6.nix { };
|
||||
geekbench = geekbench_6;
|
||||
geekbench_4 = callPackage ../by-name/ge/geekbench/4.nix { };
|
||||
geekbench_5 = callPackage ../by-name/ge/geekbench/5.nix { };
|
||||
geekbench_6 = geekbench;
|
||||
|
||||
ghidra = callPackage ../tools/security/ghidra/build.nix {
|
||||
protobuf = protobuf_21;
|
||||
|
|
@ -3886,6 +3885,8 @@ with pkgs;
|
|||
|
||||
ghdl-llvm = ghdl.override { backend = "llvm"; };
|
||||
|
||||
ghdl-llvm-jit = ghdl.override { backend = "llvm-jit"; };
|
||||
|
||||
gcc-arm-embedded = gcc-arm-embedded-15;
|
||||
|
||||
# Haskell and GHC
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue