Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-03-14 12:01:45 +00:00 committed by GitHub
commit 8ac30f8fc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
46 changed files with 983 additions and 758 deletions

14
.github/CODEOWNERS vendored
View File

@ -131,13 +131,13 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27
/pkgs/development/interpreters/python/hooks @FRidh @jonringer
# Haskell
/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @ncfavier
/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn @ncfavier
/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn @ncfavier
/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn @ncfavier
/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn @ncfavier
/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn @ncfavier
/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @ncfavier
/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @ncfavier
/maintainers/scripts/haskell @sternenseemann @maralorn @ncfavier
/pkgs/development/compilers/ghc @sternenseemann @maralorn @ncfavier
/pkgs/development/haskell-modules @sternenseemann @maralorn @ncfavier
/pkgs/test/haskell @sternenseemann @maralorn @ncfavier
/pkgs/top-level/release-haskell.nix @sternenseemann @maralorn @ncfavier
/pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn @ncfavier
# Perl
/pkgs/development/interpreters/perl @stigtsp @zakame @dasJ

View File

@ -7050,6 +7050,12 @@
github = "getpsyched";
githubId = 43472218;
};
getreu = {
email = "getreu@web.de";
github = "getreu";
githubId = 579082;
name = "Jens Getreu";
};
gfrascadorio = {
email = "gfrascadorio@tutanota.com";
github = "gfrascadorio";

View File

@ -30,21 +30,21 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1sasd183cf264a8am93ck35b485p5vl2bfzzxzpf65rvcmvhn7fh";
x86_64-darwin = "01nfh5izc53sxfw27i0byn0l6q4qwp7y9zs0g9a3rx3qglm47qr8";
aarch64-linux = "183583xnjv18ksy8bbkjfkxx3zy22anj14hi8bavhgix9bzk3wrb";
aarch64-darwin = "1whjm4z922qq1yh4vliiab777n0la6sc45n2qf7q9pvxjj1f83wj";
armv7l-linux = "171diqiv9yb9c5klihndsgk7qp7y80cc6bq8r4hnw1b834k0ywfp";
x86_64-linux = "11brsgksn3bl3px0hwa83vr22gb2k19pn8hcn7xwn6zzcgf7rsf2";
x86_64-darwin = "1ai7jmiq37zpicc5p387nvbx5122fp7c3qh2k596jq7l7k0iyfzd";
aarch64-linux = "0psjz56h8asgdh0m6insfysw1f6d00hifvb0rfsi8qv0wca72wb4";
aarch64-darwin = "0jskk6dvjg290mvw8hcs4hrhy7m3ridsj5w9lxs6kn74fdvg1byb";
armv7l-linux = "0rz26xw312s0larjvkrf8np9c0yccppadiqmj69j47vavg78274c";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.87.1";
version = "1.87.2";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
rev = "1e790d77f81672c49be070e04474901747115651";
rev = "863d2581ecda6849923a2118d93a088b0745d9d6";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@ -68,7 +68,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
sha256 = "19k2n1zlfvy1dczrslrdzhvpa27nc0mcg2x4bmp5yvvv5bpv3bbd";
sha256 = "1hdny44f93qzpm9vgx14wk1myrnsv5qcj25rqcy2jb5kspnq6813";
};
};

View File

@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "chatblade";
version = "0.3.4";
version = "0.4.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ODC8n4JS7IOfAJMn7CPzJcBNMhfD5A3eEqVUK1e4mZY=";
sha256 = "sha256-AjE+1MkSkZOtEUPKEPBKQ3n+aOB8cwsorBpL5skNskU=";
};
doCheck = false; # there are no tests

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kube-router";
version = "2.0.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "cloudnativelabs";
repo = pname;
rev = "v${version}";
hash = "sha256-Iwo+I1EfclkF4FL8QM3xGkIFxakmelI+hSUepLwfFSw=";
hash = "sha256-5aOAQ5kRnNsCn5EH9RKoeEfcFB3g59eqYIdSNjQxdjM=";
};
vendorHash = "sha256-VjPesQ27GcwnFQrNI+VYzJ4/aahcjASbfMi//Zs/KLM=";
vendorHash = "sha256-5aGcDO+dV9XinH0vw6uNB0mnWuFQcyLhRB7zYr+sRfg=";
CGO_ENABLED = 0;

View File

@ -167,9 +167,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.7.4";
hash = "sha256-LF8lFDZtDowHqa0z/TCVKznxn15Msha/af8p/w0bI1k=";
vendorHash = "sha256-DI4YTjdFFvfby8ExEY3KoK4J9YKK5LPpMbelzFMDVVs=";
version = "1.7.5";
hash = "sha256-k/ugXlHK7lEKfOpSBXQNUdcq26rVVdjo53U+7ChJLIc=";
vendorHash = "sha256-5sCf65gFpI3y+qwDYvD08OZHNsDMg2IuDL65NMsLQ4Y=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;

View File

@ -1,9 +1,9 @@
{
"version" = "1.11.59";
"version" = "1.11.60";
"hashes" = {
"desktopSrcHash" = "sha256-dasRfLsa8Jc6Vyay02f6IytjvYs3xbSFB2fU5bxi79E=";
"desktopYarnHash" = "00jvid2li68ji1xkbbpdiy39fzvhmw7ypnr3x82wbqqafkc5vil6";
"webSrcHash" = "sha256-UpRRTPrNiFsqXKD072jXVIqS8ZiuKt/BUzx1oja90VA=";
"webYarnHash" = "1s9lp2dd3slpp70rrbmsbmzphm6fwglnrqwk9fgylzqa1ds8nfjd";
"desktopSrcHash" = "sha256-r4Kcf8iBACHSiUceHq5T2BswGqgVkMBm/5ANq0smA20=";
"desktopYarnHash" = "16psxfai8dyckm4xwrg5czv6l4163x2nlqqcdgly6axabllgacj1";
"webSrcHash" = "sha256-k+jtTUuLaux2HSDsLT2ktcShQTNNnDe0e3Icoa31WdE=";
"webYarnHash" = "0rgdfdkri7mxs7rvp3rwbnijbcs5chc02smw1kbb00j6qzf6k3dj";
};
}

View File

@ -1,7 +1,7 @@
{ lib, callPackage }:
# For detailed information about the Citrix source-tarball, please refer to the OEM
# reference guide: https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/
# reference guide: https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide
let
inherit (callPackage ./sources.nix { }) supportedVersions unsupportedVersions;
@ -13,7 +13,7 @@ let
Citrix Workspace at version ${x} is not supported anymore!
Actively supported releases are listed here:
https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
https://www.citrix.com/support/product-lifecycle/workspace-app.html
'')) unsupportedVersions
);

View File

@ -195,7 +195,7 @@ stdenv.mkDerivation rec {
${mkWrappers copyCert extraCerts}
# See https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/reference-information/#library-files
# See https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide/reference-information/#library-files
# Those files are fallbacks to support older libwekit.so and libjpeg.so
rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true
rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so || true
@ -237,7 +237,7 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
description = "Citrix Workspace";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.linux;
platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux";
maintainers = with maintainers; [ michaeladler ];
inherit homepage;
};

View File

@ -12,30 +12,8 @@ let
# for Linux.
#
# The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
# x86 is unsupported past 23.11, see https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/deprecation
supportedVersions = lib.mapAttrs mkVersionInfo {
"23.02.0" = {
major = "23";
minor = "2";
patch = "0";
x64hash = "d0030a4782ba4b2628139635a12a7de044a4eb36906ef1eadb05b6ea77c1a7bc";
x86hash = "39228fc8dd69adca4e56991c1ebc0832fec183c3ab5abd2d65c66b39b634391b";
x64suffix = "10";
x86suffix = "10";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest6.html";
};
"23.07.0" = {
major = "23";
minor = "7";
patch = "0";
x64hash = "d4001226e79b5353fc74da4c8ed4f6295c1859fe18142cb5de345a3c7ae48168";
x86hash = "4a7da238286ae28d7baf0fefa1e7e09d077c8bc56c2bf7bec00da42c331bee59";
x64suffix = "17";
x86suffix = "17";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest21.html";
};
"23.09.0" = {
major = "23";
minor = "9";
@ -55,17 +33,27 @@ let
x86hash = "65b8c144e51b5bd78b98ae69e0fa76d6c020a857d74fd5254be49492527072b6";
x64suffix = "82";
x86suffix = "82";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest10.html";
};
"24.02.0" = {
major = "24";
minor = "2";
patch = "0";
x64hash = "eaeb5d3bd079d4e5c9707da67f5f7a25cb765e19c36d01861290655dbf2aaee4";
x86hash = "";
x64suffix = "65";
x86suffix = "";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
};
# Retain attribute-names for abandoned versions of Citrix workspace to
# provide a meaningful error-message if it's attempted to use such an old one.
#
# The lifespans of Citrix products can be found here:
# https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
unsupportedVersions = [ ];
# https://www.citrix.com/support/product-lifecycle/workspace-app.html
unsupportedVersions = [ "23.02.0" "23.07.0" ];
in {
inherit supportedVersions unsupportedVersions;
}

View File

@ -3,18 +3,23 @@
, fetchFromGitHub
, ocl-icd
, openssl
, re2
, libevent
, git
, zlib
, expat
, scons
, stdenv
, extraPkgs ? [ ]
}:
let
version = "8.3.1";
version = "8.3.7";
cbangSrc = fetchFromGitHub {
owner = "cauldrondevelopmentllc";
repo = "cbang";
rev = "bastet-v${version}";
hash = "sha256-cuyfJG5aDJ6e2SllxwKTViG0j8FWHvjcTaaBBtkgEdU=";
sha256 = "sha256-acAImItdkgo6PBFL6Vu/caIdcnvp/3VEW2lgVDgKy9g=";
};
fah-client = stdenv.mkDerivation {
@ -25,10 +30,10 @@ let
owner = "FoldingAtHome";
repo = "fah-client-bastet";
rev = "v${version}";
hash = "sha256-Ztc2im4Xmk8f6GotGRgA5zDkcyQFnodUvroJVl+ApT4=";
sha256 = "sha256-d+LY/R4TAko+2e2W76KEBQ8fXj0hzzmBOm+c4tksXMA=";
};
nativeBuildInputs = [ scons ];
nativeBuildInputs = [ scons re2 libevent git ];
buildInputs = [ openssl ];
@ -63,7 +68,7 @@ in
buildFHSEnv {
name = fah-client.name;
targetPkgs = _: [ fah-client ocl-icd ] ++ extraPkgs;
targetPkgs = _: [ fah-client ocl-icd zlib expat ] ++ extraPkgs;
runScript = "/bin/fah-client";

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cimg";
version = "3.3.4";
version = "3.3.5";
src = fetchFromGitHub {
owner = "GreycLab";
repo = "CImg";
rev = "v.${finalAttrs.version}";
hash = "sha256-qo/k5NpTqu+o2WUEOThozuBJVPMMy8OvIMo2DfJUE8g=";
hash = "sha256-QdQhMEY6Zl3qdvRIeDv/12TL4HMrNJSAQ66vQymOrBU=";
};
outputs = [ "out" "doc" ];

View File

@ -5,11 +5,11 @@
clash-verge.overrideAttrs (old: rec {
pname = "clash-verge-rev";
version = "1.5.7";
version = "1.5.8";
src = fetchurl {
url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb";
hash = "sha256-w6qKS+uHWGrY1f4Db7rgM/1jECHz3k9vXWdxhDmDX1A=";
hash = "sha256-cB42pnGgXyIT9H2qTeLAHi37Eij3CrJxgsp4zXRcrx8=";
};
meta = old.meta // (with lib; {

View File

@ -9,6 +9,7 @@
, webkitgtk
, udev
, libayatana-appindicator
, nix-update-script
}:
stdenv.mkDerivation rec {
@ -51,6 +52,8 @@ stdenv.mkDerivation rec {
ln -sf ${lib.getExe clash-meta} $out/bin/${clash-meta.meta.mainProgram}
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "A Clash GUI based on tauri";
homepage = "https://github.com/zzzgydi/clash-verge";

View File

@ -26,7 +26,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gmic";
version = "3.3.1";
version = "3.3.5";
outputs = [ "out" "lib" "dev" "man" ];
@ -34,15 +34,15 @@ stdenv.mkDerivation (finalAttrs: {
owner = "GreycLab";
repo = "gmic";
rev = "v.${finalAttrs.version}";
hash = "sha256-HagGabJ1jkg5SkMlr0Y5rGFw64jPW8QLuR0I2idM1N0=";
hash = "sha256-881+o6Wz4yNf92JNNLQn9x44SSjXAp/cZLkBGCfM6DY=";
};
# TODO: build this from source
# Reference: src/Makefile, directive gmic_stdlib.h
# Reference: src/Makefile, directive gmic_stdlib_community.h
gmic_stdlib = fetchurl {
name = "gmic_stdlib.h";
url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] finalAttrs.version}.h";
hash = "sha256-7JzFU4HvAtC5Nz5vusKCnJ8VMuKfSi1yFmjj0Hh+vA4=";
name = "gmic_stdlib_community.h";
url = "http://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h";
hash = "sha256-UZzCAs+x9dVMeaeEvPgyVZ5S6UO0yhJWVMgBvBiW2ME=";
};
nativeBuildInputs = [
@ -71,10 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib.h
# CMake build files were moved to subdirectory.
mv resources/CMakeLists.txt resources/cmake .
cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib_community.h
''
+ lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \

View File

@ -1,7 +1,7 @@
{
"version": "0.28",
"srcHash": "sha256-vOXY8B5CRCEQX/NnBVNwmyRKSeDSliurClRPiJIAD3Y=",
"version": "0.31",
"srcHash": "sha256-wDVeX1tHw9pTxYLRkr8BJlF5XIee0/e0f5hzes4ui/o=",
"x86_64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=",
"x86_64-darwin": "sha256-lkURZs6nQpsZ7SGX+eLoBEXa9VdTQP795iHAGYyRaVs=",
"aarch64-darwin": "sha256-lkURZs6nQpsZ7SGX+eLoBEXa9VdTQP795iHAGYyRaVs="
"x86_64-darwin": "sha256-Sjt/JkyPRCzRpAqJOmBKCBAGWSeV7RYOOokCLYCqg+8=",
"aarch64-darwin": "sha256-Sjt/JkyPRCzRpAqJOmBKCBAGWSeV7RYOOokCLYCqg+8="
}

View File

@ -0,0 +1,31 @@
{ lib
, stdenv
, fetchFromGitHub
, buildGoModule
}:
buildGoModule rec {
pname = "kafka-minion";
version = "2.2.7";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "kminion";
rev = "0c90d4301ed4600d1aaf3345b6f16587d2f282fc";
hash = "sha256-CWjX46Sfc9Xj+R7+CZeMuTY0iUStzyZXI4FotwqR44M=";
};
vendorHash = "sha256-6yfQVoY/bHMA4s0IN5ltnQdHWnE3kIKza36uEcGa11U=";
doCheck = false;
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "KMinion is a feature-rich Prometheus exporter for Apache Kafka written in Go";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ cafkafk ];
mainProgram = "kminion";
};
}

View File

@ -0,0 +1,4 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-update
nix-update kminion

File diff suppressed because it is too large Load Diff

View File

@ -8,29 +8,21 @@
rustPlatform.buildRustPackage rec {
pname = "nickel";
version = "1.4.1";
version = "1.5.0";
src = fetchFromGitHub {
owner = "tweag";
repo = "nickel";
rev = "refs/tags/${version}";
hash = "sha256-VltrIGo4jXV6lDIqj+hTQQ46PJH1v9CVFOZopyi9tbM=";
hash = "sha256-tb0nIBj/5nb0WbkceL7Rt1Rs0Qjy5/2leSOofF4zhTY=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"topiary-0.3.0" = "sha256-1leQLRohX0iDiOOO96ETM2L3yOElW8OwR5IcrsoxfOo=";
"tree-sitter-bash-0.20.4" = "sha256-+Mpks0FyQLl26TX63J6WhaAl/QDUR1k9wSUY5SFwL+w=";
"tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs=";
"tree-sitter-json-0.20.1" = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo=";
"topiary-core-0.3.0" = "sha256-2oVdtBcH1hF+p3PixBOljHXvGX2YCoRzA/vlBDvN7fE=";
"topiary-queries-0.3.0" = "sha256-1leQLRohX0iDiOOO96ETM2L3yOElW8OwR5IcrsoxfOo=";
"tree-sitter-nickel-0.1.0" = "sha256-HyHdameEgET5UXKMgw7EJvZsJxToc9Qz26XHvc5qmU0=";
"tree-sitter-ocaml-0.20.4" = "sha256-ycmjIKfrsVSVHmPP3HCxfk5wcBIF/JFH8OnU8mY1Cc8=";
"tree-sitter-ocamllex-0.20.2" = "sha256-YhmEE7I7UF83qMuldHqc/fD/no/7YuZd6CaAIaZ1now=";
"tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18=";
"tree-sitter-rust-0.20.4" = "sha256-egTxBuliboYbl+5N6Jdt960EMLByVmLqSmQLps3rEok=";
"tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ=";
"web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M=";
};
};

View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, fetchFromGitHub
, jre
, makeWrapper
@ -20,6 +21,8 @@ maven.buildMavenPackage {
hash = "sha256-GhZPvo8wlXInHwg8rSmpwMMkZVw5SMpnZyKqFUYLbrE=";
};
mvnParameters = lib.optionalString stdenv.isDarwin "-DskipTests";
nativeBuildInputs = [ makeWrapper ];
installPhase = ''

View File

@ -6,7 +6,7 @@
, lib
}:
let
version = "0.7.3";
version = "0.8.0";
in
buildGoModule rec {
inherit version;
@ -16,7 +16,7 @@ buildGoModule rec {
owner = "AnalogJ";
repo = "scrutiny";
rev = "refs/tags/v${version}";
hash = "sha256-S7GW8z6EWB+5vntKew0+EDVqhun+Ae2//15dSIlfoSs=";
hash = "sha256-ysjE2nn1WwhEiFIvJ5cRCJQf9mECTgiGUyenwf3mKTA=";
};
subPackages = "collector/cmd/collector-metrics";

View File

@ -0,0 +1,59 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, rustPlatform
, cmake
, pkg-config
, oniguruma
, darwin
, installShellFiles
, tpnote
, testers
}:
rustPlatform.buildRustPackage rec {
pname = "tpnote";
version = "1.23.9";
src = fetchFromGitHub {
owner = "getreu";
repo = "tp-note";
rev = "v${version}";
hash = "sha256-HOCd5N8oS8N+9alR3cG7IEghvhvcc8A+O24L6FD1F38=";
};
cargoHash = "sha256-T1AYiwGPolYUhJQzTyR7v5dqqNFUCSfSBzU3CithZPw=";
nativeBuildInputs = [
cmake
pkg-config
installShellFiles
];
buildInputs = [
oniguruma
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AppKit
CoreServices
SystemConfiguration
]);
RUSTONIG_SYSTEM_LIBONIG = true;
passthru.tests.version = testers.testVersion { package = tpnote; };
# The `tpnote` crate has no unit tests. All tests are in `tpnote-lib`.
checkType = "debug";
cargoTestFlags = "--package tpnote-lib";
doCheck = true;
meta = {
changelog = "https://github.com/getreu/tp-note/releases/tag/v${version}";
description = "Markup enhanced granular note-taking";
homepage = "https://blog.getreu.net/projects/tp-note/";
license = lib.licenses.mit;
mainProgram = "tpnote";
maintainers = with lib.maintainers; [ getreu ];
};
}

View File

@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "aiomisc";
version = "17.4.1";
version = "17.5.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-SJyCxKncHRdWZUdsosOCLLRYG+ym8utXwAJjn3BRRHU=";
hash = "sha256-bpR9HsR/7qVaDcTsHXJypGDyS7/BE/CzFk6eNaQ/C8k=";
};
nativeBuildInputs = [

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "langchain-core";
version = "0.1.30";
version = "0.1.31";
pyproject = true;
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "langchain_core";
inherit version;
hash = "sha256-4ToBblXn8IL/Pu7aLQy1BbiaiDDjojwdE00KideHGJQ=";
hash = "sha256-1mDPIJu2zmHLHIUxB7CRqqgJAVpV3Ongzhm1HUyPKnA=";
};
pythonRelaxDeps = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "mkdocstrings-python";
version = "1.8.0";
version = "1.9.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = "python";
rev = "refs/tags/${version}";
hash = "sha256-beLZpf0Zjk6LjveD7c+1XEi4SpQnmmZZOM8dIvzqZGI=";
hash = "sha256-RzyOhlfjLtiG5jelrRG8yS7AWQJuaJMVuNkGpNBGO64=";
};
nativeBuildInputs = [

View File

@ -4,7 +4,10 @@
, buildPythonPackage
, chardet
, copyDesktopItems
, pythonRelaxDepsHook
, cython
, catboost
, xgboost
, fetchFromGitHub
, fetchurl
, httpx
@ -45,7 +48,7 @@ let
self = buildPythonPackage rec {
pname = "orange3";
version = "3.36.2";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@ -58,15 +61,17 @@ let
postPatch = ''
substituteInPlace pyproject.toml \
--replace "setuptools>=41.0.0,<50.0" "setuptools"
sed -i 's;\(scikit-learn\)[^$]*;\1;g' requirements-core.txt
sed -i 's;pyqtgraph[^$]*;;g' requirements-gui.txt # TODO: remove after bump with a version greater than 0.13.1
--replace-fail 'cython>=3.0' 'cython'
# disable update checking
echo -e "def check_for_updates():\n\tpass" >> Orange/canvas/__main__.py
'';
nativeBuildInputs = [
copyDesktopItems
cython
pythonRelaxDepsHook
oldest-supported-numpy
cython
qt5.wrapQtAppsHook
recommonmark
setuptools
@ -76,13 +81,18 @@ let
enableParallelBuilding = true;
pythonRelaxDeps = [ "scikit-learn" ];
propagatedBuildInputs = [
numpy
scipy
chardet
catboost
xgboost
openpyxl
opentsne
qtconsole
setuptools
bottleneck
matplotlib
joblib
@ -107,6 +117,9 @@ let
# FIXME: ImportError: cannot import name '_variable' from partially initialized module 'Orange.data' (most likely due to a circular import) (/build/source/Orange/data/__init__.py)
doCheck = false;
# FIXME: pythonRelaxDeps is not relaxing the scikit-learn version constraint, had to disable this
dontCheckRuntimeDeps = true;
pythonImportsCheck = [ "Orange" "Orange.data._variable" ];
desktopItems = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1102";
version = "3.0.1107";
pyproject = true;
disabled = pythonOlder "3.9";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-VEYFNu8z/PVn+CcQzRdKtUw+JkKzxSIS6t6NMEaNNDc=";
hash = "sha256-ulvBheV97APX/y8tx0zzhP8Lih0o8Kwfn9o4SB5tCOo=";
};
nativeBuildInputs = [

View File

@ -13,6 +13,7 @@
, platformdirs
, pluggy
, py
, httpx
, pyramid
, pytestCheckHook
, repoze-lru
@ -27,7 +28,7 @@
buildPythonApplication rec {
pname = "devpi-server";
version = "6.9.2";
version = "6.10.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -36,7 +37,7 @@ buildPythonApplication rec {
owner = "devpi";
repo = "devpi";
rev = "server-${version}";
hash = "sha256-HnxWLxOK+6B8O/7lpNjuSUQ0Z7NOmV2n01WFyjow6oU=";
hash = "sha256-JqYWWItdAgtUtiYSqxUd40tT7ON4oHiDA4/3Uhb01b8=";
};
sourceRoot = "${src.name}/server";
@ -67,6 +68,7 @@ buildPythonApplication rec {
strictyaml
waitress
py
httpx
] ++ passlib.optional-dependencies.argon2;
nativeCheckInputs = [
@ -86,7 +88,6 @@ buildPythonApplication rec {
'';
pytestFlagsArray = [
"./test_devpi_server"
"--slow"
"-rfsxX"
"--ignore=test_devpi_server/test_nginx_replica.py"
"--ignore=test_devpi_server/test_streaming_nginx.py"
@ -98,6 +99,7 @@ buildPythonApplication rec {
"test_auth_mirror_url_no_hash"
"test_auth_mirror_url_with_hash"
"test_auth_mirror_url_hidden_in_logs"
"test_simplelinks_timeout"
];
__darwinAllowLocalNetworking = true;

View File

@ -12,7 +12,7 @@
, libiconv
, sqlite
, postgresql
, mariadb
, libmysqlclient
, zlib
}:
@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
++ optional (stdenv.isDarwin && mysqlSupport) libiconv
++ optional sqliteSupport sqlite
++ optional postgresqlSupport postgresql
++ optionals mysqlSupport [ mariadb zlib ];
++ optionals mysqlSupport [ libmysqlclient zlib ];
buildNoDefaultFeatures = true;
buildFeatures = optional sqliteSupport "sqlite"

View File

@ -41,7 +41,7 @@ let
++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]
++ optionals (versionOlder version "19.0.0") [ "i686-linux" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
knownVulnerabilities = optional (versionOlder version "26.0.0") "Electron version ${version} is EOL";
knownVulnerabilities = optional (versionOlder version "27.0.0") "Electron version ${version} is EOL";
};
fetcher = vers: tag: hash: fetchurl {

View File

@ -22,6 +22,8 @@ let
opts = removeAttrs dep ["fetcher"];
in pkgs.${dep.fetcher} opts;
fetchedDeps = lib.mapAttrs (name: fetchdep) info.deps;
in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
packageName = "electron";
inherit (info) version;
@ -31,11 +33,11 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
buildInputs = base.buildInputs ++ [ libnotify ];
electronOfflineCache = fetchYarnDeps {
yarnLock = (fetchdep info.deps."src/electron") + "/yarn.lock";
yarnLock = fetchedDeps."src/electron" + "/yarn.lock";
sha256 = info.electron_yarn_hash;
};
npmDeps = fetchNpmDeps rec {
src = fetchdep info.deps."src";
src = fetchedDeps."src";
# Assume that the fetcher always unpack the source,
# based on update.py
sourceRoot = "${src.name}/third_party/node";
@ -44,10 +46,11 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
src = null;
patches = base.patches ++ lib.optional (lib.versionOlder info.version "27")
patches = base.patches ++ lib.optional (lib.versionAtLeast info.version "29")
(substituteAll {
name = "version.patch";
src = ./version.patch;
# disable a component that requires CIPD blobs
name = "disable-screen-ai.patch";
src = ./disable-screen-ai.patch;
inherit (info) version;
})
;
@ -57,9 +60,9 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
'' + (
lib.concatStrings (lib.mapAttrsToList (path: dep: ''
mkdir -p ${builtins.dirOf path}
cp -r ${fetchdep dep}/. ${path}
cp -r ${dep}/. ${path}
chmod u+w -R ${path}
'') info.deps)
'') fetchedDeps)
) + ''
sourceRoot=src
runHook postUnpack
@ -117,13 +120,14 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
cd ..
PATH=$PATH:${lib.makeBinPath (with pkgsBuildHost; [ jq git ])}
config=src/electron/patches/config.json
for key in $(jq -r "keys[]" $config)
for entry in $(cat $config | jq -c ".[]")
do
value=$(jq -r ".\"$key\"" $config)
for patch in $(cat $key/.patches)
patch_dir=$(echo $entry | jq -r ".patch_dir")
repo=$(echo $entry | jq -r ".repo")
for patch in $(cat $patch_dir/.patches)
do
echo applying in $value: $patch
git apply -p1 --directory=$value --exclude='src/third_party/blink/web_tests/*' $key/$patch
echo applying in $repo: $patch
git apply -p1 --directory=$repo --exclude='src/third_party/blink/web_tests/*' $patch_dir/$patch
done
done
)
@ -150,7 +154,6 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
v8_promise_internal_field_count = 1;
v8_embedder_string = "-electron.0";
v8_enable_snapshot_native_code_counters = false;
v8_scriptormodule_legacy_lifetime = true;
v8_enable_javascript_promise_hooks = true;
enable_cdm_host_verification = false;
proprietary_codecs = true;
@ -163,11 +166,18 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
enable_cet_shadow_stack = false;
is_cfi = false;
use_qt = false;
enable_widevine = false;
use_perfetto_client_library = false;
enable_check_raw_ptr_fields = false;
} // lib.optionalAttrs (lib.versionAtLeast info.version "27") {
v8_builtins_profiling_log_file = "";
enable_dangling_raw_ptr_checks = false;
} // lib.optionalAttrs (lib.versionAtLeast info.version "28") {
dawn_use_built_dxc = false;
v8_enable_private_mapping_fork_optimization = true;
} // lib.optionalAttrs (lib.versionAtLeast info.version "29") {
v8_expose_public_symbols = true;
} // {
# other
enable_widevine = false;
override_electron_version = info.version;
};
@ -183,11 +193,11 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
requiredSystemFeatures = [ "big-parallel" ];
passthru = {
inherit info;
inherit info fetchedDeps;
headers = stdenv.mkDerivation rec {
name = "node-v${info.node}-headers.tar.gz";
nativeBuildInputs = [ python3 ];
src = fetchdep info.deps."src/third_party/electron_node";
src = fetchedDeps."src/third_party/electron_node";
buildPhase = ''
runHook preBuild
make tar-headers

View File

@ -0,0 +1,16 @@
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -3114,13 +3114,6 @@ if (!is_android && !is_fuchsia) {
"//pdf/loader",
]
- if (is_linux) {
- # Add a data dependency for pdf_extension_accessibility_test.cc to
- # notify testing builders that this test needs this library, which will
- # need to be downloaded from CIPD as defined in //DEPS.
- data_deps += [ "//third_party/screen-ai:screen_ai_linux" ]
- }
-
if (enable_printing) {
sources += [ "../browser/pdf/pdf_extension_printing_test.cc" ]

View File

@ -3,16 +3,16 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-FH1M/usdQ4BibO6PSoUPZG2MgsMTG/SfIcBJATrgZcE=",
"hash": "sha256-jvrXVi/l7KBIoHYoWhFq4Kd3nZQ9XGoKjXAHdAj3yxM=",
"owner": "electron",
"repo": "electron",
"rev": "v28.2.2"
"rev": "v28.2.6"
},
"src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-AVCD/B0Zb0/FhX+w40UAV3Z0awOn089kt3FrWJGULUw=",
"hash": "sha256-g0aRiWCPrXPKBsOsAgtLmRbOeYigtm05MrWH6/fhQs0=",
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "120.0.6099.276",
"rev": "120.0.6099.291",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; "
},
"src/third_party/clang-format/script": {
@ -873,12 +873,12 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
"version": "28.2.2",
"version": "28.2.6",
"modules": "119",
"chrome": "120.0.6099.276",
"chrome": "120.0.6099.291",
"node": "18.18.2",
"chromium": {
"version": "120.0.6099.276",
"version": "120.0.6099.291",
"deps": {
"gn": {
"version": "2023-10-23",
@ -895,10 +895,10 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-FgHDK/z2Hq/jLTPUn40iSH5Q6vu1xlNu1PSSQxL+kOw=",
"hash": "sha256-cklX+avErA79ib94VIhKNSyEP2k7CxlvTDGRDdPXu/w=",
"owner": "electron",
"repo": "electron",
"rev": "v27.3.2"
"rev": "v27.3.5"
},
"src": {
"fetcher": "fetchFromGitiles",
@ -1765,7 +1765,7 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
"version": "27.3.2",
"version": "27.3.5",
"modules": "118",
"chrome": "118.0.5993.159",
"node": "18.17.1",
@ -1780,48 +1780,48 @@
}
}
},
"electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964",
"chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ="
"chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=",
"electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964"
},
"26": {
"29": {
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-jIoRqmPge36KJBM+zXF2CXlPjjIVm9dEnt/EryHr7X4=",
"hash": "sha256-wUxpoBBlZzmOIsdQDVAirpCNReDFwZpSe15tsU9Sqqk=",
"owner": "electron",
"repo": "electron",
"rev": "v26.6.9"
"rev": "v29.1.2"
},
"src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-yctASyLtsBAxK7S34wVJB64QKnQkV3jGXshKWVpMjVo=",
"hash": "sha256-QW8r1ALMBzyUNbYPi7miaefsKlBHL5gBwz6JnfluX54=",
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "116.0.5845.228",
"rev": "122.0.6261.112",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; "
},
"src/third_party/clang-format/script": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-IL6ReGM6+urkXfGYe1BBOv+0XgCZv5i3Lib1q9COhig=",
"hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git",
"rev": "f97059df7f8b205064625cdb5f97b56668a125ef"
"rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9"
},
"src/buildtools/third_party/libc++/trunk": {
"src/third_party/libc++/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-Sdhhr/tSo7B1tvFY7jFUw82pDrF0n5cEMq567WzD1uE=",
"hash": "sha256-/3VxptC6qAv9NCt8y1peJKTXTFI7blbvnpZ6D0VYyDk=",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
"rev": "055b2e17ae4f0e2c025ad0c7508b01787df17758"
"rev": "28aa23ffb4c7344914a5b4ac7169f12e5a12333f"
},
"src/buildtools/third_party/libc++abi/trunk": {
"src/third_party/libc++abi/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-pZy10+P+RWGQavLqCI4M4bGHcxPnKulwC3WSE5lIXfU=",
"hash": "sha256-O337gqiB4uiTWUgIfPdEa1Du+/ww+xYpmmZW9Py7uyQ=",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
"rev": "8d21803b9076b16d46c32e2f10da191ee758520c"
"rev": "9986707a5f2fc6d5d1ffa7f224a032bdd45c95fd"
},
"src/buildtools/third_party/libunwind/trunk": {
"src/third_party/libunwind/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-DVacn5wSGeXLfjEQoCo2qLySgzkA79cdWktDkZ2dLY8=",
"hash": "sha256-WPd6BlhNNF9n/qFU8atEh1fagbc05dWsFzBugw55boY=",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
"rev": "b5a43ecdac82a248f8a700a68c722b4d98708377"
"rev": "f400fdb561d4416b59b8f8a33d8ec8b79da60495"
},
"src/chrome/test/data/perf/canvas_bench": {
"fetcher": "fetchFromGitiles",
@ -1843,9 +1843,9 @@
},
"src/docs/website": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-+iC1NPdw6LzzPbtLgO9ipvkeJjDAfBIODOtyIURlUX8=",
"hash": "sha256-sKbrY/m75LVWjWjhhjaeQnfXQP5AkEsEkZ+GmMNQJVo=",
"url": "https://chromium.googlesource.com/website.git",
"rev": "715769197cbe967605f24842ffcfb733d31b40fd"
"rev": "7474472013397bdb177cda70099f6411a5bd8212"
},
"src/media/cdm/api": {
"fetcher": "fetchFromGitiles",
@ -1855,15 +1855,15 @@
},
"src/net/third_party/quiche/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-GMlLTzjU592zIc8hhFyAupY95+qR49r8x0q2l80XHDI=",
"hash": "sha256-mrnKQh2d6ewg1X8sCx8U4frHXyFKHuIUpvi0WBzg+PU=",
"url": "https://quiche.googlesource.com/quiche.git",
"rev": "037705cdfae29714daa24852021c2e5998a54446"
"rev": "0e39ce016ee1ec8271aa7216d547917c239db525"
},
"src/third_party/angle": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-v4eIJssxzb2hE4NrKZMyhbzxwNc3koqcADVcBrw8iT8=",
"hash": "sha256-h2b/f8MmldZSk3c84rvwO5+UZK36BFf/H9BStWFbDoo=",
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "b48983ab8c74d2fcd9ef17c80727affb9e690c53"
"rev": "f9bad5e27d61e2ab6a7504b1793be5aa14eb1414"
},
"src/third_party/angle/third_party/glmark2/src": {
"fetcher": "fetchFromGitiles",
@ -1879,33 +1879,33 @@
},
"src/third_party/angle/third_party/VK-GL-CTS/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-aiSGPLKRUErLohhLlcY/fWIJuUMzazDPIxiohiuCs6o=",
"hash": "sha256-zBY7MY6FXazzTW+nXvknkNar/odL0tzHXxHPmpYuy7E=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
"rev": "f29bd2feeafff80013d4b52a8abbc960cbbb7dbd"
"rev": "0f6fd3de81102058dc2ae299af1ad5287d2145dd"
},
"src/third_party/anonymous_tokens/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-TcNIocV0p53NJCudvy8wf+fIPIP2tnkoBf1F7mEBFLs=",
"hash": "sha256-3+/zvwYAv3OGoKJatg+/c3OM1IyGq2iCyFWgu3b8VoU=",
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
"rev": "8c8d20953d502db31fec2353b199e6c22ef0236e"
"rev": "d024f05b39e21bb2a0b8205a7ce72b1b185b84c2"
},
"src/third_party/content_analysis_sdk/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-p4N3zAUoM/ApBlYvLsCcH9QLArz7T4+miDGVuTbrZEc=",
"hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
"url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
"rev": "b8744f00646d175057f0be7443c7c72a311b5381"
"rev": "9a408736204513e0e95dd2ab3c08de0d95963efc"
},
"src/third_party/dav1d/libdav1d": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=",
"hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=",
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
"rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0"
"rev": "47107e384bd1dc25674acf04d000a8cdc6195234"
},
"src/third_party/dawn": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-rX6wJVOoTnkpniDWjwMoneszAokXXkdcpXNE/JXayEY=",
"hash": "sha256-lVEaLONx+64ustD31+SWHoOS73kVgpMP3JYzs3cMCpc=",
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "5318d39e47819212769b974ed3a0b42e373df59e"
"rev": "8917c648bdd68007c96b8ca9995533cc3ee995c2"
},
"src/third_party/dawn/third_party/glfw": {
"fetcher": "fetchFromGitiles",
@ -1913,11 +1913,35 @@
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
"rev": "62e175ef9fae75335575964c845a302447c012c7"
},
"src/third_party/dawn/third_party/dxc": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-bPn+8v5CGv6CQe6brsPCYEJgpSoIa+ETtop1dZ9F42c=",
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
"rev": "00e170f3485dc5a83628f716c0944f2b8cf58028"
},
"src/third_party/dawn/third_party/dxheaders": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
"rev": "980971e835876dc0cde415e8f9bc646e64667bf7"
},
"src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry",
"rev": "5bae8738b23d06968e7c3a41308568120943ae77"
},
"src/third_party/dawn/third_party/khronos/EGL-Registry": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry",
"rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071"
},
"src/third_party/dawn/third_party/webgpu-cts": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-DoS9lSP9nVxeKpAtvWQbdYRSaiF0m+MXysfRC8bxqrY=",
"hash": "sha256-wlneFqVEhM6fe9p10T22dx4dxnZzWwKHw+35eIlDGVM=",
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
"rev": "b033a4f1ae4a0e19ae4d5563fae023001bbf570f"
"rev": "dedb6316202c8c55b898e52248f1345241299125"
},
"src/third_party/highway/src": {
"fetcher": "fetchFromGitiles",
@ -1933,27 +1957,27 @@
},
"src/third_party/boringssl/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-ZPao/g4Tqc6s/ZLDe3FDuw8rmO0ON07/t7y1c/C2bAs=",
"hash": "sha256-shqUB+x7oXgtQqqfhkwXHwLLaJW1/L1vh1O+jvdsDP8=",
"url": "https://boringssl.googlesource.com/boringssl.git",
"rev": "ae88f198a49d77993e9c44b017d0e69c810dc668"
"rev": "414f69504d30d0848b69f6453ea7fb5e88004cb4"
},
"src/third_party/breakpad/breakpad": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=",
"hash": "sha256-7SmO5e/U2shYVslmCRPVLyfU5N4Rp1mzls8lLqIW8x8=",
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
"rev": "8988364bcddd9b194b0bf931c10bc125987330ed"
"rev": "62ecd463583d09eb7d15b1d410055f30b2c7bcb4"
},
"src/third_party/cast_core/public/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-pyjxQQYnsASHV2SxwZeIqkZJSpTrqyGg7Uee/GRp9VU=",
"hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=",
"url": "https://chromium.googlesource.com/cast_core/public",
"rev": "e42ef68aa05ac0c163805f60b9b19284f3c2dee3"
"rev": "71f51fd6fa45fac73848f65421081edd723297cd"
},
"src/third_party/catapult": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-MkkIztmLGRmxkRAPGZgeb+cc4Dn9Z24p+umwFzAxhpQ=",
"hash": "sha256-ixfmLcWTgVcHi2CXAulMXTaAyPYT42Q8VflStxmNRXc=",
"url": "https://chromium.googlesource.com/catapult.git",
"rev": "cef5cf05b2410be6cae210e4ae7de0ab808736c3"
"rev": "ab03292694695864b523636060e2a96b2c9b2df2"
},
"src/third_party/ced/src": {
"fetcher": "fetchFromGitiles",
@ -1961,6 +1985,12 @@
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
"rev": "ba412eaaacd3186085babcd901679a48863c7dd5"
},
"src/third_party/chromium-variations": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-px8BHI5Cp3vBRyei50dbxCTn/gydLsps1/SmJxxeGKw=",
"url": "https://chromium.googlesource.com/chromium-variations.git",
"rev": "d0dcd8802c22c1ac4a7d112782a4c75f0c6ca8ee"
},
"src/third_party/cld_3/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
@ -1981,9 +2011,9 @@
},
"src/third_party/cpuinfo/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-1XazrNQwwIFeiUgFxiZq8lU1jdlusdld9ddssVLccEM=",
"hash": "sha256-56XE95dvaDF8E89V/le19Gk52fR0pqqyE38UgQo+GQM=",
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
"rev": "f44a9dabb2192ffb203ddd0c71f6373c7d82faed"
"rev": "76cc10d627add77922dc24521b332a055a4d6d77"
},
"src/third_party/crc32c/src": {
"fetcher": "fetchFromGitiles",
@ -1993,27 +2023,27 @@
},
"src/third_party/cros_system_api": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-SlIa4iN8FAGrR5/T2JlPA0RRDkwKmJ+z6FAe83Doo9c=",
"hash": "sha256-Tzn7Sx6k7BpH/UqMZHdLTk26FBp5QNcX0xWhztgRKrw=",
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
"rev": "ea8d35b6f6762ff618dabf307be7a03971afa02e"
"rev": "12d5e386005a211570cfdf9849d2fa6a3b38594b"
},
"src/third_party/crossbench": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-IM81ppJX/ib//P2ESbQXMSL+BiOSVKbdXZdcMsq4xn0=",
"hash": "sha256-VxH1eOsJGQUk93EYexl1QrCpHTpgCOQP7H+oN0MZNpA=",
"url": "https://chromium.googlesource.com/crossbench.git",
"rev": "cdc33384bfa900dfec28e6cf7b5f22cd7ff2c92f"
"rev": "1983b3f517da56c35c91296467458f71ad5b9340"
},
"src/third_party/depot_tools": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-UuF8ft26lKDc4tOmYN8yyGQ6J8YFFcK0oJ5aVskooLQ=",
"hash": "sha256-C1l4piDzNENx6Vvtzu03HsBZTHIavO5AkmO6QXErh3Y=",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
"rev": "fc75af35d41df6c7742caef751428aa875199990"
"rev": "6fc0c97ab284021b72e3bc962f7fa879ffcad65b"
},
"src/third_party/devtools-frontend/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-xq+qY3WZPRCGSmdk71wVCOAFbK4f4C87IVkSQkA5oeA=",
"hash": "sha256-Y7XPBkKU8p210dj7ydIDVJgiXx6ZQPP4D5Jfw3t9FCc=",
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
"rev": "f7c236f0555abbe40cebfdc2d4148ea8dfdf0f10"
"rev": "3fa1fc736f46022f45c7ba7d817d1df1519c55d7"
},
"src/third_party/dom_distiller_js/dist": {
"fetcher": "fetchFromGitiles",
@ -2023,9 +2053,9 @@
},
"src/third_party/eigen3/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-ycpxfxQBCMZzPBJNwkJanLUoRenC6Ja4k2KnxPZ73aA=",
"hash": "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8=",
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
"rev": "7d7576f3262fa15c34d5575637bd8d7ff4a83f16"
"rev": "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3"
},
"src/third_party/farmhash/src": {
"fetcher": "fetchFromGitiles",
@ -2035,9 +2065,9 @@
},
"src/third_party/ffmpeg": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-dvn/4ufK0lbfB9GKpNKKS/aImSVRBAyEss5cWm8iA84=",
"hash": "sha256-NRyMXRxnHJi5JiEJUxOxJyPGe5BGTxNbNyEOu1GyO8E=",
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
"rev": "881c5c3f6412020c37e97e178e0f5da9ddd2ae90"
"rev": "17525de887d54b970ffdd421a0879c1db1952307"
},
"src/third_party/flac": {
"fetcher": "fetchFromGitiles",
@ -2047,15 +2077,15 @@
},
"src/third_party/flatbuffers/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-sKBf+en13jDX84/2adz10Z248MifhZg+YaMABIqaduE=",
"hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=",
"url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git",
"rev": "13fc75cb6b7b44793f3f5b4ba025ff403d012c9f"
"rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5"
},
"src/third_party/fontconfig/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-0R+FEhtGXFiQWHEPRrJqaBW1JVfCojYI4NPDvYMBhoU=",
"hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=",
"url": "https://chromium.googlesource.com/external/fontconfig.git",
"rev": "06929a556fdc39c8fe12965b69070c8df520a33e"
"rev": "2fb3419a92156569bc1ec707401258c922cd0d99"
},
"src/third_party/fp16/src": {
"fetcher": "fetchFromGitiles",
@ -2077,9 +2107,9 @@
},
"src/third_party/freetype/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-JN7Mw+Osobx3LqAf7lR1EK3Tv2M0JCvd/8oNFEENH/k=",
"hash": "sha256-ogBt+haM+MoETsPIhwPDPZCLwQB9u9+w7OHL4us6kg8=",
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
"rev": "3829fdaae5f12590f93807e9bcb866be131a201a"
"rev": "57617782464411201ce7bbc93b086c1b4d7d84a5"
},
"src/third_party/freetype-testing/src": {
"fetcher": "fetchFromGitiles",
@ -2095,9 +2125,9 @@
},
"src/third_party/harfbuzz-ng/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=",
"hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=",
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
"rev": "db700b5670d9475cc8ed4880cc9447b232c5e432"
"rev": "155015f4bec434ecc2f94621665844218f05ce51"
},
"src/third_party/emoji-segmenter/src": {
"fetcher": "fetchFromGitiles",
@ -2113,9 +2143,9 @@
},
"src/third_party/libgav1/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-DY2BBK+bH1lGZNEl3rMDsPb7Z52YMIQy/3N0achugE0=",
"hash": "sha256-ySRgjJUYFXTw5kys9WDSuxnmfzj1I4ImvTWi+7q0HXE=",
"url": "https://chromium.googlesource.com/codecs/libgav1.git",
"rev": "cd53f7c0d6a1c005e38874d143c8876d375bae70"
"rev": "35fea10bfdb790cf131ae74a4ee346905f34dc3c"
},
"src/third_party/googletest/src": {
"fetcher": "fetchFromGitiles",
@ -2131,9 +2161,9 @@
},
"src/third_party/icu": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-SPWi626Y5WL+cBiedyofb7FRxzM+maQ+1Mp5sx/i1EA=",
"hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=",
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
"rev": "e8c3bc9ea97d4423ad0515e5f1c064f486dae8b1"
"rev": "a622de35ac311c5ad390a7af80724634e5dc61ed"
},
"src/third_party/jsoncpp/source": {
"fetcher": "fetchFromGitiles",
@ -2149,15 +2179,15 @@
},
"src/third_party/libFuzzer/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-Zp8Ea/7GwmEl964MEIk3UM6IR5+FtUz8InlqZaOniDA=",
"hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
"rev": "26cc39e59b2bf5cbc20486296248a842c536878d"
"rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303"
},
"src/third_party/fuzztest/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-SiZAiHQt37PdWYiVOexqoQnRqk+EbsZk8ELJ9eJ1iSk=",
"hash": "sha256-YEg+/562AX/hK0Adx9bUZqATt+5VDZjn/csWVhRji2M=",
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
"rev": "0e6385f1b48865f35889749046083586e110e390"
"rev": "12e7428ab0847b1d1dc6c4b89203adfd1f16a1ad"
},
"src/third_party/libaddressinput/src": {
"fetcher": "fetchFromGitiles",
@ -2167,33 +2197,33 @@
},
"src/third_party/libaom/source/libaom": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-pghv17RmD8w7eWiSB2pdR3ZWSFyhFEky0p7jfGKIu34=",
"hash": "sha256-f65sdsMAWCWpsdTgyTzx5fwM/2ESm/cBCvU41s2BEV0=",
"url": "https://aomedia.googlesource.com/aom.git",
"rev": "414a2fcbb1bb0f4ac471613e12004651f4d67c25"
"rev": "1a72ea323d65e46eb90d08d492c04891abb91926"
},
"src/third_party/libavif/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-roT/0RLGNKlz8gx209UtyM3YpM29y27P4zjZJMqnUPY=",
"hash": "sha256-rglws6GR11X8SdpYhK9CoxElWuPFYfp5b+vETjEoJOY=",
"url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
"rev": "781d6a6467d82d8ba36256f31b6593a33c03345d"
"rev": "e170c9366090cdc389d5f47ee3c2d7db71d263bc"
},
"src/third_party/libavifinfo/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-9HrWIuA3nuvqT6Hy8DHoBRCEKEG/p9UHY5gPYd/5oaI=",
"hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=",
"url": "https://aomedia.googlesource.com/libavifinfo.git",
"rev": "8ed46385f4b6fb0b4680d791002cbd674b2b9cb6"
"rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a"
},
"src/third_party/nearby/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-WLmEKIxTm7Aae/riw2HLcNmITvBHG4Z6fDA1Ue9J0tM=",
"hash": "sha256-XsQrfj0R88qf0C/LtRUsset/lnRpBkbpGUr/ZE3qmyk=",
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
"rev": "44fb9b4fa24e1140202c53a7c56bea90a0426adb"
"rev": "4bdb5000ee7919724530cf89d50969e7b0ed58a7"
},
"src/third_party/beto-core/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-qlExr/AFxJL7JLDz7bDCCk9Ios++5/n/iT9Mv8YnYxY=",
"hash": "sha256-PkvHqVKjGHxAYntylJxR5xnUVU1o8DJuBmsd9qkl/Yo=",
"url": "https://beto-core.googlesource.com/beto-core.git",
"rev": "45756ea770c41085d5c71156b2c46da0b10117d6"
"rev": "4d202dab960a0b6a6e4757ab4393945aca5a09db"
},
"src/third_party/securemessage/src": {
"fetcher": "fetchFromGitiles",
@ -2201,6 +2231,12 @@
"url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
"rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84"
},
"src/third_party/speedometer/v3.0": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-FDsK5sNy3YOrmaGpN3AhSExzBY9D8RGwoZKkjg/5vo0=",
"url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
"rev": "2ee210ca20767c949c4ff29bdffa1138eb0501fe"
},
"src/third_party/ukey2/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
@ -2209,9 +2245,9 @@
},
"src/third_party/cros-components/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-a58NnOGa2bcQ2WNULnFyjyYnw3QXUAWjsB7UAxuRakg=",
"hash": "sha256-2FuyB/TLKMbqgjvw0q19lcG85fedwlOmKKNlGevEzos=",
"url": "https://chromium.googlesource.com/external/google3/cros_components.git",
"rev": "81d1ad8e0ba89d207657f124de3d0829829484d7"
"rev": "ab7bdff32543991f52872c25cecf1f926702dfe3"
},
"src/third_party/libdrm/src": {
"fetcher": "fetchFromGitiles",
@ -2233,9 +2269,9 @@
},
"src/third_party/libjpeg_turbo": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-QnXMR9qqRiYfV1sUJvKVvLQ9A022lYKbsrI9HOU9LCs=",
"hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=",
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
"rev": "aa4075f116e4312537d0d3e9dbd5e31096539f94"
"rev": "9b894306ec3b28cea46e84c32b56773a98c483da"
},
"src/third_party/liblouis/src": {
"fetcher": "fetchFromGitiles",
@ -2269,9 +2305,9 @@
},
"src/third_party/libvpx/source/libvpx": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-9zyYyamGsDO+a6ggdlxJ78xIGmaNyD7NcmQVIZW9oLA=",
"hash": "sha256-VdNl1P+nHidhYcdyx0ceHmxweO0ypMFQKKUokvP9SEA=",
"url": "https://chromium.googlesource.com/webm/libvpx.git",
"rev": "278d0acd32c3fd544e6f99cbfd714df3430a6442"
"rev": "b95d17572629c676bdcfd535fb3990b9f6f8fb11"
},
"src/third_party/libwebm/source": {
"fetcher": "fetchFromGitiles",
@ -2281,9 +2317,9 @@
},
"src/third_party/libwebp/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-isuuqzfc7cBxVEFrpHQP79B3s/5Jwu3qC4x3VPw7MuE=",
"hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=",
"url": "https://chromium.googlesource.com/webm/libwebp.git",
"rev": "4619a48fc3292743d7ce9658bee4245406734109"
"rev": "ca332209cb5567c9b249c86788cb2dbf8847e760"
},
"src/third_party/libyuv": {
"fetcher": "fetchFromGitiles",
@ -2299,9 +2335,9 @@
},
"src/third_party/material_color_utilities/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-Cv1TjvOcswhp60LXblrLwY5jrudqKuDUqs1c//x49YE=",
"hash": "sha256-sYLpJbgwR5POWqbUqu7IdWJ2Gibjz1PsMdSK+7yPDt4=",
"url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git",
"rev": "bd6537fb1c4aa2164d97f96e78a9c826e360a0ed"
"rev": "bec7bab60e6431201a82761ea4482b98b54c2af9"
},
"src/third_party/minigbm/src": {
"fetcher": "fetchFromGitiles",
@ -2311,9 +2347,9 @@
},
"src/third_party/nasm": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=",
"hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
"rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce"
"rev": "f477acb1049f5e043904b87b825c5915084a9a29"
},
"src/third_party/neon_2_sse/src": {
"fetcher": "fetchFromGitiles",
@ -2329,9 +2365,15 @@
},
"src/third_party/openscreen/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-+Ea+CVr59WUyVk7sLdelPPwt/n5CLBNnAOW6XD7k/qM=",
"hash": "sha256-habWfKhK66T537zJb/fm0IWpDbD2xgd9Upg97xRBy/M=",
"url": "https://chromium.googlesource.com/openscreen",
"rev": "2a4dbe656f38bf7617df013b54c683e461ed064d"
"rev": "b70c552bedf189fc238e98f8f69e6c30e7925207"
},
"src/third_party/openscreen/src/buildtools": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-o974IZvLUG2KlB1pQPYFwnoPGo239CV96pQPoQO7lvM=",
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
"rev": "a9a6f0c49d0e8fa0cda37337430b4736ab3dc944"
},
"src/third_party/openscreen/src/third_party/tinycbor/src": {
"fetcher": "fetchFromGitiles",
@ -2341,21 +2383,21 @@
},
"src/third_party/pdfium": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-xYvjBv4gkVhpx8a4C1kmp6/Ngd0w9BFKizsTFR0weHM=",
"hash": "sha256-XJAQBQjM0JzyeNy5ZU1KpfxE1U6lQtTEhg21riHHJ0E=",
"url": "https://pdfium.googlesource.com/pdfium.git",
"rev": "6c2c8ce87dfbf69b533e97f78807dff28c95f014"
"rev": "4c4f9ab25dab142d7888f3258ab54df24b97b44f"
},
"src/third_party/perfetto": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-mkfzktiI1aEOcBF8S1LPH9lEXaWFURV/q9RrcXrP4Yk=",
"hash": "sha256-DLu7p6tDImRC7sk+PqIZvyjpOVIZl3I/8rYX498DVTk=",
"url": "https://android.googlesource.com/platform/external/perfetto.git",
"rev": "271c226bfba2965bb5c72fd6964f016ed1f85c05"
"rev": "1e15d01da5d619ca617dcdd870efe3c35046a89c"
},
"src/third_party/pthreadpool/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=",
"hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=",
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git",
"rev": "1787867f6183f056420e532eec640cba25efafea"
"rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8"
},
"src/third_party/pyelftools": {
"fetcher": "fetchFromGitiles",
@ -2377,21 +2419,21 @@
},
"src/third_party/re2/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-j2v1NVMGqMieHdj/5/mgC+flpWCzxoCwLLmtZa3N5+0=",
"hash": "sha256-3eAhiKUIMnpVCEuLWVCVOK3alVsxAJrEWtHBzvdjZkY=",
"url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
"rev": "7c5e396af825562ec8321fdbf2f1cf276b26e3ae"
"rev": "826ad10e58a042faf57d7c329b0fd0a04b797e0b"
},
"src/third_party/ruy/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-voWwpijTX+AZJPGH5Rgy4ISKpFV3i86/KJBU9S1IT0g=",
"hash": "sha256-gvzxHQEAK6D9qIr/Wf/s6TfBp9QorHlNi4qzSx5Ih/c=",
"url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
"rev": "caa244343de289f913c505100e6a463d46c174de"
"rev": "cd7b92695b5d3f0c9ff65b865c2a1e19b99d766d"
},
"src/third_party/skia": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-y0v/eFfrFlEcVGT1W173bgqlFfWzz32TACAdV68uqrY=",
"hash": "sha256-GR9qVnqCCd49Itc74h8e7TMkfttPbXQ9DH8iqEZ2MV0=",
"url": "https://skia.googlesource.com/skia.git",
"rev": "bb40886d43b5fcbcdfb5587a2d20db418622990a"
"rev": "c6835e2d5ff641dad9347ce4c2ff79dbc29cf9aa"
},
"src/third_party/smhasher/src": {
"fetcher": "fetchFromGitiles",
@ -2407,15 +2449,15 @@
},
"src/third_party/sqlite/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=",
"hash": "sha256-brDFYmagGIH7fvRAP/JaCAMyuFLJKrc0jf0106gofiw=",
"url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
"rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b"
"rev": "a5270ae741714a5aad187ba8dcd8bddca39f791f"
},
"src/third_party/swiftshader": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-KDBfCZeWZWdx+nkMQO4UxjYl96eLo2qksqC9mL+U+ls=",
"hash": "sha256-k0WzWDa/+48ogpbmECNDJKIED4wGu/Hm0DyGnCT9xoU=",
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
"rev": "b8f1a3ad5f9e077cd4c67e2f612e42bc8ef2fd30"
"rev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f"
},
"src/third_party/text-fragments-polyfill/src": {
"fetcher": "fetchFromGitiles",
@ -2425,81 +2467,87 @@
},
"src/third_party/tflite/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-roL+P9fJskz+9h2vK0eYud7J+IFPD1+ByHIL95JPahs=",
"hash": "sha256-LOQH+qtltrahcPIutw/zYvEhmvbSjFBWT1mrg/pUD/0=",
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
"rev": "f3e12f6b28647da499edb69794745f14869f0df9"
"rev": "296f1e3cce03308c7fd5cdc7a76fbc3e41ec5214"
},
"src/third_party/vulkan-deps": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-disqOHrly1sqqBrDdRbpPlRE9EHSSdMxJXr+Kn7sia0=",
"hash": "sha256-bxg82G3dkugLXpTkfk/kNcKHKWn2i8+cCKPgfbaIVZ8=",
"url": "https://chromium.googlesource.com/vulkan-deps",
"rev": "73a4816c4b451e0e47b35478ba204acb7848b6b9"
"rev": "c00c99b8e979ca1b1eba221a60cb1e1d3b12f956"
},
"src/third_party/vulkan-deps/glslang/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-EKV4kjmLfChKmx3ozAVNx8CJii6hQGAUTTPQmLevkX0=",
"hash": "sha256-QKSPJuIJe44vVNZ8fjqRKc73CZV0fECcnXvY6QRec+0=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
"rev": "6a7ec4be7b8a22ab16cea0f294b5973dbcdd637a"
"rev": "57d86ab763da7b2cd1e00ecec8aa697403a8fd20"
},
"src/third_party/vulkan-deps/spirv-cross/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-8Xw0pKn6puTpALAkKMHQKbzBLENm37Iep8JnslooJI8=",
"hash": "sha256-VxwAs6mNOK/46VIJ0BroR41cNy2ywU+FQCgBatY1sBY=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
"rev": "2d3a152081ca6e6bea7093940d0f81088fe4d01c"
"rev": "b82536766d1b81631b126d1ddbe49baf42929bd3"
},
"src/third_party/vulkan-deps/spirv-headers/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-JwgV3kDFvljDoWagDRjTIRRZRX5f6r9UUUxnCj1GEyc=",
"hash": "sha256-TVfaGY9YjVHvR38OvuphsS68UIpBF21ghBg/2LL3gmE=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
"rev": "6e09e44cd88a5297433411b2ee52f4cf9f50fa90"
"rev": "7b0309708da5126b89e4ce6f19835f36dc912f2f"
},
"src/third_party/vulkan-deps/spirv-tools/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-/JyTxpmh57gr1OrzCvLvbPL/iqQeplA5mKpvY6+x1Ag=",
"hash": "sha256-yUaUBCj3MqBwkGNC8ElJ/uvcm0Pl5BAdiWAw/Pi52Xo=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
"rev": "a63ac9f73d29cd27cdb6e3388d98d1d934e512bb"
"rev": "c96fe8b943564fbab3424219d924d21cac2e877a"
},
"src/third_party/vulkan-deps/vulkan-headers/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-4erHZKx4jksAtyG8ZHtlVoEY3EqE4p2pEtcGHqv7G7A=",
"hash": "sha256-kBOkj7mr4stPXUCBhNJpNL3A+9BebEwrIBEIroxdH8Y=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
"rev": "c1a8560c5cf5e7bd6dbc71fe69b1a317411c36b8"
"rev": "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40"
},
"src/third_party/vulkan-deps/vulkan-loader/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-PfVpvtBc80ZdL1SUJuoo8BGk90XSXX3l4mRVv3jdARA=",
"hash": "sha256-qvpwu4mmmLAFolLZt5q9XYgZff6BHO2Yapg93JUpBVA=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
"rev": "db51885950c860961279168997b5cde12a77abf9"
"rev": "0b2b71306aebf1e11304b9f961f9a29ab0234756"
},
"src/third_party/vulkan-deps/vulkan-tools/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-L+WNkMyIJNKjCRuhgoU6OvjcfQpwAtPtquIngYYrf1M=",
"hash": "sha256-C4xJwYkMqzmYk6lP7SQNXhCt6FyuH4+pqOHltuxJkOA=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
"rev": "0cab6e8055fb0f3a54d8314552fd523a3da57c2c"
"rev": "7c6d640a5ca3ab73c1f42d22312f672b54babfaf"
},
"src/third_party/vulkan-deps/vulkan-utility-libraries/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-gvia+Xb9BpOjPARKo3Sgp85Bfh1roFZ2PzCtXVFYeIU=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
"rev": "4cfc176e3242b4dbdfd3f6c5680c5d8f2cb7db45"
},
"src/third_party/vulkan-deps/vulkan-validation-layers/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-Ycvj5oOTE1fKHWk5Ubzr4lrzHQUjQXjguR2onXv3T5g=",
"hash": "sha256-6YUjvPKjuuZdhBRfM+84btXvAHR2rj7ovocZnLS31JY=",
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
"rev": "e2be2287f4820ed578d1adeca981736146a74d9a"
"rev": "d26b50b03815ff226e6df478b4ddc4b98d8deaee"
},
"src/third_party/vulkan_memory_allocator": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-rARuPHa/gEAOTM8/Fnob0bU0Jv+UKLiwe3o0UGWYlME=",
"hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
"rev": "ebe84bec02c041d28f902da0214bf442743fc907"
"rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21"
},
"src/third_party/wayland/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-aVcy7bW1cqEKbowlVgfa9FI8/oG7k5CzPZbRl+cPcX8=",
"hash": "sha256-By+3qSfYs4dM4Hcjq2j4ZlSSPhagwqtNl//HKMrc5LY=",
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
"rev": "a8c7553ec9af6462474524fd2bb4e9a7dc7217dd"
"rev": "af7f44122127b86a8c74cb7432909180f4899eaa"
},
"src/third_party/wayland-protocols/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=",
"hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=",
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git",
"rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867"
"rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5"
},
"src/third_party/wayland-protocols/kde": {
"fetcher": "fetchFromGitiles",
@ -2521,71 +2569,77 @@
},
"src/third_party/webgl/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-jn0HFVHFGjbScUchFBynMekZIktPp25k8O/HfjvJHRU=",
"hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=",
"url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git",
"rev": "b934957d2423492a9a8682f48517f07607503f3f"
"rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed"
},
"src/third_party/webgpu-cts/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-AW0VnZF9W1otb9+UGLGwrjXI6yqz7X0lqAMYtHVX6L8=",
"hash": "sha256-RC2t+H44HyIvHLRcZyebSgVZvbmtw0vsy2KJRUlvTKs=",
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
"rev": "82ed433cbcb632d6700551067a6d3acc6c2ab46e"
"rev": "e082b08475761a2ba6a3349dfea72f704c8b68d4"
},
"src/third_party/webrtc": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-MoEeE9iXW4bbwhugT40njlxPWO04LomykQk/hZb6TwQ=",
"hash": "sha256-KipyGhohU2fQF67dDm4tPeH9xbFC2FNxhU4yiga5pwg=",
"url": "https://webrtc.googlesource.com/src.git",
"rev": "402f60c2eabefbc7a120ec01659690c7fdf89769"
"rev": "6b419a0536b1a0ccfff3682f997c6f19bcbd9bd8"
},
"src/third_party/wuffs/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=",
"hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
"rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba"
"rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8"
},
"src/third_party/weston/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-EKl6oIM8Vml9wtSIb9ExFIuuJohbU/rsG3JVS5thaUU=",
"hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git",
"rev": "420cfd00f2de91de74bd9d4d8348e43c582d29f0"
"rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7"
},
"src/third_party/xdg-utils": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=",
"hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
"url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git",
"rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d"
"rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44"
},
"src/third_party/xnnpack/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=",
"hash": "sha256-JE3qg3lTpKTLgnpiNw6+wkhVXGx55MiyVDuvEp7Dk0Y=",
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
"rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a"
"rev": "a68aa0a24b0d3e1c75f2f7c0915b70121cee0470"
},
"src/tools/page_cycler/acid3": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-+7Ynz7k/dWdd4Wo7Rjzvc8GY9gTsjzjG3GdNsuDKszY=",
"hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=",
"url": "https://chromium.googlesource.com/chromium/deps/acid3.git",
"rev": "6be0a66a1ebd7ebc5abc1b2f405a945f6d871521"
"rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba"
},
"src/third_party/zstd/src": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-9FxRLrcbJoWAd+3Elr9mJ3vG6ilT6ZQZqdY9OiTpcWw=",
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
"rev": "050fec5c378d676fede8b2171ec5e84f6afa1504"
},
"src/v8": {
"fetcher": "fetchFromGitiles",
"hash": "sha256-FniqsFWFZUclDsA+cOvX+FFxsnVd8lfMVCfrjiOn9fQ=",
"hash": "sha256-ssM6nI9E0xF1BT6iIqN7u1kgQe8oGIzsJbFouGJi4Aw=",
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "47bf74e7ed48d3a0d6ea92f46c32be46ebed08fe"
"rev": "ddbcde1a3adf125ed72dbfcb4f90040d0c7e5dae"
},
"src/third_party/nan": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=",
"hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
"owner": "nodejs",
"repo": "nan",
"rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac"
"rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
},
"src/third_party/electron_node": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-VwG8Q+PZudblqG+m4uuWEowNWlq/MUuyEpFs8k8NbHE=",
"hash": "sha256-lGNDwe3IiQMLg5o0AMhLfNpyfu4dXVk05YRO0yMzg0I=",
"owner": "nodejs",
"repo": "node",
"rev": "v18.16.1"
"rev": "v20.9.0"
},
"src/third_party/squirrel.mac": {
"fetcher": "fetchFromGitHub",
@ -2607,24 +2661,31 @@
"owner": "Mantle",
"repo": "Mantle",
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
},
"src/third_party/engflow-reclient-configs": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
"owner": "EngFlow",
"repo": "reclient-configs",
"rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
}
},
"version": "26.6.9",
"modules": "116",
"chrome": "116.0.5845.228",
"node": "18.16.1",
"version": "29.1.2",
"modules": "121",
"chrome": "122.0.6261.112",
"node": "20.9.0",
"chromium": {
"version": "116.0.5845.228",
"version": "122.0.6261.112",
"deps": {
"gn": {
"version": "2023-06-09",
"version": "2024-01-22",
"url": "https://gn.googlesource.com/gn",
"rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d",
"hash": "sha256-XP+NQG8kjzXPzQ25YaZiPymexZwAGwhpodqgdTWWCZI="
"rev": "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e",
"hash": "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY="
}
}
},
"chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=",
"electron_yarn_hash": "05wkb1m0yjbai4153y49kwr1v2lj14fg75aqlvmmrhf3bxp9lg5g"
"electron_yarn_hash": "0spwnax6g3050z2bjylzs67l7m551is86nizzy4hp0306v57xdpz",
"chromium_npm_hash": "sha256-9eFsK673j3pTDOcsU35RN4hagFygA/v/ahCqVVEV0Rs="
}
}

View File

@ -1,42 +0,0 @@
diff --git a/electron/BUILD.gn b/electron/BUILD.gn
index c905891eb8..f2cf11fe88 100644
--- a/electron/BUILD.gn
+++ b/electron/BUILD.gn
@@ -111,8 +111,6 @@ electron_version = exec_script("script/print-version.py",
[],
"trim string",
[
- ".git/packed-refs",
- ".git/HEAD",
"script/lib/get-version.js",
])
diff --git a/electron/script/lib/get-version.js b/electron/script/lib/get-version.js
index 45a120482b..ddaf8ab60e 100644
--- a/electron/script/lib/get-version.js
+++ b/electron/script/lib/get-version.js
@@ -1,22 +1 @@
-const { spawnSync } = require('child_process');
-const path = require('path');
-
-module.exports.getElectronVersion = () => {
- // Find the nearest tag to the current HEAD
- // This is equivilant to our old logic of "use a value in package.json" for the following reasons
- //
- // 1. Whenever we updated the package.json we ALSO pushed a tag with the same version
- // 2. Whenever we _reverted_ a bump all we actually did was push a commit that deleted the tag and changed the version number back
- //
- // The only difference in the "git describe" technique is that technically a commit can "change" it's version
- // number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3
- // and after the tag is made rebuilding the same commit will result in it being 1.2.4
- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], {
- cwd: path.resolve(__dirname, '..', '..')
- });
- if (output.status !== 0) {
- console.error(output.stderr);
- throw new Error('Failed to get current electron version');
- }
- return output.stdout.toString().trim().replace(/^v/g, '');
-};
+module.exports.getElectronVersion = () => "@version@";

View File

@ -21,13 +21,13 @@ let
in
buildDartApplication rec {
pname = "dart-sass";
version = "1.71.1";
version = "1.72.0";
src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
hash = "sha256-MFBAc89Ib++Qve+SjkOOeZhdpH8Kwoic9U+d2ldt8W8=";
hash = "sha256-wDZz7tR3AfUoRD0JXetXOH73W2WDFnwV4vUHRPGxiDc=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;

View File

@ -84,11 +84,11 @@
"dependency": "direct main",
"description": {
"name": "cli_pkg",
"sha256": "b15d9558c6a44f20840198e385e3e4fe1fcb17d1a45e60e0657d9bd42e630a61",
"sha256": "f812467b5d6a5f26ad0fba5dcfc95133df02edbae47dfa4ade3df5d2b5afdcf2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.9.0"
"version": "2.10.0"
},
"cli_repl": {
"dependency": "direct main",
@ -160,35 +160,45 @@
"source": "hosted",
"version": "1.0.0"
},
"dart_mappable": {
"dependency": "transitive",
"description": {
"name": "dart_mappable",
"sha256": "f9f272f2af6c11adf4abc22574eb946df110251052a0d00c03519ecf2442defc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.2.1"
},
"dart_style": {
"dependency": "direct dev",
"description": {
"name": "dart_style",
"sha256": "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368",
"sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.4"
"version": "2.3.6"
},
"dartdoc": {
"dependency": "direct dev",
"description": {
"name": "dartdoc",
"sha256": "6b147cb40a72557749d7a6594eb4e065057be54b44000cd57273e4a450c3b84e",
"sha256": "09c07e4b5313a301f8a6fe5a3b43d2dd7fd2b0817d51d563f7dcacdac62ecf68",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.0.5"
"version": "8.0.7"
},
"ffi": {
"dependency": "transitive",
"description": {
"name": "ffi",
"sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878",
"sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
"version": "2.1.2"
},
"file": {
"dependency": "transitive",
@ -254,11 +264,11 @@
"dependency": "direct main",
"description": {
"name": "http",
"sha256": "a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba",
"sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
"version": "1.2.1"
},
"http_multi_server": {
"dependency": "transitive",
@ -334,11 +344,11 @@
"dependency": "transitive",
"description": {
"name": "markdown",
"sha256": "1b134d9f8ff2da15cb298efe6cd8b7d2a78958c1b00384ebcbdf13fe340a6c90",
"sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.2.1"
"version": "7.2.2"
},
"matcher": {
"dependency": "transitive",
@ -494,11 +504,11 @@
"dependency": "direct dev",
"description": {
"name": "pub_api_client",
"sha256": "d456816ef5142906a22dc56e37be6bef6cb0276f0a26c11d1f7d277868202e71",
"sha256": "cc3d2c93df3823553de6a3e7d3ac09a3f43f8c271af4f43c2795266090ac9625",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.6.0"
"version": "2.7.0"
},
"pub_semver": {
"dependency": "direct main",
@ -720,6 +730,16 @@
"source": "hosted",
"version": "2.1.0"
},
"type_plus": {
"dependency": "transitive",
"description": {
"name": "type_plus",
"sha256": "2e33cfac2e129297d5874567bdf7587502ec359881e9318551e014d91b02f84a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
},
"typed_data": {
"dependency": "direct main",
"description": {
@ -744,11 +764,11 @@
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246",
"sha256": "e7d5ecd604e499358c5fe35ee828c0298a320d54455e791e9dcf73486bc8d9f0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "14.0.0"
"version": "14.1.0"
},
"watcher": {
"dependency": "direct main",
@ -764,21 +784,21 @@
"dependency": "transitive",
"description": {
"name": "web",
"sha256": "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05",
"sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.4.2"
"version": "0.5.1"
},
"web_socket_channel": {
"dependency": "transitive",
"description": {
"name": "web_socket_channel",
"sha256": "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23",
"sha256": "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.3"
"version": "2.4.4"
},
"webkit_inspection_protocol": {
"dependency": "transitive",
@ -812,6 +832,6 @@
}
},
"sdks": {
"dart": ">=3.2.0 <4.0.0"
"dart": ">=3.3.0 <4.0.0"
}
}

View File

@ -15,16 +15,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "5.12.4";
version = "5.13.0";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "texlab";
rev = "refs/tags/v${version}";
hash = "sha256-kLf0EG6jKJeKowNZ21cwE0a9w630GoljNwRckHrkajg=";
hash = "sha256-k/Hfl9SZxjdNLzvGrMMu/DPQpXsW21FC/WvJbz1IhSY=";
};
cargoHash = "sha256-5vEoreDRHRxsVNPwZpgmeClEFZ0SzLjb5EZLfmlqEJM=";
cargoHash = "sha256-tM/y1A/aCkcpU/1nZfUrNYDI0jiGn8qzvmP244tEJac=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
# generate the man page
postInstall = lib.optionalString (!isCross) ''
# TexLab builds man page separately in CI:
# https://github.com/latex-lsp/texlab/blob/v5.12.0/.github/workflows/publish.yml#L117-L121
# https://github.com/latex-lsp/texlab/blob/v5.13.0/.github/workflows/publish.yml#L117-L121
help2man --no-info "$out/bin/texlab" > texlab.1
installManPage texlab.1
'';

View File

@ -9,9 +9,20 @@ python3Packages.buildPythonApplication rec {
sha256 = "sha256-OtGgToDGUr6pBu9+LS/DxaYw/9+Pd6jPhxVDAM22HB4=";
};
# Remove the wrong GROUP=plugdev.
# The udev rule already has TAG+="uaccess", which is sufficient.
postPatch = ''
substituteInPlace contrib/udev/99-usbsdmux.rules \
--replace-fail 'TAG+="uaccess", GROUP="plugdev"' 'TAG+="uaccess"'
'';
# usbsdmux is not meant to be used as an importable module and has no tests
doCheck = false;
postInstall = ''
install -Dm0444 -t $out/lib/udev/rules.d/ contrib/udev/99-usbsdmux.rules
'';
meta = with lib; {
description = "Control software for the LXA USB-SD-Mux";
homepage = "https://github.com/linux-automation/usbsdmux";

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, makeWrapper
, pkg-config
, libxslt
@ -51,6 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
./i686-test-remove-battery-check.patch
] ++ [
./installed-tests-path.patch
(fetchpatch {
url = "https://gitlab.freedesktop.org/upower/upower/-/merge_requests/207.diff";
hash = "sha256-ldr1bKbSAdYpwbbe/Iq9i0Q9zQrHWvIvBGym/F3+vxs=";
})
];
strictDeps = true;

View File

@ -1,14 +1,14 @@
{ buildGoModule, fetchFromGitLab, lib }:
buildGoModule rec {
pname = "gnss-share";
version = "0.7.2";
version = "0.8.0";
src = fetchFromGitLab {
owner = "postmarketOS";
repo = "gnss-share";
rev = version;
hash = "sha256-0osXA+t+trm41ekcDiJwq0IAB+6ibrlwP/c2JNAXRpU=";
hash = "sha256-XNKX7eIv3wKNWbVsa6w/ODDRiiBArpGNY0T/sHC5ItY=";
};
vendorHash = "sha256-a5CZxh92MW3yP/ZhwGI9UWUT8hwJ0/zeTyPNC+c2R9U=";
vendorHash = "sha256-dmE6hfKUqEr7BMNi/HMUOk4jDB0dPXEMkWQyWj6XpY4=";
meta = with lib; {
description = "share GNSS data between multiple clients";
longDescription = ''

View File

@ -12,7 +12,7 @@
}:
let
version = "1.60.1";
version = "1.62.0";
in
buildGoModule {
pname = "tailscale";
@ -22,9 +22,9 @@ buildGoModule {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-1BzzXRqbs8dS9263cXCujYYSStQlvyQr3dm3tyr+64k=";
hash = "sha256-qotoCKUb5INgdSELvJpDaDvCuzVqet5zeIazzRnYoqo=";
};
vendorHash = "sha256-eci4f6golU1eIQOezplA+I+gmOfof40ktIdpr0v/uMc=";
vendorHash = "sha256-jyRjT/CQBlmjHzilxJvMuzZQlGyJB4X/yISgWjBVDxc=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "outline";
version = "0.75.0";
version = "0.75.2";
src = fetchFromGitHub {
owner = "outline";
repo = "outline";
rev = "v${version}";
hash = "sha256-u4WDD0HRaNHdknHaoPYprebUaHt8EmESjBG0N6NZpIk=";
hash = "sha256-jK1jZ9NyBl3Dioh/7gXWx6XyyI6xJKt2a/XXzbhllZM=";
};
nativeBuildInputs = [ makeWrapper prefetch-yarn-deps ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-V+1lqZh68T3C9VAFETHehv9iCt1j24ZeY9ErbnRGIrk=";
hash = "sha256-8CfaP5T/pf/xq1lOfdOW4n2m12QLnkLFynHABjZwNiY=";
};
configurePhase = ''

View File

@ -17,6 +17,7 @@ python3.pkgs.buildPythonApplication rec {
pythonRelaxDeps = [
"beautifulsoup4"
"dnspython"
"tqdm"
];

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "3.1.10";
version = "3.2.0";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "nuclei";
rev = "refs/tags/v${version}";
hash = "sha256-11ORN9h2VsXJKZw5HUljq6Tk0XC81tC7sCPbFgcTd+k=";
hash = "sha256-LjRhJoPK/zaM0Wuy2IC3H3jfmNvhAP5hZpywjaRM6t4=";
};
vendorHash = "sha256-0ERUvPUAxj0H62YcRvsfYX8h0Hp/mA6NdE8E/BjPGzw=";
vendorHash = "sha256-OInqR1+5XgMlTSbH6E8X7Ljny6BEHk1Sh+72NoDxtAI=";
subPackages = [
"cmd/nuclei/"

View File

@ -6808,12 +6808,11 @@ with pkgs;
cirrusgo = callPackage ../tools/security/cirrusgo { };
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_23_02_0
citrix_workspace_23_07_0
citrix_workspace_23_09_0
citrix_workspace_23_11_0
citrix_workspace_24_02_0
;
citrix_workspace = citrix_workspace_23_11_0;
citrix_workspace = citrix_workspace_24_02_0;
clima = callPackage ../tools/text/clima { };
@ -9795,9 +9794,7 @@ with pkgs;
kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
kube-router = callPackage ../applications/networking/cluster/kube-router {
buildGoModule = buildGo120Module;
};
kube-router = callPackage ../applications/networking/cluster/kube-router { };
kubedock = callPackage ../development/tools/kubedock { };
@ -18289,10 +18286,11 @@ with pkgs;
electron_23 = electron_23-bin;
electron_24 = electron_24-bin;
electron_25 = electron_25-bin;
electron_26 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_26 then electron-source.electron_26 else electron_26-bin;
electron_26 = electron_26-bin;
electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin;
electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin;
electron = electron_28;
electron_29 = electron-source.electron_29;
electron = electron_29;
autobuild = callPackage ../development/tools/misc/autobuild { };