diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c049e3537d61..3efd6efcefaa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2931,7 +2931,7 @@ danth = { name = "Daniel Thwaites"; email = "danthwaites30@btinternet.com"; - matrix = "@danth:pwak.org"; + matrix = "@danth:danth.me"; github = "danth"; githubId = 28959268; keys = [{ @@ -8621,6 +8621,12 @@ fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; }]; }; + mightyiam = { + email = "mightyiampresence@gmail.com"; + github = "mightyiam"; + githubId = 635591; + name = "Shahar Dawn Or"; + }; mihnea-s = { email = "mihn.stn@gmail.com"; github = "mihnea-s"; diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index b162fbc311e3..cc2ca6314433 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -73,10 +73,10 @@ in default = 50; type = types.int; description = lib.mdDoc '' - Maximum amount of memory that can be used by the zram swap devices + Maximum total amount of memory that can be stored in the zram swap devices (as a percentage of your total memory). Defaults to 1/2 of your total - RAM. Run `zramctl` to check how good memory is - compressed. + RAM. Run `zramctl` to check how good memory is compressed. + This doesn't define how much memory will be used by the zram swap devices. ''; }; @@ -84,8 +84,9 @@ in default = null; type = with types; nullOr int; description = lib.mdDoc '' - Maximum total amount of memory (in bytes) that can be used by the zram + Maximum total amount of memory (in bytes) that can be stored in the zram swap devices. + This doesn't define how much memory will be used by the zram swap devices. ''; }; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 7c398aff8996..dc434d0fc803 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -56,8 +56,10 @@ let mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; - phpExt = pkgs.php81.withExtensions - ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache ]); + phpExt = pkgs.php80.buildEnv { + extensions = { all, ... }: with all; [ iconv mbstring curl openssl tokenizer soap ctype zip gd simplexml dom intl sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache exif sodium ]; + extraConfig = "max_input_vars = 5000"; + }; in { # interface @@ -230,6 +232,7 @@ in phpOptions = '' zend_extension = opcache.so opcache.enable = 1 + max_input_vars = 5000 ''; settings = { "listen.owner" = config.services.httpd.user; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1cf310cb3321..e3c699dfd0c9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -278,6 +278,7 @@ in { kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; + lemmy = handleTest ./lemmy.nix {}; libinput = handleTest ./libinput.nix {}; libreddit = handleTest ./libreddit.nix {}; libresprite = handleTest ./libresprite.nix {}; diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix index 1dcc910f9744..799535eecef6 100644 --- a/nixos/tests/cagebreak.nix +++ b/nixos/tests/cagebreak.nix @@ -33,6 +33,7 @@ in hardware.opengl.enable = true; programs.xwayland.enable = true; + services.udisks2.enable = true; environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ]; # Need to switch to a different GPU driver than the default one (-vga std) so that Cagebreak can launch: diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix new file mode 100644 index 000000000000..5436d0b300cc --- /dev/null +++ b/nixos/tests/lemmy.nix @@ -0,0 +1,85 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + uiPort = 1234; + backendPort = 5678; + lemmyNodeName = "server"; +in +{ + name = "lemmy"; + meta = with lib.maintainers; { maintainers = [ mightyiam ]; }; + + nodes = { + client = { }; + + "${lemmyNodeName}" = { + services.lemmy = { + enable = true; + jwtSecretPath = pkgs.writeTextFile { + name = "lemmy-secret"; + text = "very-secret-password123"; + }; + ui.port = uiPort; + settings = { + hostname = "http://${lemmyNodeName}"; + port = backendPort; + database.createLocally = true; + }; + caddy.enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + + # pict-rs seems to need more than 1025114112 bytes + virtualisation.memorySize = 2000; + }; + }; + + testScript = '' + server = ${lemmyNodeName} + + with subtest("the backend starts and responds"): + server.wait_for_unit("lemmy.service") + server.wait_for_open_port(${toString backendPort}) + server.succeed("curl --fail localhost:${toString backendPort}/api/v3/site") + + with subtest("the UI starts and responds"): + server.wait_for_unit("lemmy-ui.service") + server.wait_for_open_port(${toString uiPort}) + server.succeed("curl --fail localhost:${toString uiPort}") + + with subtest("Lemmy-UI responds through the caddy reverse proxy"): + server.wait_for_unit("network-online.target") + server.wait_for_unit("caddy.service") + server.wait_for_open_port(80) + body = server.execute("curl --fail --location ${lemmyNodeName}")[1] + assert "Lemmy" in body, f"String Lemmy not found in response for ${lemmyNodeName}: \n{body}" + + with subtest("the server is exposed externally"): + client.wait_for_unit("network-online.target") + client.succeed("curl -v --fail ${lemmyNodeName}") + + with subtest("caddy correctly routes backend requests"): + # Make sure we are not hitting frontend + server.execute("systemctl stop lemmy-ui.service") + + def assert_http_code(url, expected_http_code, extra_curl_args=""): + _, http_code = server.execute(f'curl --silent -o /dev/null {extra_curl_args} --fail --write-out "%{{http_code}}" {url}') + assert http_code == str(expected_http_code), f"expected http code {expected_http_code}, got {http_code}" + + # Caddy responds with HTTP code 502 if it cannot handle the requested path + assert_http_code("${lemmyNodeName}/obviously-wrong-path/", 502) + + assert_http_code("${lemmyNodeName}/static/js/client.js", 200) + assert_http_code("${lemmyNodeName}/api/v3/site", 200) + + # A 404 confirms that the request goes to the backend + # No path can return 200 until after we upload an image to pict-rs + assert_http_code("${lemmyNodeName}/pictrs/", 404) + + # The paths `/feeds/*` and `/nodeinfo/*` are not tested because they seem to be misconfigured + + assert_http_code("${lemmyNodeName}/some-other-made-up-path/", 404, "-X POST") + assert_http_code("${lemmyNodeName}/some-other-path", 404, "-H 'Accept: application/activity+json'") + assert_http_code("${lemmyNodeName}/some-other-path", 404, "-H 'Accept: application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"'") + ''; +}) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index b178d88d7a6b..38240d69f7c6 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.16"; + version = "6.2.17"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-k6wFTwXMXpLb+nddJ6fOfhzCOrcbQR7Pot8rmrx2gYs="; + sha256 = "sha256-368Dq4UU1+NTlskQQ5t/nEmyjLvSfdW3rhqzwKoKjzE="; }; configurePhase = '' diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index b2faf62b0fe0..2ec27cb49e67 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.6.1.1"; + version = "0.6.2.0"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-ydn3qKOK0GwA/mBPbGwSIac09b9cz6YOFbuDFFV8jJs="; + sha256 = "sha256-iSCuFCwOPrvff9N/a2J0kPrxikhyR7yYbD4VaU/TF4M="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 051a326c607d..3e7f2ddd4ad9 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.0.3"; + version = "4.1.0"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-kTuW+i/kdPhyG3L6SkgQTE9UvADY49KahJcw3+5Uz4k="; + hash = "sha256-kEZNVTAWkiqxyPJHSL4Gismpwxd+PnXiH8CgQCV3+PQ="; }; mixFodDeps = beamPackages.fetchMixDeps { @@ -61,10 +61,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapQtAppsHook copyDesktopItems - cmake pkg-config - erlang elixir beamPackages.hex diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 57eaeace12ab..3fa08757f7de 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.7"; + version = "0.9.9"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-hdXc64gj7QtCnTq3f5mpQDEKLM6qaDBLkQE07xxNaDE="; + hash = "sha256-jU0qN+T5bHn9l/SXDR/Wa8uCGyJhIDUCHzEQe39L2MQ="; }; - cargoHash = "sha256-xMATO+H3bGkM/tLRimmLGYtrOAX8hzkw5Hb0c6iVAXY="; + cargoHash = "sha256-hdScQd0Fd6gE9/f4kk0zjZLK42oK1aaDzIOcAIsJqbU="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index b21bc5e5fa26..12d6d0a40515 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -1,18 +1,16 @@ { lib , buildDotnetModule , fetchFromGitHub -, dotnetCorePackages +, wrapGAppsHook , libX11 , libgdiplus , ffmpeg -, SDL2_mixer , openal , libsoundio , sndio , pulseaudio , gtk3 , gdk-pixbuf -, wrapGAppsHook , vulkan-loader , libICE , libSM @@ -22,28 +20,24 @@ , libXrandr , fontconfig , glew +, libGL +, SDL2 +, SDL2_mixer }: buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.223"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.248"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "951700fdd8f54fb34ffe8a3fb328a68b5bf37abe"; - sha256 = "0kzchsxir8wh74rxvp582mci855hbd0vma6yhcc9vpz0zmhi2cpf"; + rev = "5ff5fe47bad947a95545390865c597bec6c62070"; + sha256 = "0nfzf7q58mhdyszwv3mbz3wqf4w0m1p3fmf3cpga1pf9mfq65nqz"; }; - projectFile = "Ryujinx.sln"; nugetDeps = ./deps.nix; - dotnetFlags = [ "/p:ExtraDefineConstants=DISABLE_UPDATER" ]; - - # TODO: Add the headless frontend. Currently errors on the following: - # System.Exception: SDL2 initlaization failed with error "No available video device" - executables = [ "Ryujinx" "Ryujinx.Ava" ]; - nativeBuildInputs = [ wrapGAppsHook ]; @@ -74,12 +68,30 @@ buildDotnetModule rec { libXrandr fontconfig glew + + # Headless executable + libGL + SDL2 ]; patches = [ ./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux. ]; + projectFile = "Ryujinx.sln"; + testProjectFile = "Ryujinx.Tests/Ryujinx.Tests.csproj"; + doCheck = true; + + dotnetFlags = [ + "/p:ExtraDefineConstants=DISABLE_UPDATER" + ]; + + executables = [ + "Ryujinx.Headless.SDL2" + "Ryujinx.Ava" + "Ryujinx" + ]; + makeWrapperArgs = [ # Without this Ryujinx fails to start on wayland. See https://github.com/Ryujinx/Ryujinx/issues/2714 "--set GDK_BACKEND x11" @@ -100,8 +112,10 @@ buildDotnetModule rec { install -D ./ryujinx-mime.xml $out/share/mime/packages/ryujinx-mime.xml install -D ./ryujinx-logo.svg $out/share/icons/hicolor/scalable/apps/ryujinx.svg - substituteInPlace $out/share/applications/ryujinx.desktop --replace \ - "Exec=Ryujinx" "Exec=$out/bin/Ryujinx" + substituteInPlace $out/share/applications/ryujinx.desktop \ + --replace "Exec=Ryujinx" "Exec=$out/bin/Ryujinx" + + ln -s $out/bin/Ryujinx $out/bin/ryujinx popd ''; diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index d1fd26bfeaf9..c509582f8cdb 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.15.4"; + version = "0.15.5"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "sha256-YLWo6Em/NdU60Dtu4ePANSKLixozxpxVwD3dJcAOs3g="; + sha256 = "sha256-R93ZIc1Ics3diJJDdGUBCEGRDW25YnC1ZY0DyJjpyVM="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 02f5025a563f..2364b4508358 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runtimeShell +{ stdenv, lib, fetchurl, fetchpatch, runtimeShell, buildPackages , gettext, pkg-config, python3 , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp , curl, systemd, libxml2, poppler, gawk @@ -29,8 +29,26 @@ stdenv.mkDerivation { sha256 = "055iicihxa6b28iv5fnz13n67frdr5nrydq2c846f9x7q0vw4a1s"; }; + patches = [ + # sane-desc will be used in postInstall so compile it for build + # https://github.com/void-linux/void-packages/blob/master/srcpkgs/sane/patches/sane-desc-cross.patch + (fetchpatch { + name = "compile-sane-desc-for-build.patch"; + url = "https://raw.githubusercontent.com/void-linux/void-packages/4b97cd2fb4ec38712544438c2491b6d7d5ab334a/srcpkgs/sane/patches/sane-desc-cross.patch"; + sha256 = "sha256-y6BOXnOJBSTqvRp6LwAucqaqv+OLLyhCS/tXfLpnAPI="; + }) + ]; + + postPatch = '' + # related to the compile-sane-desc-for-build + substituteInPlace tools/Makefile.in \ + --replace 'cc -I' '$(CC_FOR_BUILD) -I' + ''; + outputs = [ "out" "doc" "man" ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ gettext pkg-config @@ -62,6 +80,10 @@ stdenv.mkDerivation { ++ lib.optional (libusb1 != null) "--with-usb" ; + # autoconf check for HAVE_MMAP is never set on cross compilation. + # The pieusb backend fails compilation if HAVE_MMAP is not set. + buildFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CFLAGS=-DHAVE_MMAP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" ]; + postInstall = let compatFirmware = extraFirmware diff --git a/pkgs/applications/misc/dwmbar/default.nix b/pkgs/applications/misc/dwmbar/default.nix new file mode 100644 index 000000000000..5559f4a6e5af --- /dev/null +++ b/pkgs/applications/misc/dwmbar/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation { + pname = "dwmbar"; + version = "unstable-2021-12-22"; + + src = fetchFromGitHub { + owner = "thytom"; + repo = "dwmbar"; + rev = "574f5703c558a56bc9c354471543511255423dc7"; + sha256 = "sha256-IrelZpgsxq2dnsjMdh7VC5eKffEGRbDkZmZBD+tROPs="; + }; + + postPatch = '' + substituteInPlace dwmbar \ + --replace 'DEFAULT_CONFIG_DIR="/usr/share/dwmbar"' "DEFAULT_CONFIG_DIR=\"$out/share/dwmbar\"" + ''; + + installPhase = '' + install -d $out/share/dwmbar + cp -r modules $out/share/dwmbar/ + install -D -t $out/share/dwmbar/ config + install -D -t $out/share/dwmbar/ bar.sh + install -Dm755 -t $out/bin/ dwmbar + ''; + + meta = with lib; { + homepage = "https://github.com/thytom/dwmbar"; + description = "A Modular Status Bar for dwm"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ baitinq ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index c1e031b7277d..7972f78834da 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -7,14 +7,14 @@ let pname = "krename"; - version = "5.0.1"; + version = "5.0.2"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0zbadxjp13jqxgb58wslhm0wy2lhpdq1bgbvyhyn21mssfppib6a"; + sha256 = "sha256-sjxgp93Z9ttN1/VaxV/MqKVY+miq+PpcuJ4er2kvI+0="; }; buildInputs = [ taglib exiv2 podofo ]; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 32a3b2c7a00a..cffde0c3a322 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-iDswjKDGii1OnMmdhiisbwuWjs7omNOF+tubJLs69qY="; + sha256 = "sha256-hf0iU246cmTCDYotPdTACFY135L2+cRV3FpVYnRZtRc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index d7eeb95db691..793e5291d5b5 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "pure-maps"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - hash = "sha256-PjZ8aKF+g3mH7z6LIUxI7mbtkcFv3wznBywaX/Y+1FU="; + hash = "sha256-ZPW2hNnaRfv5aTXqku7hPShN0leOuVEJ3T/OOTzwgXQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index e7ca1a935bbb..7667b4103d48 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, glibcLocales, unittestCheckHook }: +{ lib, python3Packages, fetchFromGitHub, glibcLocales }: with python3Packages; diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index 7329d8204cd7..f5cd55c534c3 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -1,65 +1,54 @@ -{ mkDerivation, lib, fetchhg +{ lib, stdenv, fetchFromGitLab, substituteAll, installShellFiles , qmake, qttools -, qtbase, qtsvg, qtxmlpatterns -, poppler_utils +, qtsvg, qttranslations, qtxmlpatterns +, wrapQtAppsHook }: -with lib; - -mkDerivation rec { +stdenv.mkDerivation rec { pname = "valentina"; - version = "0.6.1"; + version = "0.7.51"; - src = fetchhg { - url = "https://bitbucket.org/dismine/valentina"; + src = fetchFromGitLab { + owner = "smart-pattern"; + repo = "valentina"; rev = "v${version}"; - sha256 = "0dxk2av7xbsd233sr9wa1hamzb7pp8yx6p5b43rsnvnzchkqf423"; + hash = "sha256-N9fC2tCP4TVNncatHaz5W5Mp3jOmAcEWYCl30+0myaE="; }; + patches = (substituteAll { + # See https://github.com/NixOS/nixpkgs/issues/86054 + src = ./fix-qttranslations-path.patch; + inherit qttranslations; + }); + postPatch = '' - substituteInPlace common.pri \ - --replace '$$[QT_INSTALL_HEADERS]/QtXmlPatterns' '${getDev qtxmlpatterns}/include/QtXmlPatterns' \ - --replace '$$[QT_INSTALL_HEADERS]/QtSvg' '${getDev qtsvg}/include/QtSvg' \ - --replace '$$[QT_INSTALL_HEADERS]/' '${getDev qtbase}/include/' \ - --replace '$$[QT_INSTALL_HEADERS]' '${getDev qtbase}' - substituteInPlace src/app/tape/tape.pro \ - --replace '$$[QT_INSTALL_BINS]/rcc' '${getDev qtbase}/bin/rcc' substituteInPlace src/app/translations.pri \ - --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${getDev qttools}/bin/lrelease' - substituteInPlace src/app/valentina/mainwindowsnogui.cpp \ - --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"' - substituteInPlace src/app/valentina/dialogs/dialogsavelayout.h \ - --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"' + --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease' ''; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ qmake qttools wrapQtAppsHook installShellFiles ]; - buildInputs = [ qtbase qtsvg qtxmlpatterns poppler_utils ]; + buildInputs = [ qtsvg qtxmlpatterns ]; - configurePhase = '' - qmake PREFIX=/ Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" - ''; - - installFlags = [ "INSTALL_ROOT=$(out)" ]; + qmakeFlags = [ + "-r" + "PREFIX=${placeholder "out"}" + "CONFIG+=noTests" + "CONFIG+=noRunPath" + "CONFIG+=no_ccache" + "CONFIG+=noDebugSymbols" + ]; postInstall = '' - mv $out/usr/share $out/ - rmdir $out/usr - - mkdir -p $out/share/man/man1 - gzip -9c dist/debian/valentina.1 > $out/share/man/man1/valentina.1.gz - gzip -9c dist/debian/tape.1 > $out/share/man/man1/tape.1.gz - - mkdir -p $out/share/mime/packages - cp dist/debian/valentina.sharedmimeinfo $out/share/mime/packages/valentina.xml + installManPage dist/debian/*.1 + install -Dm644 dist/debian/valentina.sharedmimeinfo $out/share/mime/packages/valentina.xml ''; - enableParallelBuilding = true; - - meta = { + meta = with lib; { description = "An open source sewing pattern drafting software"; - homepage = "https://valentinaproject.bitbucket.io/"; - license = licenses.gpl3; + homepage = "https://smart-pattern.com.ua/"; + changelog = "https://gitlab.com/smart-pattern/valentina/-/blob/v${version}/ChangeLog.txt"; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/applications/misc/valentina/fix-qttranslations-path.patch b/pkgs/applications/misc/valentina/fix-qttranslations-path.patch new file mode 100644 index 000000000000..de3fe05cc8b0 --- /dev/null +++ b/pkgs/applications/misc/valentina/fix-qttranslations-path.patch @@ -0,0 +1,37 @@ +diff --git i/src/libs/vmisc/vabstractapplication.cpp w/src/libs/vmisc/vabstractapplication.cpp +index b64817bab..5f9aa3518 100644 +--- i/src/libs/vmisc/vabstractapplication.cpp ++++ w/src/libs/vmisc/vabstractapplication.cpp +@@ -221,26 +221,26 @@ void VAbstractApplication::LoadTranslation(const QString &locale) + ClearTranslation(); + + qtTranslator = new QTranslator(this); +-#if defined(Q_OS_WIN) || defined(Q_OS_MAC) ++#if defined(Q_OS_WIN) + qtTranslator->load("qt_" + locale, translationsPath(locale)); + #else +- qtTranslator->load("qt_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ qtTranslator->load("qt_" + locale, QLatin1String("@qttranslations@/translations")); + #endif + installTranslator(qtTranslator); + + qtxmlTranslator = new QTranslator(this); +-#if defined(Q_OS_WIN) || defined(Q_OS_MAC) ++#if defined(Q_OS_WIN) + qtxmlTranslator->load("qtxmlpatterns_" + locale, translationsPath(locale)); + #else +- qtxmlTranslator->load("qtxmlpatterns_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ qtxmlTranslator->load("qtxmlpatterns_" + locale, QLatin1String("@qttranslations@/translations")); + #endif + installTranslator(qtxmlTranslator); + + qtBaseTranslator = new QTranslator(this); +-#if defined(Q_OS_WIN) || defined(Q_OS_MAC) ++#if defined(Q_OS_WIN) + qtBaseTranslator->load("qtbase_" + locale, translationsPath(locale)); + #else +- qtBaseTranslator->load("qtbase_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ qtBaseTranslator->load("qtbase_" + locale, QLatin1String("@qttranslations@/translations")); + #endif + installTranslator(qtBaseTranslator); + diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1bad824b4e59..b22a334b64f3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,6 +160,10 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch + # Required to fix the build with a more recent wayland-protocols version + # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): + # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1 + ./patches/angle-wayland-include-protocol.patch ]; postPatch = '' @@ -289,10 +293,6 @@ let rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; - } // optionalAttrs (chromiumVersionAtLeast "105") { - # https://bugs.chromium.org/p/chromium/issues/detail?id=1334390: - use_system_libwayland = false; - use_system_wayland_scanner = false; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/patches/angle-wayland-include-protocol.patch b/pkgs/applications/networking/browsers/chromium/patches/angle-wayland-include-protocol.patch new file mode 100644 index 000000000000..424da9d29115 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/angle-wayland-include-protocol.patch @@ -0,0 +1,38 @@ +diff -upr a/third_party/angle/BUILD.gn b/third_party/angle/BUILD.gn +--- a/third_party/angle/BUILD.gn 2022-08-17 19:38:11.000000000 +0000 ++++ b/third_party/angle/BUILD.gn 2022-08-18 11:04:09.061751111 +0000 +@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") { + if (angle_enable_vulkan && angle_use_wayland && + defined(vulkan_wayland_include_dirs)) { + include_dirs = vulkan_wayland_include_dirs ++ } else if (angle_enable_vulkan && angle_use_wayland) { ++ include_dirs = [ ++ "$wayland_gn_dir/src/src", ++ "$wayland_gn_dir/include/src", ++ "$wayland_gn_dir/include/protocol", ++ ] + } + } + +@@ -1073,6 +1079,7 @@ if (angle_use_wayland) { + include_dirs = [ + "$wayland_dir/egl", + "$wayland_dir/src", ++ "$wayland_gn_dir/include/protocol", + ] + } + +diff -upr a/third_party/angle/src/third_party/volk/BUILD.gn b/third_party/angle/src/third_party/volk/BUILD.gn +--- a/third_party/angle/src/third_party/volk/BUILD.gn 2022-08-17 19:38:12.000000000 +0000 ++++ b/third_party/angle/src/third_party/volk/BUILD.gn 2022-08-18 11:04:36.499828006 +0000 +@@ -21,6 +21,9 @@ source_set("volk") { + configs += [ "$angle_root:angle_no_cfi_icall" ] + public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ] + if (angle_use_wayland) { +- include_dirs = [ "$wayland_dir/src" ] ++ include_dirs = [ ++ "$wayland_dir/src", ++ "$wayland_gn_dir/include/protocol", ++ ] + } + } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ac20f8ae5ccd..c9c2d6a20dab 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,27 +1,8 @@ { "stable": { - "version": "104.0.5112.101", - "sha256": "0nrghgngxdn9richjnxii9y94dg5zpwc3gd3vx609r4xaphibw30", - "sha256bin64": "1cj2mi3g5wl376wc52jgqg28h7izbsqm2gji526zkhmgb7rwq4sw", - "deps": { - "gn": { - "version": "2022-06-08", - "url": "https://gn.googlesource.com/gn", - "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", - "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" - } - }, - "chromedriver": { - "version": "104.0.5112.79", - "sha256_linux": "1naxi6pa5l9ciwzlqimcwqfjsqzyqndg1i0hp6zwh20wfvcfms3w", - "sha256_darwin": "0lgls8vsv31apgxjvksqaaiqj78q5v3bs0mnrxhfbw7cbhf6wxk5", - "sha256_darwin_aarch64": "11rjqdd65zibhb1gvdwy0slcdpvwh77mkhcj5hdg4hdlysd1a3a2" - } - }, - "beta": { - "version": "105.0.5195.52", - "sha256": "0hkwjilzy0x28knm6nrkywnsmldhz4kgpnxka2iaghihkjzb4wfw", - "sha256bin64": "155w4h4py3pn337060csfia9xxbjlxvhw7s7ljb9mz6qvpijd434", + "version": "105.0.5195.102", + "sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw", + "sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa", "deps": { "gn": { "version": "2022-07-11", @@ -29,12 +10,31 @@ "rev": "9ef321772ecc161937db69acb346397e0ccc484d", "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" } + }, + "chromedriver": { + "version": "105.0.5195.52", + "sha256_linux": "063k766d95ssngg0rlx3c8w9157miga2k9kwig2fbdn7qs5ch764", + "sha256_darwin": "0rs8g25p0v3krbj00jwh5fy2nw5anrr2dzxaxaj1c8ph6qn9iqn0", + "sha256_darwin_aarch64": "14v5r4s2c76md09wgpd3mhfhnw5y57dqkq1iqajgahgqmvvim1by" + } + }, + "beta": { + "version": "106.0.5249.21", + "sha256": "0d3ha2r54sjx1rhaas0mrgk2dl4xvgb83r5pbq9qzh52z43ynmlv", + "sha256bin64": "1lcfggqrzr8rbrayffgdygzx0g1i289zvg9fbq282p2x9nwb36cm", + "deps": { + "gn": { + "version": "2022-08-11", + "url": "https://gn.googlesource.com/gn", + "rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a", + "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac" + } } }, "dev": { - "version": "106.0.5249.12", - "sha256": "0brqn9rs3z3fdsnzjq2mr4p5c6d5fjllhfjfg39z3zmijcmd7f5y", - "sha256bin64": "1giay4nfcyczzcgrrdxrizd4pkiy7hqqc4ni6jg4rnbalh72p78n", + "version": "106.0.5249.21", + "sha256": "0d3ha2r54sjx1rhaas0mrgk2dl4xvgb83r5pbq9qzh52z43ynmlv", + "sha256bin64": "0bawgqjkpllqif0jaah43vys57c9y8w7a5rjn35bxlmjrfmfwhwc", "deps": { "gn": { "version": "2022-08-11", @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "104.0.5112.102", - "sha256": "0sjpmfln6c96c2i83q8c2v1jfii8527951nbnyqi0g4wam5jqrfj", + "version": "105.0.5195.54", + "sha256": "0hj40scp54hp5xw036vb9v0h951hik4dq8skr52hffw24jqa9d5k", "sha256bin64": null, "deps": { "gn": { - "version": "2022-06-08", + "version": "2022-07-11", "url": "https://gn.googlesource.com/gn", - "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", - "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" + "rev": "9ef321772ecc161937db69acb346397e0ccc484d", + "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" }, "ungoogled-patches": { - "rev": "104.0.5112.102-1", - "sha256": "06l6af4a6ywjn6x02dgb5ywk057p30rylrvr483iwvrj4jlhqvii" + "rev": "105.0.5195.54-1", + "sha256": "021y7cm1fdwkakhqrvz3jw5hx30740qn827wcvih0jdc3msfgd97" } } } diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 5e8ce4016fcf..1290d9400975 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-LCO59gfwbFzhF1ZkbnAO7W3AquaT55YzMR2P2YIVweY="; + sha256 = "sha256-rcjAdujiK6urn14eG27Lnq/6g+O0n2KmrL7k8A5ONjg="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index b90660199e28..e7e603c28c95 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.10.5"; + version = "5.10.6"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-Pdw8xPpH9PjLDbno8u3IWI7ygO18j2P3puE55+Pmzec="; + sha256 = "sha256-FNt+e13IEpIWB6gBYWfwJ+Qu7W/cyHvV+XGNhn17rdg="; }; - vendorSha256 = "sha256-hAnlKMDqrQG8vlmBLufJlq79rb1vo4PdVaJjBBSjnRM="; + vendorSha256 = "sha256-M/D7V6v4+BlROoxhT9URuj9EI6qXYG2VoXcCVN+j6aU="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 7ab484033abc..65cb2b755dfa 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-20dbBRJ0OwRiYoLVmXyV8XApOzGsyppaTW079TGK5fI="; + sha256 = "sha256-+cipDqPsBrUw4Q3uDkV76buPWTgtJXnvFsEaqqifTH8="; }; - vendorSha256 = "sha256-Xb4gkYBDTSFPwxCSxVqXLxDLn75xyy/k6Vwy+ot59KU="; + vendorSha256 = "sha256-58XLmJaE3g2KG9e4rOyO1ouBBlCGX96e8AWfr0XVHC4="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 6024975021e5..d7f9dc7bf89d 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.166"; + version = "1.2.168"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-8LBGdjcnZTejH+lRo0im+czJJHOfhpmEB4DXM/qugYs="; + hash = "sha256-/Shmnnpme1ffN7GMTryb4ddPlcAsruyWhFdjr1PJ3HM="; }; - vendorSha256 = "sha256-E5yDk48O7zze8QTeLQ999QmB8XLkpKNZ8JQ2wVRMGCU="; + vendorHash = "sha256-E5yDk48O7zze8QTeLQ999QmB8XLkpKNZ8JQ2wVRMGCU="; proxyVendor = true; @@ -29,6 +29,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs glibc.static ]; + CGO_ENABLED = if stdenv.isLinux then 1 else 0; + ldflags = [ "-s" "-w" @@ -50,8 +52,16 @@ buildGoModule rec { "static_build" ]; - # There are no tests for cmd/werf. - doCheck = false; + preCheck = '' + # Test all targets. + unset subPackages + + # Remove tests that require external services. + rm -rf \ + integration/suites \ + pkg/true_git/*test.go \ + test/e2e + ''; postInstall = '' installShellCompletion --cmd werf \ diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 0da3d38e6759..d5d47cda3385 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "cinny-desktop"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-JLu6xAnUaeRTM/yj2Qsc7pXTRXCnvxx8NL2fDXyAUg0="; + sha256 = "sha256-fUnWGnulj/515aEdd+rCy/LGLLAs2yAOOBUn9K1LhNs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 6d212b406f54..04f7dd01ac3d 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-UbL9HP90zfsoj/ClUoBF27n5zkvvN4UU4pxQu8QsoUA="; + sha256 = "sha256-Tn8pT0tppBEQtLdwQf0edUBe3dkK7fedunnNYIld/SQ="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 7adc02efc80c..fdedea7244b5 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.56.0"; # Please backport all updates to the stable channel. + version = "5.57.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-8z6FSeEEOrkNYWh9cS7c6GDAufBuiVmHmo7Ie6mueyI="; + sha256 = "sha256-42xKqK/7V2GPHk/L396O7UoWn5vTyILVTbLa0Tf6NaY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3bc495030acf..0181bdb6a2ae 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.2.0"; + version = "102.2.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/af/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/af/thunderbird-102.2.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e0d5a533c7455301f00dcd31c3d9ce6eeaf257f42afec1ed2414c130db426152"; + sha256 = "d38c09e55cf1438269d80461672a615c155e975d65c8c35f5879f4236702c9eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ar/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ar/thunderbird-102.2.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "325ae46353ea013325af5c42430fe5dbf2643e385f339627425dfc6086d973d2"; + sha256 = "881eb9bafcea2646ab0830cc5a7d3ed2979b0e745ddb7a018336ed7b8382e491"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ast/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ast/thunderbird-102.2.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "012006fa85f1f6f45c257206ef83a94b802061e4a6e1367a3a86114ba985347e"; + sha256 = "17cba24fa82d4b3a16be5d44ea9be4b7bb1aff4b206841d5eb169815951a9f7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/be/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/be/thunderbird-102.2.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a1febd1083e17e3476e40c1026793fb56c308dca199f8eff1f930118957222b5"; + sha256 = "271b5d606fc489918cec8d8d316f0b8cf295a296b95a1dd458dd0b7f68fe148b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/bg/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/bg/thunderbird-102.2.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "54ef16d94ac2f95039dbbe03240dd401651234cfa65ed9cd128f7b78a5170809"; + sha256 = "1e68a8cd66f72712f74bc3735af6c0016256ebfe1c7c2e820624268ed8837350"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/br/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/br/thunderbird-102.2.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "296c837719db56356f2b23b06b2e0114a6c213d338e014b468bba0de6eda1165"; + sha256 = "82ab077f9a5f43875c6c82ad7d0e17f9c0b893e0bf307574fa8506e3220c8604"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ca/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ca/thunderbird-102.2.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "3193ed376a1a1634b81c868d4a48cb5a4c73f8549dbda62319e3d591cbe77f8e"; + sha256 = "2ed8291572dbfaee211f5b9fdb97d4faa591f853815d9eaa43b704270551b02e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/cak/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/cak/thunderbird-102.2.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "182074172b1b0481978c6201eab49875006c9a9feb1fdcbcf5a74594afd3f4c0"; + sha256 = "a5e472616951c799e6dbbdfedc3e8ba497812b027ab22c909166c3e452a29d74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/cs/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/cs/thunderbird-102.2.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "75186fecd4c0b248653808342fb0fcb1a4fbd1d19ef1b8cbed5d547bb74fdffd"; + sha256 = "1d3d1e0355275152050a0c5d32fc0b0f6b53f336d02837ca7653416888e271b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/cy/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/cy/thunderbird-102.2.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ac340fb179bf03226298d5a9b963c66aeec4b0a8d0a584fb5147dfa07afcb4b8"; + sha256 = "4b2f3cc7e1e81abdc52969cd08cd3586e14ea2ff574c8c3b334109dab00ccd64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/da/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/da/thunderbird-102.2.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2743548ce40a7d4732eead3dc6003c4b71e020489ca73582c7e8da7c3d542399"; + sha256 = "89613187e078a6f341ad8799cb4980cca770b2a0ccb0969740f53e5e7073f00b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/de/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/de/thunderbird-102.2.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "41629ea31959a2aa7db06908e27cc8ca73d2dd80069c6dd1bc8ddf3b8454ccb2"; + sha256 = "4b7a030cb532a94a6eb3cc1343144bb90abcb7b2fcd3df81dc126b831d0a2740"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/dsb/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/dsb/thunderbird-102.2.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c7e38f67ef8350694cb77a6a5ec289870205f172d52b6d7d2b57089d9123d6b4"; + sha256 = "e1d05cac1f513ba573239dd677da6edb94cda9badef57b168f498b5bc218a3ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/el/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/el/thunderbird-102.2.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7e5048dcd204524e516c7a2f2cf8179f389ae02ed683779a5df47e810d983f71"; + sha256 = "d63891c05b56970021fdc455fe67d2d6f27233670e436b52522cfd012c503c74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/en-CA/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/en-CA/thunderbird-102.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "dbf9d22ddc1d65e7d47c2d7cb1706c157be82367af46714592f72a6568702cf7"; + sha256 = "34c81ec572000433e356ec5f13dbe461ca788b19ca0af9fc34ab50d7feda9cd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/en-GB/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/en-GB/thunderbird-102.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "bad92cabd1c7f2886bed381b95e42a5b90a2c00a7590112df6d63dfaed191f09"; + sha256 = "2e9aeef97495ebe462a62cfd0d9966b66cdf0a0464a8d5d012cf3d430b4a28cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/en-US/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/en-US/thunderbird-102.2.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "fc46eed51f11b09a22d048a2e294bab3759ed17047ad049b295ac06124ac26d6"; + sha256 = "92883c21319411096c355569c43b6cae2cbe7770c1814a9997ea7b9746431271"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/es-AR/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/es-AR/thunderbird-102.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9904a857ea7d64917ab9a408ec3c15c61a6110f3bc0edc33f792229e9d462da9"; + sha256 = "51730734c71b67ffc865646453fec802e92852fd9ab7eb371d31d9c3e843f810"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/es-ES/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/es-ES/thunderbird-102.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "aba7bc43a22b4dc72fc86abc567b688b088bc0aff6bd98fc4d56c4befdc86d68"; + sha256 = "c61667e937b15fdb22e03b7875a474e422069800780df73529b6811cdb384824"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/es-MX/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/es-MX/thunderbird-102.2.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "07757eca4947cb99cb9fb5588659b2da053d96eb9a71b836a30c25c8d78b22f0"; + sha256 = "7c5a404101f20fd9624c5402e8ba2c0699986739302de5739ad3304e2ea234f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/et/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/et/thunderbird-102.2.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5118f9c33520e3eac6b3179b63b6d22082784272df52c96e29240360a2db927d"; + sha256 = "5fb2498c2a7e1a76512ace5421bfff47a1ef336cf95f671e85188dce7c8fea78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/eu/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/eu/thunderbird-102.2.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e1dd14890a17abe0a35f89b9ab020184b4e74436218db87f020d0650bd1e6d6b"; + sha256 = "0eb3f3ca7e23e950ebafbdb6d4f4200279cc8e18a042a91ad163eb83c939c704"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/fi/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/fi/thunderbird-102.2.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "cece483ceff36920c39172647759a482d9f62d1f5b62dbcb4f8ad45cddc2f5d6"; + sha256 = "ae76c531ac5b826593310b2b4b2e01d877dd246379a7ae8427f6039eb5dd581f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/fr/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/fr/thunderbird-102.2.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ad6d12bfe74549582d8e155bb4cdd036657c324a5d4d1e34cae24fe227d976b0"; + sha256 = "3b344b3348487c393ea72012eb6fd82dd647e31cb1dd0c305dbe6aafa8438c53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/fy-NL/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/fy-NL/thunderbird-102.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "eb736ed3354635decf682cb1c85f25d160383e0385146825ad2fdfc9523eb99b"; + sha256 = "3143c39b7e3aac2d90e6d68e2d1f782a306fdabd69641a4aa31afd02b6cd172f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ga-IE/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ga-IE/thunderbird-102.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "adf6b52fec4df57e8c53f5209ffb90d2241a17c9d950a108be42b68b7809e849"; + sha256 = "db877b69e105c8d14b6ff420448712eafbaf6580a13fd415eb5112930a8633b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/gd/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/gd/thunderbird-102.2.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6a5d219878914a9b17fef0a18d2f7ab9ca8e44fa05a33af8155117b3a892b222"; + sha256 = "3025fcddde35315267b3f0cc9d57696c5462bbe6705fb26b7a1be1eb670ca984"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/gl/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/gl/thunderbird-102.2.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ad32a71cadb1f3abeec0f397d825d839ce268249c7d8737699e86fa4c6db6648"; + sha256 = "39469544764d5607d73d3ffc0eafbcd2117072b2af6dba1a4a7ab43c3af2eb75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/he/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/he/thunderbird-102.2.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "984652267caed5007b30db4ef72e8b4d5addb84e431b36c9e590ed572e7f6dac"; + sha256 = "52c67f10bda950e12822207d41c6b425079d29f0d1d5654bb10b6e1d88751828"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/hr/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hr/thunderbird-102.2.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "10fc94bf9c86a7b93c90e97380694991515d68565f772c6b65fdb3c29b6b366c"; + sha256 = "e584a8f724d8e337743f9ad22e637089c5771c082091e221aad55b97541e0c16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/hsb/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hsb/thunderbird-102.2.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "421f91a2ad1e4d591223a36df583860a789fc5068af65eb17ec9789306582169"; + sha256 = "0304b06dd0f23ca59f85e34e3068cd9ac3275c815e2e2004358540b38cf058c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/hu/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hu/thunderbird-102.2.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "59bd60b855e74d6a22f30a2f5e1621d7831da9187fb5f87096dd751234a940ab"; + sha256 = "ef155776003ddccfe863e920f31b45f673ef445c01556d69b6ed086561a74768"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/hy-AM/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hy-AM/thunderbird-102.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b22473ac123ece7b191198ab989b7e4f8ee3bf1683851c67f42c342a6d16b735"; + sha256 = "c65a335777b3cd9ab95b14007a9b6f10304b17c267388889a7f299ea61c44fbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/id/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/id/thunderbird-102.2.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "435bbcfe33fc787646eda7307af038c2ed5958db147c7249d6be231df69b548f"; + sha256 = "a407cd50ed7b4fce63b2607632a82c4e9b853b76ba522a564aae219afd0034ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/is/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/is/thunderbird-102.2.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d650362838f0b764c90bda391f2727abd5360a6ae9449b8f8adb08cfc7c13c10"; + sha256 = "6035248bcfde9fea269fa10ff3a87f035e3552b8cf76c10dfc86dd889cc7e958"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/it/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/it/thunderbird-102.2.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1b5d6c9624b5e230880a0a6839319b317d19ebeb9ee5b73d9d515273b1e3185f"; + sha256 = "afeef80077a18120cff1854d54067ccbc92b30f9c0e75b41067ec1e398340eb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ja/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ja/thunderbird-102.2.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "587b6e71ad34e3f2a6ffb9c0b73397cbb0a237607fc2f984da4ce5123f1ac20c"; + sha256 = "1d98a3c50d1aff70bec9ae9335708a85cf4458fbe0ff49db45a57f4d29614de4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ka/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ka/thunderbird-102.2.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7af13df4fa3d598d89b615c059a2aba8667211c84b169f86275ff248c69c42c1"; + sha256 = "5c749efe25f328be5f17ba2b2eeda41af0ce69f0f3e9cbc8bb55d58a3990d99a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/kab/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/kab/thunderbird-102.2.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2109b2f25965043b95778b9109371997c380366d7db1a4b6983c19cdd845145b"; + sha256 = "93b93383e4bad3b4f930bcbc35d178639a50fd7a30eaac573bc74b895955ec5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/kk/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/kk/thunderbird-102.2.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4d5571386687c77d108ebd36ba3e2d8ce77dda77f838f78f7f3dfdb7f9be2979"; + sha256 = "298e2c42888f29b90fdc6589b6336c5c2261a5331f5d52db89ee5b6618ec120f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ko/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ko/thunderbird-102.2.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "9622dfed1f9456bc8619e065d5ec73165f0a6a3a67373804e9a5b2160e53d00f"; + sha256 = "75625d041a0193cfd8015174a1eaddd7315f3030258e58828df4b3521863bba8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/lt/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/lt/thunderbird-102.2.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9354e778336ea6fcc6d5fb62b67feaf13891a40331d3c52615207ca8698715bd"; + sha256 = "c5705caf0c71efb566a0d1828ec36e940940eeee23d37b9d66246abbb28114bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/lv/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/lv/thunderbird-102.2.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "428caff991e4e683c1584fbf352ee4853c9a615b85b1eeed48e2924bd7322940"; + sha256 = "d26ea9198e8d5e9ae5f51fa2456181bd979694d7bc9bcab8f3a82c01233760d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ms/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ms/thunderbird-102.2.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a2c8de445f99d2d2bfc11a1c3e0dd152e435f57b98dbacdc89116d87ab09af70"; + sha256 = "6dca09cd5f9306d102bca42d01607b63e1219324d1107447a728bab8693aeb8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/nb-NO/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/nb-NO/thunderbird-102.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "1d6f5d729f22a7e70034b40f8b9d2e1dbdc19f13847e3a9d188c438b2241d5dd"; + sha256 = "8d2a62dd4ccade7544ecfc6a4f88bd354f70089cf161f2fe92aeb9886e6f6411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/nl/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/nl/thunderbird-102.2.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2ca1bb47a95aa26de1c7d38f73327b0761ed4be71a06cf3ebbc3a4f6e1fdc19c"; + sha256 = "b82895cfc2058be4b7818ea17521deb014a17659ddb57c093cbdc26ab3e7f7cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/nn-NO/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/nn-NO/thunderbird-102.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "87ea920192587f9d266bc894903614ededf2e331186dde5b8e034292776ea7e8"; + sha256 = "aea319db70387a2f075776fcf07b29e433ca16f898af70689d9cd4ed9d98d52f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/pa-IN/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pa-IN/thunderbird-102.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "4173330ea979aa3af5c904a6b061f5b2446b33d0eb86b69768361a200a5c6bf7"; + sha256 = "02c366563dd39f64ae11f9377c62434291aaedd951cea43e867a236dcd99dc2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/pl/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pl/thunderbird-102.2.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "23a4864083d98587ee47e75fb3f7680bc0f6eac5108223530ea07d7919a90a7c"; + sha256 = "5e2b8d486eacda9a8913e0ab60e2c4079d3fb89e827ca1fba871f2b6295c6cbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/pt-BR/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pt-BR/thunderbird-102.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2d018b23e00810517e2d6ab50977e09f9c2c8cdbf78b49040b047e76e2722266"; + sha256 = "83339737a6ff360f1036a5b11b56f6d6648011f0c206a13da2b557aa85f4e2a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/pt-PT/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pt-PT/thunderbird-102.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "80e1f64d4697d7729162b0c63f4540eb9e5b98da162ab4ec0a9841dad7e76b8a"; + sha256 = "4950899b2da0a706f39767199ec412e9da2b670bf15c29153244c5eb3a317731"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/rm/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/rm/thunderbird-102.2.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4fc642c5a681d8fd84500452a895172b376b76e0935f7126ac4d1c773003505c"; + sha256 = "d9030e30196b03c341b1fd9078447d9baf7542a119617494ea73d11192f194e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ro/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ro/thunderbird-102.2.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fd333ad0cbe09a6a598f79921548382579cc032ac5ffecf4756da8694ba9ec28"; + sha256 = "d3be25f071698102abc71b50d71253326a9201ff9db3e7935afdd27d728985e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/ru/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ru/thunderbird-102.2.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "4e1858e7baf59ebd38994a21c12d5a490324146d89b493177ab79f9088a69bb3"; + sha256 = "f9a520adaca32180b01f18fb9b8280145075248378a4a1fd273c9687733cbf42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/sk/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sk/thunderbird-102.2.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "68fdfcf95a5bd2836622e5863c83529f15037c4676467c9e436aab3c2031a037"; + sha256 = "4045843feb9303bc65612d1060f874d21fdf39c0abadc84c84af0017b1fcee32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/sl/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sl/thunderbird-102.2.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c42bcc5ab3e6ca4a354eb5de7ce5e9560c096a45064329abbd85b0095e9c61ce"; + sha256 = "d914ee5a953b4ec651e634d7c2b971987ccb2ebdd130dd3ee4ab3d0cae274f59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/sq/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sq/thunderbird-102.2.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "d352d21bbf1e915c23ed675a1efac5ee9ed7b9b43e90aff571d6846766fb9dd1"; + sha256 = "2fd3128af2a55cae9a8adc248afcc9497d602f0d36cb2cd7ff51aaca1b064487"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/sr/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sr/thunderbird-102.2.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f20c4dd96f77e0e804be47265bfb354c0c4930dbcb5593d59471981d437f1ffb"; + sha256 = "2c5ffe0a8f4d431c37cb7f39fbd145937839425232aa72e173b88fa49628ded6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/sv-SE/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sv-SE/thunderbird-102.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "af90aea4186067856dce2b8d3a81de1ad8a28c4ddd789e871be5453e13a668b1"; + sha256 = "e98429f73e6379ebfb2bf98f9396f86025e158543e664b2b219875964dae6e1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/th/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/th/thunderbird-102.2.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "763ee3216755967f5a8f27a1083ac4c0c0ca245de6682b946f43130f64194beb"; + sha256 = "605a86e6be2eabd0ade653f93fe62e6ae47eb80951fa9c7ab9035d13bc22e52f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/tr/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/tr/thunderbird-102.2.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d70bb634e0e0634ea78dcedb12ed6fa0135662dd98fab804b51ecf20c9367c4a"; + sha256 = "51dfa4db80dd7596c24e6a0b67e1196d59b9083de63550862fccb6672535825a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/uk/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/uk/thunderbird-102.2.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6884e6518b12a7d8cd9f0755244ba9faa72457c200e10c6aa16df4351368c563"; + sha256 = "a6fcd5719501d801ed0e9f39ac100309945e567d535e6972791ca97c509131fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/uz/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/uz/thunderbird-102.2.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f4268739d0c85450bf7fdb9c0bc10882c683a890f739b75bd8778f749c2dc529"; + sha256 = "e4666827e963fd2180babba2a117425cadff2bf47674e30225ec4f046cde1adf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/vi/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/vi/thunderbird-102.2.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4c2345b6b8faed2af549015d09f2679ca604f1d0edafb0522d11a822186483da"; + sha256 = "67cfdc9bb1753852250aeb523f2f91ec2fdfcab910ca1e38ac61e3922f281ee9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/zh-CN/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/zh-CN/thunderbird-102.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e7475977ca163db56081a2c017fca98120d014ddff7ce1f23993161430a0a889"; + sha256 = "f2bcca607b71c567f0ba3414e668e033633f05fff7404a1cd321d165172a36b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-x86_64/zh-TW/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/zh-TW/thunderbird-102.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5e67c1039028037274f9f2a85d8fbd88a0ba7339132ffbf52fa2632fdd0b3ef0"; + sha256 = "e827be51e3af98fd484bb82d387754e5375cb7a5749bd1b8d0401632172165ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/af/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/af/thunderbird-102.2.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e1395eac1c8048376e90ad10012063d29c7b8413d65f3bd4862d7b3481227c36"; + sha256 = "42e10d674f9bc1220a1ae08f5c20551ceb9030700991681b32df137fb1fbbda6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ar/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ar/thunderbird-102.2.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "0da531cd5c650d41bc04994ae1b2a917a663a69afbf802bc9774efcff6ddc826"; + sha256 = "d5a6370d2e20fea976165cc0d84c13832b8ded075fefdc98f21e1ab530dc8624"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ast/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ast/thunderbird-102.2.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "090a6c78576aa8376313edd7324820391832860fd9b91c861a0c08f4c2658715"; + sha256 = "19f2ac39f04b47fb2789b0c0df8b9e0634062bcd3f117cf2cf776a39d701ec7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/be/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/be/thunderbird-102.2.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "991ab842e66834aed3f0f841c3eb59262ff67e925706de4ef61b03967dfc8507"; + sha256 = "4e007951f445b5c9daf36523535db459e869b50b732a8e82f64b3c0d898c512f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/bg/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/bg/thunderbird-102.2.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "11bcccdb1a7d1b0cee6e46c8645013be8f0372656ebe0e9f4d042950fd77976e"; + sha256 = "6430c82f5ebc4daa2fc099d54f0aacc1d680a4c603fe69fe117490d58d9c7af3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/br/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/br/thunderbird-102.2.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "0c612c2261997e4def626ce1be51d4ffa405e7ff17ccf31b1abd2e4bf2870540"; + sha256 = "84568e1ec4284d1f81cf5f5627de0e19db7a32f57cb621210df27f61178961ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ca/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ca/thunderbird-102.2.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "de9db187169c39ad823c0bb2154384ff698d04badc65e4cbd928e1f215d186e3"; + sha256 = "496bd038e349d2480c7ca8c05f8ec9ccd93d0e17210cf1ffe8f65c470a2db5ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/cak/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/cak/thunderbird-102.2.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "89972257154dc19f08c64bba98f383b67e99712af17df918da0ac047be0ab610"; + sha256 = "f1e811a5f1e821ecffb6d4d110f19fe55ef153992cbcf53980fd56c16552f663"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/cs/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/cs/thunderbird-102.2.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "cabce94fec815a9da981ec915cd56662bfaedc881ff9cb8f8247ae4baaa7477b"; + sha256 = "6ff1add590d03bb49fab16ead5b549eb32c5767998ecc955c394163ef36d8554"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/cy/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/cy/thunderbird-102.2.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "beb124d16c8fab044d2e33a1d51885a32efeacd489804fdb97f0bc3136d8cdd2"; + sha256 = "6605ab434753eda8d9f67eb57d470616e9c3b202978d655738bdd4f478cbfd42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/da/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/da/thunderbird-102.2.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6792f973b1580fac934ef8848e3ae63dd19f66d874f917d97bb2dc2f157a66a6"; + sha256 = "7f60ac0c21c4894dbaacc43e74753e5dd29a768a31167eb3b0ad86c0333c247e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/de/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/de/thunderbird-102.2.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "042a2bed47a37c073b3c07ff8afdaea8c76820d41b7ffc443aee4e991e6c877b"; + sha256 = "9d9ee8d7d92cbfa94732d915cfd4fd86278ff08225c4099d421f48527c5b279a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/dsb/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/dsb/thunderbird-102.2.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "af8b5805f40003de0d44cb136ceaf1e050ac267e5d07b9adee7c74e8e2b5e2e5"; + sha256 = "37c2ea9d16be51d4cbd9eff62d0a146681d52caa63e2407e1f0d8d422b7c62de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/el/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/el/thunderbird-102.2.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "42106c5e72dd43d7c370a0809ed3f46409708aec5278d44ce0326d610b56a585"; + sha256 = "e3804af2c4a34c8ec6679e7a06449d00416641d17f2d58d15e745b25cac4fb82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/en-CA/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/en-CA/thunderbird-102.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3accbf4e9bdb3f91412ef681fa6f051b0ef157a8011757ccc04d33d825a25676"; + sha256 = "6d2dc53467776fc068935a1181c3ec7f6c2ab9c6387ff8c12b4f689b904e9430"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/en-GB/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/en-GB/thunderbird-102.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "31a419251f58e31317ffb9354a958ebe45c7397b1d4fa4a6359b2b5e73c7eeaf"; + sha256 = "f0a2db3262832de3cf5edf4721327538af261a8eaae831337a1f1f732045f1a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/en-US/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/en-US/thunderbird-102.2.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c64e332a907769297ea4fa9261b643b95c061ff71931cba448394811ba5e8009"; + sha256 = "04754457bbcd3b037c27cf5c1186ab1224fc01d3b1106c76ca21d26770ff28a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/es-AR/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/es-AR/thunderbird-102.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "bef709b48546e812dee7705db58f6fa0b0668c01e82e2a121439553517d0a42e"; + sha256 = "9fd407ef93b7c613709312350b5ba520f06c5b0d664e315ef671f85e5af50ac0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/es-ES/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/es-ES/thunderbird-102.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "24c59cb2779215e468bd1ec1329accc4e4bb276748cf94798aaf87a8240286be"; + sha256 = "a3975e3489c8c67374a7ade117a45c85aa42c5379670204571dce0118f7aaf8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/es-MX/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/es-MX/thunderbird-102.2.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8de5de1c701f8894839fa286b3fdd67fc5e188b1b8d1681186e6e11b8e862096"; + sha256 = "857d1f4073ffbfa81a1ad17d219ccde4f8a8b18adc6e3e2f844020be32e1c5a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/et/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/et/thunderbird-102.2.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4af58f8787ca36a49d7659fed575c18b05d7c54ceb5383911b917c00f45c5311"; + sha256 = "37b5f428f5f16dc80736de0c2f23ca24003de5d4639e1500f303b1f4aa664460"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/eu/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/eu/thunderbird-102.2.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "89a3b35a85077d7ba5e85aa7b6fe24c6726a82bc9d5fc794f6b47af543c14e1a"; + sha256 = "0e4a8abe3b956d304d79218d63f64b01ef566122d00d025ef69c07f73aa87fec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/fi/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/fi/thunderbird-102.2.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "04065018c7dc5a686e2aec5c5b46e583695d1d5cbbfc6dcbe4042e004532c05f"; + sha256 = "0a3242f6d791ab5f1be52b67d8f95ac8245bc7cf556f9dda814c2827d8f60e40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/fr/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/fr/thunderbird-102.2.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "13293388059f55f039e9326dbd6f303e06b9f0ab3acc307a577334be2c98d900"; + sha256 = "32c67c444bbe3d920aa4c30226fdbf469d5caba7a066b3d84270d0f9e0daabe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/fy-NL/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/fy-NL/thunderbird-102.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1a20599ae1eed1a15db7773bb8493c9b2c6d8462c26def64704a4a3c2bd66d89"; + sha256 = "0405585c63321c44f3f459356db4bbd0cf73cccf7ae6c8684b13152e3aa3b7f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ga-IE/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ga-IE/thunderbird-102.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1cdd88f46f2a1a100124a9409f50b6a860504bae94b5c4d3032320ec8d9b12be"; + sha256 = "54e4e55b3339d6436591d8967de6c1cffab94da38d064df6fc0d8b85c4475d84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/gd/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/gd/thunderbird-102.2.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "fa0e81fc06902fdb977d5fcd0fba76b462e80e507f7ad740f59523e4cda499fc"; + sha256 = "46130971e0b49bb45c6895d7cf9ec890d7f95fda6479bba38cf180d36e4c4eb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/gl/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/gl/thunderbird-102.2.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "eb7f9c93a58f341c5e6f48527a1c8fd68a5018e4d3a79410aeaa7ac2c92a6081"; + sha256 = "6e0ae14bb163b5a10c58cbdd49793e69d9d5042b0045f40be4c595781ad84c92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/he/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/he/thunderbird-102.2.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "88c9fc856f27559b2e87b4c5aaa6be4afa049d1f415bb5f2f8d82828de12d47c"; + sha256 = "6d353e9ec5a72366b991854aea9163385ab902c812690c0161790c882343e5a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/hr/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hr/thunderbird-102.2.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ee1d57da19764898fda8867442ae3600d2e9c34a19db1eb9f61dd757802e15ab"; + sha256 = "a05a828b434cb2677b1d3c9f317d5448db003c1373edbb84d1822182a93d3e7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/hsb/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hsb/thunderbird-102.2.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "afee806f7cf3f31b9711be299ae9ce85a71fd896fcffaf1e2b7373fa5d8fd4d5"; + sha256 = "4573f6938c41160f1d4c79be035f24426bc83d9440b36ca269004b729a5564e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/hu/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hu/thunderbird-102.2.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ce3c7e6117646c3f47cff9fa86cfdaad2eab2a4b2e447a00e58c031931fc22f3"; + sha256 = "727246ee523554d64ff72611d353aead8c8b79e8f55cf187b3fb3d9f442a947e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/hy-AM/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hy-AM/thunderbird-102.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2b1e51d05939e5fa5940d2b13b6d88cca27036bf5b16c4269bd07f9296befdf0"; + sha256 = "467c8af9d3cfdbd18ea04214369b9d262c9d925a171a2f56548af00ec85a3611"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/id/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/id/thunderbird-102.2.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f0924b16cb34d52abd11b12023fd16de3655d19a6e2396dc213245beefae0812"; + sha256 = "4177b047863412c9ef91d8552440b7fa1f848b8675cc55b881a4cc5fdb157303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/is/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/is/thunderbird-102.2.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "00d302b3e8e7061b4953c716af844a04df0fee265a320eb8ddb10af8885746f0"; + sha256 = "cb8cc7838fe3c4182d887c711c636b66d017b1854a2fadbb0f6e862a54a66d40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/it/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/it/thunderbird-102.2.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "8c57f5ced863464faa061b12bca9b7ebc21e1e2d0c65e3399565cd7efdd98a38"; + sha256 = "9e9214820e407c0067cf60a3b360e8f5a608225a41708a0fd25d00fb91e46d00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ja/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ja/thunderbird-102.2.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e4c9d5ced11c04791323f9a6f2ec7972e37b59a5de8b9cb80601acee2b084c31"; + sha256 = "ffa126f9b4a25165163df6eca65299c553b087fc2313f6dd1c7b266d41a1769f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ka/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ka/thunderbird-102.2.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "6f141c07c58f04aa1a321c0c7b141b4b4b816e5930a9d399e3adadd9a0250a2d"; + sha256 = "563eb58790172bf3a037f5828786dfb7624e3f03b81c1a57a4126f102e9572f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/kab/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/kab/thunderbird-102.2.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "0549fe744c9d65656b333053061eaab75a2feceea8442c5a6968d0c9b6f50df3"; + sha256 = "c79ff5505434a23ef88c2b1aadd9e70562ad9ea77fdb379169e3495725cad1a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/kk/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/kk/thunderbird-102.2.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "ba5cce04a893d45788e3e350f1f0860aa13af28f789e9119fd7ac769a54ee52b"; + sha256 = "bfc4037fa631727d454c5b22af1e8861b436c40aa2bafda007221e5d5a813dd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ko/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ko/thunderbird-102.2.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5bd950922fca96ea24a33c1796912f347cd5d1868c0064e1881813dc01b65f55"; + sha256 = "386921200c4b6544407994c5d1d73a3671a383f1e5b69d5f34b7a8ec727bc646"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/lt/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/lt/thunderbird-102.2.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "78050a52770641145c0e3dfed35e83e2b384ff2b7bb271458fd5444e2077f5af"; + sha256 = "2027b59fc1a8f11dbc8ce693296a26604e9ba579e34df02e9f0c8243eda38e94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/lv/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/lv/thunderbird-102.2.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "746cb7995683cbc64a93bd5562eb537f1449b0f4b7c4818e786f4083c190eff0"; + sha256 = "a5179ee6caa6847b36e9494e09d3c233beb9bb8651c586b11ce160b054e12d73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ms/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ms/thunderbird-102.2.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "4c6927646e16ae85fc4522d784886c377ab11b6d0c016899af0a41f54b611e59"; + sha256 = "6d1f11d137da476fe7dbe04e7d5692c5dc81931d30e116217083ad187fdc37cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/nb-NO/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/nb-NO/thunderbird-102.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "df8a53f2e992e7113e53f42aa854ed71bbe9cde213e337eb87a051c92ce038f2"; + sha256 = "d7a50f3f8734d249e565cbf1078627fb0e3cfa42f293574127bd2fa549652be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/nl/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/nl/thunderbird-102.2.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4e3b4060d0672cec8ddd0f0f7fc5f472c74ef4dbe2fa3f321ec1a2d83f5da5b1"; + sha256 = "8962f690d105d4589df0279770b63f0b90485cb499f86e953393dd4116a87b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/nn-NO/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/nn-NO/thunderbird-102.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "bdee6b2564fbe0c27f8f73b12f0d098c880d9620aaab4a0ac4a45843c3d3cb31"; + sha256 = "d0b940decdc8d77a0a6371ded16c551d8ce081134c4bb7d795adde39c5844254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/pa-IN/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pa-IN/thunderbird-102.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d1b4977be649dc8ce14e2d1718a7e4848e2b779ab590a73d9ab9cbb93f367fe8"; + sha256 = "dd5a2d9b78085786039ca20ef88f991285ff7b59ce47857b7d81bc74faa6ec54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/pl/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pl/thunderbird-102.2.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d525db6addbce4a8184b41979762f059f1ab320689dccf2d05ebbe21605bc5a4"; + sha256 = "9da17d31bbacc006c2a9530d42d864ea56c9cf5b84a73d03add270bc275543b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/pt-BR/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pt-BR/thunderbird-102.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2fb7e81228bf937da77e9c6f3b31d6fc997963747d9c350f49061bde7a45bb8f"; + sha256 = "81fee2a7ba6a2b0b8607e412324b2eebd1dc3f28194dc7de1efa5af9f1fa23a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/pt-PT/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pt-PT/thunderbird-102.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5668d31d58bf0e127b1469a8e06751ba19cfcda76cd1cc98d02018de4165bc76"; + sha256 = "82e354e1642b8018c0a6f2ccc3d3d38f3a7aa39333a30d9a6ea7c6c52df6d6f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/rm/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/rm/thunderbird-102.2.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "904d413f3a07ef047d125a5a9395b87ef5a7babddab14ca813581861450531e4"; + sha256 = "d7fa26de70531e74931892a78a5148f95df92d29a94e7ce5aeef11168c1069ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ro/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ro/thunderbird-102.2.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e19bb49a4a542028d8457d00dce350644843795350787aa6f08c95bc74437113"; + sha256 = "c4392159cabd3cf19b575d8a0598b0d52a1f9fb993234d1170240c6c6a5e4fa6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/ru/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ru/thunderbird-102.2.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "95ba91fba53940a4966a6a7cb844498e2923b4b0ca7cf51c6e2b41f30f91b3f6"; + sha256 = "ac3d6fc7b555298ae05cb3b0fef2b6264ff11a5961f5e044664022e80bb9ae34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/sk/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sk/thunderbird-102.2.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ea321124434fac1d6ba5266d2e8b4abd1038e5447a6bc0cd44542eff4bdc4ce2"; + sha256 = "41cc5938d5b64508bcc095ddfbe3eef3cde3dd88a8f145ed279bf825785fde50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/sl/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sl/thunderbird-102.2.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6921a1590a1369eadd5f064aa5cf395fc162dde32ff0b61dc55d49a9e67807d0"; + sha256 = "f8fb013b2705ce34749d1470e799d47c09b5ba94a9580a5e2d12be8b660c58c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/sq/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sq/thunderbird-102.2.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c91a7703064f9c17c1e95b25cb4f669f95efe54b174e530bc2776d870c5225cc"; + sha256 = "dc7407c4cb28070693b7862bc29b465a4d96c473b5b4f553d238390c694804a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/sr/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sr/thunderbird-102.2.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "ad7d6a645e7ee883f1ae0cad11f4be146f97953d93e0deaefb6e890734a95cbb"; + sha256 = "640731bbc689acb4874bc0f439f34213e30812bafae3ef94471945b13ae27243"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/sv-SE/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sv-SE/thunderbird-102.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a9571d48f8cd48bc7a28fd8f6e1159ed808f316ac8e3e4a5bfaf6ce34f79fef5"; + sha256 = "6d71d4ffa6393bc997566dc604992c093c24bd3a978b947704f82f03893fccfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/th/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/th/thunderbird-102.2.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ff826f5422e47661edda7c6a9cf6ece9118134bcd5db44a77e64baf36d42d03a"; + sha256 = "faecaf65b8737dc63d2ea469ba1181c1e0a71c334baf29c8677730faecffb57c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/tr/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/tr/thunderbird-102.2.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "4b2195603362dca61f2134055642a803362fd778df64bc3cc886233387b0dacb"; + sha256 = "c6401dfca452996547b3f33dead4690f9e376313920ef7880774c8a3e556b213"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/uk/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/uk/thunderbird-102.2.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ebe0d31a0eaa084d2c34a09951bc3be9dcbdc0b70e4c445a604da10972c9dac1"; + sha256 = "05fc335e16ad0c28a59a6ba51566161f92c0053b12b0ec56409e62eaf77fa2b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/uz/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/uz/thunderbird-102.2.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4b4333b4f3fd335cc8dd46b2c180cee40ab259f94d4b1d483b8e065efe5ff05c"; + sha256 = "5690ad8156e70dba56ed7664f99ac335409e88f5fc0d05be530774fdeedd20ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/vi/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/vi/thunderbird-102.2.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ea5916ae8265ddc6f25305f902de24bec8cd4bbe81f8710689fd53e2c0833894"; + sha256 = "41cb6da3b59cfa31ebf28e67f93349977dcd640df5491fa451f19bc0670aa2d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/zh-CN/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/zh-CN/thunderbird-102.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "2e159880fcc061eae67c7a166a6deef10e9d277f00e19fbf9ee00ad46e63cb3a"; + sha256 = "79f9f7e1620efa56ab2a8f3a1d1aea91cf82a0c12b6f0bbac01bbd5fdc6b3c63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.0/linux-i686/zh-TW/thunderbird-102.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/zh-TW/thunderbird-102.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "26d10a147f3dc0f40a83a1c7a9ea84862a36c85f4a5ff4c36578814ed7f8ebbb"; + sha256 = "763790430eff0c8689cb045e30920b1c0fe239a324ce739b153f8a16ccb07b25"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index adf2c5718829..08a94291c9de 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -39,13 +39,13 @@ rec { }; thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.2.0"; + version = "102.2.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "a9ca311e3c55c8703aaecfe30f8a8040a16acc445530f7462baeaaf941f7221e60b66b0894ea0b3c0eb83ccc882706674cfa319ae93557405946ffffb1f6b5dc"; + sha512 = "7b69cfffb5de56690cbbd97f6b627733072dee498a15adfece990f9019df8df948762ce8eb2ca2d91ef12ff56262fb1905476d8a477aed70bc71cd2f9f986ea4"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 236f7df5d76b..d7480bb42518 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "nickg"; repo = pname; rev = "r${version}"; - sha256 = "sha256-U9VxpHzrAQPMqnSs0YcEnc9dlQUutTuZCJP5F1v7eaA="; + sha256 = "sha256-OcRwhhX93E8LHUeFzgjGxw6OANACOUJmY4i0JKjtHfI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 985df6a8f5f0..4d92f4f2ea34 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -84,6 +84,10 @@ let common = { version, sha256, patches ? [ ] }: }; in { + z3_4_11 = common { + version = "4.11.0"; + sha256 = "sha256-ItmtZHDhCeLAVtN7K80dqyAh20o7TM4xk2sTb9QgHvk="; + }; z3_4_8 = common { version = "4.8.15"; sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5"; diff --git a/pkgs/applications/video/mov-cli/default.nix b/pkgs/applications/video/mov-cli/default.nix new file mode 100644 index 000000000000..35789cb395f3 --- /dev/null +++ b/pkgs/applications/video/mov-cli/default.nix @@ -0,0 +1,29 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonPackage rec { + pname = "mov-cli"; + version = "unstable-2022-06-30"; + + src = fetchFromGitHub { + owner = "mov-cli"; + repo = "mov-cli"; + rev = "b89e807e8ffc830b0b18c8e98712441c03774b8e"; + sha256 = "sha256-D+OeXcLdkbG4ASbPQYIWf7J1CRZ9jH3UXxfTL4WleY0="; + }; + + propagatedBuildInputs = with python3.pkgs; [ setuptools httpx click beautifulsoup4 colorama ]; + + postPatch = '' + substituteInPlace setup.py --replace "bs4" "beautifulsoup4" + ''; + + meta = with lib; { + homepage = "https://github.com/mov-cli/mov-cli"; + description = "A cli tool to browse and watch movies"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ baitinq ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index 014a7ef2fbaa..70b6790a58a8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "fzwoch"; repo = "obs-gstreamer"; rev = "v${version}"; - hash = "sha256-CDtWe4bx1M06nfqvVmIZaLQoKAsXFnG0Xy/mhiSbMgU="; + hash = "sha256-zP1MMoXLp+gp0fjVbWi/Wse6I8u9/K2IeSew3OjkCkE="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 9449eeee3e0c..63e8858e58c4 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.3.8"; + version = "0.3.12"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fzj22vGW4qLXSw5lICxVbiVFxYYvkarVLLHT+DdLVRk="; + sha256 = "sha256-wzbyBofWYXkOx+kNAmo9lDQdfkYLndh+Pw09+bxNqbU="; }; - cargoSha256 = "sha256-v3LNadq3E08Z+LfRSGQxG1HPgYWBQ8K/44LOrjgrsy0="; + cargoSha256 = "sha256-0KMs4YeWMj4Wz+iIVQ5XEwswVRs0q5Vibcy5fFNbH04="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/ovmfvartool/default.nix b/pkgs/applications/virtualization/ovmfvartool/default.nix new file mode 100644 index 000000000000..1367087e0832 --- /dev/null +++ b/pkgs/applications/virtualization/ovmfvartool/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchFromGitHub, python3 }: + +stdenvNoCC.mkDerivation rec { + pname = "ovmfvartool"; + version = "unstable-2021-06-16"; + + src = fetchFromGitHub { + owner = "hlandau"; + repo = pname; + rev = "c4c0c24dce1d201f95dfd69fd7fd9d51ea301377"; + hash = "sha256-3OvYAB41apPn1c2YTKBIEITmHSUMQ0oEijY5DhZWWGo="; + }; + + postPatch = let + pythonPkg = python3.withPackages (p: with p; [ pyyaml ]); + in '' + # needed in build but /usr/bin/env is not available in sandbox + substituteInPlace ovmfvartool \ + --replace "/usr/bin/env python3" "${pythonPkg.interpreter}" + ''; + + installPhase = '' + mkdir -p $out/bin + install -m 755 ovmfvartool $out/bin/ + ''; + + meta = with lib; { + description = "Parse and generate OVMF_VARS.fd from Yaml"; + homepage = "https://github.com/hlandau/ovmfvartool"; + license = licenses.gpl3; + maintainers = with maintainers; [ baloo raitobezarius ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 32dc872a5c4b..3d8d87ec2274 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "sha256-9rN1x5UfcoQCeYsLqrsthkeMpT1Eztvvq74cRr9G+Dk="; + url = "https://download.qemu.org/qemu-${version}.tar.xz"; + sha256 = "1rmvrgqjhrvcmchnz170dxvrrf14n6nm39y8ivrprmfydd9lwqx0"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -109,44 +109,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) - # make nixos tests that boot from USB more stable - # https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html - (fetchpatch { - url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch"; - sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o="; - }) - # fix 9p on macOS host, landed in master - (fetchpatch { - name = "fix-9p-on-macos.patch"; - url = "https://gitlab.com/qemu/qemu/-/commit/f5643914a9e8f79c606a76e6a9d7ea82a3fc3e65.patch"; - sha256 = "sha256-8i13wU135h+YxoXFtkXweBN3hMslpWoNoeQ7Ydmn3V4="; - }) - (fetchpatch { - name = "CVE-2022-35414.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/418ade7849ce7641c0f7333718caf5091a02fd4c.patch"; - sha256 = "sha256-zQHDXedIXZBnabv4+3TA4z5mY1+KZiPmqUbhaSkGLgA="; - }) - # needed for CVE-2022-0216's test to pass - (fetchpatch { - name = "fuzz-tests-x86-only.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/b911c30c566dee48a27bc1bfa1ee6df3a729cbbb.patch"; - sha256 = "sha256-RXKRmZo25yZ1VuBtBA+BsY8as9kIcACqE6aEYmIm9KQ="; - }) - (fetchpatch { - name = "CVE-2022-0216.part-1.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/6c8fa961da5e60f574bb52fd3ad44b1e9e8ad4b8.patch"; - sha256 = "sha256-0z0zVPBVXFSU8qEV0Ea2+rDxyikMyitlDM0jZOLLC6s="; - }) - (fetchpatch { - name = "CVE-2022-0216.part-2.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/4367a20cc442c56b05611b4224de9a61908f9eac.patch"; - sha256 = "sha256-hpNu4Zjw1dIbT6Vt57cayHE1Elaltp0a/bsKlDY0Qr8="; - }) - (fetchpatch { - name = "CVE-2020-14394.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/effaf5a240e03020f4ae953e10b764622c3e87cc.patch"; - sha256 = "sha256-NobsIxRC+xlyj8d/oD4mqgXAGX37pfww/PQQuKhrTzc="; - }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; diff --git a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch index 0b2dd0ee5ece..94dec6916800 100644 --- a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch +++ b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch @@ -1,16 +1,17 @@ -diff -Naur a/qga/commands-posix.c b/qga/commands-posix.c ---- a/qga/commands-posix.c -+++ b/qga/commands-posix.c -@@ -109,6 +109,8 @@ - reopen_fd_to_null(1); - reopen_fd_to_null(2); - -+ execle("/run/current-system/sw/bin/shutdown", "shutdown", "-h", shutdown_flag, "+0", -+ "hypervisor initiated shutdown", (char*)NULL, environ); - execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", - "hypervisor initiated shutdown", (char*)NULL, environ); - _exit(EXIT_FAILURE); -@@ -157,11 +159,13 @@ +diff --git i/qga/commands-posix.c w/qga/commands-posix.c +index 954efed01b..39c4b916ce 100644 +--- i/qga/commands-posix.c ++++ w/qga/commands-posix.c +@@ -123,6 +123,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) + execl("/sbin/shutdown", "shutdown", shutdown_flag, "-g0", "-y", + "hypervisor initiated shutdown", (char *)NULL); + #else ++ execl("/run/current-system/sw/bin/shutdown", "shutdown", "-h", shutdown_flag, "+0", ++ "hypervisor initiated shutdown", (char *)NULL); + execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", + "hypervisor initiated shutdown", (char *)NULL); + #endif +@@ -158,11 +160,13 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) pid_t pid; Error *local_err = NULL; struct timeval tv; @@ -25,12 +26,11 @@ diff -Naur a/qga/commands-posix.c b/qga/commands-posix.c } if (!hwclock_available) { -@@ -207,6 +211,8 @@ +@@ -208,6 +212,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) /* Use '/sbin/hwclock -w' to set RTC from the system time, * or '/sbin/hwclock -s' to set the system time from RTC. */ -+ execle(hwclock_path_nix, "hwclock", has_time ? "-w" : "-s", -+ NULL, environ); - execle(hwclock_path, "hwclock", has_time ? "-w" : "-s", - NULL, environ); ++ execl(hwclock_path_nix, "hwclock", has_time ? "-w" : "-s", NULL); + execl(hwclock_path, "hwclock", has_time ? "-w" : "-s", NULL); _exit(EXIT_FAILURE); + } else if (pid < 0) { diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch index 775066f6fdde..2faab7acd873 100644 --- a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch +++ b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch @@ -1,4 +1,4 @@ -From 19b0952b36b6b5c4bd2665cc0bd4e55a85f81b55 Mon Sep 17 00:00:00 2001 +From 756021d1e433925cf9a732d7ea67b01b0beb061c Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 29 Mar 2022 14:00:56 -0400 Subject: [PATCH] Revert "ui/cocoa: Add clipboard support" @@ -7,8 +7,8 @@ This reverts commit 7e3e20d89129614f4a7b2451fe321cc6ccca3b76. --- include/ui/clipboard.h | 2 +- ui/clipboard.c | 2 +- - ui/cocoa.m | 121 ----------------------------------------- - 3 files changed, 2 insertions(+), 123 deletions(-) + ui/cocoa.m | 123 ----------------------------------------- + 3 files changed, 2 insertions(+), 125 deletions(-) diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h index ce76aa451f..c4e1dc4ff4 100644 @@ -37,18 +37,18 @@ index 9079ef829b..6b9ed59e1b 100644 { if (!info || diff --git a/ui/cocoa.m b/ui/cocoa.m -index c4e5468f9e..cd3bdf0cec 100644 +index 5a8bd5dd84..79ed6d043f 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m -@@ -28,7 +28,6 @@ - #include +@@ -29,7 +29,6 @@ - #include "qemu-common.h" + #include "qemu/help-texts.h" + #include "qemu-main.h" -#include "ui/clipboard.h" #include "ui/console.h" #include "ui/input.h" #include "ui/kbd-state.h" -@@ -107,10 +106,6 @@ static void cocoa_switch(DisplayChangeListener *dcl, +@@ -109,10 +108,6 @@ static void cocoa_switch(DisplayChangeListener *dcl, static QemuSemaphore app_started_sem; static bool allow_events; @@ -59,7 +59,7 @@ index c4e5468f9e..cd3bdf0cec 100644 // Utility functions to run specified code block with iothread lock held typedef void (^CodeBlock)(void); typedef bool (^BoolCodeBlock)(void); -@@ -1805,105 +1800,6 @@ static void addRemovableDevicesMenuItems(void) +@@ -1815,107 +1810,6 @@ static void addRemovableDevicesMenuItems(void) qapi_free_BlockInfoList(pointerToFree); } @@ -146,16 +146,18 @@ index c4e5468f9e..cd3bdf0cec 100644 -static void cocoa_clipboard_request(QemuClipboardInfo *info, - QemuClipboardType type) -{ +- NSAutoreleasePool *pool; - NSData *text; - - switch (type) { - case QEMU_CLIPBOARD_TYPE_TEXT: +- pool = [[NSAutoreleasePool alloc] init]; - text = [[NSPasteboard generalPasteboard] dataForType:NSPasteboardTypeString]; - if (text) { - qemu_clipboard_set_data(&cbpeer, info, type, - [text length], [text bytes], true); -- [text release]; - } +- [pool release]; - break; - default: - break; @@ -165,7 +167,7 @@ index c4e5468f9e..cd3bdf0cec 100644 /* * The startup process for the OSX/Cocoa UI is complicated, because * OSX insists that the UI runs on the initial main thread, and so we -@@ -1938,7 +1834,6 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, +@@ -1950,7 +1844,6 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, COCOA_DEBUG("Second thread: calling qemu_main()\n"); status = qemu_main(gArgc, gArgv, *_NSGetEnviron()); COCOA_DEBUG("Second thread: qemu_main() returned, exiting\n"); @@ -173,7 +175,7 @@ index c4e5468f9e..cd3bdf0cec 100644 exit(status); } -@@ -2054,18 +1949,6 @@ static void cocoa_refresh(DisplayChangeListener *dcl) +@@ -2066,18 +1959,6 @@ static void cocoa_refresh(DisplayChangeListener *dcl) [cocoaView setAbsoluteEnabled:YES]; }); } @@ -192,7 +194,7 @@ index c4e5468f9e..cd3bdf0cec 100644 [pool release]; } -@@ -2105,10 +1988,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) +@@ -2117,10 +1998,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) // register vga output callbacks register_displaychangelistener(&dcl); diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 4565128f52b0..1c15e8b970b7 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -84,6 +84,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + + # Disable tests that rely on objdump whitespace until fixed upstream: + # https://issues.dlang.org/show_bug.cgi?id=23317 + rm dmd/test/runnable/cdvecfill.sh + rm dmd/test/compilable/cdcmp.d '' # This one has tested against a hardcoded year, then against a current year on diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index efb5972e5421..0f556f85daa3 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -1,28 +1,26 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mcpp"; - version = "2.7.2"; + version = "2.7.2.1"; - src = fetchurl { - url = "mirror://sourceforge/mcpp/mcpp-${version}.tar.gz"; - sha256 = "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv"; + src = fetchFromGitHub { + owner = "museoa"; + repo = "mcpp"; + rev = finalAttrs.version; + hash= "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY="; }; configureFlags = [ "--enable-mcpplib" ]; - patches = [ - (fetchpatch { - name = "CVE-2019-14274.patch"; - url = "https://github.com/h8liu/mcpp/commit/ea453aca2742be6ac43ba4ce0da6f938a7e5a5d8.patch"; - sha256 = "0svkdr3w9b45v6scgzvggw9nsh6a3k7g19fqk0w3vlckwmk5ydzr"; - }) - ]; - meta = with lib; { - homepage = "http://mcpp.sourceforge.net/"; - description = "A portable c preprocessor"; + homepage = "https://github.com/museoa/mcpp"; + description = "Matsui's C preprocessor"; license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index 38ba9d78712e..799915b1b7f6 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ecpdap"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "adamgreig"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fdvpGmEy54i48H6YJ4E1LIuogimNEL8PJS5ScoW/6DM="; + sha256 = "sha256-KXfEQnbhUUKsCDKhPBjwjF9eJMuiCx5o7gOSzyWv36s="; }; - cargoSha256 = "sha256-2YARNoHVDBwGr8FE/oRlNZMX/vCPIre7OnZbr04eF/M="; + cargoSha256 = "sha256-BEfsNSzrdV/tnzWk4oOwchOupW6PzZ8TEx7zUzwLBV8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index bec7860223af..07adb5fde829 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -33,7 +33,7 @@ let fmt (formerly cppformat) is an open-source formatting library. It can be used as a fast and safe alternative to printf and IOStreams. ''; - homepage = "http://fmtlib.net/"; + homepage = "https://fmt.dev/"; downloadPage = "https://github.com/fmtlib/fmt/"; maintainers = [ maintainers.jdehaas ]; license = licenses.mit; @@ -51,4 +51,9 @@ in version = "8.1.1"; sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; }; + + fmt_9 = generic { + version = "9.0.0"; + sha256 = "sha256-nwlAzMkY1JdhLtes48VaNH9LS7GzqtPCwk2dZA/bGmQ="; + }; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 8e3afb1e5c38..6cde17e5fce6 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.08.22.00"; + version = "2022.08.29.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-Cj8JK3uoObt1G8kd2y4KxS88WwLPthdBvPcLi1C24aQ="; + sha256 = "sha256-OALOfjr9qEqr8dbL9G8USKImU+hDP8iDfJijzT6KPLM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 408518ba79ce..14233488844d 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "http://fox-toolkit.org"; license = licenses.lgpl3; maintainers = []; - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && stdenv.isAarch64; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 685baea4a4ca..36c7120ac609 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs configure"; meta = with lib; { - broken = stdenv.isDarwin; license = licenses.mit; homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 55f1fb2790e6..4cba9c1b511b 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.48.0"; # N.B: if you change this, please update: + version = "1.48.1"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-cR+K3po/9XpYWe+sRXGwzvNAPChrWzYu5D4ygBTKKIQ="; + hash = "sha256-It9oFenKoPDCOVxiKCGJc8i18zdDZCceR22HR5Tu1sw="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index e5d44edb6e74..85ca439b88fc 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper -, perlPackages, libxml2, libiconv }: +, perlPackages, libxml2, libintl }: stdenv.mkDerivation rec { pname = "hivex"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libxml2 ] ++ (with perlPackages; [ perl IOStringy ]) - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.isDarwin [ libintl ]; postInstall = '' wrapProgram $out/bin/hivexregedit \ @@ -29,11 +29,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Windows registry hive extraction library"; license = licenses.lgpl2; homepage = "https://github.com/libguestfs/hivex"; maintainers = with maintainers; [offline]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 60a6c4f69eb7..a77d64ffddce 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -12,8 +12,12 @@ stdenv.mkDerivation rec { sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; + patches = [ + # Fix spacing around string literal for modern clang + ./v3-darwin.patch + ]; + meta = with lib; { - broken = stdenv.isDarwin; homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' diff --git a/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch b/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch new file mode 100644 index 000000000000..af97eaff1ed3 --- /dev/null +++ b/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch @@ -0,0 +1,22 @@ +diff --git a/src/webservice.cpp b/src/webservice.cpp +index 3a36167..df14812 100644 +--- a/src/webservice.cpp ++++ b/src/webservice.cpp +@@ -184,7 +184,7 @@ WebService::get(const std::string &entity, + if (!sess) + throw WebServiceError("ne_session_create() failed."); + ne_set_server_auth(sess, httpAuth, this); +- ne_set_useragent(sess, PACKAGE"/"VERSION); ++ ne_set_useragent(sess, PACKAGE "/" VERSION); + + // Use proxy server + if (!d->proxyHost.empty()) { +@@ -269,7 +269,7 @@ WebService::post(const std::string &entity, + if (!sess) + throw WebServiceError("ne_session_create() failed."); + ne_set_server_auth(sess, httpAuth, this); +- ne_set_useragent(sess, PACKAGE"/"VERSION); ++ ne_set_useragent(sess, PACKAGE "/" VERSION); + + // Use proxy server + if (!d->proxyHost.empty()) { diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index f164bae091ce..e8d731d755f6 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.8.2"; + version = "1.8.3"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-NnbEN9dhPUBtgEiKj5mBtW9RnTE9jmx/ZqRdqmuyIog="; + sha256 = "sha256-hKpwTpeEYKDvkkmwU7olW+a1pWiQTPDlN7Wy1IDk4UY="; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 33d3dcf49918..080889680443 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.14.0"; + version = "0.14.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MGLTFcsWVC/gTdgjny6LwyOO6QRc1QcLkVzy677Lqqw="; + hash = "sha256-nLlldO4otyWKn91L6vCiBh9csplFrN8tiK1tfeik6Y4="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index 14bb7ae6cb46..5d3e7d4482bd 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -3,7 +3,6 @@ , fetchPypi , celery , humanize -, mock , pytz , tornado , prometheus-client @@ -12,12 +11,12 @@ buildPythonPackage rec { pname = "flower"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+SDKKQLXU5/BgKsV5R8dkYNV5cwj2oVP+dWcbloXJbY="; + sha256 = "46493c7e8d9ca2167e8a46eb97ae8d280997cb40a81993230124d74f0fe40bac"; }; postPatch = '' @@ -35,27 +34,17 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook ]; - disabledTests = [ - # AssertionError as the celery release can't be detected - "test_default" - "test_with_app" - ]; - pythonImportsCheck = [ "flower" ]; meta = with lib; { - description = "Celery Flower"; + description = "Real-time monitor and web admin for Celery distributed task queue"; homepage = "https://github.com/mher/flower"; license = licenses.bsdOriginal; maintainers = with maintainers; [ arnoldfarkas ]; - knownVulnerabilities = [ - "CVE-2022-30034" - ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 076be48781fc..558872f718ef 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.14.0"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VNvIt3WYMMXOMovJvbSwKU2/Xz8/F+BW0XoKdi0QSo0="; + hash = "sha256-rWV7lY0CHrVJFOA/Yix/o3OE++wKSK5EEXOV6o5lwIo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 37f3617ecf39..77ac855e1f6f 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.48.0"; + version = "1.48.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "afac961fc3713889d3c48c11461aba49842ca62a54dfe8f346442046036e9856"; + sha256 = "655af4d0d6e67586cb2ca24c3db5fe08e4e2972d17f295f6b546fa7bd7eef1f6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 4797772086ad..9fdcdce48927 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.48.0"; + version = "1.48.1"; src = fetchPypi { inherit pname version; - sha256 = "dd7f757608e7dfae4ab2e7fc1e8951e6eb9526ebdc7ce90597329bc4c408c9a1"; + sha256 = "1178f2ea531f80cc2027ec64728df6ffc8e98cf1df61652a496eafd612127183"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 38e0b16726a8..2fa85598fb15 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -18,6 +18,7 @@ , mock , magic-wormhole-transit-relay , magic-wormhole-mailbox-server +, pytestCheckHook }: buildPythonPackage rec { @@ -49,7 +50,7 @@ buildPythonPackage rec { mock magic-wormhole-transit-relay magic-wormhole-mailbox-server - twisted + pytestCheckHook ]; postPatch = lib.optionalString stdenv.isLinux '' @@ -60,18 +61,6 @@ buildPythonPackage rec { install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 ''; - checkPhase = '' - export PATH=$out/bin:$PATH - export LANG="en_US.UTF-8" - export LC_ALL="en_US.UTF-8" - substituteInPlace src/wormhole/test/test_cli.py \ - --replace 'getProcessOutputAndValue("locale", ["-a"])' 'getProcessOutputAndValue("locale", ["-a"], env=os.environ)' \ - --replace 'if (os.path.dirname(os.path.abspath(wormhole))' 'if not os.path.abspath(wormhole).startswith("/nix/store") and (os.path.dirname(os.path.abspath(wormhole))' \ - --replace 'locale_env = dict(LC_ALL=locale, LANG=locale)' 'locale_env = dict(LC_ALL=locale, LANG=locale, LOCALE_ARCHIVE=os.getenv("LOCALE_ARCHIVE"))' - - trial -j$NIX_BUILD_CORES wormhole - ''; - meta = with lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole"; diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 8f303acd8fa4..140d81c87c72 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = "refs/tags/v${version}"; - hash = "sha256-MjpWPirupXoSnvnRNePx4hUTbiWHcL2bwUOoZAvN7pU="; + hash = "sha256-/M7Wyb1GW6LPWm41jVnhWA6+dyTrdLyJ6pfsMozw5xI="; }; patches = [ diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index d4a9e9255f23..5ae75098ddd3 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "18.0.0"; + version = "18.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6esqm9ukZNggwQB3XDwvZJMIjfZq8T37kyXMa4ZcjSM="; + hash = "sha256-eCBVnRZfGk2BDn2nyV+IQl2L5JX20aPG9CA7isGH4lQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 7e49433bc2f3..8d6d457d31a6 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -4,38 +4,41 @@ , fetchFromGitHub , webencodings , pytestCheckHook +, flit-core }: buildPythonPackage rec { pname = "tinycss2"; - version = "1.1.0"; - disabled = pythonOlder "3.5"; + version = "1.1.1"; format = "flit"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "kozea"; repo = "tinycss2"; rev = "v${version}"; # for tests fetchSubmodules = true; - sha256 = "sha256-WA88EYolL76WqeA1UKR3Sfw11j8NuOGOxPezujYizH8="; + sha256 = "sha256-RUF/3cjNgDFofoxl9iKY3u5ZAVVQmXu2Qbb5U4brdcQ="; }; - propagatedBuildInputs = [ webencodings ]; - - checkInputs = [ - pytestCheckHook - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace "'pytest-cov', 'pytest-flake8', 'pytest-isort', 'coverage[toml]'" "" \ - --replace "--isort --flake8 --cov" "" + --replace "--isort --flake8 --cov --no-cov-on-fail" "" ''; + nativeBuildInputs = [ flit-core ]; + + propagatedBuildInputs = [ webencodings ]; + + checkInputs = [ pytestCheckHook ]; + meta = with lib; { description = "Low-level CSS parser for Python"; homepage = "https://github.com/Kozea/tinycss2"; license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; }; } diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 8daf80400209..04f97c68c6a6 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -1,31 +1,14 @@ -{ lib, buildRubyGem, ruby, writeScript }: +{ buildRubyGem, ruby }: buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.3.21"; - source.sha256 = "sha256-+u3H/8Fno8U7ZMRj2me1DVvkOAR2HeWmjdo0TCG/0d4="; + version = "2.3.20"; + source.sha256 = "sha256-gJJ3vHzrJo6XpHS1iwLb77jd9ZB39GGLcOJQSrgaBHw="; dontPatchShebangs = true; - passthru.updateScript = writeScript "gem-update-script" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts jq - - set -eu -o pipefail - - latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) - update-source-version ${gemName} "$latest_version" - ''; - postFixup = '' sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle ''; - - meta = with lib; { - description = "Manage your Ruby application's gem dependencies"; - homepage = "https://bundler.io"; - license = licenses.mit; - maintainers = with maintainers; [anthonyroussel]; - }; } diff --git a/pkgs/development/tools/buf-language-server/default.nix b/pkgs/development/tools/buf-language-server/default.nix new file mode 100644 index 000000000000..88da6eb94482 --- /dev/null +++ b/pkgs/development/tools/buf-language-server/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "buf-language-server"; + version = "unstable-2022-08-19"; + + src = fetchFromGitHub { + owner = "bufbuild"; + repo = pname; + rev = "6f08a7eed22c5a178cb55613f454319e09be112c"; + sha256 = "sha256-UHsWrWDOC/f3YS2g533CgUkuUmz4MUQRunClQiY/YPQ="; + }; + + vendorSha256 = "sha256-ORzCOmBx6k1GZj6pYLhqPsdneCc7Tt1yHpI5mw5ruFU="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Language server for protocol buffers"; + homepage = "https://github.com/bufbuild/buf-language-server"; + license = licenses.asl20; + maintainers = with maintainers; [ svrana ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/actions_path.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/actions_path.patch new file mode 100644 index 000000000000..1fa1e5748333 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/actions_path.patch @@ -0,0 +1,41 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java +index 6fff2af..7e2877e 100644 +--- a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java ++++ b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java +@@ -47,6 +47,16 @@ public final class PosixLocalEnvProvider implements LocalEnvProvider { + Map env, BinTools binTools, String fallbackTmpDir) { + ImmutableMap.Builder result = ImmutableMap.builder(); + result.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR"))); ++ ++ // In case we are running on NixOS. ++ // If bash is called with an unset PATH on this platform, ++ // it will set it to /no-such-path and default tools will be missings. ++ // See, https://github.com/NixOS/nixpkgs/issues/94222 ++ // So we ensure that minimal dependencies are present. ++ if (!env.containsKey("PATH")){ ++ result.put("PATH", "@actionsPathPatch@"); ++ } ++ + String p = clientEnv.get("TMPDIR"); + if (Strings.isNullOrEmpty(p)) { + // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR +index 95642767c6..39d3c62461 100644 +--- a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java ++++ b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java +@@ -74,6 +74,16 @@ public final class XcodeLocalEnvProvider implements LocalEnvProvider { + + ImmutableMap.Builder newEnvBuilder = ImmutableMap.builder(); + newEnvBuilder.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR"))); ++ ++ // In case we are running on NixOS. ++ // If bash is called with an unset PATH on this platform, ++ // it will set it to /no-such-path and default tools will be missings. ++ // See, https://github.com/NixOS/nixpkgs/issues/94222 ++ // So we ensure that minimal dependencies are present. ++ if (!env.containsKey("PATH")){ ++ newEnvBuilder.put("PATH", "@actionsPathPatch@"); ++ } ++ + String p = clientEnv.get("TMPDIR"); + if (Strings.isNullOrEmpty(p)) { + // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix new file mode 100644 index 000000000000..b8e00bb95aed --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -0,0 +1,668 @@ +{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles +, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +# this package (through the fixpoint glass) +, bazel_self +# needed only for the updater +, bazel_4 +, lr, xe, zip, unzip, bash, writeCBin, coreutils +, which, gawk, gnused, gnutar, gnugrep, gzip, findutils +# updater +, python27, python3, writeScript +# Apple dependencies +, cctools, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk, runJdk +, runtimeShell +# Downstream packages for tests +, bazel-watcher +# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). +# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). +, enableNixHacks ? false +, gcc-unwrapped +, autoPatchelfHook +, file +, substituteAll +, writeTextFile +}: + +let + version = "6.0.0-pre.20220720.3"; + sourceRoot = "."; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + hash = "sha256-i8d4yLSq8fL+YT11wYmBvLDLSprq1gVfyjsKBYci1bk="; + }; + + # Update with `eval $(nix-build -A bazel_5.updater)`, + # then add new dependencies from the dict in ./src-deps.json as required. + srcDeps = lib.attrsets.attrValues srcDepsSet; + srcDepsSet = + let + srcs = lib.importJSON ./src-deps.json; + toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { + urls = d.urls; + sha256 = d.sha256; + }); + in builtins.listToAttrs (map toFetchurl [ + srcs.desugar_jdk_libs + srcs.io_bazel_skydoc + srcs.bazel_skylib + srcs.bazelci_rules + srcs.io_bazel_rules_sass + srcs.platforms + srcs.remote_java_tools_for_testing + srcs."coverage_output_generator-v2.6.zip" + srcs.build_bazel_rules_nodejs + srcs."android_tools_pkg-0.26.0.tar.gz" + srcs."zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz" + srcs.bazel_toolchains + srcs.com_github_grpc_grpc + srcs.upb + srcs.com_google_protobuf + srcs.rules_pkg + srcs.rules_cc + srcs.rules_java + srcs.rules_proto + srcs.rules_nodejs + srcs.rules_license + srcs.com_google_absl + srcs.com_googlesource_code_re2 + srcs.com_github_cares_cares + ]); + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellUtils = + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # + # Some of the scripts explicitly depend on Python 2.7. Otherwise, we + # default to using python3. Therefore, both python27 and python3 are + # runtime dependencies. + [ + bash + coreutils + file + findutils + gawk + gnugrep + gnused + gnutar + gzip + python27 + python3 + unzip + which + zip + ]; + + defaultShellPath = lib.makeBinPath defaultShellUtils; + + platforms = lib.platforms.linux ++ lib.platforms.darwin; + + system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; + + # on aarch64 Darwin, `uname -m` returns "arm64" + arch = with stdenv.hostPlatform; if isDarwin && isAarch64 then "arm64" else parsed.cpu.name; + + bazelRC = writeTextFile { + name = "bazel-rc"; + text = '' + startup --server_javabase=${runJdk} + + # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054 + # Most commands inherit from 'build' anyway. + build --distdir=${distDir} + fetch --distdir=${distDir} + query --distdir=${distDir} + + build --extra_toolchains=@bazel_tools//tools/jdk:nonprebuilt_toolchain_definition + build --tool_java_runtime_version=local_jdk_11 + build --java_runtime_version=local_jdk_11 + + # load default location for the system wide configuration + try-import /etc/bazel.bazelrc + ''; + }; + +in +stdenv.mkDerivation rec { + pname = "bazel"; + inherit version; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel/"; + description = "Build tool that builds code quickly and reliably"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; + license = licenses.asl20; + maintainers = lib.teams.bazel.members; + inherit platforms; + }; + + inherit src; + inherit sourceRoot; + patches = [ + # Force usage of the _non_ prebuilt java toolchain. + # the prebuilt one does not work in nix world. + ./java_toolchain.patch + + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' + # This is breaking the build of any C target. This patch removes the last + # argument if it's found to be an empty string. + ../trim-last-argument-to-gcc-if-empty.patch + + # `java_proto_library` ignores `strict_proto_deps` + # https://github.com/bazelbuild/bazel/pull/16146 + ./strict_proto_deps.patch + + # On Darwin, using clang 6 to build fails because of a linker error (see #105573), + # but using clang 7 fails because libarclite_macosx.a cannot be found when linking + # the xcode_locator tool. + # This patch removes using the -fobjc-arc compiler option and makes the code + # compile without automatic reference counting. Caveat: this leaks memory, but + # we accept this fact because xcode_locator is only a short-lived process used during the build. + (substituteAll { + src = ./no-arc.patch; + multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64"; + }) + + # --experimental_strict_action_env (which may one day become the default + # see bazelbuild/bazel#2574) hardcodes the default + # action environment to a non hermetic value (e.g. "/usr/local/bin"). + # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. + # So we are replacing this bazel paths by defaultShellPath, + # improving hermeticity and making it work in nixos. + (substituteAll { + src = ../strict_action_env.patch; + strictActionEnvPatch = defaultShellPath; + }) + + (substituteAll { + src = ./actions_path.patch; + actionsPathPatch = defaultShellPath; + }) + + # bazel reads its system bazelrc in /etc + # override this path to a builtin one + (substituteAll { + src = ../bazel_rc.patch; + bazelSystemBazelRCPath = bazelRC; + }) + ] ++ lib.optional enableNixHacks ./nix-hacks.patch; + + + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel_5.tests + # + # in the nixpkgs checkout root to exercise them locally. + passthru.tests = + let + runLocal = name: attrs: script: + let + attrs' = removeAttrs attrs [ "buildInputs" ]; + buildInputs = attrs.buildInputs or []; + in + runCommandCC name ({ + inherit buildInputs; + preferLocalBuild = true; + meta.platforms = platforms; + } // attrs') script; + + # bazel wants to extract itself into $install_dir/install every time it runs, + # so let’s do that only once. + extracted = bazelPkg: + let install_dir = + # `install_base` field printed by `bazel info`, minus the hash. + # yes, this path is kinda magic. Sorry. + "$HOME/.cache/bazel/_bazel_nixbld"; + in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' + export HOME=$(mktemp -d) + touch WORKSPACE # yeah, everything sucks + install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" + # assert it’s actually below install_dir + [[ "$install_base" =~ ${install_dir} ]] \ + || (echo "oh no! $install_base but we are \ + trying to copy ${install_dir} to $out instead!"; exit 1) + cp -R ${install_dir} $out + ''; + + bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: + let + be = extracted bazelPkg; + in runLocal name { inherit buildInputs; } ( + # skip extraction caching on Darwin, because nobody knows how Darwin works + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # set up home with pre-unpacked bazel + export HOME=$(mktemp -d) + mkdir -p ${be.install_dir} + cp -R ${be}/install ${be.install_dir} + + # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 + # Bazel checks whether the mtime of the install dir files + # is >9 years in the future, otherwise it extracts itself again. + # see PosixFileMTime::IsUntampered in src/main/cpp/util + # What the hell bazel. + ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} + '') + + + '' + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + + ${bazelScript} + + touch $out + ''); + + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; + + bazel-examples = fetchFromGitHub { + owner = "bazelbuild"; + repo = "examples"; + rev = "4183fc709c26a00366665e2d60d70521dc0b405d"; + sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; + }; + + in (if !stdenv.hostPlatform.isDarwin then { + # `extracted` doesn’t work on darwin + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;}; + } else {}) // { + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + # downstream packages using buildBazelPackage + # fixed-output hashes of the fetch phase need to be spot-checked manually + downstream = recurseIntoAttrs ({ + inherit bazel-watcher; + }); + }; + + src_for_updater = stdenv.mkDerivation rec { + name = "updater-sources"; + inherit src; + nativeBuildInputs = [ unzip ]; + inherit sourceRoot; + installPhase = '' + runHook preInstall + + cp -r . "$out" + + runHook postInstall + ''; + }; + # update the list of workspace dependencies + passthru.updater = writeScript "update-bazel-deps.sh" '' + #!${runtimeShell} + (cd "${src_for_updater}" && + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ + "${bazel_4}"/bin/bazel \ + query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ + --loading_phase_threads=1 \ + --output build) \ + | "${python3}"/bin/python3 "${./update-srcDeps.py}" \ + "${builtins.toString ./src-deps.json}" + ''; + + # Necessary for the tests to pass on Darwin with sandbox enabled. + # Bazel starts a local server and needs to bind a local address. + __darwinAllowLocalNetworking = true; + + postPatch = let + + darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails + export GCOV=${coreutils}/bin/false + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + tools/osx/BUILD + + substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' "" + + # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead + sed -i -e "/#include /i #include " src/main/cpp/blaze_util_darwin.cc + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;"/usr/bin/libtool";_find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done + ''; + + genericPatches = '' + # md5sum is part of coreutils + sed -i 's|/sbin/md5|md5sum|g' \ + src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh + + # replace initial value of pythonShebang variable in BazelPythonSemantics.java + substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \ + --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" + + substituteInPlace src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java \ + --replace '"#!/usr/bin/env python3"' "\"#!${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 + # 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 + # python3 is added to $out/nix-support + substituteInPlace "$path" \ + --replace /bin/bash ${bash}/bin/bash \ + --replace "/usr/bin/env bash" ${bash}/bin/bash \ + --replace "/usr/bin/env python" ${python3}/bin/python \ + --replace /usr/bin/env ${coreutils}/bin/env \ + --replace /bin/true ${coreutils}/bin/true + done + + grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do + substituteInPlace "$path" \ + --replace "/usr/bin/env python2" ${python27}/bin/python \ + --replace "/usr/bin/env python3" ${python3}/bin/python \ + --replace /usr/bin/env ${coreutils}/bin/env + done + + # bazel test runner include references to /bin/bash + substituteInPlace tools/build_rules/test_rules.bzl \ + --replace /bin/bash ${bash}/bin/bash + + for i in $(find tools/cpp/ -type f) + do + substituteInPlace $i \ + --replace /bin/bash ${bash}/bin/bash + done + + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/bash ${bash}/bin/bash + + # add nix environment vars to .bazelrc + cat >> .bazelrc <> third_party/grpc/bazel_1.41.0.patch <> runfiles.bash.tmp + cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp + mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash + + patchShebangs . + ''; + in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + + genericPatches; + + buildInputs = [buildJdk] ++ defaultShellUtils; + + # when a command can’t be found in a bazel build, you might also + # need to add it to `defaultShellPath`. + nativeBuildInputs = [ + installShellFiles + makeWrapper + python3 + unzip + which + zip + python3.pkgs.absl-py # Needed to build fish completion + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + + # Bazel makes extensive use of symlinks in the WORKSPACE. + # This causes problems with infinite symlinks if the build output is in the same location as the + # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a + # subdirectory. + # Failing to do this causes "infinite symlink expansion detected" + preBuildPhases = ["preBuildPhase"]; + preBuildPhase = '' + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + ''; + buildPhase = '' + runHook preBuild + + # Increasing memory during compilation might be necessary. + # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + + # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md + # and `git rev-parse --short HEAD` which would result in + # "3.7.0- (@non-git)" due to non-git build and incomplete changelog. + # Actual bazel releases use scripts/release/common.sh which is based + # on branch/tag information which we don't have with tarball releases. + # Note that .bazelversion is always correct and is based on bazel-* + # executable name, version checks should work fine + export EMBED_LABEL="${version}- (@non-git)" + ${bash}/bin/bash ./bazel_src/compile.sh + ./bazel_src/scripts/generate_bash_completion.sh \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.bash \ + --prepend=./bazel_src/scripts/bazel-complete-header.bash \ + --prepend=./bazel_src/scripts/bazel-complete-template.bash + ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.fish + + # need to change directory for bazel to find the workspace + cd ./bazel_src + # build execlog tooling + 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 + # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} + # The binary _must_ exist with this naming if your project contains a .bazelversion + # file. + cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} + mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + + mkdir $out/share + cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar + cat < $out/bin/bazel-execlog + #!${runtimeShell} -e + ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ + EOF + chmod +x $out/bin/bazel-execlog + + # shell completion files + installShellCompletion --bash \ + --name bazel.bash \ + ./bazel_src/output/bazel-complete.bash + installShellCompletion --zsh \ + --name _bazel \ + ./bazel_src/scripts/zsh_completion/_bazel + installShellCompletion --fish \ + --name bazel.fish \ + ./bazel_src/output/bazel-complete.fish + ''; + + # Install check fails on `aarch64-darwin` + # https://github.com/NixOS/nixpkgs/issues/145587 + doInstallCheck = stdenv.hostPlatform.system != "aarch64-darwin"; + installCheckPhase = '' + export TEST_TMPDIR=$(pwd) + + hello_test () { + $out/bin/bazel test \ + --test_output=errors \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello + } + + cd ./bazel_src + + # test whether $WORKSPACE_ROOT/tools/bazel works + + mkdir -p tools + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exit 1 + EOF + chmod +x tools/bazel + + # first call should fail if tools/bazel is used + ! hello_test + + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exec "$BAZEL_REAL" "$@" + EOF + + # 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. + # This is needed because the templates get tar’d up into a .jar. + postFixup = '' + mkdir -p $out/nix-support + echo "${defaultShellPath}" >> $out/nix-support/depends + # The string literal specifying the path to the bazel-rc file is sometimes + # stored non-contiguously in the binary due to gcc optimisations, which leads + # Nix to miss the hash when scanning for dependencies + echo "${bazelRC}" >> $out/nix-support/depends + '' + lib.optionalString stdenv.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends + ''; + + dontStrip = true; + dontPatchELF = true; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/java_toolchain.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/java_toolchain.patch new file mode 100644 index 000000000000..219f4e0b7035 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/java_toolchain.patch @@ -0,0 +1,33 @@ +diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools +--- a/tools/jdk/BUILD.tools ++++ b/tools/jdk/BUILD.tools +@@ -3,6 +3,7 @@ load( + "DEFAULT_TOOLCHAIN_CONFIGURATION", + "PREBUILT_TOOLCHAIN_CONFIGURATION", + "VANILLA_TOOLCHAIN_CONFIGURATION", ++ "NONPREBUILT_TOOLCHAIN_CONFIGURATION", + "bootclasspath", + "default_java_toolchain", + "java_runtime_files", +@@ -321,6 +322,21 @@ alias( + actual = ":toolchain", + ) + ++default_java_toolchain( ++ name = "nonprebuilt_toolchain", ++ configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION, ++ java_runtime = "@local_jdk//:jdk", ++) ++ ++default_java_toolchain( ++ name = "nonprebuilt_toolchain_java11", ++ configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION, ++ java_runtime = "@local_jdk//:jdk", ++ source_version = "11", ++ target_version = "11", ++) ++ ++ + RELEASES = (8, 9, 10, 11) + + [ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/nix-hacks.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/nix-hacks.patch new file mode 100644 index 000000000000..acae500d522c --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/nix-hacks.patch @@ -0,0 +1,40 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +index 25fbdcac9d..49616d37df 100644 +--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java ++++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +@@ -568,22 +568,7 @@ public final class RepositoryDelegatorFunction implements SkyFunction { + String content; + try { + content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8); +- String markerRuleKey = readMarkerFile(content, markerData); +- boolean verified = false; +- if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey)) { +- verified = handler.verifyMarkerData(rule, markerData, env); +- if (env.valuesMissing()) { +- return null; +- } +- } +- +- if (verified) { +- return new Fingerprint().addString(content).digestAndReset(); +- } else { +- // So that we are in a consistent state if something happens while fetching the repository +- markerPath.delete(); +- return null; +- } ++ return new Fingerprint().addString(content).digestAndReset(); + } catch (IOException e) { + throw new RepositoryFunctionException(e, Transience.TRANSIENT); + } +diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java +index 1a45b8a3a2..a6b73213f6 100644 +--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java ++++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java +@@ -152,7 +152,6 @@ public class JavaSubprocessFactory implements SubprocessFactory { + ProcessBuilder builder = new ProcessBuilder(); + builder.command(params.getArgv()); + if (params.getEnv() != null) { +- builder.environment().clear(); + builder.environment().putAll(params.getEnv()); + } + diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch new file mode 100644 index 000000000000..95d70a9db38e --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch @@ -0,0 +1,42 @@ +diff --git a/tools/osx/BUILD b/tools/osx/BUILD +index 990afe3e8c..cd5b7b1b7a 100644 +--- a/tools/osx/BUILD ++++ b/tools/osx/BUILD +@@ -28,8 +28,8 @@ exports_files([ + ]) + + DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ +- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \ +- -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \ ++ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \ ++ -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \ + env -i codesign --identifier $@ --force --sign - $@ + """ + +diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl +index 2b819f07ec..a98ce37673 100644 +--- a/tools/osx/xcode_configure.bzl ++++ b/tools/osx/xcode_configure.bzl +@@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label): + "macosx", + "clang", + "-mmacosx-version-min=10.9", +- "-fobjc-arc", + "-framework", + "CoreServices", + "-framework", +diff --git a/tools/osx/xcode_locator.m b/tools/osx/xcode_locator.m +index ed2ef87453..e0ce6dbdd1 100644 +--- a/tools/osx/xcode_locator.m ++++ b/tools/osx/xcode_locator.m +@@ -21,10 +21,6 @@ + // 6,6.4,6.4.1 = 6.4.1 + // 6.3,6.3.0 = 6.3 + +-#if !defined(__has_feature) || !__has_feature(objc_arc) +-#error "This file requires ARC support." +-#endif +- + #import + #import + 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 new file mode 100644 index 000000000000..032ec1f80a88 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json @@ -0,0 +1,1876 @@ +{ + "1.25.0.zip": { + "name": "1.25.0.zip", + "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" + ] + }, + "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { + "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, + "20211102.0.tar.gz": { + "name": "20211102.0.tar.gz", + "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" + ] + }, + "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz": { + "name": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", + "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", + "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz" + ] + }, + "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip": { + "name": "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip", + "sha256": "299452e6f4a4981b2e6d22357f7332713382a63e4c137f5fd6b89579f6d610cb", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip", + "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip" + ] + }, + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { + "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": { + "name": "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" + ] + }, + "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { + "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", + "urls": [ + "https://mirror.bazel.build/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + ] + }, + "android_tools": { + "name": "android_tools", + "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz" + }, + "android_tools_for_testing": { + "name": "android_tools_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a86d205da8bd08515d18bb4b98e4b66b8805e57008ec55118ff5ce038c57a5f1", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.26.0.tar.gz" + }, + "android_tools_pkg-0.26.0.tar.gz": { + "name": "android_tools_pkg-0.26.0.tar.gz", + "sha256": "a86d205da8bd08515d18bb4b98e4b66b8805e57008ec55118ff5ce038c57a5f1", + "urls": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.26.0.tar.gz" + ] + }, + "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { + "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + ] + }, + "bazel-skylib-1.0.3.tar.gz": { + "name": "bazel-skylib-1.0.3.tar.gz", + "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" + ] + }, + "bazel_compdb": { + "generator_function": "grpc_deps", + "generator_name": "bazel_compdb", + "name": "bazel_compdb", + "sha256": "bcecfd622c4ef272fd4ba42726a52e140b961c4eac23025f18b346c968a8cfb4", + "strip_prefix": "bazel-compilation-database-0.4.5", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz", + "https://github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz" + ] + }, + "bazel_gazelle": { + "generator_function": "grpc_deps", + "generator_name": "bazel_gazelle", + "name": "bazel_gazelle", + "sha256": "d987004a72697334a095bbaa18d615804a28280201a50ed6c234c40ccc41e493", + "strip_prefix": "bazel-gazelle-0.19.1", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz" + ] + }, + "bazel_skylib": { + "generator_function": "dist_http_archive", + "generator_name": "bazel_skylib", + "name": "bazel_skylib", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" + ] + }, + "bazel_toolchains": { + "generator_function": "grpc_deps", + "generator_name": "bazel_toolchains", + "name": "bazel_toolchains", + "sha256": "0b36eef8a66f39c8dbae88e522d5bbbef49d5e66e834a982402c79962281be10", + "strip_prefix": "bazel-toolchains-1.0.1", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/1.0.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/1.0.1/bazel-toolchains-1.0.1.tar.gz" + ] + }, + "bazelci_rules": { + "generator_function": "dist_http_archive", + "generator_name": "bazelci_rules", + "name": "bazelci_rules", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e", + "strip_prefix": "bazelci_rules-1.0.0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz", + "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz" + ] + }, + "bazelci_rules-1.0.0.tar.gz": { + "name": "bazelci_rules-1.0.0.tar.gz", + "sha256": "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz", + "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz" + ] + }, + "boringssl": { + "generator_function": "grpc_deps", + "generator_name": "boringssl", + "name": "boringssl", + "sha256": "6f640262999cd1fb33cf705922e453e835d2d20f3f06fe0d77f6426c19257308", + "strip_prefix": "boringssl-fc44652a42b396e1645d5e72aba053349992136a", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz", + "https://github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz" + ] + }, + "build_bazel_apple_support": { + "generator_function": "grpc_deps", + "generator_name": "build_bazel_apple_support", + "name": "build_bazel_apple_support", + "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz", + "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz" + ] + }, + "build_bazel_rules_apple": { + "generator_function": "grpc_deps", + "generator_name": "build_bazel_rules_apple", + "name": "build_bazel_rules_apple", + "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e", + "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz", + "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz" + ] + }, + "build_bazel_rules_nodejs": { + "generator_function": "dist_http_archive", + "generator_name": "build_bazel_rules_nodejs", + "name": "build_bazel_rules_nodejs", + "sha256": "0fad45a9bda7dc1990c47b002fd64f55041ea751fafc00cd34efb96107675778", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz" + ] + }, + "com_envoyproxy_protoc_gen_validate": { + "generator_function": "grpc_deps", + "generator_name": "com_envoyproxy_protoc_gen_validate", + "name": "com_envoyproxy_protoc_gen_validate", + "sha256": "dd4962e4a9e8388a4fbc5c33e64d73bdb222f103e4bad40ca5535f81c2c606c2", + "strip_prefix": "protoc-gen-validate-59da36e59fef2267fc2b1849a05159e3ecdf24f3", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz", + "https://github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz" + ] + }, + "com_github_cares_cares": { + "build_file": "@com_github_grpc_grpc//third_party:cares/cares.BUILD", + "generator_function": "grpc_deps", + "generator_name": "com_github_cares_cares", + "name": "com_github_cares_cares", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, + "com_github_google_benchmark": { + "generator_function": "grpc_deps", + "generator_name": "com_github_google_benchmark", + "name": "com_github_google_benchmark", + "sha256": "daa4a97e0547d76de300e325a49177b199f3689ce5a35e25d47696f7cb050f86", + "strip_prefix": "benchmark-73d4d5e8d6d449fc8663765a42aa8aeeee844489", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz", + "https://github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz" + ] + }, + "com_github_grpc_grpc": { + "generator_function": "dist_http_archive", + "generator_name": "com_github_grpc_grpc", + "name": "com_github_grpc_grpc", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/grpc:grpc_1.41.0.patch", + "//third_party/grpc:grpc_1.41.0.win_arm64.patch" + ], + "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", + "strip_prefix": "grpc-1.41.0", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz" + ] + }, + "com_google_absl": { + "generator_function": "dist_http_archive", + "generator_name": "com_google_absl", + "name": "com_google_absl", + "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "strip_prefix": "abseil-cpp-20211102.0", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" + ] + }, + "com_google_googleapis": { + "generator_function": "grpc_deps", + "generator_name": "com_google_googleapis", + "name": "com_google_googleapis", + "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0", + "strip_prefix": "googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", + "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz" + ] + }, + "com_google_googletest": { + "name": "com_google_googletest", + "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", + "strip_prefix": "googletest-release-1.10.0", + "urls": [ + "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", + "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" + ] + }, + "com_google_protobuf": { + "generator_function": "dist_http_archive", + "generator_name": "com_google_protobuf", + "name": "com_google_protobuf", + "patch_args": [ + "-p1" + ], + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "patches": [ + "//third_party/protobuf:3.19.2.patch" + ], + "sha256": "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e", + "strip_prefix": "protobuf-3.19.2", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz" + ] + }, + "com_google_testparameterinjector": { + "build_file_content": "\njava_library(\n name = \"testparameterinjector\",\n testonly = True,\n srcs = glob([\"src/main/**/*.java\"]),\n deps = [\n \"@org_snakeyaml//:snakeyaml\",\n \"@//third_party:auto_value\",\n \"@//third_party:guava\",\n \"@//third_party:junit4\",\n \"@//third_party/protobuf:protobuf_java\",\n ],\n visibility = [\"//visibility:public\"],\n)\n", + "name": "com_google_testparameterinjector", + "sha256": "562a0e87eb413a7dcad29ebc8d578f6f97503473943585b051c1398a58189b06", + "strip_prefix": "TestParameterInjector-1.0", + "urls": [ + "https://mirror.bazel.build/github.com/google/TestParameterInjector/archive/v1.0.tar.gz", + "https://github.com/google/TestParameterInjector/archive/v1.0.tar.gz" + ] + }, + "com_googlesource_code_re2": { + "generator_function": "grpc_deps", + "generator_name": "com_googlesource_code_re2", + "name": "com_googlesource_code_re2", + "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", + "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", + "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + ] + }, + "coverage_output_generator-v2.6.zip": { + "name": "coverage_output_generator-v2.6.zip", + "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip" + ] + }, + "cython": { + "build_file": "@com_github_grpc_grpc//third_party:cython.BUILD", + "generator_function": "grpc_deps", + "generator_name": "cython", + "name": "cython", + "sha256": "e2e38e1f0572ca54d6085df3dec8b607d20e81515fb80215aed19c81e8fe2079", + "strip_prefix": "cython-0.29.21", + "urls": [ + "https://github.com/cython/cython/archive/0.29.21.tar.gz" + ] + }, + "desugar_jdk_libs": { + "generator_function": "dist_http_archive", + "generator_name": "desugar_jdk_libs", + "name": "desugar_jdk_libs", + "sha256": "299452e6f4a4981b2e6d22357f7332713382a63e4c137f5fd6b89579f6d610cb", + "strip_prefix": "desugar_jdk_libs-5847d6a06302136d95a14b4cbd4b55a9c9f1436e", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip", + "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip" + ] + }, + "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { + "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", + "urls": [ + "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", + "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + ] + }, + "enum34": { + "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD", + "generator_function": "grpc_deps", + "generator_name": "enum34", + "name": "enum34", + "sha256": "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1", + "strip_prefix": "enum34-1.1.6", + "urls": [ + "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz" + ] + }, + "envoy_api": { + "generator_function": "grpc_deps", + "generator_name": "envoy_api", + "name": "envoy_api", + "sha256": "330f2f9c938fc038b7ab438919b692d30cdfba3cf596e7824410f88da16c30b5", + "strip_prefix": "data-plane-api-2f0d081fab0b0823f088c6e368f40e1992f46fcd", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz" + ] + }, + "futures": { + "build_file": "@com_github_grpc_grpc//third_party:futures.BUILD", + "generator_function": "grpc_deps", + "generator_name": "futures", + "name": "futures", + "sha256": "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794", + "strip_prefix": "futures-3.3.0", + "urls": [ + "https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00/futures-3.3.0.tar.gz" + ] + }, + "io_bazel_rules_go": { + "generator_function": "grpc_deps", + "generator_name": "io_bazel_rules_go", + "name": "io_bazel_rules_go", + "sha256": "dbf5a9ef855684f84cac2e7ae7886c5a001d4f66ae23f6904da0faaaef0d61fc", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz" + ] + }, + "io_bazel_rules_python": { + "generator_function": "grpc_deps", + "generator_name": "io_bazel_rules_python", + "name": "io_bazel_rules_python", + "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161", + "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz" + }, + "io_bazel_rules_sass": { + "generator_function": "dist_http_archive", + "generator_name": "io_bazel_rules_sass", + "name": "io_bazel_rules_sass", + "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", + "strip_prefix": "rules_sass-1.25.0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" + ] + }, + "io_bazel_skydoc": { + "generator_function": "dist_http_archive", + "generator_name": "io_bazel_skydoc", + "name": "io_bazel_skydoc", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, + "io_opencensus_cpp": { + "generator_function": "grpc_deps", + "generator_name": "io_opencensus_cpp", + "name": "io_opencensus_cpp", + "sha256": "90d6fafa8b1a2ea613bf662731d3086e1c2ed286f458a95c81744df2dbae41b1", + "strip_prefix": "opencensus-cpp-c9a4da319bc669a772928ffc55af4a61be1a1176", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz", + "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" + ] + }, + "java_tools-v11.8.zip": { + "name": "java_tools-v11.8.zip", + "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" + ] + }, + "java_tools_darwin-v11.8.zip": { + "name": "java_tools_darwin-v11.8.zip", + "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" + ] + }, + "java_tools_linux-v11.8.zip": { + "name": "java_tools_linux-v11.8.zip", + "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" + ] + }, + "java_tools_windows-v11.8.zip": { + "name": "java_tools_windows-v11.8.zip", + "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" + ] + }, + "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { + "name": "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip", + "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" + ] + }, + "opencensus_proto": { + "generator_function": "grpc_deps", + "generator_name": "opencensus_proto", + "name": "opencensus_proto", + "sha256": "b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0", + "strip_prefix": "opencensus-proto-0.3.0/src", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz", + "https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz" + ] + }, + "openjdk11_darwin_aarch64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk11_darwin_aarch64_archive", + "name": "openjdk11_darwin_aarch64_archive", + "sha256": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2", + "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-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", + "generator_function": "dist_http_archive", + "generator_name": "openjdk11_darwin_archive", + "name": "openjdk11_darwin_archive", + "sha256": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55", + "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz" + ] + }, + "openjdk11_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk11_linux_archive", + "name": "openjdk11_linux_archive", + "sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247", + "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz" + ] + }, + "openjdk11_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk11_windows_archive", + "name": "openjdk11_windows_archive", + "sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050", + "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip" + ] + }, + "openjdk11_windows_arm64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk11_windows_arm64_archive", + "name": "openjdk11_windows_arm64_archive", + "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "strip_prefix": "jdk-11.0.13+8", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" + ] + }, + "openjdk17_darwin_aarch64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk17_darwin_aarch64_archive", + "name": "openjdk17_darwin_aarch64_archive", + "sha256": "54247dde248ffbcd3c048675504b1c503b81daf2dc0d64a79e353c48d383c977", + "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-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" + ] + }, + "openjdk17_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk17_darwin_archive", + "name": "openjdk17_darwin_archive", + "sha256": "89d04b2d99b05dcb25114178e65f6a1c5ca742e125cab0a63d87e7e42f3fcb80", + "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-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" + ] + }, + "openjdk17_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk17_linux_archive", + "name": "openjdk17_linux_archive", + "sha256": "73d5c4bae20325ca41b606f7eae64669db3aac638c5b3ead4a975055846ad6de", + "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-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" + ] + }, + "openjdk17_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk17_windows_archive", + "name": "openjdk17_windows_archive", + "sha256": "e965aa0ea7a0661a3446cf8f10ee00684b851f883b803315289f26b4aa907fdb", + "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-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" + ] + }, + "openjdk17_windows_arm64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk17_windows_arm64_archive", + "name": "openjdk17_windows_arm64_archive", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-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" + ] + }, + "openjdk18_darwin_aarch64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk18_darwin_aarch64_archive", + "name": "openjdk18_darwin_aarch64_archive", + "sha256": "9595e001451e201fdf33c1952777968a3ac18fe37273bdeaea5b5ed2c4950432", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz" + ] + }, + "openjdk18_darwin_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk18_darwin_archive", + "name": "openjdk18_darwin_archive", + "sha256": "780a9aa4bda95a6793bf41d13f837c59ef915e9bfd0e0c5fd4c70e4cdaa88541", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz" + ] + }, + "openjdk18_linux_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk18_linux_archive", + "name": "openjdk18_linux_archive", + "sha256": "959a94ca4097dcaabc7886784cec10dfdf2b0a3bff890ea8943cc09c5fff29cb", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz" + ] + }, + "openjdk18_windows_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk18_windows_archive", + "name": "openjdk18_windows_archive", + "sha256": "6c75498163b047595386fdb909cb6d4e04282c3a81799743c5e1f9316391fe16", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip" + ] + }, + "openjdk18_windows_arm64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "generator_function": "dist_http_archive", + "generator_name": "openjdk18_windows_arm64_archive", + "name": "openjdk18_windows_arm64_archive", + "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip" + ] + }, + "openjdk_linux": { + "downloaded_file_path": "zulu-linux.tar.gz", + "name": "openjdk_linux", + "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz" + ] + }, + "openjdk_linux_aarch64": { + "downloaded_file_path": "zulu-linux-aarch64.tar.gz", + "name": "openjdk_linux_aarch64", + "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" + ] + }, + "openjdk_linux_aarch64_minimal": { + "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", + "name": "openjdk_linux_aarch64_minimal", + "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" + ] + }, + "openjdk_linux_aarch64_vanilla": { + "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", + "generator_function": "dist_http_file", + "generator_name": "openjdk_linux_aarch64_vanilla", + "name": "openjdk_linux_aarch64_vanilla", + "sha256": "fc7c41a0005180d4ca471c90d01e049469e0614cf774566d4cf383caa29d1a97", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz", + "https://cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz" + ] + }, + "openjdk_linux_minimal": { + "downloaded_file_path": "zulu-linux-minimal.tar.gz", + "name": "openjdk_linux_minimal", + "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz" + ] + }, + "openjdk_linux_ppc64le_vanilla": { + "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz", + "generator_function": "dist_http_file", + "generator_name": "openjdk_linux_ppc64le_vanilla", + "name": "openjdk_linux_ppc64le_vanilla", + "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f", + "urls": [ + "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz", + "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz" + ] + }, + "openjdk_linux_s390x_vanilla": { + "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz", + "generator_function": "dist_http_file", + "generator_name": "openjdk_linux_s390x_vanilla", + "name": "openjdk_linux_s390x_vanilla", + "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b", + "urls": [ + "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz", + "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz" + ] + }, + "openjdk_linux_vanilla": { + "downloaded_file_path": "zulu-linux-vanilla.tar.gz", + "generator_function": "dist_http_file", + "generator_name": "openjdk_linux_vanilla", + "name": "openjdk_linux_vanilla", + "sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz" + ] + }, + "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", + "generator_function": "dist_http_file", + "generator_name": "openjdk_macos_aarch64_vanilla", + "name": "openjdk_macos_aarch64_vanilla", + "sha256": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz" + ] + }, + "openjdk_macos_x86_64": { + "downloaded_file_path": "zulu-macos.tar.gz", + "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_x86_64_minimal": { + "downloaded_file_path": "zulu-macos-minimal.tar.gz", + "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_x86_64_vanilla": { + "downloaded_file_path": "zulu-macos-vanilla.tar.gz", + "generator_function": "dist_http_file", + "generator_name": "openjdk_macos_x86_64_vanilla", + "name": "openjdk_macos_x86_64_vanilla", + "sha256": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz" + ] + }, + "openjdk_win": { + "downloaded_file_path": "zulu-win.zip", + "name": "openjdk_win", + "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" + ] + }, + "openjdk_win_arm64_vanilla": { + "downloaded_file_path": "zulu-win-arm64.zip", + "generator_function": "dist_http_file", + "generator_name": "openjdk_win_arm64_vanilla", + "name": "openjdk_win_arm64_vanilla", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "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" + ] + }, + "openjdk_win_minimal": { + "downloaded_file_path": "zulu-win-minimal.zip", + "name": "openjdk_win_minimal", + "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" + ] + }, + "openjdk_win_vanilla": { + "downloaded_file_path": "zulu-win-vanilla.zip", + "generator_function": "dist_http_file", + "generator_name": "openjdk_win_vanilla", + "name": "openjdk_win_vanilla", + "sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip" + ] + }, + "org_snakeyaml": { + "build_file_content": "\njava_library(\n name = \"snakeyaml\",\n srcs = glob([\"src/main/**/*.java\"]),\n visibility = [\n \"@io_bazel//src/main/java/com/google/devtools/build/docgen/release:__pkg__\",\n \"@com_google_testparameterinjector//:__pkg__\",\n ],\n)\n", + "name": "org_snakeyaml", + "sha256": "fd0e0cc6c5974fc8f08be3a15fb4a59954c7dd958b5b68186a803de6420b6e40", + "strip_prefix": "asomov-snakeyaml-b28f0b4d87c6", + "urls": [ + "https://mirror.bazel.build/bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz" + ] + }, + "platforms": { + "generator_function": "dist_http_archive", + "generator_name": "platforms", + "name": "platforms", + "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" + ] + }, + "platforms-0.0.5.tar.gz": { + "name": "platforms-0.0.5.tar.gz", + "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" + ] + }, + "r8-3.3.28.jar": { + "name": "r8-3.3.28.jar", + "sha256": "8626ca32fb47aba7fddd2c897615e2e8ffcdb4d4b213572a2aefb3f838f01972", + "urls": [ + "https://maven.google.com/com/android/tools/r8/3.3.28/r8-3.3.28.jar" + ] + }, + "remote_coverage_tools": { + "name": "remote_coverage_tools", + "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" + ] + }, + "remote_java_tools_darwin": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_darwin", + "name": "remote_java_tools_darwin", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", + "urls": [ + "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_darwin_for_testing": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_darwin_for_testing", + "name": "remote_java_tools_darwin_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" + ] + }, + "remote_java_tools_for_testing": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_for_testing", + "name": "remote_java_tools_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" + ] + }, + "remote_java_tools_linux": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_linux", + "name": "remote_java_tools_linux", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", + "urls": [ + "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_linux_for_testing": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_linux_for_testing", + "name": "remote_java_tools_linux_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" + ] + }, + "remote_java_tools_test": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_test", + "name": "remote_java_tools_test", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" + ] + }, + "remote_java_tools_test_darwin": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_test_darwin", + "name": "remote_java_tools_test_darwin", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" + ] + }, + "remote_java_tools_test_linux": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_test_linux", + "name": "remote_java_tools_test_linux", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" + ] + }, + "remote_java_tools_test_windows": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_test_windows", + "name": "remote_java_tools_test_windows", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" + ] + }, + "remote_java_tools_windows": { + "generator_function": "maybe", + "generator_name": "remote_java_tools_windows", + "name": "remote_java_tools_windows", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", + "urls": [ + "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" + ] + }, + "remote_java_tools_windows_for_testing": { + "generator_function": "dist_http_archive", + "generator_name": "remote_java_tools_windows_for_testing", + "name": "remote_java_tools_windows_for_testing", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" + ] + }, + "remotejdk11_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux", + "name": "remotejdk11_linux", + "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + ] + }, + "remotejdk11_linux_aarch64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_aarch64", + "name": "remotejdk11_linux_aarch64", + "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", + "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", + "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" + ] + }, + "remotejdk11_linux_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_linux_aarch64_for_testing", + "name": "remotejdk11_linux_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": "fc7c41a0005180d4ca471c90d01e049469e0614cf774566d4cf383caa29d1a97", + "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz", + "https://cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz" + ] + }, + "remotejdk11_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_linux_for_testing", + "name": "remotejdk11_linux_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": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247", + "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz" + ] + }, + "remotejdk11_linux_ppc64le": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_ppc64le", + "name": "remotejdk11_linux_ppc64le", + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_ppc64le_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_linux_ppc64le_for_testing", + "name": "remotejdk11_linux_ppc64le_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": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f", + "strip_prefix": "jdk-11.0.15+10", + "urls": [ + "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz", + "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz" + ] + }, + "remotejdk11_linux_s390x": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_linux_s390x", + "name": "remotejdk11_linux_s390x", + "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" + ] + }, + "remotejdk11_linux_s390x_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_linux_s390x_for_testing", + "name": "remotejdk11_linux_s390x_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": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b", + "strip_prefix": "jdk-11.0.15+10", + "urls": [ + "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz", + "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz" + ] + }, + "remotejdk11_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_macos", + "name": "remotejdk11_macos", + "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "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" + ] + }, + "remotejdk11_macos_aarch64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_macos_aarch64", + "name": "remotejdk11_macos_aarch64", + "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_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_macos_aarch64_for_testing", + "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": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2", + "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz" + ] + }, + "remotejdk11_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_macos_for_testing", + "name": "remotejdk11_macos_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": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55", + "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz" + ] + }, + "remotejdk11_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_win", + "name": "remotejdk11_win", + "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", + "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + ] + }, + "remotejdk11_win_arm64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_win_arm64_for_testing", + "name": "remotejdk11_win_arm64_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": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "strip_prefix": "jdk-11.0.13+8", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" + ] + }, + "remotejdk11_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk11_win_for_testing", + "name": "remotejdk11_win_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": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050", + "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip" + ] + }, + "remotejdk14_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_linux", + "name": "remotejdk14_linux", + "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" + ] + }, + "remotejdk14_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_macos", + "name": "remotejdk14_macos", + "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" + ] + }, + "remotejdk14_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk14_win", + "name": "remotejdk14_win", + "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" + ] + }, + "remotejdk15_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk15_linux", + "name": "remotejdk15_linux", + "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" + ] + }, + "remotejdk15_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk15_macos", + "name": "remotejdk15_macos", + "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz" + ] + }, + "remotejdk15_macos_aarch64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk15_macos_aarch64", + "name": "remotejdk15_macos_aarch64", + "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_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk15_win", + "name": "remotejdk15_win", + "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6", + "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" + ] + }, + "remotejdk17_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk17_linux_for_testing", + "name": "remotejdk17_linux_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": "73d5c4bae20325ca41b606f7eae64669db3aac638c5b3ead4a975055846ad6de", + "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-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" + ] + }, + "remotejdk17_macos_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk17_macos_aarch64_for_testing", + "name": "remotejdk17_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": "54247dde248ffbcd3c048675504b1c503b81daf2dc0d64a79e353c48d383c977", + "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-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" + ] + }, + "remotejdk17_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk17_macos_for_testing", + "name": "remotejdk17_macos_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": "89d04b2d99b05dcb25114178e65f6a1c5ca742e125cab0a63d87e7e42f3fcb80", + "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-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" + ] + }, + "remotejdk17_win_arm64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk17_win_arm64_for_testing", + "name": "remotejdk17_win_arm64_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": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-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" + ] + }, + "remotejdk17_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk17_win_for_testing", + "name": "remotejdk17_win_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": "e965aa0ea7a0661a3446cf8f10ee00684b851f883b803315289f26b4aa907fdb", + "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-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" + ] + }, + "remotejdk18_linux_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk18_linux_for_testing", + "name": "remotejdk18_linux_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": "959a94ca4097dcaabc7886784cec10dfdf2b0a3bff890ea8943cc09c5fff29cb", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz" + ] + }, + "remotejdk18_macos_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk18_macos_aarch64_for_testing", + "name": "remotejdk18_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": "9595e001451e201fdf33c1952777968a3ac18fe37273bdeaea5b5ed2c4950432", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz" + ] + }, + "remotejdk18_macos_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk18_macos_for_testing", + "name": "remotejdk18_macos_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": "780a9aa4bda95a6793bf41d13f837c59ef915e9bfd0e0c5fd4c70e4cdaa88541", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz" + ] + }, + "remotejdk18_win_arm64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk18_win_arm64_for_testing", + "name": "remotejdk18_win_arm64_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": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip" + ] + }, + "remotejdk18_win_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "generator_function": "dist_http_archive", + "generator_name": "remotejdk18_win_for_testing", + "name": "remotejdk18_win_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": "6c75498163b047595386fdb909cb6d4e04282c3a81799743c5e1f9316391fe16", + "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip" + ] + }, + "rules_cc": { + "generator_function": "dist_http_archive", + "generator_name": "rules_cc", + "name": "rules_cc", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", + "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + ] + }, + "rules_java": { + "generator_function": "dist_http_archive", + "generator_name": "rules_java", + "name": "rules_java", + "patch_cmds": [ + "test -f BUILD && chmod u+w BUILD || true", + "echo >> BUILD", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "rules_jvm_external": { + "generator_function": "grpc_extra_deps", + "generator_name": "rules_jvm_external", + "name": "rules_jvm_external", + "sha256": "f36441aa876c4f6427bfb2d1f2d723b48e9d930b62662bf723ddfb8fc80f0140", + "strip_prefix": "rules_jvm_external-4.1", + "urls": [ + "https://github.com/bazelbuild/rules_jvm_external/archive/4.1.zip" + ] + }, + "rules_license": { + "generator_function": "dist_http_archive", + "generator_name": "rules_license", + "name": "rules_license", + "sha256": "00ccc0df21312c127ac4b12880ab0f9a26c1cff99442dc6c5a331750360de3c3", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz", + "https://github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz" + ] + }, + "rules_license-0.0.3.tar.gz": { + "name": "rules_license-0.0.3.tar.gz", + "sha256": "00ccc0df21312c127ac4b12880ab0f9a26c1cff99442dc6c5a331750360de3c3", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz", + "https://github.com/bazelbuild/rules_license/releases/download/0.0.3/rules_license-0.0.3.tar.gz" + ] + }, + "rules_nodejs": { + "generator_function": "dist_http_archive", + "generator_name": "rules_nodejs", + "name": "rules_nodejs", + "sha256": "4d48998e3fa1e03c684e6bdf7ac98051232c7486bfa412e5b5475bbaec7bb257", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-core-5.5.0.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-core-5.5.0.tar.gz" + ] + }, + "rules_nodejs-5.5.0.tar.gz": { + "name": "rules_nodejs-5.5.0.tar.gz", + "sha256": "0fad45a9bda7dc1990c47b002fd64f55041ea751fafc00cd34efb96107675778", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz" + ] + }, + "rules_nodejs-core-5.5.0.tar.gz": { + "name": "rules_nodejs-core-5.5.0.tar.gz", + "sha256": "4d48998e3fa1e03c684e6bdf7ac98051232c7486bfa412e5b5475bbaec7bb257", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-core-5.5.0.tar.gz", + "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-core-5.5.0.tar.gz" + ] + }, + "rules_pkg": { + "generator_function": "dist_http_archive", + "generator_name": "rules_pkg", + "name": "rules_pkg", + "sha256": "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz" + ] + }, + "rules_pkg-0.7.0.tar.gz": { + "name": "rules_pkg-0.7.0.tar.gz", + "sha256": "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz" + ] + }, + "rules_proto": { + "generator_function": "dist_http_archive", + "generator_name": "rules_proto", + "name": "rules_proto", + "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": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", + "strip_prefix": "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" + ] + }, + "six": { + "build_file": "@com_github_grpc_grpc//third_party:six.BUILD", + "generator_function": "grpc_deps", + "generator_name": "six", + "name": "six", + "sha256": "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", + "urls": [ + "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz" + ] + }, + "upb": { + "generator_function": "grpc_deps", + "generator_name": "upb", + "name": "upb", + "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", + "strip_prefix": "upb-2de300726a1ba2de9a468468dc5ff9ed17a3215f", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", + "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz" + ] + }, + "v1.41.0.tar.gz": { + "name": "v1.41.0.tar.gz", + "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", + "urls": [ + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz" + ] + }, + "v1.5.0-4.zip": { + "name": "v1.5.0-4.zip", + "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4", + "urls": [ + "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip", + "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip" + ] + }, + "v3.19.2.tar.gz": { + "name": "v3.19.2.tar.gz", + "sha256": "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz" + ] + }, + "zlib": { + "build_file": "@com_github_grpc_grpc//third_party:zlib.BUILD", + "generator_function": "grpc_deps", + "generator_name": "zlib", + "name": "zlib", + "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45", + "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz", + "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz" + ] + }, + "zstd-jni": { + "build_file": "//third_party:zstd-jni/zstd-jni.BUILD", + "generator_function": "dist_http_archive", + "generator_name": "zstd-jni", + "name": "zstd-jni", + "patch_args": [ + "-p1" + ], + "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" + ], + "patches": [ + "//third_party:zstd-jni/Native.java.patch" + ], + "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4", + "strip_prefix": "zstd-jni-1.5.0-4", + "urls": [ + "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip", + "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip" + ] + }, + "zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz": { + "name": "zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz", + "sha256": "fc7c41a0005180d4ca471c90d01e049469e0614cf774566d4cf383caa29d1a97", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz", + "https://cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz" + ] + }, + "zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz": { + "name": "zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz", + "sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz" + ] + }, + "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz": { + "name": "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz", + "sha256": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz" + ] + }, + "zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz": { + "name": "zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz", + "sha256": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz" + ] + }, + "zulu11.56.19-ca-jdk11.0.15-win_x64.zip": { + "name": "zulu11.56.19-ca-jdk11.0.15-win_x64.zip", + "sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip" + ] + }, + "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip": { + "name": "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "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" + ] + }, + "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip": { + "name": "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip", + "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip" + ] + } +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/strict_proto_deps.patch b/pkgs/development/tools/build-managers/bazel/bazel_6/strict_proto_deps.patch new file mode 100644 index 000000000000..7362de839311 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/strict_proto_deps.patch @@ -0,0 +1,21 @@ +diff --git a/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl b/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl +index 63f68167e4..f106e64c9b 100644 +--- a/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl ++++ b/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl +@@ -114,6 +114,7 @@ def java_compile_for_protos(ctx, output_jar_suffix, source_jar = None, deps = [] + exports = exports, + output = output_jar, + output_source_jar = source_jar, ++ strict_deps = ctx.fragments.proto.strict_proto_deps(), + injecting_rule_kind = injecting_rule_kind, + javac_opts = java_toolchain.compatible_javacopts("proto"), + enable_jspecify = False, +@@ -140,7 +141,7 @@ bazel_java_proto_aspect = aspect( + attr_aspects = ["deps", "exports"], + required_providers = [ProtoInfo], + provides = [JavaInfo, JavaProtoAspectInfo], +- fragments = ["java"], ++ fragments = ["java", "proto"], + ) + + def bazel_java_proto_library_rule(ctx): diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/bazel_6/update-srcDeps.py new file mode 100755 index 000000000000..d409a32e1389 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/update-srcDeps.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python3 +import sys +import json + +if len(sys.argv) != 2: + print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr) + print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr) + print("Hail Eris.", file=sys.stderr) + sys.exit(1) + +http_archives = [] + +# just the kw args are the dict { name, sha256, urls … } +def http_archive(**kw): + http_archives.append(kw) +# like http_file +def http_file(**kw): + http_archives.append(kw) + +# this is inverted from http_archive/http_file and bundles multiple archives +def _distdir_tar(**kw): + for archive_name in kw['archives']: + http_archives.append({ + "name": archive_name, + "sha256": kw['sha256'][archive_name], + "urls": kw['urls'][archive_name] + }) + +# TODO? +def git_repository(**kw): + print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr) + sys.exit(1) + +# execute the WORKSPACE like it was python code in this module, +# using all the function stubs from above. +exec(sys.stdin.read()) + +# transform to a dict with the names as keys +d = { el['name']: el for el in http_archives } + +def has_urls(el): + return ('url' in el and el['url']) or ('urls' in el and el['urls']) +def has_sha256(el): + return 'sha256' in el and el['sha256'] +bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values())) +if bad_archives: + print('Following bazel dependencies are missing url or sha256', file=sys.stderr) + print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr) + for el in bad_archives: + print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr) + sys.exit(1) + +with open(sys.argv[1], "w") as f: + print(json.dumps(d, sort_keys=True, indent=4), file=f) diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 3f3faae25e2e..2286ed690bdc 100644 --- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -2,7 +2,8 @@ bazel , bazelTest , bazel-examples -, gccStdenv +, stdenv +, darwin , lib , runLocal , runtimeShell @@ -16,9 +17,10 @@ let toolsBazel = writeScript "bazel" '' #! ${runtimeShell} - export CXX='${gccStdenv.cc}/bin/g++' - export LD='${gccStdenv.cc}/bin/ld' - export CC='${gccStdenv.cc}/bin/gcc' + export CXX='${stdenv.cc}/bin/clang++' + export LD='${darwin.cctools}/bin/ld' + export LIBTOOL='${darwin.cctools}/bin/libtool' + export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode # See: https://github.com/bazelbuild/bazel/issues/4231 @@ -31,7 +33,7 @@ let cp -r ${bazel-examples}/cpp-tutorial/stage3 $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString gccStdenv.isDarwin '' + + (lib.optionalString stdenv.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -46,7 +48,10 @@ let --distdir=${distDir} \ --curses=no \ --sandbox_debug \ - //... + //... \ + '' + lib.optionalString (stdenv.isDarwin) '' + --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ + --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ ''; }; diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix index cfdfe84f79d3..e42e0cde7665 100644 --- a/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -2,7 +2,8 @@ bazel , bazelTest , bazel-examples -, gccStdenv +, stdenv +, darwin , lib , openjdk8 , jdk11_headless @@ -18,9 +19,10 @@ let toolsBazel = writeScript "bazel" '' #! ${runtimeShell} - export CXX='${gccStdenv.cc}/bin/g++' - export LD='${gccStdenv.cc}/bin/ld' - export CC='${gccStdenv.cc}/bin/gcc' + export CXX='${stdenv.cc}/bin/clang++' + export LD='${darwin.cctools}/bin/ld' + export LIBTOOL='${darwin.cctools}/bin/libtool' + export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode # See: https://github.com/bazelbuild/bazel/issues/4231 @@ -33,7 +35,7 @@ let cp -r ${bazel-examples}/java-tutorial $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString gccStdenv.isDarwin '' + + (lib.optionalString stdenv.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -47,14 +49,15 @@ let ${bazel}/bin/bazel \ run \ --distdir=${distDir} \ - --verbose_failures \ - --curses=no \ - --sandbox_debug \ - //:ProjectRunner \ + --verbose_failures \ + --curses=no \ + --sandbox_debug \ + --strict_java_deps=off \ + //:ProjectRunner \ '' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") '' - --host_javabase='@local_jdk//:jdk' \ - --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ - --javabase='@local_jdk//:jdk' \ + --host_javabase='@local_jdk//:jdk' \ + --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ + --javabase='@local_jdk//:jdk' \ ''; }; diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index f4872d1b1204..ddb2efdbf8e8 100644 --- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -3,7 +3,8 @@ , bazelTest , fetchFromGitHub , fetchurl -, gccStdenv +, stdenv +, darwin , lib , openjdk8 , jdk11_headless @@ -132,9 +133,10 @@ let toolsBazel = writeScript "bazel" '' #! ${runtimeShell} - export CXX='${gccStdenv.cc}/bin/g++' - export LD='${gccStdenv.cc}/bin/ld' - export CC='${gccStdenv.cc}/bin/gcc' + export CXX='${stdenv.cc}/bin/clang++' + export LD='${darwin.cctools}/bin/ld' + export LIBTOOL='${darwin.cctools}/bin/libtool' + export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode # See: https://github.com/bazelbuild/bazel/issues/4231 @@ -152,7 +154,7 @@ let cp ${personProto} $out/person/person.proto cp ${personBUILD} $out/person/BUILD.bazel '' - + (lib.optionalString gccStdenv.isDarwin '' + + (lib.optionalString stdenv.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -166,14 +168,19 @@ let ${bazel}/bin/bazel \ build \ --distdir=${distDir} \ - --verbose_failures \ - --curses=no \ - --sandbox_debug \ - //... \ + --verbose_failures \ + --curses=no \ + --sandbox_debug \ + --strict_java_deps=off \ + --strict_proto_deps=off \ + //... \ '' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") '' - --host_javabase='@local_jdk//:jdk' \ - --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ - --javabase='@local_jdk//:jdk' \ + --host_javabase='@local_jdk//:jdk' \ + --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ + --javabase='@local_jdk//:jdk' \ + '' + lib.optionalString (stdenv.isDarwin) '' + --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ + --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ ''; }; diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index c02547c08e06..d560b0af848c 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -1,6 +1,32 @@ -{ writeText, bazel, bazelTest, runLocal, distDir }: +{ + bazel +, bazelTest +, stdenv +, darwin +, lib +, runLocal +, runtimeShell +, writeScript +, writeText +, distDir +}: let + toolsBazel = writeScript "bazel" '' + #! ${runtimeShell} + + export CXX='${stdenv.cc}/bin/clang++' + export LD='${darwin.cctools}/bin/ld' + export LIBTOOL='${darwin.cctools}/bin/libtool' + export CC='${stdenv.cc}/bin/clang' + + # XXX: hack for macosX, this flags disable bazel usage of xcode + # See: https://github.com/bazelbuild/bazel/issues/4231 + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + exec "$BAZEL_REAL" "$@" + ''; + WORKSPACE = writeText "WORKSPACE" '' workspace(name = "our_workspace") ''; @@ -29,14 +55,18 @@ let ) ''; - workspaceDir = runLocal "our_workspace" {} '' + workspaceDir = runLocal "our_workspace" {} ('' mkdir $out cp ${WORKSPACE} $out/WORKSPACE mkdir $out/python cp ${pythonLib} $out/python/lib.py cp ${pythonBin} $out/python/bin.py cp ${pythonBUILD} $out/python/BUILD.bazel - ''; + '' + + (lib.optionalString stdenv.isDarwin '' + mkdir $out/tools + cp ${toolsBazel} $out/tools/bazel + '')); testBazel = bazelTest { name = "bazel-test-builtin-rules"; @@ -45,8 +75,8 @@ let bazelScript = '' ${bazel}/bin/bazel \ run \ - --distdir=${distDir} \ - //python:bin + --distdir=${distDir} \ + //python:bin ''; }; diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix new file mode 100644 index 000000000000..842186a64aa6 --- /dev/null +++ b/pkgs/development/tools/ctlptl/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ctlptl"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "tilt-dev"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FJtp4g4kIkXFYvYcM9yF3BY6tgHmip11/oIyMSfTwqM="; + }; + + vendorSha256 = "sha256-s+Cc7pG/GLK0ZhXX/wK7jMNcDIeu/Am2vCgzrNXKpdw="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + meta = with lib; { + description = "CLI for declaratively setting up local Kubernetes clusters"; + homepage = "https://github.com/tilt-dev/ctlptl"; + license = licenses.asl20; + maintainers = with maintainers; [ svrana ]; + }; +} diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index 886ca482bb79..1a8197e52f8a 100644 --- a/pkgs/development/tools/hclfmt/default.nix +++ b/pkgs/development/tools/hclfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-ENvXFOdsv3PL4jH7OfI3ZIY6ekj7ywgNOYl1uRQjypM="; + hash = "sha256-Rx073Ob7CqaPEGIskJHW/xmt4S+WE/AWKewXpjY3kQ4="; }; vendorSha256 = "sha256-9IGHILgByNFviQcHJCFoEX9cZif1uuHCu4xvmGZYoXk="; diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index 12278e56d80a..63c80d993e71 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "1.23.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "v${version}"; - sha256 = "1zg0lar16axi25mnmdbdyrm876rbc328kq1yvhjlnzskmkhzjsg2"; + sha256 = "sha256-cCAmqiriiNSEpo5fHLPsarmLLhBE9QILa9xFNLlCorM="; }; - vendorSha256 = "0pnnrpyg40lb54h0k36c4iibapzlh54cdvc4mampmj13kphk3zzg"; + vendorSha256 = "sha256-Y0Muihh9S8g3SLH12jw1MYyq5mpbrTJWJu4cSNTCqmE="; doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index a4b3241663fc..630e209879e2 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.30"; + version = "0.2.31"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QNuCXBVSERNjn4ehqpOepAmLLqZAA2FvMBmMwceh4kI="; + sha256 = "sha256-6JMWt6svJwW7FNn2sOSUjFtXBqmC02uFEiybj5H9wTw="; }; - vendorSha256 = "sha256-T5HWT0h9ZSVQBbQbwIL1wu8BXvOkFIXtimz7QMUkWtQ="; + vendorSha256 = "sha256-caFM1A4SGZ8MIIoWnzBdKJOAgzscrf9eGtv/GCSfzag="; doCheck = false; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 667afac11584..8b85d80b6931 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "8.36.7"; + version = "8.37.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K4+d7HIH7FDvXkjkf6YCJjbTgPYBBMFqKDHXUNkL2Jo="; + sha256 = "sha256-ZiDrG1GkUple+Q+MoNQlHdbq3P8PeQFWvxMC9dh7VTM="; }; vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58="; diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix new file mode 100644 index 000000000000..ed0eec126d8c --- /dev/null +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -0,0 +1,51 @@ +{ fetchCrate +, lib +, rustPlatform +, pkg-config +, openssl +, zlib +, stdenv +, darwin +, libssh2 +, libgit2 +, IOKit +, Security +, CoreFoundation +, AppKit +, System +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-workspaces"; + version = "0.2.35"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-MHoVeutoMaHHl1uxv52NOuvXsssqDuyfHTuyTqg9y+U="; + }; + + cargoSha256 = "sha256-wUVNsUx7JS5icjxbz3CV1lNUvuuL+gTL2QzuE+030WU="; + verifyCargoDeps = true; + + # needed to get libssh2/libgit2 to link properly + LIBGIT2_SYS_USE_PKG_CONFIG = true; + LIBSSH2_SYS_USE_PKG_CONFIG = true; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl zlib libssh2 libgit2 ] ++ ( + lib.optionals stdenv.isDarwin ([ IOKit Security CoreFoundation AppKit ] + ++ (lib.optionals stdenv.isAarch64 [ System ])) + ); + + meta = with lib; { + description = "A tool for managing cargo workspaces and their crates, inspired by lerna"; + longDescription = '' + A tool that optimizes the workflow around cargo workspaces with + git and cargo by providing utilities to version, publish, execute + commands and more. + ''; + homepage = "https://github.com/pksunkara/cargo-workspaces"; + license = licenses.mit; + maintainers = with maintainers; [ macalinao ]; + }; +} diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/development/tools/worker-build/default.nix index 41c92732dcc8..dc6f2e9e9df5 100644 --- a/pkgs/development/tools/worker-build/default.nix +++ b/pkgs/development/tools/worker-build/default.nix @@ -1,17 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; rev = "v${version}"; - sha256 = "sha256-p19Q/XAOvDKXRvDWeMRo4C1TnvxYg88CAyldN7AhJDM="; + sha256 = "sha256-oqnYWrytQ3hCf4T/PNIXTs3tW+W8HvuvIulRhdhzsDU="; }; - cargoSha256 = "sha256-8fnsiWZjxCxhv4NWcRIpKbT8vQyhe27es80ttKX/oPs="; + cargoSha256 = "sha256-t35LMyiQl2bsGjNIKqb8sKbrmCLZ0pmoo0qX0buGA+o="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; buildAndTestSubdir = "worker-build"; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 31c9467109e9..7b8733d6213d 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let - mcVersion = "1.18.2"; - buildNum = "313"; + mcVersion = "1.19.2"; + buildNum = "131"; jar = fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "sha256-wotk0Pu1wKomj83nMCyzzPZ+Y9RkQUbfeWjRGaSt7lE="; + sha256 = "sha256-y7+bByWPc/2KBG/DOX/CFsIQWNboJs68++6Y64lyVt4="; }; in stdenv.mkDerivation { pname = "papermc"; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index ded457c43a8b..35d79d6b1439 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.7.1"; + version = "4.7.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-0vlFc6bw5joQNMorMBwn6/LhMAplW6ZpzFAtXqjW7Gg="; + sha256 = "sha256-vbQZB5D+dZd41vBRWvu8wKKLPn4bg8Vwyq84QZ1Xgg0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 37a35d49fed5..a55b6d1a0e43 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-08-26T19-53-15Z"; + version = "2022-09-01T23-53-36Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-VZsByVcErl6dts8OlggEFnvA+9ds8ZgQvZkCb53bSac="; + sha256 = "sha256-ceiwLyhpXM6Ia21KPO0nlYMcmLg0aOuCV7Iqb+djJ7o="; }; - vendorSha256 = "sha256-eAHL8UsRllnZ5frWYxXXYlkvf9QmrcvJHx5wEcbGeM4="; + vendorSha256 = "sha256-ziW1jxlyNiXoYP6z0Uea5XVxV5O094tmZNI0vHYofMk="; doCheck = false; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index d5b7ae34f191..eae2f98d77c9 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wcj2pAKuRT3gWzczoNd0mJktM2dUL3z+2JUsM5SYRVM="; + sha256 = "sha256-ykjk2OJ1AFG4S8vQi5yb7JzQRh3hSbFm/6XqzqXNmt8="; }; vendorSha256 = "sha256-OGbfcKvPTSM9DGJ+u2fXBmHq0Sv/n8oMbHNoPZy854Q="; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index f01a9d47ad5c..68aaa1dd0a4a 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.3.1"; + version = "3.3.2"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QOIuJM0d1l56ESzTjtm5IIiZx+2oYrO5mIhkAD8kFpQ="; + sha256 = "sha256-H7h+eiH02qLscpiZ8yV5ofL7upeqRBXNQDGYS86f3og="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 384d8140af93..95a853fb6d67 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.7.2"; + version = "2.8.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-roM4a+WWn8aODkS/kvouM6rO4TnVR7hAZmCkJkLpHKQ="; + sha256 = "sha256-xJidQ25JPIFY0KMV9EVrp4+qbU+QWDLaCSNHKOQq+dI="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 65425eb96a16..2917d660ba94 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -8,6 +8,7 @@ , Security , protobuf , rustfmt +, nixosTests }: let pinData = lib.importJSON ./pin.json; @@ -42,6 +43,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf rustfmt ]; passthru.updateScript = ./update.sh; + passthru.tests.lemmy-server = nixosTests.lemmy; meta = with lib; { description = "🐀 Building a federated alternative to reddit in rust"; diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index f140cf071ea9..82aa67a45d45 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -6,6 +6,7 @@ , pkg-config , fetchFromGitHub , fetchYarnDeps +, nixosTests }: let @@ -67,6 +68,7 @@ mkYarnPackage { distPhase = "true"; passthru.updateScript = ./update.sh; + passthru.tests.lemmy-ui = nixosTests.lemmy; meta = with lib; { description = "Building a federated alternative to reddit in rust"; diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 77f02e7a78cd..5c021430eaf5 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,8 +1,13 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.11.6"; - stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version)); + version = "4.0.2"; + + versionParts = lib.take 2 (lib.splitVersion version); + # 4.2 -> 402, 3.11 -> 311 + stableVersion = lib.removePrefix "0" (lib.concatMapStrings + (p: if (lib.toInt p) < 10 then (lib.concatStrings ["0" p]) else p) + versionParts); in stdenv.mkDerivation rec { pname = "moodle"; @@ -10,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-g3qHYkxiXb18vJ23THUw8ej+s5SgIkJpmjQmmARwQhs="; + sha256 = "sha256-Ouz1U5bMzwzQZiMmVOrx3oWtqyn7GE/oeaTrsXmsBJI="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/servers/web-apps/searxng/default.nix index 0ea20aca1ffe..0ddfc5351e3f 100644 --- a/pkgs/servers/web-apps/searxng/default.nix +++ b/pkgs/servers/web-apps/searxng/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2022-07-15"; + version = "unstable-2022-09-01"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "7bf4e8d12d1d0ee53bf71f7c3a4010ef936f25d9"; - sha256 = "sha256-Fuv9AoV9WnI6qMgj4Ve016RF8gaLXYgw89jRROcm/A8="; + rev = "174e5242569812618af4ebd9a646ba2a6ded5459"; + sha256 = "sha256-Q1+4HkgOoTRtW5XYWpC5dpukkrjG5fP0585soo/srmQ="; }; postPatch = '' diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix new file mode 100644 index 000000000000..bbeb5d9b9837 --- /dev/null +++ b/pkgs/shells/murex/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "murex"; + version = "2.10.2400"; + + src = fetchFromGitHub { + owner = "lmorg"; + repo = pname; + rev = "v${version}"; + sha256 = "0bqd91m7m4i4lfvz4p1lbrfs01kyh73p0g236q13bv4x1n1lkqr3"; + }; + + vendorSha256 = "sha256-hLz36ESf6To6sT/ha/yXyhG0U1gGw8HDfnrPJnws25g="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Bash-like shell and scripting environment with advanced features designed for safety and productivity"; + homepage = "https://murex.rocks"; + license = licenses.gpl2; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index 149232c697a6..dfbf451b2d73 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zGmb3EvWkGGJuq9R3GWEfHZvFn7DMC6B6Onk06mFiWI="; + sha256 = "sha256-6x809FXjPQH7Q90GCZdcMI1SuqR868UGnVK1Hs5qZNo="; }; - vendorSha256 = "sha256-8avzCfCBSVLsWUgBBiD4pYTWrd2X2rdruU5v+AJ3EKY="; + vendorSha256 = "sha256-+nARXJdMmU36Gz2fjXbkFMafJGVUJx+T/zTQRcfVYik="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 09c1f4475420..4dcf1a7a56ce 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -5,6 +5,7 @@ , runCommand, btrfs-progs , gitUpdater , udevSupport ? true +, enablePython ? true }: stdenv.mkDerivation rec { @@ -18,7 +19,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config + ] ++ lib.optionals enablePython [ python3 python3.pkgs.setuptools + ] ++ [ sphinx ]; @@ -32,12 +35,17 @@ stdenv.mkDerivation rec { install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs ''; - configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace" - ++ lib.optional (!udevSupport) "--disable-libudev"; + configureFlags = lib.optionals stdenv.hostPlatform.isMusl [ + "--disable-backtrace" + ] ++ lib.optionals (!enablePython) [ + "--disable-python" + ] ++ lib.optionals (!udevSupport) [ + "--disable-libudev" + ]; makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ]; - installFlags = [ "install_python" ]; + installFlags = lib.optionals enablePython [ "install_python" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index c2f3743e02ea..0fb548fa34f2 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "3.1.0-dev-20220811"; + version = "3.2.0-dev-20220831"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-7lxcyIX3imqsU15HQ2Xc0S8ki6LWMlkM4fdTOCuCti8="; + sha256 = "sha256-pAPYIhNqr7TpVDnHhRVGkd6HCqu945OCXa5dpGi2UhU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index c5265c7dd4c8..37aec7e04d89 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.21.1"; + version = "2.22.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-WBshiEohUO58LSRpbwunXfSRvnYtnB8g+1zUZTZtUOg="; + sha256 = "sha256-igZURbPa4ldhkjae6olAbW9L8qddxZj6wwkIJ3L23aA="; }; - vendorSha256 = "sha256-KcUe3Wbco+s4Zt3TS6C60AYiCuTAW5qdz+x68UBPALY="; + vendorSha256 = "sha256-riGN7d+am9DXCcFVkc2WIxmHvsNaZxHm/aEDcb8kCz4="; doCheck = false; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index c0746613157f..bd4452263a92 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit }: rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-ZPIxJ8D8yxaL7RKIVKIIlqwUXBbVM0JprE5TSTGkhfI="; + sha256 = "sha256-+YcHiW4kR4JeIY6zv1WJ97dCIakvtbn8+b9tLFH+aLE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -16,7 +16,9 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-dgAyxSVNe+UKuT0UJqPvYcrLolKtC2+EN/okSvzkhcA="; + cargoSha256 = "sha256-yKj9CBoEC6UJf4L+XO2qi69//45lSqblMe8ofnLctEw="; + + buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; doCheck = false; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 8cf91fe4808c..f16a1cf16fdc 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.10"; + version = "0.10.11"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-7SaT2jwrM0pD0BqX18d3nutU52RMCnQb2FuDtoJZMQM="; + sha256 = "sha256-ZBm93lBu6sblc/P5m1igf5K8yJ8ff5qcvECZ9o3Gn6I="; }; - vendorSha256 = "sha256-ccoFTg5OYpaagyzb2lJLr6WlTO/L4YevXK09gZOELOw="; + vendorSha256 = "sha256-Hs+WWc2UJtxc2isSfef8xvKDqhWytkUWh6DEq+bbAt4="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index e9ec3c389943..9685c80f06e5 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace '.picocom_history' '.cache/picocom_history' substituteInPlace picocom.c \ - --replace '"rz -vv"' '"${lrzsz}/bin/rz -vv"' \ + --replace '"rz -vv -E"' '"${lrzsz}/bin/rz -vv -E"' \ --replace '"sz -vv"' '"${lrzsz}/bin/sz -vv"' ''; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 08617255a23f..46e699d1ccb9 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -16,21 +16,22 @@ , tzdata , cmake , perl - # kafka is optional but one of the most used features -, enableKafka ? true + # nix has a problem with the `?` in the feature list + # enabling kafka will produce a vector with no features at all +, enableKafka ? false # TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*" # "disk-buffer" is using leveldb TODO: investigate how useful # it would be, perhaps only for massive scale? , features ? ([ "sinks" "sources" "transforms" "vrl-cli" ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) - ++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ] + ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] ++ lib.optional stdenv.targetPlatform.isUnix "unix") }: let pname = "vector"; - version = "0.22.3"; + version = "0.24.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -39,10 +40,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-62oPttkdahTeMsd9lpd9/tc95kluVJuWxzP94i+gWhA="; + sha256 = "sha256-kZ6Ek3CagAznyU7yDv96jFk1xCjfF2gvrNYyVTeFuO0="; }; - cargoSha256 = "sha256-WWX47pbva7ZmPR6hBstJ5VqOwu3mkhhsHK3LHHqQjDE="; + cargoSha256 = "sha256-4aHMPrawTF9QpoX7cmiPv9ddu0LF008uqBTu0oyan98="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index c83a3e9a8068..572d8f0ea209 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-yueUpOU28IzQA/SI8YB9Lo3J4fiKDXze0MGDCUv0+jI="; + sha256 = "sha256-ivzsVP+Mm2TX9addxUKMoOWqXPKvDtfPAT5Gu+E++4Y="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-toFfxDQcN6nSzSrvlW7aychikc6GeZ8eHjvH9e6dtHQ="; + cargoSha256 = "sha256-G4EnjOuqx3k8HnKjDAz34f+kthOWFeXZdgWrXkvFWqk="; postInstall = '' installManPage man/man*/* diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix index b98103442863..5bc752eb3611 100644 --- a/pkgs/tools/security/hashdeep/default.nix +++ b/pkgs/tools/security/hashdeep/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { url = "https://github.com/jessek/hashdeep/commit/6ef69a26126ee4e69a25392fd456b8a66c51dffd.patch"; sha256 = "sha256-IrqcnrKINeoh56FR25FzSM1YJMkM2yFd/GwOeWGRLFo="; }) + (fetchpatch { + # Fix the spacing between the string literals and macros, see https://github.com/jessek/hashdeep/pull/385 + name = "string-literal-spacing.patch"; + url = "https://github.com/jessek/hashdeep/commit/18a6b5d57f7a648d2b7dcc6e50ff00a1e4b05fcc.patch"; + sha256 = "sha256-S6hzC8jPtG3ozsvVq5JfAUMwqKxytLGwBAtNYNr6RJ0="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; @@ -30,9 +36,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.karantan ]; platforms = platforms.all; - # Build fails on Darwin: - # > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] - # > void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); } - broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 48fc406d9f53..66f407e26a14 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "step-ca"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-SLURk9zdorc9PlutYcSNJ2bSocucmBxVM/2EwASVebw="; + sha256 = "sha256-iWThTFH36NNjO9Acx5QyxJrUzKFl7vD/seWF/Rz05CU="; }; vendorSha256 = "sha256-AcjICy991WPQyXp/9j6rgedg4FTYXilH7O4dy8gGYq8="; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index d881f10b9c37..98d4698464e3 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, fetchpatch +, installShellFiles +, IOKit +}: buildGoModule rec { pname = "gotop"; @@ -11,19 +18,27 @@ buildGoModule rec { hash = "sha256-jAUlaj9Nv/ipzxAkG2myd9DIboHj7IarNMVk/FQ274g="; }; + patches = [ + # To remove after https://github.com/xxxserxxx/gotop/pull/234 is merged + (fetchpatch { + url = "https://github.com/xxxserxxx/gotop/commit/3e3243fa1f046c126bf9cb34d55a12963b3ac116.patch"; + sha256 = "sha256-4q4dBTPpVfgXvApzUXdEEzIe31PoLHUK4mBWth6qCIg="; + }) + ]; + proxyVendor = true; - vendorSha256 = "sha256-y4hVouvqMYUrdF7fowsvJLp0FCGCZDeVGUQXG8z8Lyg="; + vendorSha256 = "sha256-Sq9ol9bZb0BfR/C8phcMSEjG9qgWyTmwpo/TS30j3Vk="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + preCheck = '' export HOME=$(mktemp -d) ''; - doCheck = !stdenv.isDarwin; - postInstall = '' $out/bin/gotop --create-manpage > gotop.1 installManPage gotop.1 @@ -35,6 +50,5 @@ buildGoModule rec { changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; - broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 }; } diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 78091d2d4ab0..57d0f548f00e 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Sort of like top or htop but with zoom-able charts, network, and disk usage" + lib.optionalString nvidiaSupport ", and NVIDIA GPU usage"; homepage = "https://github.com/bvaisvil/zenith"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 133ceedc5aa8..397995a45efb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -230,6 +230,8 @@ with pkgs; python3 = python39; }; + mov-cli = callPackage ../applications/video/mov-cli { }; + ani-cli = callPackage ../applications/video/ani-cli { }; anime-downloader = callPackage ../applications/video/anime-downloader { }; @@ -302,6 +304,8 @@ with pkgs; buf = callPackage ../development/tools/buf { }; + buf-language-server = callPackage ../development/tools/buf-language-server { }; + cbfmt = callPackage ../development/tools/cbfmt { }; cfn-nag = callPackage ../development/tools/cfn-nag { }; @@ -5384,6 +5388,8 @@ with pkgs; cron = callPackage ../tools/system/cron { }; + ctlptl = callPackage ../development/tools/ctlptl { }; + snooze = callPackage ../tools/system/snooze { }; cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; }; @@ -5938,7 +5944,9 @@ with pkgs; wallutils = callPackage ../tools/graphics/wallutils { }; - worker-build = callPackage ../development/tools/worker-build { }; + worker-build = callPackage ../development/tools/worker-build { + inherit (darwin.apple_sdk.frameworks) Security; + }; wrangler = callPackage ../development/tools/wrangler { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; @@ -12734,6 +12742,8 @@ with pkgs; mksh = callPackage ../shells/mksh { }; + murex = callPackage ../shells/murex { }; + oh = callPackage ../shells/oh { }; oil = callPackage ../shells/oil { }; @@ -14497,6 +14507,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; + cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { + inherit (darwin.apple_sdk.frameworks) IOKit Security CoreFoundation AppKit System; + }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; cargo-generate = callPackage ../development/tools/rust/cargo-generate { inherit (darwin.apple_sdk.frameworks) Security; @@ -15655,6 +15668,17 @@ with pkgs; bazel_self = bazel_5; }; + bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { + inherit (darwin) cctools; + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk11_headless; + runJdk = jdk11_headless; + stdenv = if stdenv.isDarwin then + darwin.apple_sdk_11_0.stdenv else + if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + bazel_self = bazel_6; + }; + bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; buildozer = bazel-buildtools; @@ -17990,9 +18014,10 @@ with pkgs; flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) fmt_7 fmt_8; + inherit (callPackages ../development/libraries/fmt { }) fmt_7 fmt_8 fmt_9; fmt = fmt_7; + fmt_latest = fmt_9; fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; @@ -23254,6 +23279,8 @@ with pkgs; tpmSupport = true; }; + ovmfvartool = callPackage ../applications/virtualization/ovmfvartool { }; + ops = callPackage ../applications/virtualization/ops { }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -24492,7 +24519,9 @@ with pkgs; gotools = callPackage ../development/tools/gotools { }; - gotop = callPackage ../tools/system/gotop { }; + gotop = callPackage ../tools/system/gotop { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; go-migrate = callPackage ../development/tools/go-migrate { }; @@ -26954,7 +26983,9 @@ with pkgs; dunst = callPackage ../applications/misc/dunst { }; - du-dust = callPackage ../tools/misc/dust { }; + du-dust = callPackage ../tools/misc/dust { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; dutree = callPackage ../tools/misc/dutree { }; @@ -26989,6 +27020,8 @@ with pkgs; dwmblocks = callPackage ../applications/misc/dwmblocks { }; + dwmbar = callPackage ../applications/misc/dwmbar { }; + dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; exploitdb = callPackage ../tools/security/exploitdb { }; @@ -31398,7 +31431,7 @@ with pkgs; utox = callPackage ../applications/networking/instant-messengers/utox { }; - valentina = libsForQt512.callPackage ../applications/misc/valentina { }; + valentina = libsForQt5.callPackage ../applications/misc/valentina { }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -34667,6 +34700,7 @@ with pkgs; inherit (callPackages ../applications/science/logic/z3 { python = python2; }) + z3_4_11 z3_4_8 z3_4_7; z3 = z3_4_8;