diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/applications/audio/g4music/default.nix index 3e45bf4d8752..6cefefcb1d29 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/applications/audio/g4music/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 libadwaita ] ++ (with gst_all_1; [ + gst-plugins-bad gst-plugins-base gst-plugins-good gstreamer diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index c54911041069..aa4e5eef3c92 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1505"; + version = "1506"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-4HPrBr1M8J484qu1cXpZyVdLu3+/IYoNnNV9vSd4SlY="; + sha256 = "sha256-QmUquXoDGhoan+Y1kdkTirdkIvYPBkeAEkMLkaE9QKk="; }; installPhase = '' diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 0496bd1c2267..090d1d5dca6b 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.33.3"; + version = "0.34.3"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-3qBd1WgHn/sfEyNRPTX5viMX3lVZPfsG6x7GfNwkL3E="; + sha256 = "sha256-YJMpCEQ6eJYISGeYgvS6TcQwU2eD6fjgHrHRKA6CQJU="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix index b2d57d098ee7..1156bd4a94c9 100644 --- a/pkgs/applications/misc/nwg-dock/default.nix +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kLvVP+hwv8Xgvp1YqrXZ2xpEcU92yvNMT5YCcDcg7xQ="; + sha256 = "sha256-Nh6VAgQIGxNxkWnNieRope5Hj3RL0uSFuOLqg+/oucw="; }; - vendorHash = "sha256-WDygnKdldZda4GadfStHWsDel1KLdzjVjw0RxmnFPRE="; + vendorHash = "sha256-k/2JD25ZmVI3G9GqJnI9vz5WtRc2vo4nfAiGUt6IPyU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 7d9db57ddae1..e175c4915540 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.155.1"; + version = "0.156.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-6y+7Jrs/sIpxJjO9Zzv2ht1RprrqcBjwyOsCnqDHxUY="; + sha256 = "sha256-MrDhOsjXo4aaeWSo/WNheUqom7kF2MzyaqeZXVAAzz4="; }; - vendorHash = "sha256-MCx+6K3CqVfFEYgkxT1sFvy0vshpKwW07AUngEG2muk="; + vendorHash = "sha256-hMoBwA9KmQSBJkEu3UAxM1wi6RRHZdUhYqri5JGwEmw="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 48facfde2316..b27212753dc2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-eUvN+b7rj1l20/RHo+zFz2rxpZM4QlXBlag/Nfnt7ps=", + "hash": "sha256-25CTfFwj/RxsFE6gpUxS1X3TbsuRhTZP89WqhsaRp8w=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.13.0", + "rev": "v5.13.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-w+p37Ayw/wsv6k5Bk6SWwiVdyJtH1z6mx6hM301Dnyw=" + "vendorHash": "sha256-Oir+zn8UNbO3vbl3+QUIlis4K2watmWokaYdD7xGYzI=" }, "azuread": { "hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=", @@ -836,13 +836,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-yoO8LDSB80GfEjPR3sf8JcciX+3gM1qtFBv/rFAzb6g=", + "hash": "sha256-Y3sLtuN55vgO35aWM6c2zIChkF5Q+8zlvH5NOJF/tRU=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.2.0", + "rev": "v4.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tXVV8lcB8A66WtsWb2wDcJEERjzbHm/eqHyzIOrVk7E=" + "vendorHash": "sha256-2w/cdB8ySt+nimU4KXSpWjWMkeX7rEmhYHBJWQPJ5PI=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -1061,13 +1061,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-g0qkUzLcMZZQrYtRbpyNWkpYLzJskP7Be+tGs3SGyVo=", + "hash": "sha256-PzIQ8hYCoZOdNoFvHGBGG/3ROIBl6micozonoMojG0Q=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.133.0", + "rev": "v1.134.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-5F8A8v8YQXrYAgWGYjO5G+sY3SY+O2oiYo3zVLZ9LUc=" + "vendorHash": "sha256-ptMO8xtL5STVapeZbie+6UHR4AcLbHkzXTz7sPfbsV4=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", @@ -1115,11 +1115,11 @@ "vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc=" }, "tencentcloud": { - "hash": "sha256-T98RZ775nXIjqanqWhZfz+IKJIXvDEkVnqHhznilYe0=", + "hash": "sha256-9nm4x3pBHvUDyMWUZpxqbSOc4uxGZ50lKBwf8PV9UAQ=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.20", + "rev": "v1.81.21", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1188,13 +1188,13 @@ "vendorHash": null }, "utils": { - "hash": "sha256-UqAWByIArvTz2ArR/dgIDw98grqj9BEyRJzNODteKao=", + "hash": "sha256-+11qnWZPtCyAjON5XZye9069332lKEpJdy504dYhOLw=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.10.0", + "rev": "1.11.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-n70qtdz4x8bdzCmVYyVTvvndx0w0AV/Yv8thGvitT6U=" + "vendorHash": "sha256-D7geLjmJoelbHolyS5IhnGNNl6kD8ZGtCRWcy+j2dxA=" }, "vault": { "hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=", diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index ac9774e2ef60..6d367587946b 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.28.4"; + version = "0.29.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-UloVE3CRiXYzIAm0Yyt0WyYEY7ykCyIiPH5JNa/acAo="; + hash = "sha256-MpjxyVOouivB1FT8ejKhq3lPSfCaXwxMXpyxoaNxVEk="; }; - vendorHash = "sha256-+i4pHHCo7sSESerHEVQ1r8MoEzhKdfhRGRjvyiyPG5E="; + vendorHash = "sha256-h/N50x64ROW3KJ5965vauSpkIoeq8Zn26eCEmJqU0Zg="; proxyVendor = true; preBuild = '' diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 22148e9d71a6..c9c275817020 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -3,17 +3,17 @@ mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb"; - sha256 = "sha256-zIGtGmCtQn26rxDsZfPKUZAFnBaWYRhfVJdazPyZ/g0="; + hash = "sha256-Oai5z6/CE/R2rH9LBVhY7eaKpF8eIIYI+3vjJPbq+rw="; }; extraBuildInputs = [ xorg.libxshmfence ]; passthru = { updateScript = nix-update-script { - extraArgs = [ "--override-filename" ./default.nix ]; + extraArgs = [ "--override-filename" ./default.nix ]; }; }; diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix new file mode 100644 index 000000000000..aaaca9a47b95 --- /dev/null +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -0,0 +1,43 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, ddev }: + +buildGoModule rec { + pname = "ddev"; + version = "1.22.1"; + + src = fetchFromGitHub { + owner = "ddev"; + repo = "ddev"; + rev = "v${version}"; + hash = "sha256-3uDdp827noiY6P7VSBXM34MTe9+MCEkNtuRQ3eFoBnk="; + }; + + vendorHash = null; + + ldflags = [ + "-extldflags -static" + "-X github.com/ddev/ddev/pkg/versionconstants.DdevVersion=${version}" + "-X github.com/ddev/ddev/pkg/versionconstants.SegmentKey=${version}" + ]; + + # Tests need docker. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = ddev; + command = '' + # DDEV will try to create $HOME/.ddev, so we set $HOME to a temporary + # directory. + export HOME=$(mktemp -d) + ddev --version + ''; + }; + + meta = with lib; { + description = "Docker-based local PHP+Node.js web development environments"; + homepage = "https://ddev.com/"; + license = licenses.asl20; + platforms = platforms.unix; + mainProgram = "ddev"; + maintainers = with maintainers; [ star-szr ]; + }; +} diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 5c3589454340..af5b18463ff9 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -33,7 +33,7 @@ }: let pname = "gamescope"; - version = "3.12.0-beta10"; + version = "3.12.3"; vkroots = fetchFromGitHub { owner = "Joshua-Ashton"; @@ -49,7 +49,7 @@ stdenv.mkDerivation { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-31zGo22Z0+zQ81LmzI+Xif9eREzRpS0S9+nK1i/cBCY="; + hash = "sha256-eo3c+s+sB20wrzbe2H/pMAYdvKeYOpWwEqmuuLY6ZJA="; }; patches = [ diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh index b17fb552cc6b..efbe7fbffc19 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh @@ -24,6 +24,13 @@ npmInstallHook() { elif $typ == "object" then .bin | to_entries | map(.key + " " + .value) | join("\n") else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json") + while IFS= read -r man; do + mkdir -p "$out/share/man" + ln -s "$packageOut/$man" "$out/share/man" + done < <(@jq@ --raw-output '(.man | type) as $typ | if $typ == "string" then .man + elif $typ == "list" then .man | join("\n") + else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json") + local -r nodeModulesPath="$packageOut/node_modules" if [ ! -d "$nodeModulesPath" ]; then diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6ccd9b7e125f..1de90bcb0463 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -60,6 +60,7 @@ mapAliases { markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 readability-cli = pkgs.readability-cli; # Added 2023-06-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 + s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 thelounge = pkgs.thelounge; # Added 2023-05-22 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d9d52c777b45..15a94b6541c9 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -68,7 +68,6 @@ react-native-cli = "react-native"; react-tools = "jsx"; remod-cli = "remod"; - s3http = "s3http.js"; svelte-language-server = "svelteserver"; teck-programmer = "teck-firmware-upgrade"; typescript-language-server = "typescript-language-server"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3cf0e5e9c607..61c70c09bd5f 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -267,7 +267,6 @@ , "rollup" , {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"} , "rtlcss" -, "s3http" , "sass" , "semver" , "serve" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index cdf9b904fcfe..e930cbb8f9c0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -127965,103 +127965,6 @@ in bypassCache = true; reconstructLock = true; }; - s3http = nodeEnv.buildNodePackage { - name = "s3http"; - packageName = "s3http"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz"; - sha512 = "AvzoPrG52y/LXjDmKiRoLrZbTJHXdfGYqzHlVLTrdK/+aeCI+RyGB/F1gd9qs6qwP4c1Ntdgvx9W5FziivG4+Q=="; - }; - dependencies = [ - sources."aws-sdk-1.18.0" - sources."axios-0.21.4" - sources."buffer-crc32-0.2.1" - sources."bytes-0.2.1" - sources."call-bind-1.0.2" - sources."coffee-script-1.6.3" - sources."commander-2.0.0" - (sources."connect-2.11.0" // { - dependencies = [ - sources."methods-0.0.1" - ]; - }) - sources."cookie-0.1.0" - sources."cookie-signature-1.0.1" - sources."core-util-is-1.0.3" - sources."crc-0.2.0" - sources."crypto-0.0.3" - sources."debug-4.3.4" - sources."events.node-0.4.9" - (sources."everyauth-0.4.5" // { - dependencies = [ - sources."bytes-0.1.0" - sources."connect-2.3.9" - sources."cookie-0.0.4" - sources."debug-0.5.0" - sources."fresh-0.1.0" - sources."mime-1.2.6" - sources."qs-0.4.2" - sources."send-0.0.3" - ]; - }) - (sources."express-3.4.4" // { - dependencies = [ - sources."commander-1.3.2" - ]; - }) - sources."follow-redirects-1.15.2" - sources."formidable-1.0.11" - sources."fresh-0.2.0" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."has-1.0.3" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."http-auth-2.0.7" - sources."inherits-2.0.4" - sources."isarray-0.0.1" - sources."keypress-0.1.0" - sources."methods-0.1.0" - sources."mime-1.2.11" - sources."mkdirp-0.3.5" - sources."ms-2.1.2" - sources."multiparty-2.2.0" - sources."negotiator-0.3.0" - sources."node-swt-0.1.1" - sources."node-uuid-1.4.1" - sources."node-wsfederation-0.1.1" - sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" - sources."object-inspect-1.12.3" - (sources."openid-2.0.10" // { - dependencies = [ - sources."qs-6.11.2" - ]; - }) - sources."pause-0.0.1" - sources."qs-0.6.5" - sources."range-parser-0.0.4" - sources."raw-body-0.0.3" - sources."readable-stream-1.1.14" - sources."request-2.9.203" - sources."sax-1.2.4" - sources."send-0.1.4" - sources."side-channel-1.0.4" - sources."stream-counter-0.2.0" - sources."string-1.6.1" - sources."string_decoder-0.10.31" - sources."uid2-0.0.3" - sources."util-0.4.9" - sources."xml2js-0.2.4" - sources."xmlbuilder-0.4.2" - ]; - buildInputs = globalBuildInputs; - meta = { - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index a20598b61d01..b2fc1043f29c 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "batchgenerators"; - version = "0.24"; + version = "0.25"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MIC-DKFZ"; repo = pname; rev = "v${version}"; - hash = "sha256-47jAeHMJPBk7GpUvXtQuJchgiSy6M50anftsuXWk2ag="; + hash = "sha256-L2mWH2t8PN9o1M67KDdl1Tj2ZZ02MY4icsJY2VNrj3A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index d5401c603e36..5166afde24de 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -3,9 +3,9 @@ , buildPythonPackage , fetchFromGitHub -# build-syste +# build-system , setuptools -, versioneer +, wheel # dependencies , click @@ -52,7 +52,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - versioneer + wheel ]; propagatedBuildInputs = [ @@ -109,10 +109,12 @@ buildPythonPackage rec { echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py substituteInPlace setup.py \ + --replace "import versioneer" "" \ --replace "version=versioneer.get_version()," "version='${version}'," \ --replace "cmdclass=versioneer.get_cmdclass()," "" substituteInPlace pyproject.toml \ + --replace ', "versioneer[toml]==0.28"' "" \ --replace " --durations=10" "" \ --replace " --cov-config=pyproject.toml" "" \ --replace "\"-v" "\" " diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index 02f89f237b74..c01fa75e5447 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -3,31 +3,26 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder -, typing-extensions }: buildPythonPackage rec { pname = "immutables"; - version = "0.19"; + version = "0.20"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "MagicStack"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yW+pmAryBp6bvjolN91ACDkk5zxvKfu4nRLQSy71kqs="; + hash = "sha256-fEECtP6WQVzwSzBYX+CbhQtzkB/1WC3OYKXk2XY//xA="; }; postPatch = '' rm tests/conftest.py ''; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - typing-extensions - ]; - nativeCheckInputs = [ pytestCheckHook ]; @@ -49,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "An immutable mapping type"; homepage = "https://github.com/MagicStack/immutables"; + changelog = "https://github.com/MagicStack/immutables/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index e2008e29dbad..2a6e9f0556a9 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -17,8 +19,18 @@ buildPythonPackage rec { hash = "sha256-R+P4pgKbLvf0mwpSDoujCvlJe/yS+nvSJ7ewLVOOg/0="; }; + patches = [ + # https://github.com/pyinsteon/insteon-panel/pull/33 + (fetchpatch { + name = "unpin-setuptools.patch"; + url = "https://github.com/pyinsteon/insteon-panel/commit/2297eb05668907edd03633f244e5876990e340c7.patch"; + hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; # upstream has no tests diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 070516deefd9..7a9e49a6a290 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -260,10 +260,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-8QaXoZq6oITRsYn4RdLUXcKQv3PJ4Q3ItX9PkBwxGBI="; + x86_64-linux = "sha256-L+d4umcN8eZQJS7NtbyMhFbbGUVd0a73GOYbZx3bW9Q="; } else { - x86_64-linux = "sha256-M/h5EZmyiV4QvzgKRjdz7V1LHENUJlc/ig1QAItnWVQ="; - aarch64-linux = "sha256-edkYcdlvOLNGRSanch1fGCZwq8SFn3TzcUNt1LhzG/E="; + x86_64-linux = "sha256-V1giQbu70RYjbNsqudibiCgvtFNRIJ8XG75QtIzjM4g="; + aarch64-linux = "sha256-DRU4aT7kQffhsOllgHtSlIsYOeLF4Sy5o5RR1CaTle0="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index ead028dd94de..df04d5b4659c 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.263"; + version = "0.0.268"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -94,7 +94,7 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-/ReuUVSVO/JqfXFmGU/Yk5GAzmSuJvnr8zOTw3qLZvQ="; + hash = "sha256-x5cYtOY91JpW3vV7Q6JNNRoTFKGMu93TqBAhnhQ6pHE="; }; sourceRoot = "${src.name}/libs/langchain"; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 910ba98e8815..eeae23611148 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -3,23 +3,24 @@ , fetchFromGitHub , poetry-core , pydantic -, requests -, pytestCheckHook , pytest-asyncio +, pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { pname = "langsmith"; - version = "0.0.14"; + version = "0.0.24"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "langchain-ai"; - repo = "langchainplus-sdk"; - # there are no correct tags - # https://github.com/langchain-ai/langchainplus-sdk/issues/105 - rev = "092f67222e4beabca0f51ba03f1ee028f916da63"; - hash = "sha256-U8fs16Uq80EB7Ey5YuQhUKKI9DOXJWlabM5JdoDnWP0="; + repo = "langsmith-sdk"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uv6zzSWs+Fvb0ztwgkbkZcaNJOFpt8pWh88HZHsTris="; }; sourceRoot = "${src.name}/python"; @@ -39,15 +40,18 @@ buildPythonPackage rec { ]; disabledTests = [ - # these tests require network access + # These tests require network access "integration_tests" ]; - pythonImportsCheck = [ "langsmith" ]; + pythonImportsCheck = [ + "langsmith" + ]; meta = with lib; { description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; - homepage = "https://github.com/langchain-ai/langchainplus-sdk"; + homepage = "https://github.com/langchain-ai/langsmith-sdk"; + changelog = "https://github.com/langchain-ai/langsmith-sdk/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 587341b9c719..9cae940ccc38 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.110.0"; + version = "2.110.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-aZo/Xv5+AzAEgEGN1GNtqEtUtuhDnOYneG/0f+hByc0="; + hash = "sha256-v2h/K1gat+nHGjn6a9r1BDMDAoJ/OtNctxHzV41gRkg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pytest-test-utils/default.nix b/pkgs/development/python-modules/pytest-test-utils/default.nix index 1d15abd4b1bd..cf2322d39a8c 100644 --- a/pkgs/development/python-modules/pytest-test-utils/default.nix +++ b/pkgs/development/python-modules/pytest-test-utils/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchFromGitHub , setuptools +, setuptools-scm +, wheel , pytestCheckHook , pytest , pythonOlder @@ -21,8 +23,12 @@ buildPythonPackage rec { hash = "sha256-5gB+hnJR2+NQd/n7RGrX1bzfKt8Np7IbWw61SZgNVJY="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; buildInputs = [ diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 52aab228e5c4..702be7d2f1b0 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -120,6 +120,7 @@ buildPythonPackage rec { "click" "grpcio" "protobuf" + "virtualenv" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix new file mode 100644 index 000000000000..62e048639273 --- /dev/null +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -0,0 +1,78 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, rustPlatform +, bitstring +, cachetools +, cffi +, deprecation +, iconv +, matplotlib +, numpy +, scipy +, screed +, hypothesis +, pytest-xdist +, pyyaml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "sourmash"; + version = "4.8.3"; + format = "pyproject"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LIMpL9cLafytRFyPam/FBNi757j1v6o1FG/K2JknDQY="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-mcJzFRYkdxuqqXH+ryg5v+9tQtuN1hkEeW2DF+wEJ/w="; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + buildInputs = [ iconv ]; + + propagatedBuildInputs = [ + bitstring + cachetools + cffi + deprecation + matplotlib + numpy + scipy + screed + ]; + + pythonImportsCheck = [ "sourmash" ]; + nativeCheckInputs = [ + hypothesis + pytest-xdist + pytestCheckHook + pyyaml + ]; + + # TODO(luizirber): Working on fixing these upstream + disabledTests = [ + "test_compare_no_such_file" + "test_do_sourmash_index_multiscaled_rescale_fail" + "test_metagenome_kreport_out_fail" + ]; + + meta = with lib; { + description = "Quickly search, compare, and analyze genomic and metagenomic data sets"; + homepage = "https://sourmash.bio"; + changelog = "https://github.com/sourmash-bio/sourmash/releases/tag/v${version}"; + maintainers = with maintainers; [ luizirber ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 7c5147c4e556..677afda4f1ff 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -54,7 +54,7 @@ let LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - sha256 = "sha256-tMiZsX5OyVw6VVImn4nWwEFdBw+TKKbE7oACibQC0oA="; + sha256 = "sha256-XChXujA2XpnkybrraN3FIJA/QkxLCfX97id2jMFzFJk="; }; buildAttrs = { diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 93373d8a310e..2b65136aaf83 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -6,7 +6,7 @@ , zope_deprecation , zope_event , zope-hookable -, zope_i18nmessageid +, zope-i18nmessageid , zope_interface }: @@ -27,7 +27,7 @@ buildPythonPackage rec { zope_deprecation zope_event zope-hookable - zope_i18nmessageid + zope-i18nmessageid zope_interface ]; diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix new file mode 100644 index 000000000000..fa8f4c1a30ee --- /dev/null +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zope_testrunner +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "zope-i18nmessageid"; + version = "6.0.1"; + format = "setuptools"; + + src = fetchPypi { + pname = "zope.i18nmessageid"; + inherit version; + hash = "sha256-LVvOb7MfHOoO+iZEZJvIZ9KXIwPx272f/vzlsuueAXY="; + }; + + nativeCheckInputs = [ + unittestCheckHook + zope_testrunner + ]; + + unittestFlagsArray = [ + "src/zope/i18nmessageid" + ]; + + pythonImportsCheck = [ + "zope.i18nmessageid" + ]; + + meta = with lib; { + homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; + description = "Message Identifiers for internationalization"; + changelog = "https://github.com/zopefoundation/zope.i18nmessageid/blob/${version}/CHANGES.rst"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index 6b96708e221c..b6cc1c0f9998 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_i18nmessageid +, zope-i18nmessageid , zope_schema , zope_testrunner , manuel @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeCheckInputs = [ zope_testrunner manuel ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_schema ]; + propagatedBuildInputs = [ zope-i18nmessageid zope_schema ]; # Need to investigate how to run the tests with zope-testrunner doCheck = false; diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix deleted file mode 100644 index 42aa31415e15..000000000000 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, six -, coverage -, zope_testrunner -}: - -buildPythonPackage rec { - pname = "zope.i18nmessageid"; - version = "5.1.1"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-R7djR7gOCytmxIbuZvP4bFdJOiB1uFqfuAJpD6cwvZI="; - }; - - propagatedBuildInputs = [ six ]; - - nativeCheckInputs = [ coverage zope_testrunner ]; - - meta = with lib; { - homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; - description = "Message Identifiers for internationalization"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 6480e91b730f..836d0fa66f82 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_i18nmessageid +, zope-i18nmessageid , zope_interface }: @@ -14,7 +14,7 @@ buildPythonPackage rec { hash = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk="; }; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; + propagatedBuildInputs = [ zope-i18nmessageid zope_interface ]; meta = with lib; { homepage = "https://github.com/zopefoundation/zope.size"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index d09b0dad82f3..fca02e80ee50 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -24,12 +24,12 @@ }: let - version = "6.2.0"; + version = "6.3.2"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-8ej3iGN6xXTUcdYZ0glrqsoEoZtXoDQ5ngeWM9tEGUU="; + hash = "sha256-jNf+rFgZO+K8ukUbpmiKRoJNN8pjWf9Y4NROuY8EKUg="; }; # Update with diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json index c39723aa455f..e407902f7949 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json @@ -91,8 +91,8 @@ "generator_function": "maybe", "generator_name": "android_tools", "name": "android_tools", - "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" + "sha256": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar" }, "android_tools_for_testing": { "name": "android_tools_for_testing", @@ -104,14 +104,14 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" + "sha256": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar" }, - "android_tools_pkg-0.27.0.tar.gz": { - "name": "android_tools_pkg-0.27.0.tar.gz", - "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", + "android_tools_pkg-0.27.2.tar": { + "name": "android_tools_pkg-0.27.2.tar", + "sha256": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar" ] }, "bazel-gazelle-v0.24.0.tar.gz": { @@ -538,44 +538,44 @@ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" ] }, - "java_tools-v12.3.zip": { - "name": "java_tools-v12.3.zip", - "sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f", + "java_tools-v12.6.zip": { + "name": "java_tools-v12.6.zip", + "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" ] }, - "java_tools_darwin_arm64-v12.3.zip": { - "name": "java_tools_darwin_arm64-v12.3.zip", - "sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b", + "java_tools_darwin_arm64-v12.6.zip": { + "name": "java_tools_darwin_arm64-v12.6.zip", + "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_arm64-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" ] }, - "java_tools_darwin_x86_64-v12.3.zip": { - "name": "java_tools_darwin_x86_64-v12.3.zip", - "sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c", + "java_tools_darwin_x86_64-v12.6.zip": { + "name": "java_tools_darwin_x86_64-v12.6.zip", + "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_x86_64-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" ] }, - "java_tools_linux-v12.3.zip": { - "name": "java_tools_linux-v12.3.zip", - "sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d", + "java_tools_linux-v12.6.zip": { + "name": "java_tools_linux-v12.6.zip", + "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_linux-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" ] }, - "java_tools_windows-v12.3.zip": { - "name": "java_tools_windows-v12.3.zip", - "sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1", + "java_tools_windows-v12.6.zip": { + "name": "java_tools_windows-v12.6.zip", + "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_windows-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" ] }, "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { @@ -1103,11 +1103,11 @@ "https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz" ] }, - "r8-3.3.28.jar": { - "name": "r8-3.3.28.jar", - "sha256": "8626ca32fb47aba7fddd2c897615e2e8ffcdb4d4b213572a2aefb3f838f01972", + "r8-8.0.40.jar": { + "name": "r8-8.0.40.jar", + "sha256": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702", "urls": [ - "https://maven.google.com/com/android/tools/r8/3.3.28/r8-3.3.28.jar" + "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar" ] }, "remote_coverage_tools": { @@ -1131,20 +1131,20 @@ "generator_function": "maybe", "generator_name": "remote_java_tools", "name": "remote_java_tools", - "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", + "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" ] }, - "remote_java_tools_darwin": { + "remote_java_tools_darwin_arm64": { "generator_function": "maybe", - "generator_name": "remote_java_tools_darwin", - "name": "remote_java_tools_darwin", - "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", + "generator_name": "remote_java_tools_darwin_arm64", + "name": "remote_java_tools_darwin_arm64", + "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" ] }, "remote_java_tools_darwin_arm64_for_testing": { @@ -1159,10 +1159,20 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b", + "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_arm64-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" + ] + }, + "remote_java_tools_darwin_x86_64": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_darwin_x86_64", + "name": "remote_java_tools_darwin_x86_64", + "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" ] }, "remote_java_tools_darwin_x86_64_for_testing": { @@ -1177,10 +1187,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c", + "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_x86_64-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" ] }, "remote_java_tools_for_testing": { @@ -1195,20 +1205,20 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f", + "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" ] }, "remote_java_tools_linux": { "generator_function": "maybe", "generator_name": "remote_java_tools_linux", "name": "remote_java_tools_linux", - "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", + "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" ] }, "remote_java_tools_linux_for_testing": { @@ -1223,10 +1233,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d", + "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_linux-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" ] }, "remote_java_tools_test": { @@ -1241,10 +1251,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f", + "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" ] }, "remote_java_tools_test_darwin_arm64": { @@ -1259,10 +1269,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b", + "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_arm64-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" ] }, "remote_java_tools_test_darwin_x86_64": { @@ -1277,10 +1287,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c", + "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_x86_64-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" ] }, "remote_java_tools_test_linux": { @@ -1295,10 +1305,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d", + "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_linux-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" ] }, "remote_java_tools_test_windows": { @@ -1313,20 +1323,20 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1", + "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_windows-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" ] }, "remote_java_tools_windows": { "generator_function": "maybe", "generator_name": "remote_java_tools_windows", "name": "remote_java_tools_windows", - "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", + "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" ] }, "remote_java_tools_windows_for_testing": { @@ -1341,14 +1351,14 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1", + "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_windows-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" ] }, "remotejdk11_linux": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 11,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk11_linux", "name": "remotejdk11_linux", @@ -1360,7 +1370,7 @@ ] }, "remotejdk11_linux_aarch64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 11,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk11_linux_aarch64", "name": "remotejdk11_linux_aarch64", @@ -1412,7 +1422,7 @@ ] }, "remotejdk11_linux_ppc64le": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 11,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk11_linux_ppc64le", "name": "remotejdk11_linux_ppc64le", @@ -1444,7 +1454,7 @@ ] }, "remotejdk11_linux_s390x": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 11,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk11_linux_s390x", "name": "remotejdk11_linux_s390x", @@ -1476,7 +1486,7 @@ ] }, "remotejdk11_macos": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 11,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk11_macos", "name": "remotejdk11_macos", @@ -1488,7 +1498,7 @@ ] }, "remotejdk11_macos_aarch64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 11,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk11_macos_aarch64", "name": "remotejdk11_macos_aarch64", @@ -1540,7 +1550,7 @@ ] }, "remotejdk11_win": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 11,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk11_win", "name": "remotejdk11_win", @@ -1552,7 +1562,7 @@ ] }, "remotejdk11_win_arm64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 11,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk11_win_arm64", "name": "remotejdk11_win_arm64", @@ -1602,27 +1612,27 @@ ] }, "remotejdk17_linux": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 17,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk17_linux", "name": "remotejdk17_linux", - "sha256": "73d5c4bae20325ca41b606f7eae64669db3aac638c5b3ead4a975055846ad6de", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_x64", + "sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz" ] }, "remotejdk17_linux_aarch64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 17,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk17_linux_aarch64", "name": "remotejdk17_linux_aarch64", - "sha256": "2b8066bbdbc5cff422bb6b6db1b8f8d362b576340cce8492f1255502af632b06", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_aarch64", + "sha256": "dbc6ae9163e7ff469a9ab1f342cd1bc1f4c1fb78afc3c4f2228ee3b32c4f3e43", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz" ] }, "remotejdk17_linux_for_testing": { @@ -1646,27 +1656,27 @@ ] }, "remotejdk17_macos": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 17,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk17_macos", "name": "remotejdk17_macos", - "sha256": "89d04b2d99b05dcb25114178e65f6a1c5ca742e125cab0a63d87e7e42f3fcb80", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_x64", + "sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz" ] }, "remotejdk17_macos_aarch64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 17,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk17_macos_aarch64", "name": "remotejdk17_macos_aarch64", - "sha256": "54247dde248ffbcd3c048675504b1c503b81daf2dc0d64a79e353c48d383c977", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_aarch64", + "sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz" ] }, "remotejdk17_macos_aarch64_for_testing": { @@ -1710,27 +1720,27 @@ ] }, "remotejdk17_win": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 17,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk17_win", "name": "remotejdk17_win", - "sha256": "e965aa0ea7a0661a3446cf8f10ee00684b851f883b803315289f26b4aa907fdb", - "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-win_x64", + "sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip", - "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip" ] }, "remotejdk17_win_arm64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 17,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk17_win_arm64", "name": "remotejdk17_win_arm64", - "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", - "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64", + "sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f", + "strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", - "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip" ] }, "remotejdk17_win_arm64_for_testing": { @@ -1774,7 +1784,7 @@ ] }, "remotejdk18_linux": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 18,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk18_linux", "name": "remotejdk18_linux", @@ -1786,7 +1796,7 @@ ] }, "remotejdk18_linux_aarch64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 18,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk18_linux_aarch64", "name": "remotejdk18_linux_aarch64", @@ -1818,7 +1828,7 @@ ] }, "remotejdk18_macos": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 18,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk18_macos", "name": "remotejdk18_macos", @@ -1830,7 +1840,7 @@ ] }, "remotejdk18_macos_aarch64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 18,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk18_macos_aarch64", "name": "remotejdk18_macos_aarch64", @@ -1882,7 +1892,7 @@ ] }, "remotejdk18_win": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 18,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk18_win", "name": "remotejdk18_win", @@ -1894,7 +1904,7 @@ ] }, "remotejdk18_win_arm64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_import\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"BUILD.bazel\"])\n\nDEPRECATION_MESSAGE = (\"Don't depend on targets in the JDK workspace;\" +\n \" use @bazel_tools//tools/jdk:current_java_runtime instead\" +\n \" (see https://github.com/bazelbuild/bazel/issues/5594)\")\n\nfilegroup(\n name = \"jni_header\",\n srcs = [\"include/jni.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-darwin\",\n srcs = [\"include/darwin/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-linux\",\n srcs = [\"include/linux/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-freebsd\",\n srcs = [\"include/freebsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-openbsd\",\n srcs = [\"include/openbsd/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jni_md_header-windows\",\n srcs = [\"include/win32/jni_md.h\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"java\",\n srcs = select({\n \":windows\": [\"bin/java.exe\"],\n \"//conditions:default\": [\"bin/java\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jar\",\n srcs = select({\n \":windows\": [\"bin/jar.exe\"],\n \"//conditions:default\": [\"bin/jar\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javac\",\n srcs = select({\n \":windows\": [\"bin/javac.exe\"],\n \"//conditions:default\": [\"bin/javac\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"javadoc\",\n srcs = select({\n \":windows\": [\"bin/javadoc.exe\"],\n \"//conditions:default\": [\"bin/javadoc\"],\n }),\n data = [\":jdk\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"xjc\",\n srcs = [\"bin/xjc\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"wsimport\",\n srcs = [\"bin/wsimport\"],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nBOOTCLASS_JARS = [\n \"rt.jar\",\n \"resources.jar\",\n \"jsse.jar\",\n \"jce.jar\",\n \"charsets.jar\",\n]\n\n# TODO(cushon): this isn't compatible with JDK 9\nfilegroup(\n name = \"bootclasspath\",\n srcs = [\"jre/lib/%s\" % jar for jar in BOOTCLASS_JARS],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-bin\",\n srcs = select({\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n \":windows\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n \"//conditions:default\": glob(\n [\"jre/bin/**\"],\n allow_empty = True,\n ),\n }),\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jre-lib\",\n srcs = glob(\n [\"jre/lib/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jre\",\n srcs = [\":jre-default\"],\n)\n\nfilegroup(\n name = \"jre-default\",\n srcs = [\n \":jre-bin\",\n \":jre-lib\",\n ],\n deprecation = DEPRECATION_MESSAGE,\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n#This folder holds security policies\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre-default\",\n ],\n version = 18,\n)\n\nconfig_setting(\n name = \"windows\",\n constraint_values = [\"@platforms//os:windows\"],\n visibility = [\"//visibility:private\"],\n)\n", "generator_function": "maybe", "generator_name": "remotejdk18_win_arm64", "name": "remotejdk18_win_arm64", diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 592790da0ac3..61b2cbb415d8 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "6.1.2"; + version = "6.3.2"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-iYLebD41x03kCW/k+bYVaYa2/erhrx/EithLaeTKfCw="; + hash = "sha256-K0MJQYzWkryrO7jjx16UMq7CGRasWF40WUWRtroW6ME="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix index 4b14501f35f8..6aa4479181f3 100644 --- a/pkgs/development/tools/database/mermerd/default.nix +++ b/pkgs/development/tools/database/mermerd/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "mermerd"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "KarnerTh"; repo = "mermerd"; rev = "refs/tags/v${version}"; - hash = "sha256-L/ieDhducOpdJ0vu578YcjSLTARlih81xAyly4pVE80="; + hash = "sha256-oYX1473bfZHwCscIpZSDfkKgIsGMcmkFGfWI400Maao="; }; vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ="; diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index 09a6351ca7a9..5ce37c9773c5 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "gci"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/YR61lovuYw+GEeXIgvyPbesz2epmQVmSLWjWwKT4Ag="; + sha256 = "sha256-EBklnsZR8VwM89BztligZBDapmgyKuI9Ns8EFFo3ai8="; }; vendorHash = "sha256-g7htGfU6C2rzfu8hAn6SGr0ZRwB8ZzSf9CgHYmdupE8="; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 5b3be5277785..db0e40545472 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.110.0"; + version = "0.110.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-xxpuvMlfDflXmUkJcTxw3enz27OadebsDWxoP8Ooi1w="; + sha256 = "sha256-49Qwn41xQ0fbS/61S/Z9NLkmjyHxYa7ns3E7ziHcsxM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index d3169a0191ac..8d66810e0a86 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -2,7 +2,7 @@ , stdenv , pythonOlder , buildPythonPackage -, fetchPypi +, fetchFromGitHub , ruff , pygls , lsprotocol @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.35"; + version = "0.0.36"; format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit version; - pname = "ruff_lsp"; - hash = "sha256-qRNpswpQitvVczFBKsUFlew+W1uEjtkbWnmwBRUHq0w="; + src = fetchFromGitHub { + owner = "astral-sh"; + repo = "ruff-lsp"; + rev = "v${version}"; + hash = "sha256-29LK/upjtgv9LIOn4bJMHkWXUJEkR0pR5fuyOYP9hAI="; }; postPatch = '' diff --git a/pkgs/development/tools/misc/fzf-make/default.nix b/pkgs/development/tools/misc/fzf-make/default.nix new file mode 100644 index 000000000000..23017c0afaa3 --- /dev/null +++ b/pkgs/development/tools/misc/fzf-make/default.nix @@ -0,0 +1,38 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, makeBinaryWrapper +, gnumake +}: + +rustPlatform.buildRustPackage rec { + pname = "fzf-make"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "kyu08"; + repo = "fzf-make"; + rev = "v${version}"; + hash = "sha256-Rpz10sHu/pzy/WX1yj0N78gVaw0fO8D92TSdtkmL/MU="; + }; + + cargoHash = "sha256-vy1LJciZMwMo0gxoEtfgESYnUPRhbpnyvciRZHk1Oao="; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/fzf-make \ + --suffix PATH : ${lib.makeBinPath [ gnumake ]} + ''; + + meta = with lib; { + description = "Fuzzy finder for Makefile"; + homepage = "https://github.com/kyu08/fzf-make"; + changelog = "https://github.com/kyu08/fzf-make/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda sigmanificient ]; + mainProgram = "fzf-make"; + }; +} diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 3904d45a7191..d931775dc582 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.5"; + version = "1.16.6"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-KRu9hbMwfLug827r0OnrRQIiF0y6Qq6Llb5F1rwQdt4="; + hash = "sha256-ZpOIKruxv22e/kMUfU8hY7jJjCadLSo7UEGn+Akx13c="; }; - cargoHash = "sha256-oBl8FTgxTK8czIExMsAHgJyHsfEzyoDRiAhH9R5tHKw="; + cargoHash = "sha256-OlblTYN1gG/Lt+ZKB7kEQsxX1WnfC1zuT/nfOVG6eqU="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 299897afda49..fd8d29ee1b39 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -46,7 +46,6 @@ let }; anki-build-python = python3.withPackages (ps: with ps; [ - pip mypy-protobuf ]); diff --git a/pkgs/games/lgames/lbreakout2/default.nix b/pkgs/games/lgames/lbreakout2/default.nix index 4645baf06244..f554a1683eee 100644 --- a/pkgs/games/lgames/lbreakout2/default.nix +++ b/pkgs/games/lgames/lbreakout2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , SDL , SDL_mixer , libintl @@ -17,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; }; + # Can't exit from pause without this patch + patches = [(fetchpatch { + url = "https://sources.debian.org/data/main/l/lbreakout2/2.6.5-2/debian/patches/sdl_fix_pauses.patch"; + hash = "sha256-ycsuxfokpOblLky42MwtJowdEp7v5dZRMFIR4id4ZBI="; + })]; + buildInputs = [ SDL SDL_mixer @@ -25,6 +32,11 @@ stdenv.mkDerivation rec { zlib ]; + # With fortify it crashes at runtime: + # *** buffer overflow detected ***: terminated + # Aborted (core dumped) + hardeningDisable = [ "fortify" ]; + meta = with lib; { homepage = "http://lgames.sourceforge.net/LBreakout2/"; description = "Breakout clone from the LGames series"; diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index f9cc5591cc35..13fc41e49813 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -80,8 +80,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "sha256-7CB6mRe+q1LMryh50dEjgR+RWU//tbaedgipuB4B+S4="; - aarch64-linux = "sha256-kdc1vMPueONOaT8w0Gbkz7OUOcPMMHHdwQ+ABTIL8xs="; + x86_64-linux = "sha256-IykwwjRWIxruV7kSU1EYx6sQoUtFctcVqs22dCQuEDA="; + aarch64-linux = "sha256-YtII4hSVp9CFWvlRgjQ3l7/nHvkVKJOImtmBxYwleOQ="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 079a4c53a384..49854d0960ea 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zfs_exporter"; - version = "2.2.8"; + version = "2.3.1"; src = fetchFromGitHub { owner = "pdf"; repo = pname; rev = "v" + version; - hash = "sha256-NTlYMznUfDfLftvuR5YWOW4Zu0rWfLkKPHPTrD/62+Q="; + hash = "sha256-EM7CHvpqPwCKgb5QU+jYmMaovHp12hJD1zVxcYygHdU="; }; - vendorHash = "sha256-ZJRxH9RhNSnVmcsonaakbvvjQ+3ovnyMny1Pe/vyQxE="; + vendorHash = "sha256-AgZo+5gYJ2EaxSI+Jxl7ldu6iZ+uSncYR0n+D2mMC4w="; postInstall = '' install -Dm444 -t $out/share/doc/${pname} *.md diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index c11bcfa4ec19..170ed6ecb1ad 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.20.2"; + version = "2.21.0"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-wC19wEQz/dQDJ+VKgCWhe3zYyxb4JrzmWENgdgSUGi0="; + hash = "sha256-4BQDbJTGEOZ+lB7b7KQE82I95+JCbPY9z/oU32TjYc4="; }; - cargoHash = "sha256-q6rwbt4RdE69LxBSP8oDS/sI9Txr5R1tDSnvzQaZMmI="; + cargoHash = "sha256-kPd77hJHVfzfBLixROTXxIbWtAskxUEJqbdFME+FL1U="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/tools/misc/mommy/default.nix b/pkgs/tools/misc/mommy/default.nix new file mode 100644 index 000000000000..ae04e92c630b --- /dev/null +++ b/pkgs/tools/misc/mommy/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, writeText +, shellspec +, fetchpatch + # usage: + # pkgs.mommy.override { + # mommySettings.sweetie = "catgirl"; + # } + # + # $ mommy + # who's my good catgirl~ +, mommySettings ? null +}: + +let + variables = lib.mapAttrs' + (name: value: lib.nameValuePair "MOMMY_${lib.toUpper name}" value) + mommySettings; + configFile = writeText "mommy-config" (lib.toShellVars variables); +in +stdenv.mkDerivation rec { + pname = "mommy"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "FWDekker"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LT21MJg2rF84o2rWKguEP4UUOOu27nNGls95sBYgICw="; + }; + + patches = [ + # 🫣 mommy finds your config with an environment variable now~ + (fetchpatch { + url = "https://github.com/FWDekker/mommy/commit/d5785521fe2ce9ec832dbfe20abc483545b1df97.patch"; + hash = "sha256-GacUjQyvvwRRYKIHHTTAL0mQSPMZbbxacqilBaw807Y="; + }) + # 💜 mommy follows the XDG base directory specification now~ + (fetchpatch { + url = "https://github.com/FWDekker/mommy/commit/71806bc0ace2822ac32dc8dd5bb0b0881d849982.patch"; + hash = "sha256-Znq3VOgYI7a13Fqyz9nevtrvn7S5Jb2uBc78D0BG8rY="; + }) + ]; + + nativeBuildInputs = [ makeWrapper ]; + nativeCheckInputs = [ shellspec ]; + installFlags = [ "prefix=$(out)" ]; + + doCheck = true; + checkTarget = "test/unit"; + + postInstall = '' + ${lib.optionalString (mommySettings != null) '' + wrapProgram $out/bin/mommy \ + --set-default MOMMY_OPT_CONFIG_FILE "${configFile}" + ''} + ''; + + meta = with lib; { + description = "mommy's here to support you, in any shell, on any system~ ❤️"; + homepage = "https://github.com/FWDekker/mommy"; + changelog = "https://github.com/FWDekker/mommy/blob/v${version}/CHANGELOG.md"; + license = licenses.unlicense; + platforms = platforms.all; + maintainers = with maintainers; [ ckie ]; + mainProgram = "mommy"; + }; +} diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 6b1e7a2d8667..5b2d16097164 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.68.1"; + version = "1.68.2"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-z5tDPXz6Z6oPzWIp4gapNLwm+0VrwCGNIXsFu94Zn08="; + hash = "sha256-yDWAKkzRb487iZ+5tmIH1qfuHj0TldOT+tTQwtVyX7s="; }; vendorHash = "sha256-V6TF7Q+9XxBeSVXlotu8tUrNCWDr80BZsQcVSBGikl8="; diff --git a/pkgs/tools/misc/wasm-tools/Cargo.lock b/pkgs/tools/misc/wasm-tools/Cargo.lock index 53d0877bac82..131ab047353d 100644 --- a/pkgs/tools/misc/wasm-tools/Cargo.lock +++ b/pkgs/tools/misc/wasm-tools/Cargo.lock @@ -4,11 +4,11 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli 0.26.2", + "gimli", ] [[package]] @@ -19,7 +19,7 @@ checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "cpp_demangle 0.4.2", "fallible-iterator", - "gimli 0.27.3", + "gimli", "memmap2", "object 0.31.1", "rustc-demangle", @@ -34,20 +34,20 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "getrandom", + "cfg-if", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -88,24 +88,24 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arbitrary" @@ -162,9 +162,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "blake3" @@ -209,11 +209,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -235,9 +236,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3" dependencies = [ "clap_builder", "clap_derive", @@ -246,9 +247,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98" dependencies = [ "anstream", "anstyle", @@ -265,7 +266,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -306,28 +307,28 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.90.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62c772976416112fa4484cbd688cb6fb35fd430005c1c586224fc014018abad" +checksum = "1380172556902242d32f78ed08c98aac4f5952aef22d3684aed5c66a5db0a6fc" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.90.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b40ed2dd13c2ac7e24f88a3090c68ad3414eb1d066a95f8f1f7b3b819cb4e46" +checksum = "037cca234e1ad0766fdfe43b527ec14e100414b4ccf4bb614977aa9754958f57" dependencies = [ - "arrayvec", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", - "cranelift-egraph", + "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.26.2", + "gimli", + "hashbrown 0.13.2", "log", "regalloc2", "smallvec", @@ -336,47 +337,42 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.90.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb927a8f1c27c34ee3759b6b0ffa528d2330405d5cc4511f0cab33fe2279f4b5" +checksum = "d375e6afa8b9a304999ea8cf58424414b8e55e004571265a4f0826eba8b74f18" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.90.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43dfa417b884a9ab488d95fd6b93b25e959321fe7bfd7a0a960ba5d7fb7ab927" +checksum = "ca590e72ccb8da963def6e36460cce4412032b1f03c31d1a601838d305abdc39" [[package]] -name = "cranelift-egraph" -version = "0.90.1" +name = "cranelift-control" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a66b39785efd8513d2cca967ede56d6cc57c8d7986a595c7c47d0c78de8dce" +checksum = "9d2d38eea4373639f4b6236a40f69820fed16c5511093cd3783bf8491a93d9cf" dependencies = [ - "cranelift-entity", - "fxhash", - "hashbrown 0.12.3", - "indexmap 1.9.3", - "log", - "smallvec", + "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.90.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0637ffde963cb5d759bc4d454cfa364b6509e6c74cdaa21298add0ed9276f346" +checksum = "5e3173c1434af23c00e4964722cf93ca8f0e6287289bf5d52110597c3ba2ea09" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.90.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb72b8342685e850cb037350418f62cc4fc55d6c2eb9c7ca01b82f9f1a6f3d56" +checksum = "aec4a3a33825062eccf6eec73e852c8773220f6e4798925e19696562948beb1f" dependencies = [ "cranelift-codegen", "log", @@ -386,15 +382,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.90.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850579cb9e4b448f7c301f1e6e6cbad99abe3f1f1d878a4994cb66e33c6db8cd" +checksum = "5146b5cea4b21095a021d964b0174cf6ff5530f83e8d0a822683c7559e360b66" [[package]] name = "cranelift-native" -version = "0.90.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a279e5bcba3e0466c734d8d8eb6bfc1ad29e95c37f3e4955b492b5616335e" +checksum = "21cec3717ce554d3936b2101aa8eae1a2a410bd6da0f4df698a4b008fe9cf1e9" dependencies = [ "cranelift-codegen", "libc", @@ -403,9 +399,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.90.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b8c5e7ffb754093fb89ec4bd4f9dbb9f1c955427299e334917d284745835c2" +checksum = "d7fd2f9f1bf29ce6639ae2f477a2fe20bad0bd09289df13efeb890e8e4b9f807" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -413,7 +409,7 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser 0.93.0", + "wasmparser 0.107.0", "wasmtime-types", ] @@ -536,6 +532,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "uuid", +] + [[package]] name = "derive_arbitrary" version = "1.3.1" @@ -544,7 +549,7 @@ checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -584,6 +589,15 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + [[package]] name = "env_logger" version = "0.9.3" @@ -605,24 +619,13 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.2.8" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "winapi", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -664,9 +667,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -702,6 +705,19 @@ dependencies = [ "byteorder", ] +[[package]] +name = "fxprof-processed-profile" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" +dependencies = [ + "bitflags 2.4.0", + "debugid", + "fxhash", + "serde", + "serde_json", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -723,17 +739,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -dependencies = [ - "fallible-iterator", - "indexmap 1.9.3", - "stable_deref_trait", -] - [[package]] name = "gimli" version = "0.27.3" @@ -762,6 +767,12 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ "ahash", ] @@ -848,9 +859,14 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.2", + "libc", + "windows-sys", +] [[package]] name = "is-terminal" @@ -859,8 +875,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.4", - "windows-sys 0.48.0", + "rustix 0.38.8", + "windows-sys", ] [[package]] @@ -925,9 +941,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libfuzzer-sys" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb09950ae85a0a94b27676cccf37da5ff13f27076aa1adbc6545dd0d0e1bd4e" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" dependencies = [ "arbitrary", "cc", @@ -936,21 +952,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "mach" @@ -967,6 +983,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +dependencies = [ + "rustix 0.37.23", +] + [[package]] name = "memmap2" version = "0.5.10" @@ -978,9 +1003,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -1024,12 +1049,12 @@ dependencies = [ [[package]] name = "object" -version = "0.29.0" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "crc32fast", - "hashbrown 0.12.3", + "hashbrown 0.13.2", "indexmap 1.9.3", "memchr", ] @@ -1141,6 +1166,17 @@ dependencies = [ "cc", ] +[[package]] +name = "pulldown-cmark" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +dependencies = [ + "bitflags 1.3.2", + "memchr", + "unicase", +] + [[package]] name = "pulldown-cmark" version = "0.9.3" @@ -1154,9 +1190,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1224,21 +1260,22 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.4.2" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b2eab54204ea0117fe9a060537e0b07a4e72f7c7d182361ecc346cab2240e5" +checksum = "5b4dcbd3a2ae7fb94b5813fa0e957c6ab51bf5d0a8ee1b69e0c2d0f1e6eb8485" dependencies = [ - "fxhash", + "hashbrown 0.13.2", "log", + "rustc-hash", "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -1248,9 +1285,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -1270,30 +1307,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] -name = "rustix" -version = "0.35.14" +name = "rustc-hash" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6380889b07a03b5ecf1d44dc9ede6fd2145d84b502a2a9ca0b03c48e0cc3220f" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", - "errno 0.2.8", + "errno", "io-lifetimes", "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", + "linux-raw-sys 0.3.8", + "windows-sys", ] [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", - "errno 0.3.1", + "bitflags 2.4.0", + "errno", "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.5", + "windows-sys", ] [[package]] @@ -1336,9 +1379,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.176" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] @@ -1355,20 +1398,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.176" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -1409,6 +1452,12 @@ dependencies = [ "smallvec", ] +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -1441,9 +1490,20 @@ checksum = "7c68d531d83ec6c531150584c42a4290911964d5f0d79132b193b67252a23b71" [[package]] name = "syn" -version = "2.0.27" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1452,21 +1512,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ "cfg-if", "fastrand", "redox_syscall", - "rustix 0.38.4", - "windows-sys 0.48.0", + "rustix 0.38.8", + "windows-sys", ] [[package]] @@ -1489,22 +1549,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -1613,6 +1673,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" + [[package]] name = "version_check" version = "0.9.4" @@ -1656,7 +1722,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -1678,7 +1744,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1691,7 +1757,7 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-compose" -version = "0.4.0" +version = "0.4.1" dependencies = [ "anyhow", "glob", @@ -1703,13 +1769,22 @@ dependencies = [ "serde", "serde_yaml", "smallvec", - "wasm-encoder", - "wasmparser 0.110.0", - "wasmprinter", + "wasm-encoder 0.31.1", + "wasmparser 0.111.0", + "wasmprinter 0.2.63", "wat", "wit-component", ] +[[package]] +name = "wasm-encoder" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +dependencies = [ + "leb128", +] + [[package]] name = "wasm-encoder" version = "0.31.1" @@ -1717,38 +1792,38 @@ dependencies = [ "anyhow", "leb128", "tempfile", - "wasmparser 0.110.0", + "wasmparser 0.111.0", ] [[package]] name = "wasm-metadata" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", - "clap 4.3.19", + "clap 4.3.23", "indexmap 2.0.0", "serde", "serde_json", "spdx", - "wasm-encoder", - "wasmparser 0.110.0", + "wasm-encoder 0.31.1", + "wasmparser 0.111.0", "wat", ] [[package]] name = "wasm-mutate" -version = "0.2.30" +version = "0.2.31" dependencies = [ "anyhow", - "clap 4.3.19", + "clap 4.3.23", "egg", "env_logger", "log", "rand", "thiserror", - "wasm-encoder", - "wasmparser 0.110.0", - "wasmprinter", + "wasm-encoder 0.31.1", + "wasmparser 0.111.0", + "wasmprinter 0.2.63", "wat", ] @@ -1758,37 +1833,37 @@ version = "0.1.0" dependencies = [ "anyhow", "arbitrary", - "clap 4.3.19", + "clap 4.3.23", "env_logger", "itertools", "log", "num_cpus", "rand", "wasm-mutate", - "wasmparser 0.110.0", - "wasmprinter", + "wasmparser 0.111.0", + "wasmprinter 0.2.63", "wasmtime", ] [[package]] name = "wasm-shrink" -version = "0.1.31" +version = "0.1.32" dependencies = [ "anyhow", "blake3", - "clap 4.3.19", + "clap 4.3.23", "env_logger", "log", "rand", "wasm-mutate", - "wasmparser 0.110.0", - "wasmprinter", + "wasmparser 0.111.0", + "wasmprinter 0.2.63", "wat", ] [[package]] name = "wasm-smith" -version = "0.12.13" +version = "0.12.14" dependencies = [ "arbitrary", "criterion", @@ -1798,24 +1873,24 @@ dependencies = [ "libfuzzer-sys", "rand", "serde", - "wasm-encoder", - "wasmparser 0.110.0", - "wasmprinter", + "wasm-encoder 0.31.1", + "wasmparser 0.111.0", + "wasmprinter 0.2.63", "wat", ] [[package]] name = "wasm-tools" -version = "1.0.38" +version = "1.0.39" dependencies = [ "addr2line 0.20.0", "anyhow", "arbitrary", - "clap 4.3.19", + "clap 4.3.23", "cpp_demangle 0.4.2", "diff", "env_logger", - "gimli 0.27.3", + "gimli", "is_executable", "log", "pretty_assertions", @@ -1827,17 +1902,17 @@ dependencies = [ "tempfile", "termcolor", "wasm-compose", - "wasm-encoder", + "wasm-encoder 0.31.1", "wasm-metadata", "wasm-mutate", "wasm-shrink", "wasm-smith", - "wasmparser 0.110.0", - "wasmprinter", + "wasmparser 0.111.0", + "wasmprinter 0.2.63", "wast", "wat", "wit-component", - "wit-parser", + "wit-parser 0.10.0", "wit-smith", ] @@ -1849,8 +1924,8 @@ dependencies = [ "wasm-mutate", "wasm-shrink", "wasm-smith", - "wasmparser 0.110.0", - "wasmprinter", + "wasmparser 0.111.0", + "wasmprinter 0.2.63", "wast", "wat", ] @@ -1865,31 +1940,32 @@ dependencies = [ "libfuzzer-sys", "log", "tempfile", - "wasm-encoder", + "wasm-encoder 0.31.1", "wasm-mutate", "wasm-smith", - "wasmparser 0.110.0", - "wasmprinter", + "wasmparser 0.111.0", + "wasmprinter 0.2.63", "wasmtime", "wast", "wat", "wit-component", - "wit-parser", + "wit-parser 0.10.0", "wit-smith", ] [[package]] name = "wasmparser" -version = "0.93.0" +version = "0.107.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a4460aa3e271fa180b6a5d003e728f3963fb30e3ba0fa7c9634caa06049328" +checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" dependencies = [ "indexmap 1.9.3", + "semver", ] [[package]] name = "wasmparser" -version = "0.110.0" +version = "0.111.0" dependencies = [ "anyhow", "criterion", @@ -1897,196 +1973,295 @@ dependencies = [ "once_cell", "rayon", "semver", - "wasm-encoder", + "wasm-encoder 0.31.1", + "wast", + "wat", +] + +[[package]] +name = "wasmparser" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad71036aada3f6b09251546e97e4f4f176dd6b41cf6fa55e7e0f65e86aec319a" +dependencies = [ + "indexmap 2.0.0", + "semver", +] + +[[package]] +name = "wasmprinter" +version = "0.2.63" +dependencies = [ + "anyhow", + "diff", + "rayon", + "tempfile", + "wasmparser 0.111.0", "wast", "wat", ] [[package]] name = "wasmprinter" -version = "0.2.62" +version = "0.2.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeb8cc41d341939dce08ee902b50e36cd35add940f6044c94b144e8f73fe07a6" dependencies = [ "anyhow", - "diff", - "rayon", - "tempfile", - "wasmparser 0.110.0", - "wast", - "wat", + "wasmparser 0.111.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasmtime" -version = "3.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18265705b1c49218776577d9f301d79ab06888c7f4a32e2ed24e68a55738ce7" +checksum = "0b1f817f2ca5070983c71f1205fbab5848c9073df7f4e1af9fdceb4cc4a1b8e5" dependencies = [ "anyhow", "bincode", + "bumpalo", "cfg-if", + "encoding_rs", + "fxprof-processed-profile", "indexmap 1.9.3", "libc", "log", - "object 0.29.0", + "object 0.30.4", "once_cell", "paste", "psm", "serde", + "serde_json", "target-lexicon", - "wasmparser 0.93.0", + "wasmparser 0.107.0", + "wasmtime-component-macro", + "wasmtime-component-util", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.36.1", + "wasmtime-winch", + "windows-sys", ] [[package]] name = "wasmtime-asm-macros" -version = "3.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a201583f6c79b96e74dcce748fa44fb2958f474ef13c93f880ea4d3bed31ae4f" +checksum = "0f82fbfda4610e9225238c62574ecded8e9d6ad3a12f387ac45819ecad5c3f9b" dependencies = [ "cfg-if", ] [[package]] -name = "wasmtime-cranelift" -version = "3.0.1" +name = "wasmtime-component-macro" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe208297e045ea0ee6702be88772ea40f918d55fbd4163981a4699aff034b634" +checksum = "e27b96c540c78e12b60025fcbc0ba8a55bff1b32885a5e8eae2df765a6bc97ac" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 1.0.109", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser 0.8.0", +] + +[[package]] +name = "wasmtime-component-util" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0928fe66c22bf8887e2fb524b7647308b8ce836a333af8504e4f1d80b8ea849f" + +[[package]] +name = "wasmtime-cranelift" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b659f6e58662d1131f250339acd03aa49377f9351474282699985b79ca4d4a7c" dependencies = [ "anyhow", "cranelift-codegen", + "cranelift-control", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.26.2", + "gimli", "log", - "object 0.29.0", + "object 0.30.4", "target-lexicon", "thiserror", - "wasmparser 0.93.0", + "wasmparser 0.107.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74171de083bf2ecb716c507900f825e2b858346c714fbf48f4763ea760f998a8" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-control", + "cranelift-native", + "gimli", + "object 0.30.4", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "3.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b97f7441ac780a7fa738db5b9c23c1b70ef4abccd8ad205ada5669d196ba2" +checksum = "b124cbac1a3e04a744c76b3f77919343ef16dc4c818a2406dd7b689b16a54639" dependencies = [ "anyhow", "cranelift-entity", - "gimli 0.26.2", + "gimli", "indexmap 1.9.3", "log", - "object 0.29.0", + "object 0.30.4", "serde", "target-lexicon", "thiserror", - "wasmparser 0.93.0", + "wasm-encoder 0.29.0", + "wasmparser 0.107.0", + "wasmprinter 0.2.63 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-component-util", "wasmtime-types", ] [[package]] name = "wasmtime-jit" -version = "3.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32800cb6e29faabab7056593f70a4c00c65c75c365aaf05406933f2169d0c22f" +checksum = "90ff15f426c2378f32ffb6d9b4370e3504231492e93f6968e8b5102c3256bbc4" dependencies = [ - "addr2line 0.17.0", + "addr2line 0.19.0", "anyhow", "bincode", "cfg-if", "cpp_demangle 0.3.5", - "gimli 0.26.2", + "gimli", "log", - "object 0.29.0", + "object 0.30.4", "rustc-demangle", + "rustix 0.37.23", "serde", "target-lexicon", - "thiserror", "wasmtime-environ", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] name = "wasmtime-jit-debug" -version = "3.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe057012a0ba6cee3685af1e923d6e0a6cb9baf15fb3ffa4be3d7f712c7dec42" +checksum = "c549e219102426aa1f90bd18e56a3195ed1e696c318abb3f501c1f4924b530ac" dependencies = [ "once_cell", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "2.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6bbabb309c06cc238ee91b1455b748c45f0bdcab0dda2c2db85b0a1e69fcb66" +checksum = "1cf02fedda287a409cff80ad40a7c6c0f0771e99b0cd5e2b79d9cb7ecdc1b2f4" dependencies = [ "cfg-if", "libc", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] name = "wasmtime-runtime" -version = "3.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a23b6e138e89594c0189162e524a29e217aec8f9a4e1959a34f74c64e8d17d" +checksum = "fc38c6229a5d3b8a2528eb33eb11d3e7ebf570259c7cd2f01e8668fe783ea443" dependencies = [ "anyhow", "cc", "cfg-if", + "encoding_rs", "indexmap 1.9.3", "libc", "log", "mach", - "memoffset 0.6.5", + "memfd", + "memoffset 0.8.0", "paste", "rand", - "rustix 0.35.14", - "thiserror", + "rustix 0.37.23", + "sptr", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] name = "wasmtime-types" -version = "3.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ec7615fde8c79737f1345d81f0b18da83b3db929a87b4604f27c932246d1e2" +checksum = "768f6c5e7afc3a02eff2753196741db8e5ac5faf26a1e2204d7341b30a637c6f" dependencies = [ "cranelift-entity", "serde", "thiserror", - "wasmparser 0.93.0", + "wasmparser 0.107.0", +] + +[[package]] +name = "wasmtime-winch" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2249faeb887b8b7e7b1797c460ac76160654aea3b8d5842093a771d77fc3819" +dependencies = [ + "anyhow", + "cranelift-codegen", + "gimli", + "object 0.30.4", + "target-lexicon", + "wasmparser 0.107.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "winch-codegen", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a4a005a6a2d5faa7cd953d389da8ae979cb571fe40edec7769649d8c98d874" +dependencies = [ + "anyhow", + "heck", + "wit-parser 0.8.0", ] [[package]] name = "wast" -version = "62.0.1" +version = "63.0.0" dependencies = [ "anyhow", "leb128", "memchr", "rayon", "unicode-width", - "wasm-encoder", - "wasmparser 0.110.0", + "wasm-encoder 0.31.1", + "wasmparser 0.111.0", "wat", ] [[package]] name = "wat" -version = "1.0.69" +version = "1.0.70" dependencies = [ "wast", ] @@ -2133,31 +2308,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.36.1" +name = "winch-codegen" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "21de111a36e8f367416862fdf6f10caa411cc07a6e21b614eedbf9388c2a3dc9" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "anyhow", + "cranelift-codegen", + "gimli", + "regalloc2", + "smallvec", + "target-lexicon", + "wasmparser 0.107.0", + "wasmtime-environ", ] [[package]] @@ -2171,155 +2334,100 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "wit-component" -version = "0.13.1" +version = "0.13.2" dependencies = [ "anyhow", - "bitflags 2.3.3", + "bitflags 2.4.0", "env_logger", "glob", "indexmap 2.0.0", "log", "pretty_assertions", - "wasm-encoder", + "wasm-encoder 0.31.1", "wasm-metadata", - "wasmparser 0.110.0", - "wasmprinter", + "wasmparser 0.111.0", + "wasmprinter 0.2.63", + "wasmtime", "wat", - "wit-parser", + "wit-parser 0.10.0", ] [[package]] name = "wit-parser" -version = "0.9.2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 1.9.3", + "log", + "pulldown-cmark 0.8.0", + "semver", + "unicode-xid", + "url", +] + +[[package]] +name = "wit-parser" +version = "0.10.0" dependencies = [ "anyhow", "env_logger", @@ -2327,7 +2435,7 @@ dependencies = [ "indexmap 2.0.0", "log", "pretty_assertions", - "pulldown-cmark", + "pulldown-cmark 0.9.3", "rayon", "semver", "unicode-xid", @@ -2342,21 +2450,21 @@ dependencies = [ "env_logger", "libfuzzer-sys", "log", - "wasmprinter", - "wit-parser", + "wasmprinter 0.2.63", + "wit-parser 0.10.0", ] [[package]] name = "wit-smith" -version = "0.1.8" +version = "0.1.9" dependencies = [ "arbitrary", - "clap 4.3.19", + "clap 4.3.23", "indexmap 2.0.0", "log", "semver", "wit-component", - "wit-parser", + "wit-parser 0.10.0", ] [[package]] diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 6572b7469f30..81e4f70065a6 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.38"; + version = "1.0.39"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-SGNIGOpkREGu/bmojOh+TPlg75rKoa04u+BDiida6dI="; + hash = "sha256-NohA/2yzsEtMECvnntPyWvhEdVL63elmw0B+4Med6OE="; fetchSubmodules = true; }; cargoLock.lockFile = ./Cargo.lock; postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock + ln -sf ${./Cargo.lock} Cargo.lock ''; cargoBuildFlags = [ "--package" "wasm-tools" ]; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 80002afa520f..bd780a107092 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-RdZk2I7QvIWEeiL81N5PLJYE0KHYbkvjJeDXTg3F9c4="; + sha256 = "sha256-LpQMRn0mINhixbS8GpYAqr0pjwbnQdUOs2BH3rkQ3hU="; }; vendorHash = "sha256-Z7vYpDQIKc4elVBLiGtxF3D9pec4QNvWFLpux/29t1Y="; diff --git a/pkgs/tools/security/nmap-formatter/default.nix b/pkgs/tools/security/nmap-formatter/default.nix index b7538311c895..a81037da44e4 100644 --- a/pkgs/tools/security/nmap-formatter/default.nix +++ b/pkgs/tools/security/nmap-formatter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nmap-formatter"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "vdjagilev"; repo = pname; rev = "v${version}"; - hash = "sha256-9DbX1pHI/G6aejVN6AgULOxnpawnJHTiYMiTq+crMJI="; + hash = "sha256-i2g+l5XJkBjXMbJwpSirEKCDxO2Ric4CwF3jzue/4+o="; }; - vendorHash = "sha256-OwyLY8y+HGxCteRqGEYvnVa6r27TwT9s9HyWKtvIxxI="; + vendorHash = "sha256-YAsWXbIyeC4uhzRFXX/bZs3cOvEa3k4/ZCoDisUN1Yw="; meta = with lib; { description = "Tool that allows you to convert nmap output"; diff --git a/pkgs/tools/security/threatest/default.nix b/pkgs/tools/security/threatest/default.nix index 78318a5ac1f2..cfae26aaa034 100644 --- a/pkgs/tools/security/threatest/default.nix +++ b/pkgs/tools/security/threatest/default.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "threatest"; - version = "1.2.1"; + version = "1.2.4"; src = fetchFromGitHub { owner = "DataDog"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FDcCAKexFpqViSQngfOhkjTr0czHIRtZL3v2psfTuYI="; + hash = "sha256-pCSSAEeVxi3/yK7B2g9ZZRU5TjdNd8qp+52Yc1HmxT8="; }; proxyVendor = true; - vendorHash = "sha256-UQ3GPSv7P4+oMvcu4eFlosnw0TQxG33ptlMTQA/5Lkw="; + vendorHash = "sha256-nHA+UJP6gYWdbTKFcxw1gI6X2ueTUIsHVBIlaprPwsQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f973b693a278..69770897bba8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7746,6 +7746,8 @@ with pkgs; d2 = callPackage ../tools/text/d2 { }; + ddev = callPackage ../applications/virtualization/ddev { }; + easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { @@ -19192,6 +19194,8 @@ with pkgs; funzzy = callPackage ../development/tools/misc/funzzy { }; + fzf-make = callPackage ../development/tools/misc/fzf-make { }; + gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -19602,6 +19606,8 @@ with pkgs; mold = callPackage ../development/tools/mold { }; + mommy = callPackage ../tools/misc/mommy { }; + moon = callPackage ../development/tools/build-managers/moon/default.nix { }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9edc961397d1..8d15f5979d5c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -396,4 +396,5 @@ mapAliases ({ zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 zope_component = zope-component; # added 2023-07-28 + zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 538225837f00..f23b9f7bff12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11884,6 +11884,8 @@ self: super: with self; { soupsieve = callPackage ../development/python-modules/soupsieve { }; + sourmash = callPackage ../development/python-modules/sourmash { }; + soxr = callPackage ../development/python-modules/soxr { libsoxr = pkgs.soxr; }; @@ -14026,7 +14028,7 @@ self: super: with self; { zope-hookable = callPackage ../development/python-modules/zope-hookable { }; - zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; + zope-i18nmessageid = callPackage ../development/python-modules/zope-i18nmessageid { }; zope_interface = callPackage ../development/python-modules/zope_interface { };