Merge staging-next into staging
This commit is contained in:
@@ -2706,6 +2706,12 @@
|
||||
github = "Axler1";
|
||||
githubId = 69816272;
|
||||
};
|
||||
axodentally = {
|
||||
name = "Henri Wagner";
|
||||
email = "axo@frankfurt.ccc.de";
|
||||
github = "axodentally";
|
||||
githubId = 24368475;
|
||||
};
|
||||
ayazhafiz = {
|
||||
email = "ayaz.hafiz.1@gmail.com";
|
||||
github = "hafiz";
|
||||
|
||||
@@ -106,7 +106,7 @@ in
|
||||
settings = lib.mkOption {
|
||||
inherit (settingsFormat) type;
|
||||
default = { };
|
||||
description = "Content of IfState's configuration file. See <https://ifstate.net/2.0/schema/> for details.";
|
||||
description = "Content of IfState's configuration file. See <https://ifstate.net/2.2/schema/> for details.";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -131,19 +131,27 @@ in
|
||||
settings = lib.mkOption {
|
||||
inherit (settingsFormat) type;
|
||||
default = { };
|
||||
description = "Content of IfState's initrd configuration file. See <https://ifstate.net/2.0/schema/> for details.";
|
||||
description = "Content of IfState's initrd configuration file. See <https://ifstate.net/2.2/schema/> for details.";
|
||||
};
|
||||
|
||||
cleanupSettings = lib.mkOption {
|
||||
inherit (settingsFormat) type;
|
||||
# required by json schema
|
||||
default.interfaces = { };
|
||||
description = "Content of IfState's initrd cleanup configuration file. See <https://ifstate.net/2.0/schema/> for details. This configuration gets applied before systemd switches to stage two. The goas is to deconfigurate the whole network in order to prevent access to services, before the firewall is configured. The stage two IfState configuration will start after the firewall is configured.";
|
||||
description = "Content of IfState's initrd cleanup configuration file. See <https://ifstate.net/2.0/schema/> for details. This configuration gets applied before systemd switches to stage two. The goal is to deconfigurate the whole network in order to prevent access to services, before the firewall is configured. The stage two IfState configuration will start after the firewall is configured.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf (cfg.enable || initrdCfg.enable) {
|
||||
# sane defaults to not let IfState work against the kernel
|
||||
boot.extraModprobeConfig = ''
|
||||
options bonding max_bonds=0
|
||||
options dummy numdummies=0
|
||||
options ifb numifbs=0
|
||||
'';
|
||||
})
|
||||
(lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
@@ -158,13 +166,6 @@ in
|
||||
|
||||
networking.useDHCP = lib.mkDefault false;
|
||||
|
||||
# sane defaults to not let IfState work against the kernel
|
||||
boot.extraModprobeConfig = ''
|
||||
options bonding max_bonds=0
|
||||
options dummy numdummies=0
|
||||
options ifb numifbs=0
|
||||
'';
|
||||
|
||||
environment = {
|
||||
# ifstatecli command should be available to use user, there are other useful subcommands like check or show
|
||||
systemPackages = [ cfg.package ];
|
||||
|
||||
@@ -28,6 +28,9 @@ in
|
||||
};
|
||||
|
||||
boot.initrd = {
|
||||
# otherwise the interfaces do not get created
|
||||
kernelModules = [ "virtio_net" ];
|
||||
|
||||
network = {
|
||||
enable = true;
|
||||
ifstate = lib.mkMerge [
|
||||
@@ -46,6 +49,7 @@ in
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
systemd = {
|
||||
enable = true;
|
||||
network.enable = false;
|
||||
|
||||
@@ -10,19 +10,20 @@ let
|
||||
{
|
||||
enable = true;
|
||||
settings = {
|
||||
interfaces = {
|
||||
eth1 = {
|
||||
addresses = [ "2001:0db8:a::${builtins.toString id}/64" ];
|
||||
link = {
|
||||
state = "up";
|
||||
kind = "physical";
|
||||
};
|
||||
namespaces.outside.interfaces.eth1 = {
|
||||
addresses = [ "2001:0db8:a::${builtins.toString id}/64" ];
|
||||
link = {
|
||||
state = "up";
|
||||
kind = "physical";
|
||||
};
|
||||
};
|
||||
interfaces = {
|
||||
wg0 = {
|
||||
addresses = [ "2001:0db8:b::${builtins.toString id}/64" ];
|
||||
link = {
|
||||
state = "up";
|
||||
kind = "wireguard";
|
||||
bind_netns = "outside";
|
||||
};
|
||||
wireguard = {
|
||||
private_key = "!include ${pkgs.writeText "wg_priv.key" wgPriv}";
|
||||
@@ -61,6 +62,9 @@ in
|
||||
};
|
||||
|
||||
boot.initrd = {
|
||||
# otherwise the interfaces do not get created
|
||||
kernelModules = [ "virtio_net" ];
|
||||
|
||||
network = {
|
||||
enable = true;
|
||||
ifstate =
|
||||
@@ -72,12 +76,10 @@ in
|
||||
wgPeerId = 2;
|
||||
}
|
||||
// {
|
||||
package = pkgs.ifstate.override {
|
||||
withConfigValidation = false;
|
||||
};
|
||||
allowIfstateToDrasticlyIncreaseInitrdSize = true;
|
||||
};
|
||||
};
|
||||
|
||||
systemd = {
|
||||
enable = true;
|
||||
network.enable = false;
|
||||
|
||||
@@ -26,12 +26,16 @@ in
|
||||
};
|
||||
|
||||
boot.initrd = {
|
||||
# otherwise the interfaces do not get created
|
||||
kernelModules = [ "virtio_net" ];
|
||||
|
||||
network = {
|
||||
enable = true;
|
||||
ifstate = mkIfStateConfig 1 // {
|
||||
allowIfstateToDrasticlyIncreaseInitrdSize = true;
|
||||
};
|
||||
};
|
||||
|
||||
systemd = {
|
||||
enable = true;
|
||||
network.enable = false;
|
||||
|
||||
@@ -10,15 +10,7 @@
|
||||
{
|
||||
services.loki = {
|
||||
enable = true;
|
||||
|
||||
# FIXME: revert to original file when upstream fix released
|
||||
# https://github.com/grafana/loki/issues/16990
|
||||
# https://github.com/grafana/loki/issues/17736
|
||||
# configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";
|
||||
configFile = pkgs.runCommand "patched-loki-cfg.yml" { } ''
|
||||
substitute "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml" "$out" \
|
||||
--replace-fail "enable_multi_variant_queries: true" ""
|
||||
'';
|
||||
configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";
|
||||
};
|
||||
services.promtail = {
|
||||
enable = true;
|
||||
|
||||
@@ -227,19 +227,25 @@ lib.makeScope pkgs.newScope (
|
||||
Filters/Render/Texture...
|
||||
*/
|
||||
pname = "resynthesizer";
|
||||
version = "2.0.3";
|
||||
version = "3.0";
|
||||
buildInputs = with pkgs; [ fftw ];
|
||||
nativeBuildInputs = with pkgs; [ autoreconfHook ];
|
||||
nativeBuildInputs = with pkgs; [
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/${gimp.targetLibDir}" ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "bootchk";
|
||||
repo = "resynthesizer";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/Py5R1RxiftTR0z++mQzgTn/J9v4p8efuGZSfhe6FfA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
broken = gimp.majorVersion != "2.0";
|
||||
broken = lib.versionOlder gimp.version "3";
|
||||
description = "Suite of gimp plugins for texture synthesis";
|
||||
homepage = "https://github.com/bootchk/resynthesizer";
|
||||
license = [ lib.licenses.gpl3Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -157,7 +157,11 @@ let
|
||||
# "snappy"
|
||||
"flac"
|
||||
"libjpeg"
|
||||
]
|
||||
++ lib.optionals needsLibpng [
|
||||
"libpng"
|
||||
]
|
||||
++ [
|
||||
# Use the vendored libwebp for M124+ until we figure out how to solve:
|
||||
# Running phase: configurePhase
|
||||
# ERROR Unresolved dependencies.
|
||||
@@ -217,6 +221,9 @@ let
|
||||
|
||||
isElectron = packageName == "electron";
|
||||
rustcVersion = buildPackages.rustc.version;
|
||||
# libpng has been replaced by the png rust crate
|
||||
# https://github.com/image-rs/image-png/discussions/562
|
||||
needsLibpng = !chromiumVersionAtLeast "143";
|
||||
|
||||
chromiumDeps = lib.mapAttrs (
|
||||
path: args:
|
||||
@@ -321,8 +328,10 @@ let
|
||||
# maintain a separate list of buildPlatform-dependencies, we
|
||||
# simply throw in the kitchen sink.
|
||||
# ** Because of overrides, we have to copy the list as it otherwise mess with splicing **
|
||||
++ [
|
||||
++ lib.optionals needsLibpng [
|
||||
(buildPackages.libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403
|
||||
]
|
||||
++ [
|
||||
(buildPackages.libopus.override { withCustomModes = true; })
|
||||
bzip2
|
||||
flac
|
||||
@@ -378,7 +387,11 @@ let
|
||||
++ lib.optional pulseSupport libpulseaudio;
|
||||
|
||||
buildInputs = [
|
||||
]
|
||||
++ lib.optionals needsLibpng [
|
||||
(libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403
|
||||
]
|
||||
++ [
|
||||
(libopus.override { withCustomModes = true; })
|
||||
bzip2
|
||||
flac
|
||||
|
||||
@@ -1,59 +1,59 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "142.0.7444.175",
|
||||
"version": "143.0.7499.40",
|
||||
"chromedriver": {
|
||||
"version": "142.0.7444.176",
|
||||
"hash_darwin": "sha256-VG4+tQbZ8r3i8NZpia/9tRC0sqzbH5auTHbBsPbkqpc=",
|
||||
"hash_darwin_aarch64": "sha256-A1xHznjElisrEQY0UIbjizGpCbxlCa7wnvTK6rlMH2w="
|
||||
"version": "143.0.7499.41",
|
||||
"hash_darwin": "sha256-oZpq+RJz1ITkRLTdUJbpBrGr/ly01nqAOQ8PBR0DYiY=",
|
||||
"hash_darwin_aarch64": "sha256-yw2454Q1o/J4LgTMTm3EG6rAbC4u8gnw64sEg7V6HAU="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
|
||||
"hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
|
||||
"rev": "e2bb3cd55899346cc68bbfd5139e59c9d85a6984",
|
||||
"hash": "sha256-Qlc0UAdGRm1C0DNAqBsssND8PQZUVkj6aDaeExjwi2E="
|
||||
},
|
||||
"gn": {
|
||||
"version": "0-unstable-2025-09-18",
|
||||
"rev": "81b24e01531ecf0eff12ec9359a555ec3944ec4e",
|
||||
"hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ="
|
||||
"version": "0-unstable-2025-10-08",
|
||||
"rev": "07d3c6f4dc290fae5ca6152ebcb37d6815c411ab",
|
||||
"hash": "sha256-kIPhfuJBQSISdRjloe0N2JrqvuVrEkNijb92/9zSE9I="
|
||||
},
|
||||
"npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
|
||||
"npmHash": "sha256-HF6B4abJJJ9JDVbovtAdaHIvqE1zHJZ2a+g2Cudx8Pw="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "302067f14a4ea3f42001580e6101fa25ed343445",
|
||||
"hash": "sha256-2x1IpfD0BXDaPKwdBO4+t8Dw7dYLM7oQDlrXY57tFIw=",
|
||||
"rev": "c23ff452476d1b6322d73b9b629420ef119d0388",
|
||||
"hash": "sha256-ujiHFq8I6yENksWhBJ/BYMd5eDdlThfZxMfvDZH9sUo=",
|
||||
"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": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
|
||||
"hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU="
|
||||
"rev": "c2725e0622e1a86d55f14514f2177a39efea4a0e",
|
||||
"hash": "sha256-f+BbQ6xIubloSzx/MhPSZ8ymCskmS+9+epDGtPjZqXc="
|
||||
},
|
||||
"src/third_party/compiler-rt/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
|
||||
"rev": "05f2a5dd0d1386777ae9d7fac9da776f82e7e0f2",
|
||||
"hash": "sha256-XTPhIXHzTW4EjyER/49mKJVDQQVNGuyLu2OBAxSt+CQ="
|
||||
"rev": "08611c39bbfc52cc034904eb88817c6209b828f9",
|
||||
"hash": "sha256-AfVP7cm7eNGl0JPnMkixMFgloDTHh0KSOAwXDEcl5MU="
|
||||
},
|
||||
"src/third_party/libc++/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
|
||||
"rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8",
|
||||
"hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs="
|
||||
"rev": "8cd54f6b0741cdef08299711668e6b25fef26406",
|
||||
"hash": "sha256-AJx0Oz1sNubo2JNPjeXO5f9SnoXewOsPlgFrRXiCEKg="
|
||||
},
|
||||
"src/third_party/libc++abi/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
|
||||
"rev": "864f61dc9253d56586ada34c388278565ef513f6",
|
||||
"hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ="
|
||||
"rev": "a02fa0058d8d52aca049868d229808a3e5dadbad",
|
||||
"hash": "sha256-iNV7NtVviRBDjt6mK/DK3WfYd/QNGejRaSvpgEXmLqY="
|
||||
},
|
||||
"src/third_party/libunwind/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
|
||||
"rev": "322be580a5a193a921c349a15747eeeb9a716ad1",
|
||||
"hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30="
|
||||
"rev": "b7c3dda13e46ced88a6f7230e271ebd633b4cef2",
|
||||
"hash": "sha256-eWxGIMxMBRvQVJ6uc3ZWaKO7oXLLCXTi8sVR8v3H4MM="
|
||||
},
|
||||
"src/third_party/llvm-libc/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
|
||||
"rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55",
|
||||
"hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg="
|
||||
"rev": "796bfb264a22264b11acda9feaffdffb168c7e12",
|
||||
"hash": "sha256-J/FiUpmwkFVZcLmeXABl4FE9rzGFsbo/Lc1Rjy5wdOU="
|
||||
},
|
||||
"src/chrome/test/data/perf/canvas_bench": {
|
||||
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
|
||||
@@ -72,8 +72,8 @@
|
||||
},
|
||||
"src/docs/website": {
|
||||
"url": "https://chromium.googlesource.com/website.git",
|
||||
"rev": "3913dbd6fdde06b914d0e1119fcc884f8115e4f8",
|
||||
"hash": "sha256-+2OBUpLLVPB/fDlF/9mEwTsvH2Una3ZYKUJY06nZauo="
|
||||
"rev": "2acb551cf58ff3b6e6a093fe36deb8c625046900",
|
||||
"hash": "sha256-HaNA1Es8t3A/WR9aXdEoFOdeNO6c6ydPDF1CCBb0Bu4="
|
||||
},
|
||||
"src/media/cdm/api": {
|
||||
"url": "https://chromium.googlesource.com/chromium/cdm.git",
|
||||
@@ -82,8 +82,8 @@
|
||||
},
|
||||
"src/net/third_party/quiche/src": {
|
||||
"url": "https://quiche.googlesource.com/quiche.git",
|
||||
"rev": "c0df0d316bd7e4ddf44e5ba094b5c5b061d94b0c",
|
||||
"hash": "sha256-ACXkivQ4tqePgNIg2hpl4DQFa8n0CUkCOqPlgh56oLs="
|
||||
"rev": "42cbfedd76691c19af012a3d717fca07d7b09cc9",
|
||||
"hash": "sha256-ik5NjHWC8LHJiOde7Jdqq2C/NOofQwtPT4ubAqc8D4A="
|
||||
},
|
||||
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
|
||||
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
|
||||
@@ -92,8 +92,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "7b27cb13556246035dfc7b308702b1b20710df47",
|
||||
"hash": "sha256-PM7msE9678QFyr7qp47Bc0vTntsSCeB/cirg9ME6TZk="
|
||||
"rev": "9b75aecb1fa769e357d1dad2614228b6a04ddee6",
|
||||
"hash": "sha256-d375qLKzOX3fap5ZjbhPzU/8hWAB9GeT6IWrw3Vedsc="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -107,8 +107,8 @@
|
||||
},
|
||||
"src/third_party/angle/third_party/VK-GL-CTS/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
|
||||
"rev": "c67cffddd65aba724950e062343fa1cc89560b33",
|
||||
"hash": "sha256-VYROUPvcpkV+skw3RKXoCpB+4xVA2Qem+15YKjV7pMg="
|
||||
"rev": "53f6cec6c0a81fc4e712cd3ec87a1a39b802f5d5",
|
||||
"hash": "sha256-KC9sHWRrPI5R10z5Epq3e7BW7+Ez0AoYe+bKPYL58jg="
|
||||
},
|
||||
"src/third_party/anonymous_tokens/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
|
||||
@@ -117,8 +117,8 @@
|
||||
},
|
||||
"src/third_party/readability/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
|
||||
"rev": "1f0ec42686c89a4a1c71789849f7ffde349ab197",
|
||||
"hash": "sha256-liNoIZreSx/RgL5/oSKyzOuqChAgDwTtViNq0KiY0R0="
|
||||
"rev": "d7949dc47dd9ed9ee1d3b34ffdcf3bce28cde435",
|
||||
"hash": "sha256-lFsHXk4kEkzIbHgJiLTgeiKqiGOErzUwADo8WSZlnec="
|
||||
},
|
||||
"src/third_party/content_analysis_sdk/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
|
||||
@@ -127,13 +127,13 @@
|
||||
},
|
||||
"src/third_party/dav1d/libdav1d": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
|
||||
"rev": "af5cf2b1e7f03d6f6de84477e1ca8eed1f3eb03d",
|
||||
"hash": "sha256-dPVDZ4SyrHWsRWERUl6UKbbdUG/5dC/UTte6sItMYxg="
|
||||
"rev": "fcbc3d1b93f91c709293ed9faea8b7cbcac9030b",
|
||||
"hash": "sha256-Lux+OGbeWnQJhIYDczH6jP/+lO+ZLlwpuUcLbO4Jvuo="
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831",
|
||||
"hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M="
|
||||
"rev": "e1ce227ebf75378c5f60a9d531579982bcdd93ee",
|
||||
"hash": "sha256-RqGCh/InZagPemqMRnR/ziaxDm3ruS4dtnj87mBmIjc="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -142,8 +142,8 @@
|
||||
},
|
||||
"src/third_party/dawn/third_party/dxc": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
|
||||
"rev": "2b58d6d865832f7146d6e22e2106e562458bbd0a",
|
||||
"hash": "sha256-kcmuSCdAAzyQrg33b3dlkUErd0x5TDZkE8iXMEYW8wo="
|
||||
"rev": "c522461221759f1785b3434ce52ae89d6b66855a",
|
||||
"hash": "sha256-UqgsxtEdvGs3fOueXJU6DJcESmgkEGAjdnMig78qKzE="
|
||||
},
|
||||
"src/third_party/dawn/third_party/dxheaders": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
|
||||
@@ -162,13 +162,13 @@
|
||||
},
|
||||
"src/third_party/dawn/third_party/webgpu-cts": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
|
||||
"rev": "18f1cc77dea7254258eeee21839d1c249b506576",
|
||||
"hash": "sha256-lZgUbs1+6+tLeHmJTIWMbpT6oSVzC3A9/J3vKONgxSs="
|
||||
"rev": "95042527d1555325b90dbb745a29d32eb9fad14a",
|
||||
"hash": "sha256-Ofi/XfzyQrt2gUHaJpOyUUD7DXTWWmvXXJQP7C6AN8w="
|
||||
},
|
||||
"src/third_party/dawn/third_party/webgpu-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
|
||||
"rev": "53a87a3d8cb4c32ec026978ce003020741df6f53",
|
||||
"hash": "sha256-V/JhZyjLNSElllXbLduqyNjJqjrxB4SwwPpRHIcfIis="
|
||||
"rev": "ca7071cd5dd8a67cb8ca4f8614fd006ff3d93bde",
|
||||
"hash": "sha256-ucRkEY1bZ3WyK55FW0pujl9LWFENmEzZvxO2QKYXmhc="
|
||||
},
|
||||
"src/third_party/highway/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
|
||||
@@ -187,13 +187,13 @@
|
||||
},
|
||||
"src/third_party/boringssl/src": {
|
||||
"url": "https://boringssl.googlesource.com/boringssl.git",
|
||||
"rev": "91f3df0a20f6d3dd3e2f749b4a2730b68c3d585e",
|
||||
"hash": "sha256-rhUF9fuWbiAkaGbHnhANZxCYEhkkoMQoiYzn1EfR270="
|
||||
"rev": "58da9b0d721fd807279f4e3898741c92cf43bdbd",
|
||||
"hash": "sha256-uvsW0p3wo7L1tQqelRk5QJ65Jt5cpv6ORZRorZjHqrw="
|
||||
},
|
||||
"src/third_party/breakpad/breakpad": {
|
||||
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
|
||||
"rev": "a1220f673dc44632e821bd1a217089e5a159a203",
|
||||
"hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM="
|
||||
"rev": "d0b41ca2a38c7b14c4b7853254eb5bf3b4039691",
|
||||
"hash": "sha256-CQ1doQRsX0zvfgYKJalz0i35mPJfk5o6m2sdGYqS4co="
|
||||
},
|
||||
"src/third_party/cast_core/public/src": {
|
||||
"url": "https://chromium.googlesource.com/cast_core/public",
|
||||
@@ -202,8 +202,8 @@
|
||||
},
|
||||
"src/third_party/catapult": {
|
||||
"url": "https://chromium.googlesource.com/catapult.git",
|
||||
"rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a",
|
||||
"hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0="
|
||||
"rev": "ddb5845c3f7d88d8698e602547bd854b36f0604f",
|
||||
"hash": "sha256-N+h99EL03NL6sAGJJM/aZEdVibn7SziLJp5G09y0EOc="
|
||||
},
|
||||
"src/third_party/ced/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
|
||||
@@ -237,13 +237,13 @@
|
||||
},
|
||||
"src/third_party/cros_system_api": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
|
||||
"rev": "c33ff08e2b27ddaed22c8799fefd3a4b7d3c49a9",
|
||||
"hash": "sha256-N8/0tVMBi6yFe9HkR5wxDJ1+QAP1IV1Bz99Il3RZNFU="
|
||||
"rev": "2c31c25519405d3d2b107844fd5e8c8bc397dbf7",
|
||||
"hash": "sha256-Ew7gk1XxZccztYLZc4sOrzyKjNTkFPG8g+oOLy4/g1Q="
|
||||
},
|
||||
"src/third_party/crossbench": {
|
||||
"url": "https://chromium.googlesource.com/crossbench.git",
|
||||
"rev": "f6e9d3627685e3bcb82d5a24c1f075b8dd0d881c",
|
||||
"hash": "sha256-JbgzTTFEFuA8ZyRLih3T/Fa3RhcOK4fi+9RuzZioiPI="
|
||||
"rev": "e4937b062fe8b9130ea0fc02c406c045b5cb7b31",
|
||||
"hash": "sha256-C//wuupFwZL4m8mMutY/SxCmg7mcfw2Sj5eS4c95+XE="
|
||||
},
|
||||
"src/third_party/crossbench-web-tests": {
|
||||
"url": "https://chromium.googlesource.com/chromium/web-tests.git",
|
||||
@@ -252,13 +252,13 @@
|
||||
},
|
||||
"src/third_party/depot_tools": {
|
||||
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
|
||||
"rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
|
||||
"hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
|
||||
"rev": "e2bb3cd55899346cc68bbfd5139e59c9d85a6984",
|
||||
"hash": "sha256-Qlc0UAdGRm1C0DNAqBsssND8PQZUVkj6aDaeExjwi2E="
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17",
|
||||
"hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo="
|
||||
"rev": "4190a105897e986349694cae685b51054bf2dc51",
|
||||
"hash": "sha256-K+bg3OPmv7tN/elOtmlDXwyhC6FxrAEEAY/MqMkQbrU="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -272,8 +272,8 @@
|
||||
},
|
||||
"src/third_party/eigen3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
|
||||
"rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3",
|
||||
"hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE="
|
||||
"rev": "cd4f989f8f9288ab5aed1643ecb04c7be021021e",
|
||||
"hash": "sha256-qkdtS4kz8m5ZW30SQpDCbgM3WvfCGc+WGsv59J4FYpQ="
|
||||
},
|
||||
"src/third_party/farmhash/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
|
||||
@@ -302,8 +302,8 @@
|
||||
},
|
||||
"src/third_party/flatbuffers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git",
|
||||
"rev": "1c514626e83c20fffa8557e75641848e1e15cd5e",
|
||||
"hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E="
|
||||
"rev": "187240970746d00bbd26b0f5873ed54d2477f9f3",
|
||||
"hash": "sha256-A9nWfgcuVW3x9MDFeviCUK/oGcWJQwadI8LqNR8BlQw="
|
||||
},
|
||||
"src/third_party/fontconfig/src": {
|
||||
"url": "https://chromium.googlesource.com/external/fontconfig.git",
|
||||
@@ -322,8 +322,8 @@
|
||||
},
|
||||
"src/third_party/freetype/src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
|
||||
"rev": "d3668e00da732654b50e4e81f982544ed6e26390",
|
||||
"hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98="
|
||||
"rev": "ae63cc0d13318f2f93fd440cce277388d1b30a49",
|
||||
"hash": "sha256-Tx5MbwMk+d2OZGd4CxJhJtP1pQyRJ0pe358OdKuWiRU="
|
||||
},
|
||||
"src/third_party/fxdiv/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
|
||||
@@ -337,13 +337,13 @@
|
||||
},
|
||||
"src/third_party/ink/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
|
||||
"rev": "4e6081ad7052f97df7d77e1d87cea2d70c18a47b",
|
||||
"hash": "sha256-SVwZWhM63iN2ajTMldgug0mfJV1rdvxTZwj/zyLe4WA="
|
||||
"rev": "f70052a0bbae22fe52b630844e9651b27db92ed2",
|
||||
"hash": "sha256-Mvxbdn4m/H3HBss31Z9nz0LphqpFeBHcX/kbFxJQPqM="
|
||||
},
|
||||
"src/third_party/ink_stroke_modeler/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
|
||||
"rev": "fe79520c9ad7d2d445d26d3c59fda6fc54eb4d5c",
|
||||
"hash": "sha256-4iXoBgCCbWCqGbpchiAYQhKBK9rO1Xb6wP98iMd06cY="
|
||||
"rev": "2cd45e8683025c28fa2efcf672ad46607e8af869",
|
||||
"hash": "sha256-h/xI/TPV2yiRLqrBgaDAkr8Nfg3RLkjHVuYX+nH99CQ="
|
||||
},
|
||||
"src/third_party/instrumented_libs": {
|
||||
"url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
|
||||
@@ -372,8 +372,8 @@
|
||||
},
|
||||
"src/third_party/googletest/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
|
||||
"rev": "244cec869d12e53378fa0efb610cd4c32a454ec8",
|
||||
"hash": "sha256-A3kDQbt9ITaxCjl/tJtwySsPUyH+NNb8erdjBzq81o8="
|
||||
"rev": "b2b9072ecbe874f5937054653ef8f2731eb0f010",
|
||||
"hash": "sha256-cTPx19WAXlyXDK4nY0pxbMI4oRojaARgIeASA+MB3NY="
|
||||
},
|
||||
"src/third_party/hunspell_dictionaries": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
|
||||
@@ -382,8 +382,8 @@
|
||||
},
|
||||
"src/third_party/icu": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
|
||||
"rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
|
||||
"hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q="
|
||||
"rev": "a86a32e67b8d1384b33f8fa48c83a6079b86f8cd",
|
||||
"hash": "sha256-zFxeAY6lEFRGNbCOOJij0CFjp3512WkyaN1Ld0+WADs="
|
||||
},
|
||||
"src/third_party/jsoncpp/source": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
|
||||
@@ -402,8 +402,8 @@
|
||||
},
|
||||
"src/third_party/fuzztest/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
|
||||
"rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a",
|
||||
"hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k="
|
||||
"rev": "7940ee9a7ebce6419c6391eef8b289524b16f198",
|
||||
"hash": "sha256-uIb2nzPzMU/FZGYs3cFQwc4QNTNRmz01uF6XDCLrgDk="
|
||||
},
|
||||
"src/third_party/domato/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
|
||||
@@ -417,8 +417,8 @@
|
||||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"url": "https://aomedia.googlesource.com/aom.git",
|
||||
"rev": "2a70ad7bee390757eaa83aff12f310ba53915e9f",
|
||||
"hash": "sha256-RWm/xaX3WGgCy6o4lM5g6j0vS6mc6ZbDAhRw6OQgJlU="
|
||||
"rev": "93233d27eb23ac3f1f13da1b19c5380bacc75baa",
|
||||
"hash": "sha256-wDW+YXxIaenDtqf3zdpMT2hbwEMEswC88+Q2ylfzHw0="
|
||||
},
|
||||
"src/third_party/crabbyavif/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
||||
@@ -437,8 +437,8 @@
|
||||
},
|
||||
"src/third_party/jetstream/main": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
|
||||
"rev": "b400dd340af3457890ec7b4a903fefb02fcf2dc6",
|
||||
"hash": "sha256-jn6Twi+fc/qKjsqLqkrWxhQ677wY3rSCx3JfWCGhxr0="
|
||||
"rev": "0debbb0b94486d4c78162ad5a102279b96dc79d3",
|
||||
"hash": "sha256-w1oBQrjYK8ze02MRNPO8PsV5rNHiLzToCQjoSm+NagI="
|
||||
},
|
||||
"src/third_party/jetstream/v2.2": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
|
||||
@@ -447,8 +447,8 @@
|
||||
},
|
||||
"src/third_party/speedometer/main": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
|
||||
"rev": "06449bdc34789a7459393405dd777e02d78a3743",
|
||||
"hash": "sha256-3TlVewJ9C3MXvlIudzLHshQZOCAmUkMYsZzAazSbMLY="
|
||||
"rev": "d90b6fde07041d9d19ab71de32b461b613c899a1",
|
||||
"hash": "sha256-/S8YBNfxbQe6Wt0h2Otuw7+bkObBtvmtb6ZO6nsce6E="
|
||||
},
|
||||
"src/third_party/speedometer/v3.1": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
|
||||
@@ -492,8 +492,8 @@
|
||||
},
|
||||
"src/third_party/libipp/libipp": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git",
|
||||
"rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
|
||||
"hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY="
|
||||
"rev": "4be5f77f672a3a9f1bbf3c935fb0ea8b3f86ce61",
|
||||
"hash": "sha256-GzLVt6RIN+FgOpcK61ya5lvdIIhQRciAb/ISIirWogY="
|
||||
},
|
||||
"src/third_party/libjpeg_turbo": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
|
||||
@@ -522,8 +522,8 @@
|
||||
},
|
||||
"src/third_party/libsync/src": {
|
||||
"url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git",
|
||||
"rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
|
||||
"hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E="
|
||||
"rev": "d29ac04dc81e6b072c091c5b1342a282765ea250",
|
||||
"hash": "sha256-aI7Exie3AmTy8R/Ua5lua0lCwMO1k4wMS6cxulU6iD8="
|
||||
},
|
||||
"src/third_party/libva-fake-driver/src": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git",
|
||||
@@ -532,8 +532,8 @@
|
||||
},
|
||||
"src/third_party/libvpx/source/libvpx": {
|
||||
"url": "https://chromium.googlesource.com/webm/libvpx.git",
|
||||
"rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c",
|
||||
"hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c="
|
||||
"rev": "4c1801be20dd53900d2a7cd74f6fc91a9ae353be",
|
||||
"hash": "sha256-8k8KWkDS3kvJjHWVlOlTW/By7rQLiT7TrOtxwEOCXgk="
|
||||
},
|
||||
"src/third_party/libwebm/source": {
|
||||
"url": "https://chromium.googlesource.com/webm/libwebm.git",
|
||||
@@ -542,18 +542,18 @@
|
||||
},
|
||||
"src/third_party/libwebp/src": {
|
||||
"url": "https://chromium.googlesource.com/webm/libwebp.git",
|
||||
"rev": "b0e8039062eedbcb20ebb1bad62bfeaee2b94ec6",
|
||||
"hash": "sha256-yKVLUxzIK5ybYM/22fVaQlqSCG5Hx4Notxj+3kI2LCg="
|
||||
"rev": "c00d83f6642e7838a12bb03bca94237f03cc2e00",
|
||||
"hash": "sha256-a7F97BEnwpdx9W8OsVnz+NfIYW+J1XVDSi38KsIZIfI="
|
||||
},
|
||||
"src/third_party/libyuv": {
|
||||
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
|
||||
"rev": "94417b9d213364905ce849c25719b819b8dbbaaa",
|
||||
"hash": "sha256-8sxr0TMQaCzBqQ39FADqWTATcmQlL6TOV3nFM/YySyY="
|
||||
"rev": "900da61d3cadba86ec593c8226de736b5e6b2c43",
|
||||
"hash": "sha256-vqPiv1HJe883aDOjzLBNXGA/b/F/frcW3Iml3ZUyHlY="
|
||||
},
|
||||
"src/third_party/lss": {
|
||||
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
|
||||
"rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0",
|
||||
"hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY="
|
||||
"rev": "29164a80da4d41134950d76d55199ea33fbb9613",
|
||||
"hash": "sha256-89CdA7vBYudbko0nAIyHcpHMXqFZHC05kwRIUmeEWGo="
|
||||
},
|
||||
"src/third_party/material_color_utilities/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git",
|
||||
@@ -582,8 +582,8 @@
|
||||
},
|
||||
"src/third_party/openscreen/src": {
|
||||
"url": "https://chromium.googlesource.com/openscreen",
|
||||
"rev": "4654d7968ac1a1e825a84bd4d85acadd7993c49a",
|
||||
"hash": "sha256-gg9PtdIuCN3eQJhutbBz411zIsyCpagb5BARGdCWLMA="
|
||||
"rev": "279b21edd27132609d2f46b702c42455ea05c4a8",
|
||||
"hash": "sha256-BxS1VaDK6ZwS7tXjimeBPNqdPKsIOosH29cL6EmWEM4="
|
||||
},
|
||||
"src/third_party/openscreen/src/buildtools": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
|
||||
@@ -597,13 +597,13 @@
|
||||
},
|
||||
"src/third_party/pdfium": {
|
||||
"url": "https://pdfium.googlesource.com/pdfium.git",
|
||||
"rev": "e95c6ead2f97716c98526ec42d5fd9ebb50e6e23",
|
||||
"hash": "sha256-tZXu+3w+CplXbP8TgRetyl1Q2gacAqWtP9uJ6XZchHk="
|
||||
"rev": "f5c376f93d33709ecd6b0dc8147b14a651ddbfeb",
|
||||
"hash": "sha256-Rfpdow3S3HTHVEEAmCyiKU7XfuUoxvtHeWV+wfarvF8="
|
||||
},
|
||||
"src/third_party/perfetto": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
|
||||
"rev": "d5bbee7afdf259af4212929ccbff467dd5349953",
|
||||
"hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs="
|
||||
"rev": "ac7792a0f3f1cbfffb071e8b97cd9a5168900e03",
|
||||
"hash": "sha256-9vpds/Xgw65uW5TG0kenqFVEh/NM1V3OpRdkGd0pMk4="
|
||||
},
|
||||
"src/third_party/protobuf-javascript/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
|
||||
@@ -612,8 +612,8 @@
|
||||
},
|
||||
"src/third_party/pthreadpool/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
|
||||
"rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119",
|
||||
"hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0="
|
||||
"rev": "0e6ca13779b57d397a5ba6bfdcaa8a275bc8ea2e",
|
||||
"hash": "sha256-FPUKjWARY4TdUq7ni48tnszEdmVYxPXIgtddPBHn/U0="
|
||||
},
|
||||
"src/third_party/pyelftools": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
|
||||
@@ -622,8 +622,8 @@
|
||||
},
|
||||
"src/third_party/quic_trace/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git",
|
||||
"rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad",
|
||||
"hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0="
|
||||
"rev": "e5c4ef17d934e078644e65d667ca6d86fe020d49",
|
||||
"hash": "sha256-LFZ5qFQoyBKta05wJUtJh3oIvaBYlzOozFpDulrQ/no="
|
||||
},
|
||||
"src/third_party/pywebsocket3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git",
|
||||
@@ -632,8 +632,8 @@
|
||||
},
|
||||
"src/third_party/re2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
|
||||
"rev": "cd7b2823a8375371f7efe6dae17837c9ab407693",
|
||||
"hash": "sha256-YXYRgSWUrX+tkaMiRpaCFrrP3vyhzGIP9ApsxWX08VQ="
|
||||
"rev": "61c4644171ee6b480540bf9e569cba06d9090b4b",
|
||||
"hash": "sha256-fRnjrP6Bz33eW+bOta5v3k9gqgN+gBvRH+t1i7b+eXA="
|
||||
},
|
||||
"src/third_party/ruy/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
|
||||
@@ -647,8 +647,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "f4ed99d2443962782cf5f8b4dd27179f131e7cbe",
|
||||
"hash": "sha256-7dpaRB/du2Y13BV3K7/Zx6lQwMtgtF17oKPoBtyEc64="
|
||||
"rev": "da51f0d60ea2b14e845a823dc11b405dbeef42d8",
|
||||
"hash": "sha256-thUbelru/6nPF7haXJtW6ncT6sIQzYqi0BCAJ+BWNY0="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -667,8 +667,8 @@
|
||||
},
|
||||
"src/third_party/swiftshader": {
|
||||
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
|
||||
"rev": "5f1c459a11bb4899301e89609cbf7547f9f31e20",
|
||||
"hash": "sha256-raNaqoF6CYdBowrQOGRZk6vDdpr/2xAXR2+RaDF0ypk="
|
||||
"rev": "3d536c0fc62b1cdea0f78c3c38d79be559855b88",
|
||||
"hash": "sha256-mlKoTdZgqfMzKGB7dUaETCd6NIQm5dne59w09/0bnGE="
|
||||
},
|
||||
"src/third_party/text-fragments-polyfill/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
|
||||
@@ -677,18 +677,18 @@
|
||||
},
|
||||
"src/third_party/tflite/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
|
||||
"rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f",
|
||||
"hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY="
|
||||
"rev": "5fcf510a862fb6d3c0d34906044389095a180ff6",
|
||||
"hash": "sha256-iXt3IutfZxiH9j7/mnx+YeZwak44+nhNo2rbDxtgKTg="
|
||||
},
|
||||
"src/third_party/vulkan-deps": {
|
||||
"url": "https://chromium.googlesource.com/vulkan-deps",
|
||||
"rev": "02470a3c2773a9fa236c7e8dacd72deb4b5131e3",
|
||||
"hash": "sha256-zziYZlVaxG5UQPm/SlodT85f+pAoGwuAO9FKnkSN53E="
|
||||
"rev": "224a52b06d0e019c7f7c006c2306de095207f77f",
|
||||
"hash": "sha256-/RkiBLiXo7Z+FUIjHIrvvcU8Mg6vX9vJUn8Cz1fI2OE="
|
||||
},
|
||||
"src/third_party/glslang/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
|
||||
"rev": "a57276bf558f5cf94d3a9854ebdf5a2236849a5a",
|
||||
"hash": "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY="
|
||||
"rev": "36b4d078576ad465e85b4b0502695ac5f3edb2e6",
|
||||
"hash": "sha256-A2D6fSfHpeXsYnXZs9l7DRE4ELUHbNQxr7HaokFByDQ="
|
||||
},
|
||||
"src/third_party/spirv-cross/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
|
||||
@@ -697,38 +697,38 @@
|
||||
},
|
||||
"src/third_party/spirv-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
|
||||
"rev": "01e0577914a75a2569c846778c2f93aa8e6feddd",
|
||||
"hash": "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08="
|
||||
"rev": "6bb105b6c4b3a246e1e6bb96366fe14c6dbfde83",
|
||||
"hash": "sha256-rgLhWf3U7gMjB+mpwq4EgQdRS6yP2/Q71Ns42ZDu7cc="
|
||||
},
|
||||
"src/third_party/spirv-tools/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
|
||||
"rev": "d5d5b61e2d5ae9b98ef403b3f3f922711812888a",
|
||||
"hash": "sha256-wP/ZjSXXB1NrRVmtaqxoJ+jdHlRNsXg7dRxYp9zfKKc="
|
||||
"rev": "05b0ab1253db43c3ea29efd593f3f13dfa621ab1",
|
||||
"hash": "sha256-OmvvBOBacp8ZgY+tcV1a7OmdGL607rrH89bu9uLj1L4="
|
||||
},
|
||||
"src/third_party/vulkan-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
|
||||
"rev": "a4f8ada9f4f97c45b8c89c57997be9cebaae65d2",
|
||||
"hash": "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU="
|
||||
"rev": "df274657d83f3bd8c77aef816c1cbf27352a948b",
|
||||
"hash": "sha256-/YXVD60zaSRgqkAFGZs0D0T2LoXRgMnYcO/RkQznW+I="
|
||||
},
|
||||
"src/third_party/vulkan-loader/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
|
||||
"rev": "f703f919c30c5b67958d35d40a4297cb3823ed78",
|
||||
"hash": "sha256-3BBltVh3M9OnBk1uf+xpaaJaaF9QP9DHeX7tu6ET05Y="
|
||||
"rev": "e1cad037970cfeeb86051c49d00ead75311acbec",
|
||||
"hash": "sha256-/xnxL+S6Z04FLHLv1V/YBcDu4fzhXvAqfHgS5cgeVhg="
|
||||
},
|
||||
"src/third_party/vulkan-tools/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
|
||||
"rev": "d643b80d6ba8c191bc289fdda52867c3bb3c190b",
|
||||
"hash": "sha256-E8VEn0s/ZuIIx4sH9ItLx+3+FOPi8gbQ0Ht7iIyYBUU="
|
||||
"rev": "7f6326618226225269a274869ac638b870c8fe2b",
|
||||
"hash": "sha256-hInSJsfPuI7U74rEqFQf6De1QoBkFjAnGLFE91uyJ5s="
|
||||
},
|
||||
"src/third_party/vulkan-utility-libraries/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
|
||||
"rev": "4322db5906e67b57ec9c327e6afe3d98ed893df7",
|
||||
"hash": "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg="
|
||||
"rev": "ea43e2f5e51e9ad958a40fdce981f2f0abf09cb5",
|
||||
"hash": "sha256-7SYRTJLLkC1OXDZ/llNRpVKhQeNak2IFxrHNJKRfrLk="
|
||||
},
|
||||
"src/third_party/vulkan-validation-layers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
|
||||
"rev": "83d96b88de7b85c3f29545170857e54e348421b2",
|
||||
"hash": "sha256-ugV2Gwgrerbqbtc5SgKN5wm4eT4JbXRCiryu1bLGR+M="
|
||||
"rev": "0cb2d651931455e44aa898585d7d78a9d90d31c5",
|
||||
"hash": "sha256-IxxvrY90d/NJWRNcvMIaUjg2o7LZEHi2gmOe+eyJmHI="
|
||||
},
|
||||
"src/third_party/vulkan_memory_allocator": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
|
||||
@@ -737,8 +737,8 @@
|
||||
},
|
||||
"src/third_party/wayland/src": {
|
||||
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
|
||||
"rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
|
||||
"hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w="
|
||||
"rev": "736d12ac67c20c60dc406dc49bb06be878501f86",
|
||||
"hash": "sha256-5iG0HaPXJCEo027TuyXlJQNGluTaAPlvwQDFbiYOEJQ="
|
||||
},
|
||||
"src/third_party/wayland-protocols/src": {
|
||||
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git",
|
||||
@@ -767,18 +767,18 @@
|
||||
},
|
||||
"src/third_party/webgpu-cts/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
|
||||
"rev": "b62c3fc76c9c644a8597399b0d23f7032cabb366",
|
||||
"hash": "sha256-L3DuBVH7x1vxpDp/wrykcyPCjVLJr4ox4gEl76f320A="
|
||||
"rev": "eefe6f33964beec1bd1534b1d9065ad027b71740",
|
||||
"hash": "sha256-g+zg7SpK/BztfgT+y45Ygb9+7izQpkgAM3vRX5iKkbU="
|
||||
},
|
||||
"src/third_party/webpagereplay": {
|
||||
"url": "https://chromium.googlesource.com/webpagereplay.git",
|
||||
"rev": "9057e5d942f2bfcee71cc20415a7f86c966241f8",
|
||||
"hash": "sha256-W/f+vYNC9xiCPVvHezlVPFAze77OTCMMj7PgNN5ixaw="
|
||||
"rev": "ab0ca8075f0cc5d40fed25e08ddabb144c29fc08",
|
||||
"hash": "sha256-hZ2TH5AsPPqxxShDTG1hhgpZWqXccD7TsoPfXcdhIUg="
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "29d6eabaf0b5c1a62af6e7fd03adebf5e1a446e8",
|
||||
"hash": "sha256-kVzks2ncpgd+aQ7JT2pAV/WJXxFIE7Es5Yzd/XGgm4w="
|
||||
"rev": "a5751574a386ba0ba80b8c62201977f6aab6c225",
|
||||
"hash": "sha256-amrKVRN2QsjeDbxkKu0yjAs06U094MHj4ccSJHoVgPE="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
@@ -797,8 +797,8 @@
|
||||
},
|
||||
"src/third_party/xnnpack/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
|
||||
"rev": "4d098efeac50c44a7c03e6feb1794908db4c3158",
|
||||
"hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw="
|
||||
"rev": "98a027498845d3e2acd0e983fff6950714edbfc2",
|
||||
"hash": "sha256-MwzgJN/QE3pLI+5UZNz2oepBibQq5j4CKLDQ1jFyi2w="
|
||||
},
|
||||
"src/third_party/zstd/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
|
||||
@@ -807,8 +807,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "baea8d627b70725fb777ebc1074f8ec4110ef6cb",
|
||||
"hash": "sha256-jECAfgeAgdkhbI/8BgT9TakR9Ylha2zPznjZzibPQbE="
|
||||
"rev": "beee9f5cafde91bbd086077a11db16cb9768e62a",
|
||||
"hash": "sha256-q1gVbNGls2izSDb3KZmteZQvcc6M0JyPuZFPfG4FIAs="
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -886,13 +886,13 @@
|
||||
"vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0="
|
||||
},
|
||||
"metio_migadu": {
|
||||
"hash": "sha256-wz74VlScxOqkRAok6/4pDSEb15ubwR6ogcHMqDMSvVY=",
|
||||
"hash": "sha256-WEgMbkB7NRv9z0n3C8pNCkPzy1gpog6xxseFr3kHRcU=",
|
||||
"homepage": "https://registry.terraform.io/providers/metio/migadu",
|
||||
"owner": "metio",
|
||||
"repo": "terraform-provider-migadu",
|
||||
"rev": "2025.11.20",
|
||||
"rev": "2025.11.27",
|
||||
"spdx": "0BSD",
|
||||
"vendorHash": "sha256-eyapSniZ96V/Eqov0PENbNZYXntPH0JIGERQ/TVsH70="
|
||||
"vendorHash": "sha256-RAM/3IDQaigS+xNZYkg7Ftm4MPP1FMiiXwd5y31zJzA="
|
||||
},
|
||||
"mongey_kafka": {
|
||||
"hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
|
||||
@@ -1129,13 +1129,13 @@
|
||||
"vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
|
||||
},
|
||||
"rootlyhq_rootly": {
|
||||
"hash": "sha256-RlEQd09iCT3XAuDKCvDAe7iVgx8cDkEqogK/xpVCPrA=",
|
||||
"hash": "sha256-2qDsqHwaTRfzTiMvLeTMEpMiYZAbL4yGoAOPZt73Wlg=",
|
||||
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
|
||||
"owner": "rootlyhq",
|
||||
"repo": "terraform-provider-rootly",
|
||||
"rev": "v4.3.8",
|
||||
"rev": "v4.3.9",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-IpWN8hCZlXm9hbPr2VcjzU7wtqivUk2h+LOaaz4KyP4="
|
||||
"vendorHash": "sha256-/KIUDgjyfZLyH8bTVbL0onUEXBR4nWemkugUykphqbU="
|
||||
},
|
||||
"rundeck_rundeck": {
|
||||
"hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",
|
||||
|
||||
@@ -1,96 +1,62 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
installShellFiles,
|
||||
bash,
|
||||
curl,
|
||||
git,
|
||||
writeScript,
|
||||
}:
|
||||
|
||||
let
|
||||
asdfReshimFile = writeScript "asdf-reshim" ''
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# asdf-vm create "shim" file like this:
|
||||
#
|
||||
# exec $ASDF_DIR/bin/asdf exec "node" "$@"
|
||||
#
|
||||
# So we should reshim all installed versions every time shell initialized,
|
||||
# because $out always change
|
||||
|
||||
asdfDir="''${ASDF_DIR:-$HOME/.asdf}"
|
||||
asdfDataDir="''${ASDF_DATA_DIR:-$HOME/.asdf}"
|
||||
|
||||
prevAsdfDirFilePath="$asdfDataDir/.nix-prev-asdf-dir-path"
|
||||
|
||||
if [ -r "$prevAsdfDirFilePath" ]; then
|
||||
prevAsdfDir="$(cat "$prevAsdfDirFilePath")"
|
||||
else
|
||||
prevAsdfDir=""
|
||||
fi
|
||||
|
||||
if [ "$prevAsdfDir" != "$asdfDir" ]; then
|
||||
rm -rf "$asdfDataDir"/shims
|
||||
"$asdfDir"/bin/asdf reshim
|
||||
echo "$asdfDir" > "$prevAsdfDirFilePath"
|
||||
fi
|
||||
'';
|
||||
|
||||
asdfPrepareFile = writeScript "asdf-prepare" ''
|
||||
ASDF_DIR="@asdfDir@"
|
||||
|
||||
source "$ASDF_DIR/asdf.sh"
|
||||
${asdfReshimFile}
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "asdf-vm";
|
||||
version = "0.15.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asdf-vm";
|
||||
repo = "asdf";
|
||||
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-quDgoYi+3hZUEAzXWTHuL5UK1T+4o7+G67w0UzZOjJA=";
|
||||
hash = "sha256-BBd+MiRISjMz2m29nNIakG79Oy1k7bZI/Q24QQNp5CY=";
|
||||
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gzlHXIzDYo4leP+37HgNrz5faIlrCLYA7AVSvZ6Uicc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
curl
|
||||
git
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/asdf-vm
|
||||
cp -r . $out/share/asdf-vm
|
||||
# Tests have additional requirements
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
# Install profile.d script for environment setup
|
||||
mkdir -p $out/etc/profile.d
|
||||
substitute ${asdfPrepareFile} $out/etc/profile.d/asdf-prepare.sh \
|
||||
--replace "@asdfDir@" "$out/share/asdf-vm"
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper $out/share/asdf-vm/bin/asdf $out/bin/asdf \
|
||||
--set ASDF_DIR $out/share/asdf-vm
|
||||
cat > $out/etc/profile.d/asdf-prepare.sh <<'EOF'
|
||||
export ASDF_DIR="${placeholder "out"}"
|
||||
export PATH="''${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"
|
||||
EOF
|
||||
|
||||
# Wrap the asdf binary to set ASDF_DIR
|
||||
wrapProgram $out/bin/asdf \
|
||||
--set ASDF_DIR $out
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
# Generate completions using the built asdf binary
|
||||
installShellCompletion --cmd asdf \
|
||||
--zsh completions/_asdf \
|
||||
--fish completions/asdf.fish \
|
||||
--bash completions/asdf.bash
|
||||
--bash <($out/bin/asdf completion bash) \
|
||||
--fish <($out/bin/asdf completion fish) \
|
||||
--zsh <($out/bin/asdf completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Extendable version manager with support for Ruby, Node.js, Erlang & more";
|
||||
homepage = "https://asdf-vm.com/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ c4605 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
c4605
|
||||
vringar
|
||||
];
|
||||
mainProgram = "asdf";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -7,20 +7,21 @@
|
||||
installShellFiles,
|
||||
makeWrapper,
|
||||
zlib,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bat";
|
||||
version = "0.26.0";
|
||||
version = "0.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = "bat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JWpdAO+OCqoWa6KVR8sxvHHy1SdR4BmRO0oU0ZAOWl0=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IbTvFT37BFo0tKOiApDL9sT+/nMD33MO3TXuho+lF2c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wb86yWWnRHs1vG8+oyhs6bUD4x7AdWvIvPPNBcLs4Hs=";
|
||||
cargoHash = "sha256-WRLCs1hrwFT3tya9CzKUuh5g+6fYqKDtv3yvDx8Wws8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -62,6 +63,9 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=file_with_invalid_utf8_filename"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
@@ -78,7 +82,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Cat(1) clone with syntax highlighting and Git integration";
|
||||
homepage = "https://github.com/sharkdp/bat";
|
||||
changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/sharkdp/bat/raw/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
@@ -91,4 +95,4 @@ rustPlatform.buildRustPackage rec {
|
||||
sigmasquadron
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-about";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-about";
|
||||
tag = version;
|
||||
sha256 = "sha256-cNKZpDlfqEXeOE5lmu79AcKOawkPpk4PQCsBzNtIEbs=";
|
||||
sha256 = "sha256-MRrcSVWcvp0E135ViKbPo7a60TcYjWZNj8ZL/lJ/XDM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NnocSs6UkuF/mCM3lIdFk+r51Iz2bHuYzMT/gEbT/nk=";
|
||||
cargoHash = "sha256-KIc3LPkFGMvNusyRAhaejv6wZjQnDmrGn4cOTYb70KM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code-acp";
|
||||
version = "0.10.8";
|
||||
version = "0.10.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "claude-code-acp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eQhUXdYynBCv/6P60JRo43MDpWEPdIdEEQnFeY9AnhA=";
|
||||
hash = "sha256-cSgKMeOW2oYy26HRo5qzoPHuoidqZ3TiLfgQAVbUIXA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-dzgqmJPU3hIcQag+PnS1n8U05Mx+WN27d1Hwyy7CdZo=";
|
||||
npmDepsHash = "sha256-IOTcAylJuDorC6qPiQ2gJFeQu0dR+EAAKcyPsPdR0d0=";
|
||||
|
||||
meta = {
|
||||
description = "ACP-compatible coding agent powered by the Claude Code SDK";
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "12.11.0";
|
||||
version = "12.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vU6ezKt9pmcHiNHiwNYnJS7ClyEibJ9gK/JUM7/8SMo=";
|
||||
hash = "sha256-UOF6Blou1ehwNCVldkLf4LaW9F71fndjwvP21gZ+r1o=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-UDMJsqDg4cDzj15vw/3JDRT3rVcZ/VuAuv5LYSCPY1k=";
|
||||
vendorHash = "sha256-49R8/adcMsUBQcQf7JoevCRh3P37kzht6vn6cWo0iiE=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "coc-pyright";
|
||||
version = "0-unstable-2025-11-01";
|
||||
version = "0-unstable-2025-12-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-pyright";
|
||||
# No tagged releases, this commit corresponds to the latest release of the package.
|
||||
rev = "9ac99c71ea92810b532283b690f6771601c74ff2";
|
||||
hash = "sha256-nADl29GiApBZMKW0yQ9QVWBiduaGNXO8Cm4XxZmNfMQ=";
|
||||
rev = "263919ddd3dce33d15626ed6c6139702839295e0";
|
||||
hash = "sha256-tcD4Irq3IRVNFh1rCfvVg1VSbiMtc1bswAKTRmIfo8Y=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-+9bf/3b8vZZgkiC2DA15js9X5PFHzK9dltTA9XJt+GE=";
|
||||
npmDepsHash = "sha256-LW0twhPlWZLFYSzfzoi9Rg8+EsmkllfasR51YtrcdnQ=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
||||
@@ -24,12 +24,12 @@ let
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ULOnR1YvNmKr7iEuf8cZ+WgN4JRIG3md9gwyXK81vPQ=";
|
||||
hash = "sha256-pW1+9aljtnYJmlJOj+m0aQekYO5IsL0fduR7kIAPdN8=";
|
||||
};
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "chatmail-core";
|
||||
inherit version src;
|
||||
hash = "sha256-EkYlG32EhtIFFDpVgbKw8TSqHhPHgxd6Kh3wYN4Moq8=";
|
||||
hash = "sha256-iIC9wE7P2SKeCMtc/hFTRaOGXD2F7kh1TptOoes/Qi0=";
|
||||
};
|
||||
};
|
||||
electron = electron_37;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
rustPlatform,
|
||||
libdeltachat,
|
||||
pkg-config,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
@@ -29,6 +30,12 @@ rustPlatform.buildRustPackage {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
meta = libdeltachat.meta // {
|
||||
description = "Delta Chat RPC server exposing JSON-RPC core API over standard I/O";
|
||||
mainProgram = "deltachat-rpc-server";
|
||||
|
||||
@@ -21,13 +21,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ed-odyssey-materials-helper";
|
||||
version = "3.1.3";
|
||||
version = "3.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jixxed";
|
||||
repo = "ed-odyssey-materials-helper";
|
||||
tag = version;
|
||||
hash = "sha256-eKQ2Hvx+IIZNvd5ZNr/V+ii8vtDkoWToqdtPDI+3glI=";
|
||||
hash = "sha256-m4Wv1M6UliyERjZHZvAqJVttFwZfsr0oxrK4/AZmy1Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
ninja,
|
||||
pkg-config,
|
||||
gst_all_1,
|
||||
openssl,
|
||||
protobuf,
|
||||
libspelling,
|
||||
libsecret,
|
||||
@@ -16,57 +17,28 @@
|
||||
gtksourceview5,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
yq,
|
||||
appstream,
|
||||
blueprint-compiler,
|
||||
desktop-file-utils,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
let
|
||||
presage = fetchFromGitHub {
|
||||
owner = "whisperfish";
|
||||
repo = "presage";
|
||||
# match with commit from Cargo.toml
|
||||
rev = "559591c0e5886f101d3c25c27d8010214e9ea0c3";
|
||||
hash = "sha256-WEWVhG/azf9BjLLzTEys+JGWbd+FzIDHm9QeWAeMLGA=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flare";
|
||||
# NOTE: also update presage commit
|
||||
version = "0.17.3";
|
||||
version = "0.17.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "flare";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-W26RR4BmGeXL6AoWMkf9BmU3nLY4rTnVf2OJPWKmKYc=";
|
||||
hash = "sha256-GW7v5ZsVPqQ+hZLOB0A/wVbOQHA9OgGCfeSONCNPKhk=";
|
||||
};
|
||||
|
||||
cargoDeps =
|
||||
let
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-bpafm+yyHNAoHVAgzc3BgM3+Jm7L+2gdoOdRSJ05iTE=";
|
||||
};
|
||||
in
|
||||
# Replace with simpler solution:
|
||||
# https://github.com/NixOS/nixpkgs/pull/432651#discussion_r2312796706
|
||||
# depending on sqlx release and update in flare-signal
|
||||
runCommand "${finalAttrs.pname}-${finalAttrs.version}-vendor-patched" { inherit cargoDeps; }
|
||||
# https://github.com/flathub/de.schmidhuberj.Flare/commit/b1352087beaf299569c798bc69e31660712853db
|
||||
# bash
|
||||
''
|
||||
mkdir $out
|
||||
find $cargoDeps -maxdepth 1 -exec sh -c "ln -s {} $out/\$(basename {})" \;
|
||||
rm $out/presage-store-sqlite-*
|
||||
cp -r $cargoDeps/presage-store-sqlite-* $out
|
||||
chmod +w $out/presage-store-sqlite-*
|
||||
ln -s ${presage}/.sqlx $out/presage-store-sqlite-*
|
||||
'';
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-CGgoHL6dDovBe1W04A8fOH5EnkqezPuiO8f7/ZCgjAM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream # for appstream-util
|
||||
@@ -79,30 +51,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
# yq contains tomlq
|
||||
yq
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cargoPresageRev="$(tomlq -r '.dependencies.presage.rev' Cargo.toml)"
|
||||
actualPresageRev="${presage.rev}"
|
||||
if [ "$cargoPresageRev" != "$actualPresageRev" ]; then
|
||||
echo ""
|
||||
echo "fetchFromGitHub presage revision does not match revision specified in Cargo.toml"
|
||||
echo "consider replacing fetchFromGitHub's revision with revision specified in Cargo.toml"
|
||||
echo ""
|
||||
echo " fetchFromGitHub = ''${actualPresageRev}"
|
||||
echo " Cargo.toml = ''${cargoPresageRev}"
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gtksourceview5
|
||||
libadwaita
|
||||
libsecret
|
||||
libspelling
|
||||
openssl
|
||||
protobuf
|
||||
|
||||
# To reproduce audio messages
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "3.5.8";
|
||||
version = "3.6.2";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BTAjlA8jk75tkgUpSJrEe4m9aVUav3eeTk7IjT2AYlY=";
|
||||
hash = "sha256-7Z1TzAtKBrivnpkgipWK33Yyc6yguoNuinqSvG5gvXM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gvm-libs";
|
||||
version = "22.32.0";
|
||||
version = "22.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "gvm-libs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-obQfexzE4vHnmzFp3gzPiKhzQJXrr6RWlg4v08WP4zE=";
|
||||
hash = "sha256-TFXM348a+PgpSyPENNlfoIGb/h6HvtIM1jlDnSbt/KI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"desktop_webview_window": "sha256-l5n57iKLgsH4TaBYRaTDEPznzljI0jfOGcvxyYcIW6M=",
|
||||
"media_kit": "sha256-/7a9k6BF4dyeyIY4LGSl2xQ2HsP4IQ5m+oeFcvOP1G0=",
|
||||
"media_kit_libs_android_video": "sha256-/7a9k6BF4dyeyIY4LGSl2xQ2HsP4IQ5m+oeFcvOP1G0=",
|
||||
"media_kit_libs_ios_video": "sha256-/7a9k6BF4dyeyIY4LGSl2xQ2HsP4IQ5m+oeFcvOP1G0=",
|
||||
"media_kit_libs_linux": "sha256-/7a9k6BF4dyeyIY4LGSl2xQ2HsP4IQ5m+oeFcvOP1G0=",
|
||||
"media_kit_libs_macos_video": "sha256-/7a9k6BF4dyeyIY4LGSl2xQ2HsP4IQ5m+oeFcvOP1G0=",
|
||||
"media_kit_libs_video": "sha256-/7a9k6BF4dyeyIY4LGSl2xQ2HsP4IQ5m+oeFcvOP1G0=",
|
||||
"media_kit_libs_windows_video": "sha256-/7a9k6BF4dyeyIY4LGSl2xQ2HsP4IQ5m+oeFcvOP1G0=",
|
||||
"media_kit_video": "sha256-/7a9k6BF4dyeyIY4LGSl2xQ2HsP4IQ5m+oeFcvOP1G0=",
|
||||
"desktop_webview_window": "sha256-FSI/R9HvAJWQttY8oaAmBYygUliv/bw3hmwty7PRUjE=",
|
||||
"media_kit": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
|
||||
"media_kit_libs_android_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
|
||||
"media_kit_libs_ios_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
|
||||
"media_kit_libs_linux": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
|
||||
"media_kit_libs_macos_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
|
||||
"media_kit_libs_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
|
||||
"media_kit_libs_windows_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
|
||||
"media_kit_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
|
||||
"webview_windows": "sha256-6Uk4H2SYhjrs1+/27FmlWopDyM09Mc7SqFJ4syg3dDU="
|
||||
}
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Predidit";
|
||||
repo = "Kazumi";
|
||||
tag = version;
|
||||
hash = "sha256-KcZh8T6tf81/bAJj2ZMNynfHWGvzrwxwj0nXbXckJhY=";
|
||||
hash = "sha256-NGJp4F2b6SCy83p9IHekAH1jB8BDQZwMKU8BKS/hyq0=";
|
||||
};
|
||||
in
|
||||
flutter338.buildFlutterApplication {
|
||||
|
||||
@@ -394,8 +394,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "f95c8d09e66a73dce5465770f6fb41e4a13fad44",
|
||||
"resolved-ref": "f95c8d09e66a73dce5465770f6fb41e4a13fad44",
|
||||
"ref": "b107a03068b8c4249cec4a3b159d56f1326103c5",
|
||||
"resolved-ref": "b107a03068b8c4249cec4a3b159d56f1326103c5",
|
||||
"url": "https://github.com/Predidit/linux_webview_window.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -929,11 +929,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "logger",
|
||||
"sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c",
|
||||
"sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.6.1"
|
||||
"version": "2.6.2"
|
||||
},
|
||||
"logging": {
|
||||
"dependency": "transitive",
|
||||
@@ -969,8 +969,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "media_kit",
|
||||
"ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"resolved-ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -980,8 +980,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/android/media_kit_libs_android_video",
|
||||
"ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"resolved-ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -991,8 +991,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/ios/media_kit_libs_ios_video",
|
||||
"ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"resolved-ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1002,8 +1002,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/linux/media_kit_libs_linux",
|
||||
"ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"resolved-ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1013,8 +1013,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/macos/media_kit_libs_macos_video",
|
||||
"ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"resolved-ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1024,8 +1024,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "libs/universal/media_kit_libs_video",
|
||||
"ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"resolved-ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1035,8 +1035,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/windows/media_kit_libs_windows_video",
|
||||
"ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"resolved-ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1046,8 +1046,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "media_kit_video",
|
||||
"ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"resolved-ref": "13a209a0af921d117be7f1aac6f9066949e39db9",
|
||||
"ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -2203,6 +2203,6 @@
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.8.0 <4.0.0",
|
||||
"flutter": ">=3.38.1"
|
||||
"flutter": ">=3.38.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,14 +2,15 @@
|
||||
appimageTools,
|
||||
lib,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
}:
|
||||
let
|
||||
pname = "mathpix-snipping-tool";
|
||||
version = "03.00.0072";
|
||||
version = "03.00.0138";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.mathpix.com/linux/Mathpix_Snipping_Tool-x86_64.v${version}.AppImage";
|
||||
sha256 = "1igg8wnshmg9f23qqw1gqb85h1aa3461c1n7dmgw6sn4lrrrh5ms";
|
||||
sha256 = "sha256-29iLdrWxqLL7uRfHae8Mq+w9yaGtM9Y5vRLzYESgzBs=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
@@ -17,17 +18,24 @@ in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
|
||||
wrapProgram $out/bin/${pname} --set QT_QPA_PLATFORM xcb
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "OCR tool to convert pictures to LaTeX";
|
||||
homepage = "https://mathpix.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.hiro98 ];
|
||||
maintainers = [
|
||||
maintainers.hiro98
|
||||
maintainers.axodentally
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "mathpix-snipping-tool";
|
||||
};
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "par-lang";
|
||||
version = "0-unstable-2025-11-20";
|
||||
version = "0-unstable-2025-12-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "faiface";
|
||||
repo = "par-lang";
|
||||
rev = "1f6671068d93defdd14a7ff86b9fc167b6949906";
|
||||
hash = "sha256-skBH5m/cJ7CZJqfDtKxk8AqaP/dwGCmEb9CDtmMUzlU=";
|
||||
rev = "aa01ca58034b91f64b3ad5c849bb0e97762221af";
|
||||
hash = "sha256-W68fareSkbnHnFy0IFIShOebC0cCcWqRWoaez3drsYI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sW+gAIp/DjlTo44QDXpP6COrCK/CcDlx3no284MEQJo=";
|
||||
|
||||
@@ -12,10 +12,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andersson";
|
||||
owner = "linux-msm";
|
||||
repo = "rmtfs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-00KOjdkwcAER261lleSl7OVDEAEbDyW9MWxDd0GI8KA=";
|
||||
hash = "sha256-ehd8SbKNOpyVoF9oc7e5uYmJOHI+Q6woLyvwO8hhKEc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -32,5 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/linux-msm/rmtfs";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.aarch64;
|
||||
mainProgram = "rmtfs";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sdl_gamecontrollerdb";
|
||||
version = "0-unstable-2025-11-17";
|
||||
version = "0-unstable-2025-11-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdqinc";
|
||||
repo = "SDL_GameControllerDB";
|
||||
rev = "e1efb4bad8730b2c0c6316617cbd06b9def1192e";
|
||||
hash = "sha256-NeNWDVFEK54v5GoBybWeiNeJoe7u3e0Ci0yTB5n/57U=";
|
||||
rev = "cbfc87488e446c446d5b5ded1d99a0df2273d499";
|
||||
hash = "sha256-Za1TtweRWKiwJfvtjvaM+HMFjRgx7GTcg4S4xCRTcNE=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VO8uQ5tXYK1k1WZiJAq8/VcvCiCcbjzGMDWfZwKSw9w=";
|
||||
hash = "sha256-+oCPjof64j+XUnQtml6y2v/1/AiHGpN5DAkFfAEy8Nw=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorHash = "sha256-BAZ/rZqI51FYAHLcxbsPQofeNvRZRWihWAMEf91DDHI=";
|
||||
vendorHash = "sha256-sXyM9tPsIW+x5zjiah1sr+iGq2JC2VcLHKvoFW6yr3M=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stackit-cli";
|
||||
version = "0.48.0";
|
||||
version = "0.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackitcloud";
|
||||
repo = "stackit-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W7X4pe4/Id/rxIKMI/GnhHpKtcIFHi/cbOXQ1HELHaQ=";
|
||||
hash = "sha256-hhsiFfDrxuBIOWX2tHCMGBRP7z04dmwH4V6KicxzsDc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-C2DnHpXWjoXUNbra+6NVp2h24MWp/5QK2q/9bVTix1E=";
|
||||
vendorHash = "sha256-6AcSPt5CVFUPpP0ve7XtxbM1pJlPrdi3nKtzgeu649Y=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tenv";
|
||||
version = "4.8.3";
|
||||
version = "4.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tofuutils";
|
||||
repo = "tenv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-p0LaTj+hGZapvJR5IU0hwaeUjyBwEsvOXQhvA+NXHkw=";
|
||||
hash = "sha256-B9K8IDUjd3gQrg5q2IoIsKJHHzRDil4oHEuB2DTMS3k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BZjS9A6j0S1Q1Aq0BeHXT8jiO4gZG4t3xySF4VtTsS4=";
|
||||
vendorHash = "sha256-+kJ3TMAyuHZBHfINAOsAP3XIF4TYfO9zH+8ZKJOvPK0=";
|
||||
|
||||
excludedPackages = [ "tools" ];
|
||||
|
||||
|
||||
@@ -12,13 +12,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tqftpserv";
|
||||
version = "1.1";
|
||||
# Use unstable for fixed systemd service
|
||||
# with removed qrtr-ns dependency.
|
||||
version = "1.1-unstable-2025-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-msm";
|
||||
repo = "tqftpserv";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Djw2rx1FXYYPXs6Htq7jWcgeXFvfCUoeidKtYUvTqZU=";
|
||||
rev = "408ca1ed5e4e0a9ac3650b13d3f3c60079b3e2a3";
|
||||
hash = "sha256-IlM/HVdo/7cA9NnJrCW/B0yKks5jWYqxRyy3ay4wDr8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -45,5 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/andersson/tqftpserv";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.aarch64;
|
||||
mainProgram = "tqftpserv";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.91.1";
|
||||
version = "3.91.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-knlcaV0+yB+S7Yyvq4CmkmMd4uQRhcZm96q7p7hLv7g=";
|
||||
hash = "sha256-+sG/heW0Dqs3TvdtpAvqnCYU7e4paTSDKX7rtCvacq4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Qz0tKqqT3PlZFCiYxLBmHeICIx2ogOUW7rfXHadcVPg=";
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "visual-paradigm-ce";
|
||||
version = "17.3.20251166";
|
||||
version = "17.3.20251201";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://eu10-dl.visual-paradigm.com/visual-paradigm/vpce${majorMinor}/${suffix}/Visual_Paradigm_CE_${
|
||||
builtins.replaceStrings [ "." ] [ "_" ] majorMinor
|
||||
}_${suffix}_Linux64_InstallFree.tar.gz";
|
||||
hash = "sha256-QCa5HsCA7L5ev1nySIpBRCkFvBabNsuBS4vA7zoyWvM=";
|
||||
hash = "sha256-qHatD+W2SP9bLrOoIDXDNGdNKYoL52XdC6mVdelMFdc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg";
|
||||
hash = "sha256-YivHBEFPkm79y2R5QIV+trm8O3aFzvXTqVzFr1tcoIo=";
|
||||
hash = "sha256-lDf/jULLQyzxNVGRUKuF2df+FTbJK08z+fFQbVgwjsY=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
|
||||
hash = "sha256-ce0Lvz0k3DH6rGzdGoqYIW1OBiaJwaxn8pDnMQbqtv4=";
|
||||
hash = "sha256-uV0R0L8EoZt59hMKXFlJ+EhONArPpRbb/tIV+wZKLgY=";
|
||||
};
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "zotero";
|
||||
version = "7.0.27";
|
||||
version = "7.0.30";
|
||||
meta = {
|
||||
homepage = "https://www.zotero.org";
|
||||
description = "Collect, organize, cite, and share your research sources";
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
beamPackages.mixRelease rec {
|
||||
pname = "livebook";
|
||||
version = "0.17.3";
|
||||
version = "0.18.0";
|
||||
|
||||
inherit (beamPackages) elixir;
|
||||
|
||||
@@ -21,13 +21,13 @@ beamPackages.mixRelease rec {
|
||||
owner = "livebook-dev";
|
||||
repo = "livebook";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WElJgW2TxjeUgv6GZwq+hcgl6n4xr8mmCBPqoOGc1+w=";
|
||||
hash = "sha256-cALXl9CQZtg7kVAAWEu5CMbimrsjcfpxXLM1LhtxB/g=";
|
||||
};
|
||||
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version;
|
||||
hash = "sha256-18fmaNuu2KqTGhBBd+pSBfgnrHiqzXc3CMdSpC5lFs8=";
|
||||
hash = "sha256-pfHzcYEEvj+x1/vLKhJ6bAsKGg19UisVK6h0xskhu74=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -24,11 +24,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "go";
|
||||
version = "1.24.10";
|
||||
version = "1.24.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-NAANzEelF7ePzyZX7n0DMyilcHn+YMTti3uEJg0dGdM=";
|
||||
hash = "sha256-/9+XdmpMSxNc1TgJcTl46e4alDssjiitIhpUKd4w4hA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
stanza,
|
||||
torch,
|
||||
tqdm,
|
||||
colorama,
|
||||
python-dotenv,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
@@ -28,24 +30,16 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "cltk";
|
||||
version = "1.5.0";
|
||||
version = "2.0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cltk";
|
||||
repo = "cltk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-aeWbfDVNn6DwW+KFh62n5RBgWp5uSWDv2RHmB27/xI4=";
|
||||
hash = "sha256-tAomXxI6XsIAxQzPiUsT5t1CHrFDPkwyWtVuHXQCz2A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "poetry>=1.1.13" poetry-core \
|
||||
--replace-fail "poetry.masonry.api" "poetry.core.masonry.api" \
|
||||
--replace-fail 'scipy = "<1.13.0"' 'scipy = "^1"' \
|
||||
--replace-fail 'boltons = "^21.0.0"' 'boltons = "^24.0.0"'
|
||||
'';
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -67,6 +61,8 @@ buildPythonPackage rec {
|
||||
stanza
|
||||
torch
|
||||
tqdm
|
||||
colorama
|
||||
python-dotenv
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django";
|
||||
version = "5.2.8";
|
||||
version = "5.2.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -52,7 +52,7 @@ buildPythonPackage rec {
|
||||
owner = "django";
|
||||
repo = "django";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ruzQ3CUNqHa0RmxCDBVXbtetkMvz+G/D4/LB/2aBc8I=";
|
||||
hash = "sha256-9URe8hB15WP92AU1YgGGFfZhVxn59gfBRrORZ04L+F0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,65 +1,76 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
cython_0,
|
||||
oldest-supported-numpy,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
cython,
|
||||
setuptools,
|
||||
fetchPypi,
|
||||
mock,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
scipy,
|
||||
smart-open,
|
||||
|
||||
# tests
|
||||
mock,
|
||||
pyemd,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
testfixtures,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gensim";
|
||||
version = "4.3.3";
|
||||
version = "4.4.0";
|
||||
pyproject = true;
|
||||
|
||||
# C code generated with CPython3.12 does not work cython_0.
|
||||
disabled = !(pythonOlder "3.12");
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hIUgdqaj2I19rFviReJMIcO4GbVl4UwbYfo+Xudtz1c=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "piskvorky";
|
||||
repo = "gensim";
|
||||
tag = version;
|
||||
hash = "sha256-TXutcU43ReBj9ss9+zBJFUxb5JqVHpl+B0c7hqcJAJY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
cython_0
|
||||
oldest-supported-numpy
|
||||
cython
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
smart-open
|
||||
numpy
|
||||
scipy
|
||||
smart-open
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pyemd
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"scipy"
|
||||
testfixtures
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gensim" ];
|
||||
|
||||
# Test setup takes several minutes
|
||||
doCheck = false;
|
||||
|
||||
enabledTestPaths = [ "gensim/test" ];
|
||||
|
||||
meta = with lib; {
|
||||
# test_parallel is flaky under load
|
||||
disabledTests = [ "test_parallel" ];
|
||||
|
||||
preCheck = ''
|
||||
export GENSIM_DATA_DIR="$NIX_BUILD_TOP/gensim-data"
|
||||
mkdir -p "$GENSIM_DATA_DIR"
|
||||
export SKIP_NETWORK_TESTS=1
|
||||
''
|
||||
# Prevent python from importing gensim from the source files during tests
|
||||
+ ''
|
||||
rm gensim/__init__.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Topic-modelling library";
|
||||
homepage = "https://radimrehurek.com/gensim/";
|
||||
downloadPage = "https://github.com/piskvorky/gensim";
|
||||
changelog = "https://github.com/RaRe-Technologies/gensim/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.lgpl21Only;
|
||||
license = lib.licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,38 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
poetry-dynamic-versioning,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
aiofiles,
|
||||
aiolimiter,
|
||||
azure-cosmos,
|
||||
azure-identity,
|
||||
azure-search-documents,
|
||||
azure-storage-blob,
|
||||
datashaper,
|
||||
devtools,
|
||||
environs,
|
||||
fnllm,
|
||||
future,
|
||||
graspologic,
|
||||
json-repair,
|
||||
lancedb,
|
||||
matplotlib,
|
||||
litellm,
|
||||
networkx,
|
||||
nltk,
|
||||
numpy,
|
||||
openai,
|
||||
pandas,
|
||||
pyaml-env,
|
||||
pyarrow,
|
||||
pydantic,
|
||||
python-dotenv,
|
||||
pyyaml,
|
||||
rich,
|
||||
tenacity,
|
||||
spacy,
|
||||
textblob,
|
||||
tiktoken,
|
||||
tqdm,
|
||||
typer,
|
||||
typing-extensions,
|
||||
umap-learn,
|
||||
|
||||
# tests
|
||||
nbformat,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
@@ -40,54 +46,55 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphrag";
|
||||
version = "2.4.0";
|
||||
version = "2.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "graphrag";
|
||||
tag = "v.${version}";
|
||||
hash = "sha256-a8t6Nl9W/Cr7eueAvJ3dbz5G0oIhddqFMIm7HeZ8N9A=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-F0MiC+14KOjCVwlcZpNo15SqDOfSYsVwH8qNQTHBKPQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
poetry-dynamic-versioning
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
dependencies = [
|
||||
aiofiles
|
||||
aiolimiter
|
||||
azure-cosmos
|
||||
azure-identity
|
||||
azure-search-documents
|
||||
azure-storage-blob
|
||||
datashaper
|
||||
devtools
|
||||
environs
|
||||
fnllm
|
||||
future
|
||||
graspologic
|
||||
json-repair
|
||||
lancedb
|
||||
matplotlib
|
||||
litellm
|
||||
networkx
|
||||
nltk
|
||||
numpy
|
||||
openai
|
||||
pandas
|
||||
pyaml-env
|
||||
pyarrow
|
||||
pydantic
|
||||
python-dotenv
|
||||
pyyaml
|
||||
rich
|
||||
tenacity
|
||||
spacy
|
||||
textblob
|
||||
tiktoken
|
||||
tqdm
|
||||
typer
|
||||
typing-extensions
|
||||
umap-learn
|
||||
];
|
||||
]
|
||||
++ fnllm.optional-dependencies.azure
|
||||
++ fnllm.optional-dependencies.openai;
|
||||
|
||||
env.NUMBA_CACHE_DIR = "$TMPDIR";
|
||||
|
||||
@@ -101,11 +108,20 @@ buildPythonPackage rec {
|
||||
|
||||
enabledTestPaths = [ "tests/unit" ];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Flaky
|
||||
"tests/unit/litellm_services/test_rate_limiter.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# touch the network
|
||||
"test_basic_functionality"
|
||||
"test_child"
|
||||
"test_dotprefix"
|
||||
"test_find"
|
||||
"test_load_strategy_sentence"
|
||||
"test_mixed_whitespace_handling"
|
||||
"test_multiple_documents"
|
||||
"test_run_extract_entities_multiple_documents"
|
||||
"test_run_extract_entities_single_document"
|
||||
"test_sort_context"
|
||||
|
||||
@@ -3,12 +3,15 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
poetry-core,
|
||||
poetry-dynamic-versioning,
|
||||
pytestCheckHook,
|
||||
testfixtures,
|
||||
|
||||
# dependencies
|
||||
anytree,
|
||||
beartype,
|
||||
future,
|
||||
gensim,
|
||||
graspologic-native,
|
||||
hyppo,
|
||||
@@ -23,20 +26,34 @@
|
||||
statsmodels,
|
||||
typing-extensions,
|
||||
umap-learn,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
testfixtures,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graspologic";
|
||||
version = "3.4.1";
|
||||
version = "3.4.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graspologic-org";
|
||||
repo = "graspologic";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-taX/4/uCQXW7yFykVHY78hJIGThEIycHwrEOZ3h1LPY=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ulsb7jD/tIVEISjnNRif7VO+ZcXCAGIFl1SNZhOC7ik=";
|
||||
};
|
||||
|
||||
# Fix numpy 2 compat
|
||||
postPatch = ''
|
||||
substituteInPlace graspologic/utils/utils.py \
|
||||
--replace-fail "np.float_" "np.float64"
|
||||
substituteInPlace graspologic/embed/omni.py \
|
||||
--replace-fail \
|
||||
"A = np.array(graphs, copy=False, ndmin=3)" \
|
||||
"A = np.asarray(graphs)"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
poetry-dynamic-versioning
|
||||
@@ -45,12 +62,14 @@ buildPythonPackage rec {
|
||||
pythonRelaxDeps = [
|
||||
"beartype"
|
||||
"hyppo"
|
||||
"numpy"
|
||||
"scipy"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
anytree
|
||||
beartype
|
||||
future
|
||||
gensim
|
||||
graspologic-native
|
||||
hyppo
|
||||
@@ -82,19 +101,21 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTestPaths = [
|
||||
"docs"
|
||||
"tests/test_sklearn.py"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# SIGABRT
|
||||
"tests/test_plot.py"
|
||||
"tests/test_plot_matrix.py"
|
||||
|
||||
# Hang forever
|
||||
"tests/pipeline/embed/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Package for graph statistical algorithms";
|
||||
homepage = "https://graspologic-org.github.io/graspologic";
|
||||
changelog = "https://github.com/graspologic-org/graspologic/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
changelog = "https://github.com/graspologic-org/graspologic/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gvm-tools";
|
||||
version = "25.4.2";
|
||||
version = "25.4.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "gvm-tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mhQX9yBH8mQ+ESZzqM2VC4bfktI677Y/dli/YWTYRhE=";
|
||||
hash = "sha256-EyDD/ejqdToukdU5QJuouQCbrF84XSld4Ae7IWp4GVE=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -18,9 +18,14 @@ buildPythonPackage rec {
|
||||
owner = "pymitsubishi";
|
||||
repo = "pymitsubishi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QjHMIzl2VV1S8tNWsFLgLDNX6/0wN9FeIJIo5KgkDVE=";
|
||||
hash = "sha256-frqyAXAP2O8TZzXx5ephcLSLJA9p0P74KJrPoSKPYYo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# make sure pyproject.toml specifies the correct version
|
||||
grep -qF 'version = "${version}"' pyproject.toml
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-automodapi";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astropy";
|
||||
repo = "sphinx-automodapi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RdJZAlHWYrDaGbip+HyCX+tns1nvLkCQa99WyLMIyxo=";
|
||||
hash = "sha256-ISIS4IVtFnFqtHQiudRueiiWoAAkQ77fSe7Y0nyKtuI=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "volkswagencarnet";
|
||||
version = "5.1.8";
|
||||
version = "5.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robinostlund";
|
||||
repo = "volkswagencarnet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LH8w+sIInez5hUM/rj1C8ew/RlfKTPKh0ZgLt6cRcnY=";
|
||||
hash = "sha256-OXEVXIhS82WEcusvP0vvOWDWjy63U0SrSphTOpkg2IQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weaviate-client";
|
||||
version = "4.18.1";
|
||||
version = "4.18.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate-python-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-37c/mXrl9SUS5oYUxtqG9rQmgXTneoCwN9zg/7JEjnM=";
|
||||
hash = "sha256-WaNTYV8HmfyC+OuDZOMmb5uKaACxmdk5qXZ9AxsMQaw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -68,7 +68,7 @@ def main(args):
|
||||
# At least one manifest should match the component name
|
||||
ok &= any(check_derivation_name(manifest) for manifest in manifests)
|
||||
|
||||
# All requirements need to match, use `ignoreRequirementVersion` to ignore too strict version constraints
|
||||
# All requirements need to match, use `ignoreVersionRequirement` to ignore too strict version constraints
|
||||
ok &= all(
|
||||
check_requirements(manifest, args.ignore_version_requirement)
|
||||
for manifest in manifests
|
||||
|
||||
@@ -41,13 +41,13 @@ home-assistant.python.pkgs.buildPythonPackage (
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeCheckInputs =
|
||||
nativeBuildInputs =
|
||||
with home-assistant.python.pkgs;
|
||||
[
|
||||
manifestRequirementsCheckHook
|
||||
packaging
|
||||
]
|
||||
++ (args.nativeCheckInputs or [ ]);
|
||||
++ (args.nativeBuildInputs or [ ]);
|
||||
|
||||
passthru = {
|
||||
isHomeAssistantComponent = true;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "mampfes";
|
||||
domain = "epex_spot";
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mampfes";
|
||||
repo = "ha_epex_spot";
|
||||
tag = version;
|
||||
hash = "sha256-UaPgf0861TaSgawjJCyNjs8hRE5L5vWnyoXENrzCfb4=";
|
||||
hash = "sha256-kpyWBeKZ0WUoWI/KwKUo/U3RVz2Kdn4xe5WHWr2pV+U=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "pymitsubishi";
|
||||
domain = "mitsubishi";
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pymitsubishi";
|
||||
repo = "homeassistant-mitsubishi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VEV+HOzXrxX2rsStjwXD4ZWclP2oF6zZHv0MuzL8DE4=";
|
||||
hash = "sha256-c1KnFpRK5dH7ZGsDuJD6Awa0xhxYYZxC4zCjoRdpOns=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "weltenwort";
|
||||
domain = "rct_power";
|
||||
version = "v0.14.1";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weltenwort";
|
||||
repo = "home-assistant-rct-power-integration";
|
||||
tag = version;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wM66MyRhBsMfUr+KlqV4jSuXcnKfW0fkbDAyuU2crsc=";
|
||||
};
|
||||
|
||||
@@ -21,6 +21,11 @@ buildHomeAssistantComponent rec {
|
||||
rctclient
|
||||
];
|
||||
|
||||
ignoreVersionRequirement = [
|
||||
# rctclient 0.0.4 was never published on PyPI
|
||||
"rctclient"
|
||||
];
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
{
|
||||
ascii-magic,
|
||||
buildHomeAssistantComponent,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
weconnect,
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "mitch-dc";
|
||||
domain = "volkswagen_we-connect_id";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "volkswagen_we_connect_id";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-f5guxLE93QtTPV1zw1313bzF521pVr0vsUa3hzcRmJo=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
ascii-magic
|
||||
weconnect
|
||||
];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/mitch-dc/volkswagen_we_connect_id/releases/tag/v${version}";
|
||||
description = "Statistics from the Volkswagen ID API";
|
||||
homepage = "https://github.com/mitch-dc/volkswagen_we_connect_id";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -10,15 +10,19 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "robinostlund";
|
||||
domain = "volkswagencarnet";
|
||||
version = "5.2.0";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robinostlund";
|
||||
repo = "homeassistant-volkswagencarnet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NAWE489MUyXwRtW7rOGOEz9BFF+BwqS0MWNYtunfOIo=";
|
||||
hash = "sha256-qXtZwiQRPNtxAsdp2gOoToqT4CHXS+76EWrzqp+9udk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
python3 manage/update_manifest.py --version '${version}'
|
||||
'';
|
||||
|
||||
dependencies = [ volkswagencarnet ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
grafanaPlugin {
|
||||
pname = "victoriametrics-metrics-datasource";
|
||||
version = "0.19.5";
|
||||
zipHash = "sha256-wKLtfCI/onYPFrtP1EUrCbZ+OCHicshRZkZtltH6LzI=";
|
||||
version = "0.19.7";
|
||||
zipHash = "sha256-0XqZoL01/LwcMKFYEcFl88ekCrp94676bvVYj2aBltk=";
|
||||
meta = {
|
||||
description = "VictoriaMetrics metrics datasource for Grafana";
|
||||
license = lib.licenses.agpl3Only;
|
||||
|
||||
@@ -38,7 +38,7 @@ let
|
||||
)
|
||||
else
|
||||
# it's a file, so the result is the contents of the file itself
|
||||
import path;
|
||||
[ (import path) ];
|
||||
in
|
||||
if pathOverlays != "" && builtins.pathExists pathOverlays then
|
||||
overlays pathOverlays
|
||||
|
||||
Reference in New Issue
Block a user