Merge staging-next into staging
This commit is contained in:
@@ -571,13 +571,13 @@
|
||||
"vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
|
||||
},
|
||||
"hashicorp_google": {
|
||||
"hash": "sha256-HXHeCA3h5h9pyC9WZ+3EnySWmIsxGMskHbW+SjvZel4=",
|
||||
"hash": "sha256-mSUEhO6zZ4PO/WzvHVCaoxFjhL/kF1OfuCeH67DA4+w=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v7.20.0",
|
||||
"rev": "v7.22.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-lhTdDrTwTbRuWngQ+NGuh+x5Z5HZfVTtNi+mZqIENbg="
|
||||
"vendorHash": "sha256-v/XHGUEpAIpGHErv7GPqfosVLL3xaqBwZHbJKS8fkn4="
|
||||
},
|
||||
"hashicorp_google-beta": {
|
||||
"hash": "sha256-ypC8av5GnFBlUp2eVDZWqnPGrZT8QihYnxsIHw8g+oA=",
|
||||
|
||||
@@ -18,17 +18,18 @@
|
||||
libuuid,
|
||||
tomlplusplus,
|
||||
fuse3,
|
||||
curl,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "buildbox";
|
||||
version = "1.3.21";
|
||||
version = "1.3.53";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "BuildGrid";
|
||||
repo = "buildbox/buildbox";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-gZ4PnaIiMPh18Yy2120yIEaQaFpzGNnWXzS7Uw+n/+k=";
|
||||
hash = "sha256-G4K6KxKAG+BgWtuG7HOxpRr+oa8SJ435zF0wbZCLXTk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
bubblewrap
|
||||
curl
|
||||
fuse3
|
||||
gbenchmark
|
||||
glog
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "chkbit";
|
||||
version = "6.5.0";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laktak";
|
||||
repo = "chkbit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zf5UNpTsdTRym9B2xfuRIBl4Mpv97K+4VVbVPTEWFms=";
|
||||
hash = "sha256-mdcksmbwEYNtY+2Hl1Lg1OG7OjG5tW1KYNVmPEhEnDE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hiXn7LmO4bYti9iufonQSLM1G0BZGB8u0QRqSYBvxNc=";
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "datafusion-cli";
|
||||
version = "52.1.0";
|
||||
version = "52.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "datafusion-cli-source";
|
||||
owner = "apache";
|
||||
repo = "arrow-datafusion";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ViO4Z+8l8hv7gZ1behRlIgV+kdWiGwy+DyaBJrq+gyY=";
|
||||
hash = "sha256-WmCklLZKuCiVYOPQOW0QLn1vTMnz4Hgm1HeuXHZe4XU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KZa4/J7JSOP7TN85fj+QzxUTSMOLcZ+rsjNA/bYU+uU=";
|
||||
cargoHash = "sha256-wDEEoDYFx+Yb06Ufaf+zR79kluhSworoGLaa71niwEg=";
|
||||
|
||||
buildAndTestSubdir = "datafusion-cli";
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Fetch CLI workspace dependencies
|
||||
deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json)
|
||||
deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
|
||||
deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
|
||||
|
||||
# Remove unnecessary external dependencies
|
||||
find . -name node_modules -type d -prune -exec rm -rf {} +
|
||||
|
||||
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Fetch CLI workspace dependencies
|
||||
deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json)
|
||||
deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
|
||||
deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
|
||||
|
||||
# Remove unnecessary external dependencies
|
||||
find . -name node_modules -type d -prune -exec rm -rf {} +
|
||||
|
||||
@@ -15,8 +15,8 @@ let
|
||||
hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
|
||||
};
|
||||
"10" = {
|
||||
version = "10.28.0";
|
||||
hash = "sha256-mwsE5ueZRVZpF/hBG7b2X9Lz4VkEJpBOhQDhrMSzNWE=";
|
||||
version = "10.29.2";
|
||||
hash = "sha256-hAL2daH0zJ1PJ7v6s1wtSi4dfrATHfA9rQlhnoZnTQw=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user