From dad995850306a7b7dc431ab4d8a29369fe25c2db Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:23:34 +0200 Subject: [PATCH 01/12] nixos/darkhttpd: set port type to `types.port` (cherry picked from commit a5321aecfb51c7abdd45254d821e8122820850d3) --- nixos/modules/services/web-servers/darkhttpd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/darkhttpd.nix b/nixos/modules/services/web-servers/darkhttpd.nix index d6649fd472d..f6b693139a1 100644 --- a/nixos/modules/services/web-servers/darkhttpd.nix +++ b/nixos/modules/services/web-servers/darkhttpd.nix @@ -19,7 +19,7 @@ in { port = mkOption { default = 80; - type = ints.u16; + type = types.port; description = '' Port to listen on. Pass 0 to let the system choose any free port for you. From 33ce03a6533440db2b84a7122989d7fe7b2ecfec Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:24:29 +0200 Subject: [PATCH 02/12] nixos/lighttpd: set port type to `types.port` (cherry picked from commit 941fd008ede8ad2423c257a18681011939d9fe11) --- nixos/modules/services/web-servers/lighttpd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index d1cb8a8dc25..7a691aa7891 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -134,7 +134,7 @@ in port = mkOption { default = 80; - type = types.int; + type = types.port; description = '' TCP port number for lighttpd to bind to. ''; From 24e35b8c44704dee6a8827bf6b04e0058d163f71 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:25:07 +0200 Subject: [PATCH 03/12] nixos/terraria: adapt option types (cherry picked from commit 137924cc96b589c8d335ff4a420b0e3bb208ac9e) --- nixos/modules/services/games/terraria.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 9e8e5ae8759..7312c7e6b63 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -42,7 +42,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 7777; description = '' Specifies the port to listen on. @@ -50,7 +50,7 @@ in }; maxPlayers = mkOption { - type = types.int; + type = types.ints.u8; default = 255; description = '' Sets the max number of players (between 1 and 255). From d71b353d151d74ff5b1d13044c4d977efc34e93f Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:25:46 +0200 Subject: [PATCH 04/12] nixos/discourse: set port type to `types.port` (cherry picked from commit 73f9c29a2cd4e298493751ba1e3f1f5750021ad2) --- nixos/modules/services/web-apps/discourse.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 49958fc6190..9c7166f381a 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -356,7 +356,7 @@ in }; port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 25; description = '' The port of the SMTP server Discourse should use to From 98d6d1dbf78511a5d36173ea9c7b96a1f1d34c48 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:26:38 +0200 Subject: [PATCH 05/12] nixos/redis: set port type to `types.port` (cherry picked from commit 0cde374a7604821ceddd24d06ae21e44de59d04c) --- nixos/modules/services/databases/redis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index c4d51958e23..9c0740f28c9 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -52,7 +52,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 6379; description = "The port for Redis to listen to."; }; From 2c97740c47cea58cd602c54bc86d806e47dccc08 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:27:42 +0200 Subject: [PATCH 06/12] nixos/gitDaemon: set port type to `types.port` (cherry picked from commit 048c45679fe6fda60b00bf45890e5990f0e6d9f2) --- nixos/modules/services/networking/git-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix index 52c895215fb..98f80dd4bc4 100644 --- a/nixos/modules/services/networking/git-daemon.nix +++ b/nixos/modules/services/networking/git-daemon.nix @@ -74,7 +74,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 9418; description = "Port to listen on."; }; From fda7b068300782188bd77396a7a438787ad092cb Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:28:01 +0200 Subject: [PATCH 07/12] nixos/syncserver: set port type to `types.port` (cherry picked from commit 65b32a0afe69258e3fa2fb245ea2315c8683281f) --- nixos/modules/services/networking/firefox/sync-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 6842aa73561..24f76864953 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -67,7 +67,7 @@ in }; listen.port = mkOption { - type = types.int; + type = types.port; default = 5000; description = '' Port on which the sync server listen to. From 28e57cb0c7316cf89552c991baac7c37f64c6bcc Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:29:16 +0200 Subject: [PATCH 08/12] nixos/matrix-synapse: set port type to types.port (cherry picked from commit 8e760f485873d202a0ad4aba7a78caabc85cf5db) --- nixos/modules/services/misc/matrix-synapse.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index dff58745304..d623e97b8b1 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -231,7 +231,7 @@ in { type = types.listOf (types.submodule { options = { port = mkOption { - type = types.int; + type = types.port; example = 8448; description = '' The port to listen for HTTP(S) requests on. From ab496da13814151d1e93c5bd49f6b31767578b33 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:37:34 +0200 Subject: [PATCH 09/12] nixos/gitlab: set port type to `types.port` (cherry picked from commit cc5517da4c2221ee42163b69e1648cc472fcba0e) --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 253d87537cf..4026a833759 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -462,7 +462,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 8080; description = '' GitLab server port for copy-paste URLs, e.g. 80 or 443 if you're From 4d837a7a98f1bbc9fd8505794c587488cd5e3324 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 25 May 2021 19:37:54 +0200 Subject: [PATCH 10/12] nixos/monero: set port type to `types.port` (cherry picked from commit e57465a617f4cc993a7b32f90cb9e095f2b09596) --- nixos/modules/services/networking/monero.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 952d1d47ca6..9a9084e4ce1 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -110,7 +110,7 @@ in }; rpc.port = mkOption { - type = types.int; + type = types.port; default = 18081; description = '' Port the RPC server will bind to. From 12fa8699c372544171e8d871a192f17465775683 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Fri, 21 May 2021 14:33:23 +0200 Subject: [PATCH 11/12] bazel_4: 4.0.0 -> 4.1.0 https://github.com/bazelbuild/bazel/releases/tag/4.1.0 other minor changes: - grep for /bin/ rather than /bin for blanket substitute - invoke {pre,post}{Build,Install} hooks (cherry picked from commit a15204fcc02ab20abeb19fc6d71403c4b9f6fd85) --- .../build-managers/bazel/bazel_4/default.nix | 32 ++- .../bazel/bazel_4/src-deps.json | 213 ++++++++++++------ 2 files changed, 176 insertions(+), 69 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 7fc03422016..6cd378492e3 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -27,12 +27,12 @@ }: let - version = "4.0.0"; + version = "4.1.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1lfdx54dpzwrqysg5ngqhq7a0i01xk981crd4pdk4jb5f07ghl6k"; + sha256 = "1svf9n345m0ag05hlcw3cwsl6bw2imcn4da25yyzcl3ar5axfxzk"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -52,8 +52,8 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v10.5.zip" - else srcs."java_tools_javac11_linux-v10.5.zip") + then srcs."java_tools_javac11_darwin-v10.6.zip" + else srcs."java_tools_javac11_linux-v10.6.zip") srcs."coverage_output_generator-v2.5.zip" srcs.build_bazel_rules_nodejs srcs."android_tools_pkg-0.19.0rc3.tar.gz" @@ -120,7 +120,7 @@ let remote_java_tools = stdenv.mkDerivation { name = "remote_java_tools_${system}"; - src = srcDepsSet."java_tools_javac11_${system}-v10.5.zip"; + src = srcDepsSet."java_tools_javac11_${system}-v10.6.zip"; nativeBuildInputs = [ autoPatchelfHook unzip ]; buildInputs = [ gcc-unwrapped ]; @@ -128,12 +128,20 @@ let sourceRoot = "."; buildPhase = '' + runHook preBuild + mkdir $out; + + runHook postBuild ''; installPhase = '' + runHook preInstall + cp -Ra * $out/ touch $out/WORKSPACE + + runHook postInstall ''; }; @@ -318,7 +326,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; inherit sourceRoot; installPhase = '' + runHook preInstall + cp -r . "$out" + + runHook postInstall ''; }; # update the list of workspace dependencies @@ -430,7 +442,7 @@ stdenv.mkDerivation rec { --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" # substituteInPlace is rather slow, so prefilter the files with grep - grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do + grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. # We default to python3 where possible. See also `postFixup` where @@ -540,6 +552,8 @@ stdenv.mkDerivation rec { # Needed to build fish completion propagatedBuildInputs = [ python3.pkgs.absl-py ]; buildPhase = '' + runHook preBuild + # Increasing memory during compilation might be necessary. # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" @@ -567,9 +581,13 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) ./output/bazel build src/tools/execlog:parser_deploy.jar cd - + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel @@ -632,6 +650,8 @@ stdenv.mkDerivation rec { # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} hello_test + + runHook postInstall ''; # Save paths to hardcoded dependencies so Nix can detect them. diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json index 43ad4100315..3027183aef3 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json @@ -23,14 +23,6 @@ "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" ] }, - "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { - "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" - ] - }, "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", @@ -159,11 +151,11 @@ "generator_function": "grpc_deps", "generator_name": "boringssl", "name": "boringssl", - "sha256": "81333e496d7b74a60aa6fa622c028ba382a0a6b9c815cc6ccb221042383b9a9b", - "strip_prefix": "boringssl-412844d75b14b9090b58423fd5f5ed8c2fd80212", + "sha256": "cb0fd3eda612d4ae4be21108938800a19b015717a7627ea7f530e3469d207707", + "strip_prefix": "boringssl-88aeb757f1a415c71fb4cbf5af936ecae4bc8179", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz", - "https://github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/88aeb757f1a415c71fb4cbf5af936ecae4bc8179.tar.gz", + "https://github.com/google/boringssl/archive/88aeb757f1a415c71fb4cbf5af936ecae4bc8179.tar.gz" ] }, "build_bazel_apple_support": { @@ -246,13 +238,13 @@ "-p1" ], "patches": [ - "//third_party/grpc:grpc_1.32.0.patch" + "//third_party/grpc:grpc_1.33.1.patch" ], - "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", - "strip_prefix": "grpc-1.32.0", + "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", + "strip_prefix": "grpc-1.33.1", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz", + "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz" ] }, "com_google_absl": { @@ -364,11 +356,11 @@ "generator_function": "grpc_deps", "generator_name": "envoy_api", "name": "envoy_api", - "sha256": "9150f920abd3e710e0e58519cd769822f13d7a56988f2c34c2008815ec8d9c88", - "strip_prefix": "data-plane-api-8dcc476be69437b505af181a6e8b167fdb101d7e", + "sha256": "466585f253471259ce17641348149f458270316e81ec6702fdd8bf0b1b681256", + "strip_prefix": "data-plane-api-9997e1137cdb59e622af13e57ca915a2f3c9f84f", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz", - "https://github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9997e1137cdb59e622af13e57ca915a2f3c9f84f.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/9997e1137cdb59e622af13e57ca915a2f3c9f84f.tar.gz" ] }, "futures": { @@ -428,25 +420,25 @@ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" ] }, - "java_tools_javac11_darwin-v10.5.zip": { - "name": "java_tools_javac11_darwin-v10.5.zip", - "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "java_tools_javac11_darwin-v10.6.zip": { + "name": "java_tools_javac11_darwin-v10.6.zip", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip" ] }, - "java_tools_javac11_linux-v10.5.zip": { - "name": "java_tools_javac11_linux-v10.5.zip", - "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "java_tools_javac11_linux-v10.6.zip": { + "name": "java_tools_javac11_linux-v10.6.zip", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip" ] }, - "java_tools_javac11_windows-v10.5.zip": { - "name": "java_tools_javac11_windows-v10.5.zip", - "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "java_tools_javac11_windows-v10.6.zip": { + "name": "java_tools_javac11_windows-v10.6.zip", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip" ] }, "java_tools_langtools_javac11": { @@ -673,6 +665,16 @@ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.7.0.tar" ] }, + "openjdk11_darwin_aarch64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_darwin_aarch64_archive", + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] + }, "openjdk11_darwin_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "name": "openjdk11_darwin_archive", @@ -727,6 +729,16 @@ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" ] }, + "openjdk15_darwin_aarch64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_darwin_aarch64_archive", + "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5", + "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz" + ] + }, "openjdk15_darwin_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "name": "openjdk15_darwin_archive", @@ -823,25 +835,50 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" ] }, - "openjdk_macos": { + "openjdk_macos_aarch64": { + "downloaded_file_path": "zulu-macos-aarch64.tar.gz", + "name": "openjdk_macos_aarch64", + "sha256": "a900ef793cb34b03ac5d93ea2f67291b6842e99d500934e19393a8d8f9bfa6ff", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-allmodules-1611665569.tar.gz" + ] + }, + "openjdk_macos_aarch64_minimal": { + "downloaded_file_path": "zulu-macos-aarch64-minimal.tar.gz", + "name": "openjdk_macos_aarch64_minimal", + "sha256": "f4f606926e6deeaa8b8397e299313d9df87642fe464b0ccf1ed0432aeb00640b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-minimal-1611665562.tar.gz" + ] + }, + "openjdk_macos_aarch64_vanilla": { + "downloaded_file_path": "zulu-macos-aarch64-vanilla.tar.gz", + "name": "openjdk_macos_aarch64_vanilla", + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] + }, + "openjdk_macos_x86_64": { "downloaded_file_path": "zulu-macos.tar.gz", - "name": "openjdk_macos", + "name": "openjdk_macos_x86_64", "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b", "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz" ] }, - "openjdk_macos_minimal": { + "openjdk_macos_x86_64_minimal": { "downloaded_file_path": "zulu-macos-minimal.tar.gz", - "name": "openjdk_macos_minimal", + "name": "openjdk_macos_x86_64_minimal", "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6", "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz" ] }, - "openjdk_macos_vanilla": { + "openjdk_macos_x86_64_vanilla": { "downloaded_file_path": "zulu-macos-vanilla.tar.gz", - "name": "openjdk_macos_vanilla", + "name": "openjdk_macos_x86_64_vanilla", "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" @@ -873,11 +910,18 @@ }, "platforms": { "name": "platforms", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51", + "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" + ] + }, + "platforms-0.0.4.tar.gz": { + "name": "platforms-0.0.4.tar.gz", + "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" ] }, "remote_coverage_tools": { @@ -922,10 +966,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip" ] }, "remote_java_tools_javac11_test_darwin": { @@ -938,9 +982,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip" ] }, "remote_java_tools_javac11_test_linux": { @@ -953,9 +997,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip" ] }, "remote_java_tools_javac11_test_windows": { @@ -968,9 +1012,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip" ] }, "remote_java_tools_linux": { @@ -993,10 +1037,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip" ] }, "remote_java_tools_windows": { @@ -1019,10 +1063,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip" ] }, "remotejdk11_linux": { @@ -1152,6 +1196,24 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" ] }, + "remotejdk11_macos_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_macos_aarch64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] + }, "remotejdk11_macos_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk11_macos_for_testing", @@ -1299,6 +1361,24 @@ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" ] }, + "remotejdk15_macos_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_macos_aarch64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5", + "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz" + ] + }, "remotejdk15_macos_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk15_macos_for_testing", @@ -1439,12 +1519,12 @@ "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" ] }, - "v1.32.0.tar.gz": { - "name": "v1.32.0.tar.gz", - "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", + "v1.33.1.tar.gz": { + "name": "v1.33.1.tar.gz", + "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz", + "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz" ] }, "v3.13.0.tar.gz": { @@ -1494,5 +1574,12 @@ "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" ] + }, + "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz": { + "name": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] } } From 57c0c1104f0e906dacdc7fce627035c2cf324bf8 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 10 Jun 2021 09:59:46 +0200 Subject: [PATCH 12/12] shattered-pixel-dungeon: 0.9.2 -> 0.9.3 (cherry picked from commit 9306fb9f3d8ecc0ad94fb36775f6155a35a71b92) --- pkgs/games/shattered-pixel-dungeon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 2ced60ef890..ec18a26829f 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,15 +10,15 @@ let pname = "shattered-pixel-dungeon"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; # NOTE: always use the commit sha, not the tag. Tags _will_ disappear! # https://github.com/00-Evan/shattered-pixel-dungeon/issues/596 - rev = "5be9ee815f1fc6e3511a09a367d3f9d8dc55c783"; - sha256 = "0wknrf7jjnkshj4gmb1ksqiqif1rq53ffi3y29ynhcz68sa0frx6"; + rev = "785c869f2b61013a15fddbf5f0c65d67fe900e80"; + sha256 = "sha256-d7Fc1IPOW/0RwLYe9vwaD3gFw6div2/J0DOFdWYDXWY="; }; postPatch = ''