From f7baa65db75b32db49894296646a1b9b74115482 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 26 Jun 2022 13:19:10 +0800 Subject: [PATCH 001/167] nixos/caddy: improve security about acme certs Before this patch, the caddy process has acme in its supplementary group because of the SupplementaryGroups in its service config, which may give it more permission than needed, is inconsistent with the documentation of services.caddy.virtualHosts..useACMEHost and is redundant since we have mkCertOwnershipAssertion in assertions. This patch fixes these problems by defaulting the group of needed certs to caddy, which is what other web servers like nginx do and deleting SupplementaryGroups config. --- nixos/modules/services/web-servers/caddy/default.nix | 8 +++++--- .../modules/services/web-servers/caddy/vhost-options.nix | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 2b8c6f2e308b..bcf90e30fe88 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -308,7 +308,6 @@ in StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ]; LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ]; Restart = "on-abnormal"; - SupplementaryGroups = mkIf (length acmeVHosts != 0) [ "acme" ]; # TODO: attempt to upstream these options NoNewPrivileges = true; @@ -331,9 +330,12 @@ in security.acme.certs = let - reloads = map (useACMEHost: nameValuePair useACMEHost { reloadServices = [ "caddy.service" ]; }) acmeHosts; + certCfg = map (useACMEHost: nameValuePair useACMEHost { + group = mkDefault cfg.group; + reloadServices = [ "caddy.service" ]; + }) acmeHosts; in - listToAttrs reloads; + listToAttrs certCfg; }; } diff --git a/nixos/modules/services/web-servers/caddy/vhost-options.nix b/nixos/modules/services/web-servers/caddy/vhost-options.nix index f240ec605c29..668f17ea3403 100644 --- a/nixos/modules/services/web-servers/caddy/vhost-options.nix +++ b/nixos/modules/services/web-servers/caddy/vhost-options.nix @@ -40,9 +40,7 @@ in Note that this option does not create any certificates, nor does it add subdomains to existing ones – you will need to create them - manually using . Additionally, - you should probably add the caddy user to the - acme group to grant access to the certificates. + manually using . ''; }; From 168cdcd9bdaf42abfbfe317b3e6b223c0e022dbd Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 6 Jul 2022 08:30:41 +0200 Subject: [PATCH 002/167] linux_lqx, linux_zen: avoid unnecessary prefetch If the version hasn't changed, there is no need to run nix_prefetch_git (which is quite expensive for the large kernel repo). --- pkgs/os-specific/linux/kernel/update-zen.py | 29 +++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/update-zen.py b/pkgs/os-specific/linux/kernel/update-zen.py index 204a39ad3a9a..3c51f806d8f8 100755 --- a/pkgs/os-specific/linux/kernel/update-zen.py +++ b/pkgs/os-specific/linux/kernel/update-zen.py @@ -78,6 +78,29 @@ def update_file(relpath, variant, version, suffix, sha256): print(result, end='') +def read_file(relpath, variant): + file_path = os.path.join(DIR, relpath) + re_version = re.compile(fr'^\s*version = "(.+)"; #{variant}') + re_suffix = re.compile(fr'^\s*suffix = "(.+)"; #{variant}') + version = None + suffix = None + with fileinput.FileInput(file_path, mode='r') as f: + for line in f: + version_match = re_version.match(line) + if version_match: + version = version_match.group(1) + continue + + suffix_match = re_suffix.match(line) + if suffix_match: + suffix = suffix_match.group(1) + continue + + if version and suffix: + break + return version, suffix + + if __name__ == "__main__": if len(sys.argv) == 1: panic("Update variant expected") @@ -93,5 +116,7 @@ if __name__ == "__main__": zen_version = zen_match.group(1) zen_suffix = zen_match.group(2) break - zen_hash = nix_prefetch_git('https://github.com/zen-kernel/zen-kernel.git', zen_tag) - update_file('zen-kernels.nix', variant, zen_version, zen_suffix, zen_hash) + old_version, old_suffix = read_file('zen-kernels.nix', variant) + if old_version != zen_version or old_suffix != zen_suffix: + zen_hash = nix_prefetch_git('https://github.com/zen-kernel/zen-kernel.git', zen_tag) + update_file('zen-kernels.nix', variant, zen_version, zen_suffix, zen_hash) From 0276d2fcbb41f7a59c00be34949133e97e5b8880 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 7 Jul 2022 22:59:41 +0200 Subject: [PATCH 003/167] common-updater-scripts/update-source-version: Add flag required for nix-command --- pkgs/common-updater/scripts/update-source-version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 88cf7d459a72..fbeb375fa891 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -196,7 +196,7 @@ tempHash=$(printf '%0*d' "$hashLength" 0) if [[ -n "$sri" ]]; then # SRI hashes only support base64 # SRI hashes need to declare the hash type as part of the hash - tempHash="$(nix hash to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null \ + tempHash="$(nix --extra-experimental-features nix-command hash to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null \ || nix to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null)" \ || die "Failed to convert hash to SRI representation!" fi @@ -242,7 +242,7 @@ if [[ -z "$newHash" ]]; then if [[ -n "$sri" ]]; then # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type - newHash="$(nix hash to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null \ + newHash="$(nix --extra-experimental-features nix-command hash to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null \ || nix to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null)" \ || die "Failed to convert hash to SRI representation!" fi From 58e7457e2afb0a0f88df0d58214d29a3f2e514c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 22:22:39 +0000 Subject: [PATCH 004/167] dtrx: 8.2.2 -> 8.3.1 --- pkgs/tools/compression/dtrx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 98fc0befafbf..78c2a9f399c6 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "dtrx"; - version = "8.2.2"; + version = "8.3.1"; src = fetchFromGitHub { owner = "dtrx-py"; repo = "dtrx"; - rev = version; - sha256 = "sha256-thtBVGgKRYHOAFuxDvuFxcIHoyYAI58AiNCx4vuVXGs="; + rev = "refs/tags/${version}"; + sha256 = "sha256-a8ZHIPunWGwI992HfgdRvJGtDfYUP50kFt/ROAqDO7E="; }; postInstall = From 5d0a3c070e514ed70bee22d85cf7a98954a243d8 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 11 Jul 2022 16:39:52 +0200 Subject: [PATCH 005/167] kopia: 0.11.2 -> 0.11.3 https://github.com/kopia/kopia/releases/tag/v0.11.3 --- pkgs/tools/backup/kopia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index d4a20201e0f6..d6e0e481b8dc 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-WxbD68KTO9hYhwwSSj7wwDGOiJdaLFdqJR+xw3dLfio="; + sha256 = "sha256-BdWxNJr5RofpblvKKQXtdA49pLD6MKlEi3XViIpt4Ww="; }; - vendorSha256 = "sha256-i3hK1567KrxBSS3iGeNnKfsFuHsukRI6l9jG+UztY+c="; + vendorSha256 = "sha256-ZLVBYosPvININQsqU2hy25vtUfW1mRjipm7VykVLV7w="; doCheck = false; From eda07a0e8f116803c4120aa26e248c86b531b91c Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 11 Jul 2022 13:48:41 +0200 Subject: [PATCH 006/167] mesa-demos: 8.4.0 -> 8.5.0 --- pkgs/tools/graphics/mesa-demos/default.nix | 24 ++++++++++++------- .../graphics/mesa-demos/demos-data-dir.patch | 13 ++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/graphics/mesa-demos/demos-data-dir.patch diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 550b06d0f0e2..11ca657ebfed 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -1,19 +1,27 @@ -{ lib, stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa, pkg-config, wayland }: +{ lib, stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa +, meson, ninja, pkg-config, wayland, wayland-protocols }: stdenv.mkDerivation rec { pname = "mesa-demos"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${pname}-${version}.tar.bz2"; - sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81"; + url = "https://archive.mesa3d.org/demos/${version}/${pname}-${version}.tar.bz2"; + sha256 = "sha256-zqLfCoDwmjD2NcTrGmcr+Qxd3uC4539NcAQWaO9xqsE="; }; - buildInputs = [ freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland ]; - nativeBuildInputs = [ pkg-config ]; + patches = [ + # https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/83 + ./demos-data-dir.patch + ]; - configureFlags = [ "--with-system-data-files" ]; - enableParallelBuilding = true; + buildInputs = [ + freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland + wayland-protocols + ]; + nativeBuildInputs = [ meson ninja pkg-config ]; + + mesonFlags = [ "-Dwith-system-data-files=true" ]; meta = with lib; { description = "Collection of demos and test programs for OpenGL and Mesa"; diff --git a/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch b/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch new file mode 100644 index 000000000000..d2f22a675ce3 --- /dev/null +++ b/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 282c39629da54ba6d7e1e380ffcf70da15e48d83..0c15274bff62b43f95ca7d7c5e29cc2dbd3cc42f 100644 +--- a/meson.build ++++ b/meson.build +@@ -29,7 +29,7 @@ null_dep = dependency('', required : false) + + demos_data_dir = '../data/' + if get_option('with-system-data-files') +- demos_data_dir = get_option('datadir') / 'mesa-demos' ++ demos_data_dir = get_option('prefix') / get_option('datadir') / 'mesa-demos/' + endif + add_project_arguments( + '-DDEMOS_DATA_DIR="@0@"'.format(demos_data_dir), From 5e765ecc68a02fbad7ae1626558f5a58a8825764 Mon Sep 17 00:00:00 2001 From: thyol Date: Wed, 13 Jul 2022 11:58:02 +0200 Subject: [PATCH 007/167] diamond: 0.8.36 -> 2.0.15 --- pkgs/applications/science/biology/diamond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 86b239c93843..c0e59fbaf066 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "0.8.36"; + version = "2.0.15"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-7uqOQOzkYN0RNwKBGUZ/Ny5NVZMoGByOk+GUvjdBzck="; + sha256 = "17z9vwj58i1zc22gv4qscx0dk3nxf5ix443gxsibh3a5zsnc6dkg"; }; patches = [ From 4e79b5e370d92197d53713e49884ab3f6045711c Mon Sep 17 00:00:00 2001 From: thyol Date: Wed, 13 Jul 2022 11:58:39 +0200 Subject: [PATCH 008/167] diamond: remove patch --- .../science/biology/diamond/default.nix | 3 --- .../diamond/diamond-0.8.36-no-warning.patch | 20 ------------------- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index c0e59fbaf066..d287ab8a4848 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -11,9 +11,6 @@ stdenv.mkDerivation rec { sha256 = "17z9vwj58i1zc22gv4qscx0dk3nxf5ix443gxsibh3a5zsnc6dkg"; }; - patches = [ - ./diamond-0.8.36-no-warning.patch - ]; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch deleted file mode 100644 index a16d475c5564..000000000000 --- a/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -u -r diamond-0.8.36/src/dp/scalar_traceback.h diamond-0.8.36-patched/src/dp/scalar_traceback.h ---- diamond-0.8.36/src/dp/scalar_traceback.h 2017-02-06 16:32:05.000000000 +0100 -+++ diamond-0.8.36-patched/src/dp/scalar_traceback.h 2017-02-23 15:13:24.000000000 +0100 -@@ -19,6 +19,7 @@ - #ifndef SCALAR_TRACEBACK_H_ - #define SCALAR_TRACEBACK_H_ - -+#include - #include - #include "../basic/score_matrix.h" - -@@ -31,7 +32,7 @@ - template<> - inline bool almost_equal(float x, float y) - { -- return abs(x - y) < 0.001f; -+ return std::abs(x - y) < 0.001f; - } - - template From 55853ae09676ecd78170f514d4d8961908d2adbe Mon Sep 17 00:00:00 2001 From: thyol Date: Wed, 13 Jul 2022 12:01:14 +0200 Subject: [PATCH 009/167] maintainers: add thyol --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/science/biology/diamond/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6d9da62e2ddf..52bf46e86671 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12694,6 +12694,12 @@ githubId = 3268082; name = "Thibaut Marty"; }; + thyol = { + name = "thyol"; + email = "thyol@pm.me"; + github = "thyol"; + githubId = 81481634; + }; thmzlt = { email = "git@thomazleite.com"; github = "thmzlt"; diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index d287ab8a4848..fc3721dc66eb 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { fullName = "University of Tuebingen, Benjamin Buchfink"; url = "https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING"; }; - maintainers = [ ]; + maintainers = with lib.maintainers; [ thyol ]; }; } From 0d6e3afdba59da87eecc3aed8b1bef73a78f38fd Mon Sep 17 00:00:00 2001 From: thyol Date: Wed, 13 Jul 2022 12:03:05 +0200 Subject: [PATCH 010/167] diamond: update metadata --- .../science/biology/diamond/default.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index fc3721dc66eb..8073b1bea163 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -18,24 +18,17 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Accelerated BLAST compatible local sequence aligner"; longDescription = '' - A sequence aligner for protein and translated DNA - searches and functions as a drop-in replacement for the NCBI BLAST - software tools. It is suitable for protein-protein search as well as - DNA-protein search on short reads and longer sequences including contigs - and assemblies, providing a speedup of BLAST ranging up to x20,000. + DIAMOND is a sequence aligner for protein and translated DNA searches, designed for high performance analysis of big sequence data. The key features are: + - Pairwise alignment of proteins and translated DNA at 100x-10,000x speed of BLAST. + - Frameshift alignments for long read analysis. + - Low resource requirements and suitable for running on standard desktops or laptops. + - Various output formats, including BLAST pairwise, tabular and XML, as well as taxonomic classification. - DIAMOND is developed by Benjamin Buchfink. Feel free to contact him for support (Email Twitter). - - If you use DIAMOND in published research, please cite - B. Buchfink, Xie C., D. Huson, - "Fast and sensitive protein alignment using DIAMOND", - Nature Methods 12, 59-60 (2015). + When using the tool in published research, please cite: + - Buchfink B, Reuter K, Drost HG, "Sensitive protein alignments at tree-of-life scale using DIAMOND", Nature Methods 18, 366–368 (2021). doi:10.1038/s41592-021-01101-x ''; homepage = "https://github.com/bbuchfink/diamond"; - license = { - fullName = "University of Tuebingen, Benjamin Buchfink"; - url = "https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING"; - }; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ thyol ]; }; } From bb3ed09b06bd4ac113b6192b45f3f993cf28be84 Mon Sep 17 00:00:00 2001 From: thyol Date: Wed, 13 Jul 2022 12:18:08 +0200 Subject: [PATCH 011/167] diamond: add release notes --- .../doc/manual/from_md/release-notes/rl-2211.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 550dddfaf352..57df5483a0a7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -320,6 +320,14 @@ and require manual remediation. + + + The diamond package has been update from + 0.8.36 to 2.0.15. See the + upstream + release notes for more details. + + dockerTools.buildImage deprecates the diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index b652419bcf16..028b5a5b7774 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -121,6 +121,8 @@ Use `configure.packages` instead. - Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. +- The `diamond` package has been update from 0.8.36 to 2.0.15. See the [upstream release notes](https://github.com/bbuchfink/diamond/releases) for more details. + - `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`. Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`. From 9126d975e85c7700dc8f0580933f0104016ecf24 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 13 Jul 2022 19:29:12 +0200 Subject: [PATCH 012/167] wire-desktop: linux 3.27.2944 -> 3.28.2946 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 304d1bf4255c..271f09d06f67 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -24,12 +24,12 @@ let version = { x86_64-darwin = "3.27.4357"; - x86_64-linux = "3.27.2944"; + x86_64-linux = "3.28.2946"; }.${system} or throwSystem; sha256 = { x86_64-darwin = "0xihg9fzsbwib2fmb1yqx9015i9q4k0ph8lna4mzgicmrjkw54g8"; - x86_64-linux = "1wqnrmp8q84izvqv25fgks5pv6la3vahm5dsn7bc6zxqb0xz2xvy"; + x86_64-linux = "03f1qz0mwn6f14w4g1w72sd5idfyvmv18r5y1h279p56x0i919kq"; }.${system} or throwSystem; meta = with lib; { From 5aaae1ddc9f4340291f1d60aeb89eff2781d8423 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 13 Jul 2022 19:30:37 +0200 Subject: [PATCH 013/167] wire-desktop: mac 3.27.4357 -> 3.28.4393 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 271f09d06f67..97f8e4ea1aea 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -23,12 +23,12 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.27.4357"; + x86_64-darwin = "3.28.4393"; x86_64-linux = "3.28.2946"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "0xihg9fzsbwib2fmb1yqx9015i9q4k0ph8lna4mzgicmrjkw54g8"; + x86_64-darwin = "03w8hafwxg4v85s8n3ss6bsr7fipksyjax30dnxxj72x947zygxw"; x86_64-linux = "03f1qz0mwn6f14w4g1w72sd5idfyvmv18r5y1h279p56x0i919kq"; }.${system} or throwSystem; From 02c2eda2636e487d20e2a2c34b3744697d2f8263 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Jul 2022 05:16:22 +0000 Subject: [PATCH 014/167] manim: 0.16.0 -> 0.16.0.post0 --- pkgs/applications/video/manim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 67a406d134e9..62a17d9c1dc8 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -45,14 +45,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "manim"; format = "pyproject"; - version = "0.16.0"; + version = "0.16.0.post0"; disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-NQI+kJV0Mu2O/DlwwLYQw2jjJk/TmR7avBX9Fe7zmdk="; + sha256 = "sha256-iXiPnI6lTP51P1X3iLp75ArRP66o8WAANBLoStPrz4M="; }; nativeBuildInputs = [ From acc7dd7cd946221e032769eb9bdd5fb25fcccfe4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 05:32:57 +0000 Subject: [PATCH 015/167] python310Packages.cloup: 0.15.1 -> 1.0.0 --- pkgs/development/python-modules/cloup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index c4b4de4832ab..aa1ce4c3603f 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cloup"; - version = "0.15.1"; + version = "1.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gAi0gKd9ihEseHAvZGda299Z+tw545HzuovKycTUzYY="; + sha256 = "sha256-/DR3evRK1d7Kz9dCp4RzeAD5opsYPZF0ox0HqR9u710="; }; nativeBuildInputs = [ From 37ad7e2f9849a3bd9558530cc9ae221526871245 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 21:54:27 +0000 Subject: [PATCH 016/167] mtools: 4.0.38 -> 4.0.40 --- pkgs/tools/filesystems/mtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index e7345c639fe2..a774b21a24f7 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.38"; + version = "4.0.40"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-e5RIX0huffCMymiwChZKE8049MY8uGhNGIdZ7nvF5yk="; + sha256 = "sha256-oi/KQjVAEd0ik6f1HyKLRuu9gC53QLCXWRKv7LedXfQ="; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; From b5e7879cd9634eb6201c6cc2692898a69a364f6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 23:09:55 +0000 Subject: [PATCH 017/167] marvin: 22.8.0 -> 22.13.0 --- pkgs/applications/science/chemistry/marvin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 2b5a1b969509..aa40c4c21dd2 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "22.8.0"; + version = "22.13.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-dmG2p4KqzjLuuVw+wPWaxVoqOqba8Tx5l44PauWpqv4="; + sha256 = "sha256-cZ9SFdKNURhcInM6zZNwoi+WyHAsGCeAgkfpAVi7GYE="; }; nativeBuildInputs = [ dpkg makeWrapper ]; From 51ec59da173adb9a6eea12e31a85fbc78acc2a64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 03:17:53 +0000 Subject: [PATCH 018/167] ocamlPackages.camlp-streams: 5.0 -> 5.0.1 --- pkgs/development/ocaml-modules/camlp-streams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlp-streams/default.nix b/pkgs/development/ocaml-modules/camlp-streams/default.nix index d5c8ac945d58..1e2a71cc0b9d 100644 --- a/pkgs/development/ocaml-modules/camlp-streams/default.nix +++ b/pkgs/development/ocaml-modules/camlp-streams/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "camlp-streams"; - version = "5.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "ocaml"; repo = pname; rev = "v${version}"; - sha256 = "sha256:1wd5k0irzwi841b27pbx0n5fdybbgx97184zm8cjajizd2j8w0g5"; + sha256 = "sha256-kHuFBqu0mjFv53sOtmFZcX2reo5ToaOpItP7P53bfGQ="; }; meta = { From ecccd5395f4c34691a429604bb05083bf54a17db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 08:11:17 +0000 Subject: [PATCH 019/167] python310Packages.pytest-httpserver: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/pytest-httpserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index eb04881455d7..4b58c71cc656 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { pname = "pytest_httpserver"; inherit version; - sha256 = "6de464ba5f74628d6182ebbdcb56783edf2c9b0caf598dc35c11f014f24a3f0d"; + sha256 = "sha256-rjKWYm0KEOg1qfQjxhtFQFR9WCQivgVMP8wIYmuqECQ="; }; propagatedBuildInputs = [ werkzeug ]; From ccd27a930e23d8e8fedf5c4c25b5e07da2a6f438 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Aug 2022 05:58:38 +0000 Subject: [PATCH 020/167] x42-plugins: 20220327 -> 20220714 --- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 4e2bb5600d3b..30b7abc6dfba 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20220327"; + version = "20220714"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-IhuPqTlCbCxExT5B9Au42RQQl4sDEvz6+HhsuT02KVs="; + sha256 = "sha256-myrHOfgpCwuW8YX0jZ3RutoqtXysU0ejBNcuxN3stXU="; }; nativeBuildInputs = [ pkg-config ]; From 68647c002a9e7697fa3d6d881ef309e8bf065377 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 11 Jul 2022 14:44:08 +0200 Subject: [PATCH 021/167] wvkbd: 0.7 -> 0.9 https://github.com/jjsullivan5196/wvkbd/releases/tag/v0.9 --- pkgs/applications/accessibility/wvkbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index a593b0d2ea2b..7f3a1315873f 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.7"; + version = "0.9"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5UV2PMrLXtF3AxjfPxxwFRkgVef+Ap8nG1v795o0bWE="; + sha256 = "sha256-Dcb1mnqvf2MvwljWuqMV/8AyF/aGMcDiz4cRQ9NAFtM="; }; nativeBuildInputs = [ pkg-config ]; From 6122297eab17cd48b364ecb25c622d864e28f98f Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 24 Jul 2022 14:51:12 -0700 Subject: [PATCH 022/167] pkgs/stdenv/linux: update powerpc64le bootstrap-files This PR updates the Hydra-generated bootstrap tarballs for powerpc64le-linux. The bootstrap-files referenced prior to this commit will only bootstrap in a nixpkgs which has https://github.com/NixOS/nixpkgs/pull/181802. That PR was closed in favor of https://github.com/NixOS/nixpkgs/pull/181943, which is a cleaner solution but which requires regenerating the bootstrap-files. I'll be following the script established in https://github.com/NixOS/nixpkgs/pull/151399, which I previously used in https://github.com/NixOS/nixpkgs/pull/168199. Files came from [this](https://hydra.nixos.org/build/186237511) Hydra build, which used nixpkgs revision ac43c444780a80e789fd14fe2114acd4a3b5cf9d to instantiate: ``` /nix/store/nhjbza9vlcyhp9zxfz6lwpc3m2ghrpzj-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu.drv ``` and then built: ``` /nix/store/fklpm7fy6cp5wz55w0gd8wakyqvzapjx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu ``` I downloaded these files from Hydra with the following commands: ``` STOREPATH=fklpm7fy6cp5wz55w0gd8wakyqvzapjx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu OPTIONS="--option binary-caches https://cache.nixos.org --option trusted-public-keys cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" nix store add-file \ --name bootstrap-tools.tar.xz \ $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/bootstrap-tools.tar.xz nix store add-path \ --name busybox \ $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/busybox ``` I then prefetched them into `/nix/store` with: ``` $ nix store prefetch-file --executable file:///nix/store/p9lz8r81zp3a4sl2qq2v4j69syjzryn2-busybox Downloaded 'file:///nix/store/p9lz8r81zp3a4sl2qq2v4j69syjzryn2-busybox' to '/nix/store/a42qf2kf5hychcsw5sz0pvghy9vli1im-p9lz8r81zp3a4sl2qq2v4j69syjzryn2-busybox' (hash 'sha256-jtPEAsht4AUAG4MLK8xocQSfveUR4ppU1lS4bGI1VN4='). $ nix store prefetch-file file:///nix/store/y4530zpk7ia4szf5cdi4zpyy5lpjv3iv-bootstrap-tools.tar.xz Downloaded 'file:///nix/store/y4530zpk7ia4szf5cdi4zpyy5lpjv3iv-bootstrap-tools.tar.xz' to '/nix/store/kgzyq9q08nll28ccqjcbv8angq5hyvdp-y4530zpk7ia4szf5cdi4zpyy5lpjv3iv-bootstrap-tools.tar.xz' (hash 'sha256-MpIDnpZUK3M17qlnuoxfnK0EgxRosm3TMW1WfPZ1+jU='). ``` And started the bootstrap with the following command: ``` nix build -f . -L hello ``` As @lovesegfault requested in #151399, here are the the `sha256sum`s of all the `on-server` components for extra verification: ``` $ sha256sum /nix/store/fklpm7fy6cp5wz55w0gd8wakyqvzapjx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu/on-server/* 3292039e96542b7335eea967ba8c5f9cad04831468b26dd3316d567cf675fa35 /nix/store/fklpm7fy6cp5wz55w0gd8wakyqvzapjx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu/on-server/bootstrap-tools.tar.xz 3d078dff7b4087d82442937667c91dace3321493aae4d3a4160d046b7eabcc2c /nix/store/fklpm7fy6cp5wz55w0gd8wakyqvzapjx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu/on-server/busybox ``` --- .../linux/bootstrap-files/powerpc64le.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix b/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix index 9f09a6b60a43..c35cb9b102c0 100644 --- a/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix +++ b/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix @@ -1,25 +1,25 @@ # # Files came from this Hydra build: # -# https://hydra.nixos.org/build/172142499 +# https://hydra.nixos.org/build/186237511 # -# Which used nixpkgs revision 49a83445c28c4ffb8a1a90a1f68e6150ea48893b +# Which used nixpkgs revision ac43c444780a80e789fd14fe2114acd4a3b5cf9d # to instantiate: # -# /nix/store/gj272sd56gsj6qpyzh4njpfzwdhviliz-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu.drv +# /nix/store/nhjbza9vlcyhp9zxfz6lwpc3m2ghrpzj-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu.drv # # and then built: # -# /nix/store/n81pljbd8m0xgypm84krc2bnvqgjrfxx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu +# /nix/store/fklpm7fy6cp5wz55w0gd8wakyqvzapjx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu # { busybox = import { - url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/49a83445c28c4ffb8a1a90a1f68e6150ea48893b/busybox"; - sha256 = "sha256-UscnfGKOZAKLkPcRtwrbT5Uj8m3Kj9jhkKp9MUc1eCY="; + url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/ac43c444780a80e789fd14fe2114acd4a3b5cf9d/busybox"; + sha256 = "sha256-jtPEAsht4AUAG4MLK8xocQSfveUR4ppU1lS4bGI1VN4="; executable = true; }; - bootstrapTools =import { - url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/49a83445c28c4ffb8a1a90a1f68e6150ea48893b/bootstrap-tools.tar.xz"; - sha256 = "sha256-A20GKGn3rM8K2JcU0SApRp3+avUE+bIm1h632AitRzU="; + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/ac43c444780a80e789fd14fe2114acd4a3b5cf9d/bootstrap-tools.tar.xz"; + sha256 = "sha256-MpIDnpZUK3M17qlnuoxfnK0EgxRosm3TMW1WfPZ1+jU="; }; } From dca493fe1d6457d0f4f9cddacfc921c5e31b9592 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Aug 2022 06:09:54 +0000 Subject: [PATCH 023/167] sqlcipher: 4.5.1 -> 4.5.2 --- pkgs/development/libraries/sqlcipher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 13714b4825cf..7a6b53cb9bf3 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "sha256-cvbR3tav6DjIdJB/x2q5Oq7ju9q63z75b6q1uHYY9bE="; + sha256 = "sha256-EUm4akVWUiK8U6Je1uWMo8KLQLsk57kOFCCU5Uajjt8="; }; nativeBuildInputs = [ installShellFiles tcl ]; From b109491732c7f35c1a81bf244795be6076b7b0ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Aug 2022 07:44:57 +0000 Subject: [PATCH 024/167] system76-firmware: 1.0.39 -> 1.0.42 --- .../linux/firmware/system76-firmware/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index a019a6f79321..9e3a8209a4d7 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.39"; + version = "1.0.42"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "sha256-nPHBL73hmvW9z5SQjmfu+ozMXxUEajNQxNtE/V9QwZ0="; + sha256 = "sha256-8raRfmNAvgxBVsFeOu/XPs5YU1wPpRBo3Cog/UpE5/o="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "sha256-BrzicLj7FbUqRG1BgQIRqh801tRQpRZkHSiX3ekAYqc="; + cargoSha256 = "sha256-aKyLAISZlQz5e8MvOoydAZ4bwCEZ1K3FldyoG6R9FJU="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' From 9a2f75fc98b43de8dfdb5fa9cebfeaba9e9ebc31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Aug 2022 03:21:51 +0000 Subject: [PATCH 025/167] tutanota-desktop: 3.98.17 -> 3.98.20 --- .../networking/mailreaders/tutanota-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index b4b46f36b3fc..6375e8212473 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.98.17"; + version = "3.98.20"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-rVAiutjFI3/KJZeiTy6H2IdMh+SFz9+NvEoriPTnW2w="; + sha256 = "sha256-ddRuIFmsZcyrZ/0T0Sk6pnmxuG5osZVYFw7NCmgvECc="; }; nativeBuildInputs = [ From 3133c979f9a432af01679a277c6b042309f3def0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 13 Aug 2022 19:44:47 +0800 Subject: [PATCH 026/167] harePackages.hare: fix evaluation for riscv --- pkgs/development/compilers/hare/hare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix index 9411f4e4e905..2c6b8da6e342 100644 --- a/pkgs/development/compilers/hare/hare/default.nix +++ b/pkgs/development/compilers/hare/hare/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { arch = if stdenv.isx86_64 then "x86_64" else if stdenv.isAarch64 then "aarch64" - else if stdenv.isRiscV64 then "riscv64" + else if stdenv.hostPlatform.isRiscV && stdenv.is64bit then "riscv64" else "unsupported"; platform = if stdenv.isLinux then "linux" From 2e4cf931aaa7c51e1b6635713ef42b0199b199d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 16:14:34 +0000 Subject: [PATCH 027/167] corectrl: 1.2.4 -> 1.2.7 --- pkgs/applications/misc/corectrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 899939b6cfc2..67e819ef9951 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.2.4"; + version = "1.2.7"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-3WOuPOJEY941JVoF5aQp5LvPeh3shalb6H9FMmmctN4="; + sha256 = "sha256-X+S+k9LuZveNOV3X7fulsnk9GfGO1czWEvU41q9/cJI="; }; nativeBuildInputs = [ From 2dc141182b5388c57846cfb220665f02caf5622d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 21:13:34 +0000 Subject: [PATCH 028/167] ryzenadj: 0.10.0 -> 0.11.1 --- pkgs/os-specific/linux/ryzenadj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/os-specific/linux/ryzenadj/default.nix index c7d9c1f8fb96..b533643752ae 100644 --- a/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-SEM+HN5ecxp64jZTOouWuFO1HICtc6M+GitnS+bdfb4="; + sha256 = "sha256-tfki+7W2RbqzEHG/Ibton/V5koT89emdQ7aX8WDUzdI="; }; nativeBuildInputs = [ pciutils cmake ]; From 7cb13910efd7f2d613c89a7c480b042d47d2f688 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 21:16:33 +0000 Subject: [PATCH 029/167] s3-credentials: 0.12.1 -> 0.13 --- pkgs/development/python-modules/s3-credentials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix index 13431569d505..2b7be9ba3f7b 100644 --- a/pkgs/development/python-modules/s3-credentials/default.nix +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "s3-credentials"; - version = "0.12.1"; + version = "0.13"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-w0pwQidSAh/CQPVbv4UocbbETyyOT/rcNFE1ixYz4lY="; + hash = "sha256-kzu+ySeAi+nRIJSBSJUQzNHD7KVANlWoi0OWKXkc0/8="; }; propagatedBuildInputs = [ From effe5d44ddfdd2877e485e053f1c68314334e2fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 22:03:42 +0000 Subject: [PATCH 030/167] serfdom: 0.9.8 -> 0.10.0 --- pkgs/servers/serf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index da1bf0770fd0..1b9c40a9895a 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "serf"; - version = "0.9.8"; + version = "0.10.0"; rev = "a2bba5676d6e37953715ea10e583843793a0c507"; src = fetchFromGitHub { owner = "hashicorp"; repo = "serf"; rev = "v${version}"; - sha256 = "sha256-UWCxzwV2bcT8Sfl296HpBThe+qYX19M7sNcEJHs/sXc="; + sha256 = "sha256-5P2Pq2yzTGyw0hLwHdJB4YB+du0D8Q3MagRH3WXZ100="; }; - vendorSha256 = "sha256-DaPcCuj0KGpuOC6XynltMBE9wO7w5qKrTChC401249o="; + vendorSha256 = "sha256-2v2KcULgrwMRVGA91p7LJQPyQqwHLHhJa1WSivXHQG4="; subPackages = [ "cmd/serf" ]; From f6b4379720f4ffd404aed6b2ae295b0ca45537ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 23:17:07 +0000 Subject: [PATCH 031/167] python310Packages.pypinyin: 0.46.0 -> 0.47.0 --- pkgs/development/python-modules/pypinyin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 210e6129199b..0f6a9407f49d 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; - rev = "v${version}"; - sha256 = "sha256-KPyFvO6TR0mg09xcraHFaWklJgzF5oqk3d8H+G4gh3I="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-DsSrWbnBFEGQTXP1+C8j5RqSplDitsFl+13YwwE+3pE="; }; postPatch = '' From e15d874463adba4f953f5ebe3f8c7c00579e4a60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 03:07:17 +0000 Subject: [PATCH 032/167] tesseract5: 5.1.0 -> 5.2.0 --- pkgs/applications/graphics/tesseract/tesseract5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index dd4d6cb2791d..a9776d48d0a9 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "sha256-B1x3wxr9Sn2rsG8AHncPTEErhDo7YtpDRxfW9ZOPWoU="; + sha256 = "sha256-SvnV6sY+66ozOvgznTE6Gd/GFx/NfugpkpgeANMoUTU="; }; enableParallelBuilding = true; From 9cad3c278999b073098e140cfe983eaf8be7659b Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 4 Jun 2022 16:03:02 +0900 Subject: [PATCH 033/167] pinentry-mac: 0.9.4 -> 1.1.1.1 --- pkgs/tools/security/pinentry/mac.nix | 49 ++++++++++++++++++++-------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 27917ffbbf17..fbd5a3a31f95 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,28 +1,49 @@ -{ lib, stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libassuan +, libgpg-error +, libiconv +, texinfo +, Cocoa +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pinentry-mac"; - version = "0.9.4"; + version = "1.1.1.1"; src = fetchFromGitHub { - owner = "matthewbauer"; - repo = "pinentry-mac"; - rev = "6dfef256c8ea32d642fea847f27d800f024cf51e"; - sha256 = "0g75302697gqcxyf2hyqzvcbd5pyss1bl2xvfd40wqav7dlyvj83"; + owner = "GPGTools"; + repo = "pinentry"; + rev = "v${version}"; + sha256 = "sha256-QnDuqFrI/U7aZ5WcOCp5vLE+w59LVvDGOFNQy9fSy70="; }; - nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ libiconv ncurses Cocoa ]; + postPatch = '' + substituteInPlace macosx/Makefile.am --replace ibtool /usr/bin/ibtool + ''; - preBuild = '' - # Only build for what we care about (also allows arm64) - substituteInPlace pinentry-mac.xcodeproj/project.pbxproj \ - --replace "i386 x86_64 ppc" "${stdenv.targetPlatform.darwinArch}" + nativeBuildInputs = [ autoreconfHook texinfo ]; + buildInputs = [ libassuan libgpg-error libiconv Cocoa ]; + + configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ]; + + # This is required to let ibtool run. + sandboxProfile = '' + (allow process-exec + (literal "/usr/bin/ibtool") + (regex "/Xcode.app/Contents/Developer/usr/bin/ibtool") + (regex "/Xcode.app/Contents/Developer/usr/bin/xcodebuild") + (literal "/usr/libexec/PlistBuddy")) + (allow file-read*) + (deny file-read* (subpath "/usr/local") (with no-log)) + (allow file-write* (subpath "/private/var/folders")) ''; installPhase = '' mkdir -p $out/Applications - mv Products/Release/pinentry-mac.app $out/Applications + mv macosx/pinentry-mac.app $out/Applications ''; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ff8d0d543c9..9df6e23e7c58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9741,7 +9741,6 @@ with pkgs; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook; }; pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { }; From c0ce2f3070210e38d1883f250584eb4f70462d86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 21:53:22 +0000 Subject: [PATCH 034/167] wxGTK31-gtk2: 3.1.5 -> 3.2.0 --- pkgs/development/libraries/wxwidgets/wxGTK31.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 5bce6250c74f..a3c89113c9d3 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.1.5"; + version = "3.2.0"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-2zMvcva0GUDmSYK0Wk3/2Y6R3F7MgdqGBrOhmWgVA6g="; + hash = "sha256-8rOnIyNADQsZBmiofrxRc52WWNFH5u39gH/1FKKF4ZQ="; fetchSubmodules = true; }; From febb86fd6c304f035c3cf52e091368a2a0586143 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 Aug 2022 02:13:59 +0200 Subject: [PATCH 035/167] python3Packages.pydantic: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/pydantic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index f9993850f1df..31f456dabc68 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.9.1"; + version = "1.9.2"; outputs = [ "out" @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-jqTtNJQ9lRkxDYGG4vg91qH1jrxRU9orEeUofO+bBpA="; + sha256 = "sha256-ZGFxyQ1qD3zZWTdfTeoGj3UcUwAzO8K0DySdVAsMHyI="; }; postPatch = '' From 7e4e39d9d7be05d6a2273b89afbe4d17566b66b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 13:33:43 +0000 Subject: [PATCH 036/167] intel-media-sdk: 22.5.1 -> 22.5.2 --- pkgs/development/libraries/intel-media-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index a8591f40ee98..5ec0eabf1fcd 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.5.1"; + version = "22.5.2"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-HTCqJG//byTTlTRdE8IyFGuUaLiNVDfl9swbH6d5gCk="; + sha256 = "sha256-HBG1JsTwAbl7p42Crmx82M7VnIaLk0oBXc4SJoIdEIs="; }; nativeBuildInputs = [ cmake pkg-config ]; From b025c8cc5e8b0a21456d715d5d8d068fa4a8d21b Mon Sep 17 00:00:00 2001 From: midchildan Date: Wed, 17 Aug 2022 01:19:50 +0900 Subject: [PATCH 037/167] pinentry_mac: use pregenerated nib files --- pkgs/tools/security/pinentry/mac.nix | 51 +++++++++++++----- .../mac/Main.nib/keyedobjects-101300.nib | Bin 0 -> 974 bytes .../pinentry/mac/Main.nib/keyedobjects.nib | Bin 0 -> 1354 bytes .../mac/Pinentry.nib/keyedobjects-101300.nib | Bin 0 -> 30301 bytes .../mac/Pinentry.nib/keyedobjects.nib | Bin 0 -> 40124 bytes 5 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects-101300.nib create mode 100644 pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects.nib create mode 100644 pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects-101300.nib create mode 100644 pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects.nib diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index fbd5a3a31f95..daf2d82d66b0 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -6,11 +6,16 @@ , libgpg-error , libiconv , texinfo +, common-updater-scripts +, writers , Cocoa }: stdenv.mkDerivation rec { pname = "pinentry-mac"; + + # NOTE: Don't update manually. Use passthru.updateScript on a Mac with XCode + # installed. version = "1.1.1.1"; src = fetchFromGitHub { @@ -20,8 +25,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-QnDuqFrI/U7aZ5WcOCp5vLE+w59LVvDGOFNQy9fSy70="; }; + # use pregenerated nib files because generating them requires XCode postPatch = '' - substituteInPlace macosx/Makefile.am --replace ibtool /usr/bin/ibtool + cp -r ${./mac/Main.nib} macosx/Main.nib + cp -r ${./mac/Pinentry.nib} macosx/Pinentry.nib + chmod -R u+w macosx/*.nib ''; nativeBuildInputs = [ autoreconfHook texinfo ]; @@ -29,25 +37,42 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ]; - # This is required to let ibtool run. - sandboxProfile = '' - (allow process-exec - (literal "/usr/bin/ibtool") - (regex "/Xcode.app/Contents/Developer/usr/bin/ibtool") - (regex "/Xcode.app/Contents/Developer/usr/bin/xcodebuild") - (literal "/usr/libexec/PlistBuddy")) - (allow file-read*) - (deny file-read* (subpath "/usr/local") (with no-log)) - (allow file-write* (subpath "/private/var/folders")) - ''; - installPhase = '' mkdir -p $out/Applications mv macosx/pinentry-mac.app $out/Applications ''; + enableParallelBuilding = true; + passthru = { binaryPath = "Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac"; + updateScript = writers.writeBash "update-pinentry-mac" '' + set -euxo pipefail + + main() { + tag="$(queryLatestTag)" + ver="$(expr "$tag" : 'v\(.*\)')" + + ${common-updater-scripts}/bin/update-source-version pinentry_mac "$ver" + + cd ${lib.escapeShellArg ./.} + rm -rf mac + mkdir mac + + srcDir="$(nix-build ../../../.. --no-out-link -A pinentry_mac.src)" + for path in "$srcDir"/macosx/*.xib; do + filename="''${path##*/}" + /usr/bin/ibtool --compile "mac/''${filename%.*}.nib" "$path" + done + } + + queryLatestTag() { + curl -sS https://api.github.com/repos/GPGTools/pinentry/tags \ + | jq -r '.[] | .name' | sort --version-sort | tail -1 + } + + main + ''; }; meta = { diff --git a/pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects-101300.nib b/pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects-101300.nib new file mode 100644 index 0000000000000000000000000000000000000000..18cc1c8b46f5547b00be9780dcea02c243071529 GIT binary patch literal 974 zcmebCbaE_8&d4lFWn^Gr;9_84kYHe7Fk)a}kYr$BsA6DXuwY)IPnrc~)c7?56g)&CLrMn-?~AENbpp+T5|CwPS5- z=cdNa&5fN~8auZ(wr*?e*xuOd7wn&um6}{q?44R!Jku}OF*!N4xHvN@Gbgj8(m6jb zFEzO&zo@v!)5$kKr8FniFEKZDmZy_mab+sUSdgReqM)PuwGJSNosLF+|sbboYK_d34Xz0nZ=n&IjP~9c`5nj z#Zy8({W6nW^OEyZQj1)33rZ@zQ!AJH1v_VC=A=01=am%Y=j5aoITxjZ4GvDt0lO09 zHgqreXQmWGZSiz+&PgmT4oXc+ElSNxPVI&YfV543`7fX-zbrE)wW!B07@@V@FW4tB zDK)3hFW56LCo?ZK1#D!SUvN-1(c3)aibD=ACNnal-B1TDVvl7#JG3_!t-% z+PU}{7#OB;2{14)^m7R^FfcT7i7_xROyv@1U|{G5lT)~u85kJaI67cqJ&|=HYbO^Q z0|Uc!E_Mb6hE^_6I-9`7%fP_U#o5Ef!N9;Ug^QDcfuR?ywTZKjvyG$IFW9l5ASW{! z9MC;n++bBaU{xRzqN>}mpuiB(;sBBL&I?SqQSK6KoZT2l7uR*jET1LIuQm zAQ>SB28K>9VK6BICPf(-7-ldq&R}4g!N5F&fd%ZH2AJm<`WyU$J)Iy)*(I?g5iHfmV2B=&@qVSbNvTB)06x4qp#T5? literal 0 HcmV?d00001 diff --git a/pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects.nib b/pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects.nib new file mode 100644 index 0000000000000000000000000000000000000000..90635122ffdc699640a5d0f8dd2efbce27e03564 GIT binary patch literal 1354 zcmYc)$jK}&F)+Bo$i&RT%ErzUp;DGwRGgWg7pan1l$?=SmRb~|Qj%W~p^~4Jm6}{q zEX2Urwjf@B-!IrZwK6ru5vu4C2PYSIynvLalU{LUaY<^fTYg?iXhBM1Nop9xz*tWw zJ%|}8i6w~wj17$I1r&JsR5i5>Oe}2Ny!C^_BVrPhlGC#bipuM_THD$?y8A*^@=9}Z zZu1KW3JHsdiit}|N=eJe%E>FpD=Djl`2`2%=aY8$tjc7vc!$}cJoQ%TNAEG~|MI1Hq^fvJJLL83vdL8L*hfwe)dLAF7@ zLHv@Mgt|twU$8SswO?XxY6EivO9aflm$Y?s^`am~9GqWTl$;vt7wnQ+T#}iW2ny(MzhIxlq|}^v0ad?X z=Zwsp6zBZBlA`>aoYW%cqExV&;MAPdfcxuE82zWYy z{Th^-mRgjWmz>(b+rZVpa>d8jPr}tTFet{;$u~cxG$$3LAFLe04JgVl%S=fviiYY3 zNjESwFf?#C@LbZ?2?+(OMKyX+m_8QKSifM$f`XjPWUzBV4vUP^Xb@=Nhr1#&2yC)I z15dPLL4iwZPHK8$Noqt2lyOO0CnYsrK*TTDFEh!%v?M3B1Rn8=Q_}R~z!GqwOWHaa znQ`#YcPuJOtX!Otr62AW3}#<4l*q|nGkwG0aw zmND#QIKps=;XcDhhX0JxjCzb7j46!SjAe`!j8%*^jCG6+j7^L!jBSh^j9rX9j1w8> zGR|jQ$heAeJ>xFM!;F_0uQJ|ae9ZWc@jc^5#&1l_Ozcd&OhQZ|OkzwDOv+3;Ojb-z zOj%4hOnFQNOhrs3Ow~+%OcR(UF->8b%e0DVFVjh;(@bZX&NE$Py2kX9=?&9=W?p6y zW-(?7W+`T6W>sc&W=&>oW^-l-W>@AI<^<+^<`U*+=62?O<|)k6nP)Q3W}eHuhzOw)Z)V=Xyq9@D^Fijr%tx7zGoN9;$b6akD)V*bo6NVF?=s(Ke#rcc`8o4T d=6B5RnLjdrV_{_g113f=#lSETN<%3Y4gkoswr~Id literal 0 HcmV?d00001 diff --git a/pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects-101300.nib b/pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects-101300.nib new file mode 100644 index 0000000000000000000000000000000000000000..6df3d5f462270cba6188965979ce6a37612f41ef GIT binary patch literal 30301 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 Hpb-lI;n$d4 literal 0 HcmV?d00001 diff --git a/pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects.nib b/pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects.nib new file mode 100644 index 0000000000000000000000000000000000000000..aa8bca0d085e23023a740caee5748288b8ec3f43 GIT binary patch literal 40124 zcmYc)$jK}&F)+Boz{tSFz|6qHz{0$9 z7>_cZVLZ!tj`0fPbH*2pZy7%_eq;R3_=E9369W??6B82$lPu$0COIZ~CS@iKCSxWO zCQBwOCVM6qCRZjeCSN8$rVyqyrgWwZrc9<{rZT2VrYfcerpZiGn5Ht#WSYyglxZ2$ za;CLR2bc~r9c4Pjbeic5(+#GZO!t@`F+FB_#`K)&1=BlbMrI~vW@dI~Ze|f?QD!k_ z8D@QE17<^JQ)WwMM`kBxXJ$|480J{!MCMfHH0E^XeC7h?LgsSj>C7{jXEM)XUdw!h z`8e|_=4;H?nQt)PWWL3GoB0m&UFLht_n99sKV^Q!{GRy-3kwS?3mXeJ3l9rFix7(_ ziv)`%ix!JEi!qA{iwBD*i$6;UOB72SOFT;gO9o3OOD#(SOAkvg%OsZREVEhWvut45 z$g+uLC(ACD-7Mc&8CY3axmg8RMOmd-V%~)+%9a-I2y;%cTLs_F(6IfGO zvsepQOIfQ}>seb^J6Zc!C$r9EoyWSEbp`8M)=jM2S@*CWWIe`un)L$fRn}Xq_gSB? zzG8jP`i1o;>pwPTHV!skHX$}~HW@ZKHhDG$HbpiSHdQulHXSx2He)tRHY+vJXD?u{VXtMcW3Oj#VDDt_VxPu7oqY!TO!isq3)vU3FJ@oOzJ`4* z`)2k%?0ebwv7cc-%YKgiJo^Rq8|*jPAF)4Xf5QHW{WJR)_OI;U*#ENsWB<>=#=*|P z!NJcVz#+&X!6C^Z#i7Wd#G%Zg!=cNe$6>-@&0)h~%i+S|%HhM|%Mrp6$`Qs9#}Utw zz>&t0&XLbiz){Fi&e6cp$kER+fny@aB#y}(vpME)%;i|dv7BQw#}a^w#2F+QBpIX_ zq#0xwWEtcb^Gjm=f}Qj8@=}vaGV}9_WBh{sGgFGg5_3vZ zi@{ZkKcudKh{XB@L;2pRmBsM_l77LC$;qk3#hFQ&IhiGu$a)3*g2OV4Gm~;s!!z?z z^2>|k1;nu^$8HeRN%=*^VJgWviN(cH5Ql+OH!wADHZt)vGI2FBu{JVYYhZ6=y4uKe ztdZ$QH-aPZ+=Q?PAXg*gd0$lUzVAYS`-a62PECV(7@2Z(!d%W zkeQd7S5j2zo0xow!IZ&_!JNS&3gY&>#N5;f2on^j7|vM4V98*G#d#61(1sXj!(bcd z7wlYGT#}y)iG@WBHVjsm80;A&7#tWJqx^!QHG1)a1`dcGX9kxTzhK|elEkE()Zo;T z#SG32t_)V8e!;=1B@mtN3=`K2crth}crth~cr*Ag_%ir0_%j4B1Tq9M1T%y%gffIN zgfm1iL^4D%L^H%N#4^M{u?Br+s1Br~Kiq%x#2q%&kNWHMwiWHaP2)tbTV`? zbTjlY^fL4@^fOFo;A)U>uxM~<@N0-~$Y>~RXlUqcnA9+*kx{adQM!>)wvkc3kx`|Q zQMHj#t&vf^kx`?OQL~XztC3N=kx{3SQMZv%uaQx|k<$YGi!c$oQs_ z@k1ly_eREFjf{UA8UHsdxym5HFqvTr!&HW84AU8;7-lleV$hH93l7dNElN&}^$T`M zEiTE-O9W-aaKB)m#H7@mcmY+vVCRg?oD}E$ypp2)oSf7m=b}`wn&8x&)Z~)z6XF>Geo!myQL8^d-6eTJP3I~jH}=rinP*vGJ+;Q+%yhC>X87>+O;U^vQf zfI*+(IKv@^-3$l7>drv&e_lzZbAE0?5vUZ%&kHEZ%rD9;sf_RoE_2ICOfQZX5c6~b z`KB_zw8S^DC_OW;*u69}B{g0^7+my#dq)OoL{hGPELM#u}^+_W^!VV zPa;UCOJ)(IhyoW%eyJ5DL8-+B`FSa+MezdSARB@c(^4IaQWGKSp;k!3tq3p5EXmAE zM>0noE*G4dm*NO60DTjSvmqrS$XUUeRjKg;f}nydwcI&BuehWrF*C2EI9@;vA{L&Q zS5oYhS`2bbeoiSU=KKp%^W1%cON-JHlT+gb6#Rl+^8NBlLW&aeigOZ6QXNZ6@{3Z7 zGpjQ5(m}Sx3y8tp5t3R_;+T_}o|l`NSAs0zlbM(5RFs;S?VF#H8txbDR+N~V3MvdB zi2~$KqgcOSzs#hN{Ln4rl)7-rNh!dgRmeYPXhx7M*~j-gYbVS5MXJL5nyQGFCbc7ZER|wqhM%UtD{hDX{4iIY*bqd zDgW*;+*`_e%}H@eg?7hMqQIe6T#}eq0&*!ROg&3d zb7K&~AdLd(rZor%Fbc49Dmw%>Fn~Y5;=$M7C(4J4T(66GR>cc8ieRP%gf_!RCJ z>{wKkShKy2I153#t*(WonPrJNsd*)! z0D+kRO3WaYMfo{lnW^QFAS{9Fb1bcZSP)WKkQxa}2?YiDMJ3>(0p>85)SSf1I24x{ z33v;!Ffc%pVq1d)LxW_4ln@64149FMgJ^?vgP0)WgfQpCyyVoJD~$Y%0*rzT5{yEO z!i*w}qG5i)pad4-7n}z6R+wKfsNhw0&;rE{1A`!oNP~ETM7)5Io?}5lPHHf?+a2l& z>Ue`=j!}Y9GR!X+#9zcH!C(~-C=C&pWt5A7xf7IUmoUmQ$}=i3SjB*vOQ13ZBnr*Y z5G_iK$`LRvOBt0IRTxzn)flWI!D$Lqa)m+4r)W@ug%*=B$zYE`0uEw~CZkrofC#wU z@GmXNNiBglyB0HQGHNqe#ewDEqG&Z3qdubngMI_3>QQJghgLm|#za&;>lxM|Dj!A@ zh9l^e52Fs0fs4_eK_5~1fa^t2ap{(snv()AGlNo-OFZ+6Q%j1W zqZ|#Yu=1zDtU-yBvq7;zt$_ht;KU1vS63SvnCK`Nnwf%%1rsA<9R)*kXt}`X&TwxL zqX(mBgK~pPgWz=r3AB>oCBq>`KSq5f8kri@-emaB@CTd$BN)~){AG+}_{|u_sLvR~$junXz{MEP zn826_E@zz*le5!{K*hFmeolT-v|lhND8OtX76Ar_289OG2C)W>2K5F5Aps{AhRD>S zqWmI|qN@xNj46z%jA@MNj2VoXj9HA?jNr@*G6+*4lYOpH%gonOA>SP(?L?< zpyZX4U(}%Ape4Z8pxK}u21(^H$&h*o?1HO|1&oD^sf zj8%-)3=)hrjJ1q)jP)UY!JaOme!-s3&f$K+pxP)$fU`kYfT2OpUr=xk1B2k4#Danx zCI$wE+`N(^_aMi}h{z}f_B#w54B`y@40;UwiOIzUjsXEaplHd<&r1c-sQBA821by` zWnGY2AQlOjH6^t;nSp`f00RR4QD(A&dr@Mgf_q|aZlZ#bo{>U8QGQxx4i;B~ zG*Nd3&rpu@nxv@Wg4EtG+Q!H$7}=~hOm2Z(LL zz`!g~l@Suoz`!8Iz`*R2o$n3OtHi*-oR*j5=g+{vV8y_|+>u=D9L2!Epuxbvd?+K; z6BK7E3=GV#it>X%YP1*_Sol&>U0fL$82lI*SS&J2JVT)Dw&Jp2khlc{1Iv}F3}=u# zr5G4kd9o6{0vH$=)EF38)lzfZLH24fFtGX*lmvjx3}RqlEz8UC1KH)kz`%MUwHWMQ z9|i_Cj*^TJ4+aJXBL)VxkdmShkX{uA2DY}eOgB#k1_n0<2DVihMIIn=I|c@}4+S~k zbmqmtz^<2AjaP+)Lo$Y3aC$YV%nP(ZQ8hykQO0PI?b z8$j|PTV6tK$!7q$1>`%3>p(0}mlI@WCPN-W6+Ua zZ7X6(WT<4&1&iB&#bCA~d=B#IONKlKh^>VTr3|TH|3Z8Zl7)pBER+v2*lBr@bM zJOp=lLE%%(P{r_vp@<nfl=yu3#Q6;QJowc4T==Bn;Q@=W9B7UPr96lqK`{(Al_8QL2cFXM zz@;{!uMGX0j(cm})#RamtIt)f^R&45Qu59Y?5Kv%qVe?>f zV^Cl-1c|fhvw1NnuvvmsvBu=q15usE`qvN%B5ppwvr1y<&P@{ul!J&Oa2 z9g7Q#1*nWf_ANs)*njwZiku5m85l}ZD@s5O1LypL%A(Blj1mQK$49|4FIi7V!N|bS zh=Bpr&H|}nVE7yeZa*=Kok=b&DualDI%5p13|tKS3?dAY3~~(03>pl&3`Pv*4Au+| z46Y1b4E_uu43P|R49N@`47m(N4CM?p42=wJ4BZS97^X7JVwlgcgkdGaI)+UQ+ZpyS z9Ar4gaGK!)!&Qdc3=bHdGQ4K^!0?UXHzOk>J0mZnFry@+JfkY3Hlq=v1*09KE29r% z5Mv}`0%JO39%CtE4P!H7H{&G6S&R!AS2Av7+{t*5@g(C##+!@}8DBDfV*JI#%*4Ya z!X(S2#-z_=!Q{x~%@o2E%aqPk$W+DD!qmq!gJ}`d8m4Vb2boSYU1fT}^qT1_GXpa> zvlz1?vo5m*voo_la};wLa}jeLa~Jb8=0(iwn0GNBXTHq*fcXvcPZl;7VHO1zT^4H= z50+4tWR^mfI+h-mSu879wy_*xxy`&Q$aBy?Ta~N^BaYS+CaWrvE<5N8C&|;y(LXU-+g_VV!g_DJwg_j5)6@Dth zCZaClDUv19EwWbRoX7`JAyE_2FwqLp*`j+zABZuFsfl@t<%so*Z4$dC_Dft=+)+GL zyit|H_*+R`DO9ORX}!{2WiDk4IcsK~4Ms??~gR=K6hscNB`p*mglxaxN`b+vG{cD3zlFVrQ}J=Lq!SF7LA;MK6# zDAZV_aYd6&(?T;_bFStEEha5ftqiT%TIaQyw9T|LwdZPI)M3@J)XCFXq;p-DN7qre zOn0^JLp?D)AH62M?RxL@RrI6uC+Z*9|7T!okYljK;I^TVp_gHk;V#2ZMp{P6Mzf8s z81ovt8P^-{F#c$wZIWs-&*X-wu&J+UyXhg*zh>rUMP}>FUYe_zCz#JMziuI75n$0{ zal(?-(#f*ka*yRtD>JJSt4&t#t#z%ltyfvUuu->3wOL~G*jC9l(RQKj13Lw~1iJ-x z59}4~6YUq-KXOoZNO4%^@Z3?;G0Sm{<2xqai8EC*!2za^m*J^T#K~Z%$xM2v1m*@F&qfaZ%#eB+sNdNgtA( zlcy)YPH{+?lJYXuHg!_!^EBJENogGzs#`Dn3nM-(>Zfi=Ep3Ltod2rv;DJ| zXaCO$&sm?#k(-daGfyZlJMT!oTz*CV#RBbuwt@$RR)tdwKNNWvEh}a$jxF9%B2rRN za;8+Hw6*kMnO)iJvLEGP<(n%6EAlGNRBBarRz9zCt6EykQk`6Vs7A4-vF2f|W9`B^ z#=4}sL-oq_E%i?u+#6Ojay4c*o^3K{n$+~AIlOsSi)>3n%i~t}*41r%ZAER@+pXK@ zcd&G1cAV=p?wr~AuPdeNRJTF*wC+DW$vvlf4SQ$w{_jicJJ)a4KW_rtguDsYCfZM2 zF-dSz)uhLheJ5|5qA;av%9p9}Q%_DanKpkq*Ywiq4`%qx*fCRO=7gDlW@XH}I@@XX z`Z+RlI_G?!n=<#(JcoJf=F86Sp8sn>=7Jjw-4||Kq_$|3zh7F|~ zUTsX+cx{vSrbC-8Hm}>Fx@FE*;jLZU7`Ih!`>;J@`-2^kJ1*|@+IeV~^{%bE^>#1c zqqt}GUeUe%`?&VC?EAmJYX8>*1qa?7Oh5SeQ2e3Wha(POITCo}+)?kNCyu!tJAB;n z`2G{NC-$7QI=Smwz$&a_DQo*L&Y`zy1E+^+WQgWR3m4HXO&3=|Cg1!N8MEG)UriLcw3=PH&`j

%~m88c#RVPIg$fs89L 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≷E}+Ofu94v1bz$r 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 Date: Tue, 16 Aug 2022 16:43:43 +0000 Subject: [PATCH 038/167] ocenaudio: 3.11.11 -> 3.11.14 --- pkgs/applications/audio/ocenaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 1bbbe3583f90..862c082a3823 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.11.11"; + version = "3.11.14"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-S3Fqg5DjhVoYwfF3A/P7WcOUsU1x+IGwLopyNA3FkRQ="; + sha256 = "sha256-5HQ64jCM8kyWLqxFqsFN3lJgM/JlWf1/RYKSpAFYTYE="; }; nativeBuildInputs = [ From cbd3e2ba7196bcb0d6b163458d3189ee090150e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 19:28:41 +0000 Subject: [PATCH 039/167] psi-notify: 1.2.1 -> 1.3.1 --- pkgs/applications/misc/psi-notify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/psi-notify/default.nix b/pkgs/applications/misc/psi-notify/default.nix index 9e4dcd783b73..e086ee01afed 100644 --- a/pkgs/applications/misc/psi-notify/default.nix +++ b/pkgs/applications/misc/psi-notify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "psi-notify"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "cdown"; repo = pname; rev = version; - sha256 = "0hn37plim1smmlrjjmz8kybyms8pz3wxcgf8vmqjrsqi6bfcym7g"; + sha256 = "sha256-GhGiSI5r0Ki6+MYNa5jCDyYZEW5R9LDNZ/S8K+6L0jo="; }; buildInputs = [ systemd libnotify ]; From 356ea489afc21e70a3c927dd4684e2dde75fc5e6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 17 Aug 2022 00:59:48 +0200 Subject: [PATCH 040/167] nfs-utils: 2.5.1 -> 2.6.2 --- pkgs/os-specific/linux/nfs-utils/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 7b5f6e720018..acb325a6e09f 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "nfs-utils"; - version = "2.5.1"; + version = "2.6.2"; src = fetchurl { - url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; - sha256 = "1i1h3n2m35q9ixs1i2qf1rpjp10cipa3c25zdf1xj1vaw5q8270g"; + url = "mirror://kernel/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-UgCHPoHE1hDiRi/CYv4YE18tvni3l5+VrM0VmuZNUBE="; }; # libnfsidmap is built together with nfs-utils from the same source, @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { "--enable-libmount-mount" "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen" + "--with-modprobedir=${placeholder "out"}/etc/modprobe.d" ]; patches = lib.optionals stdenv.hostPlatform.isMusl [ @@ -71,6 +72,9 @@ stdenv.mkDerivation rec { substituteInPlace systemd/nfs-utils.service \ --replace "/bin/true" "${coreutils}/bin/true" + substituteInPlace tools/nfsrahead/Makefile.in \ + --replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/" + substituteInPlace utils/mount/Makefile.in \ --replace "chmod 4511" "chmod 0511" From 5fdd6f336056c731ed5a776b5cbe0bc5d413c0a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 23:09:08 +0000 Subject: [PATCH 041/167] tgt: 1.0.82 -> 1.0.84 --- pkgs/tools/networking/tgt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 85c981c5c105..dedafc52f979 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.82"; + version = "1.0.84"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uVd1qPNBIqs9+pRnRP/Q8Z5sXpRdcwBejKjt0BJbXWA="; + sha256 = "sha256-NlEEakmut4WMI+mpm+SJOgHmWELRcl/dZJspks3VoqY="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; From 5333e243e993776c888cfddfc2136d341cf3a865 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 23:31:36 +0000 Subject: [PATCH 042/167] stdman: 2021.12.21 -> 2022.07.30 --- pkgs/data/documentation/stdman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index c09c204c55a2..57e32d864053 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stdman"; - version = "2021.12.21"; + version = "2022.07.30"; src = fetchFromGitHub { owner = "jeaye"; repo = "stdman"; rev = version; - sha256 = "sha256-wOMQzC5w8aDmxNxQ5HK8jMgoow1wXBfHGUwFBw2WiPA="; + sha256 = "sha256-ABogxVQS6p3wUV8GuB2tp7vMxe63t51dNoclEnYpa/0="; }; outputDevdoc = "out"; From 688fe5500cd1cbfc52b03eba336fd8f6d6e74d4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 06:58:59 +0000 Subject: [PATCH 043/167] erigon: 2022.07.03 -> 2022.08.02 --- pkgs/applications/blockchains/erigon.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index e17baf49dc71..5b3cdac7316a 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "erigon"; - version = "2022.07.03"; + version = "2022.08.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zWygG06H5+QuG11klRq+7T2v40FNMxmYENdsK3KB+ko="; + sha256 = "sha256-JXVVfhR7XQKPLpH9F+78+y5hLBGdq/qSA2wniM/sf5s="; fetchSubmodules = true; }; - vendorSha256 = "sha256-vxLe8uEjuQ96JiIDxlSrpVATScNl2fscXVUqFKmMPxs="; + vendorSha256 = "sha256-Muksput9s0I9AeQNG+QSbfz0/s14EmSERFg8h0rqaJ8="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: From 584ec678389a6538dad94e7f74a72e278619a2a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 08:55:40 +0000 Subject: [PATCH 044/167] consul-template: 0.29.0 -> 0.29.2 --- pkgs/tools/system/consul-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index c265cf028bc8..28d7158d08ff 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.29.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-HxzniR4z3YzvFww3KqhtelaqMQJBsSw83pfz+jHxvKQ="; + sha256 = "sha256-wvnOKbxS1j+MhmOs9INPusA1whLDo1sLGNxmzBQWPWc="; }; - vendorSha256 = "sha256-wRNfxJVX45dfIBZ0sy48qbPkAsD0CIB1PDTiGs8Fjhs="; + vendorSha256 = "sha256-uR1hzP17hFo9DUNCeKcwepZSxJJoV8WBsX9l+1CR4Ek="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here From 36a4a09aabbc7c03bb4063ee5831c87de3868598 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 Aug 2022 02:28:00 +0200 Subject: [PATCH 045/167] python3Packages.kanidm: init at 0.0.3 --- .../python-modules/kanidm/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/kanidm/default.nix diff --git a/pkgs/development/python-modules/kanidm/default.nix b/pkgs/development/python-modules/kanidm/default.nix new file mode 100644 index 000000000000..57ae3c59b563 --- /dev/null +++ b/pkgs/development/python-modules/kanidm/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, pythonOlder + +# build +, poetry-core + +# propagates +, aiohttp +, pydantic +, toml + +# tests +, pytest-asyncio +, pytest-mock +, pytestCheckHook +}: + +let + pname = "kanidm"; + version = "0.0.3"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sTkAKxtJa7CVYKuXC//eMmf3l8ABsrEr2mdf1r2Gf9A="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + toml + ]; + + checkInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pytestFlagsArray = [ + "-m 'not network'" + ]; + + pythonImportsCheck = [ + "kanidm" + ]; + + meta = with lib; { + description = "Kanidm client library"; + homepage = "https://github.com/kanidm/kanidm/tree/master/pykanidm"; + license = licenses.mpl20; + maintainers = with maintainers; [ arianvp hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec657aca004e..c6500f5ce99a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4812,6 +4812,8 @@ in { kaldi-active-grammar = callPackage ../development/python-modules/kaldi-active-grammar { }; + kanidm = callPackage ../development/python-modules/kanidm { }; + kaptan = callPackage ../development/python-modules/kaptan { }; karton-asciimagic = callPackage ../development/python-modules/karton-asciimagic { }; From 72152f2bcf9ba93a7889a13485a356ad1b267b7f Mon Sep 17 00:00:00 2001 From: midchildan Date: Wed, 17 Aug 2022 01:58:57 +0900 Subject: [PATCH 046/167] .editorconfig: disable for Apple nib files --- .editorconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.editorconfig b/.editorconfig index 3c7962ab4d8b..a4f216d71a22 100644 --- a/.editorconfig +++ b/.editorconfig @@ -60,6 +60,13 @@ indent_size = unset [*.md] trim_trailing_whitespace = unset +# binaries +[*.nib] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +charset = unset + [eggs.nix] trim_trailing_whitespace = unset From 316b53b78cf6f3178ff2074687f8c1175f482762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 16 Aug 2022 21:59:20 +0000 Subject: [PATCH 047/167] reaper: 6.61 -> 6.66 --- pkgs/applications/audio/reaper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 47a50f2a855a..28d050d2e425 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.61"; + version = "6.66"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz"; hash = { - x86_64-linux = "sha256-Lp2EVky1+ruc86LdMmvhZIisoYl0OxdkVnN3h/u09IQ="; - aarch64-linux = "sha256-sPLCMA//xAdWXjY7++R6eLWS56Zi0u+9ju7JlICGvVc="; + x86_64-linux = "sha256-kMXHHd+uIc5tKlDlxKjphZsfNMYvvV/4Zx84eRwPGcs="; + aarch64-linux = "sha256-pB3qj9CJbI5iWBNKNX2niIfHrpSz9+qotX/zKGYDwYo="; }.${stdenv.hostPlatform.system}; }; From 55812d7b48ed50ed2c50cb2dd28b5991eaa37dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 19 Aug 2022 10:25:05 +0200 Subject: [PATCH 048/167] linux_5_4_hardened: don't build on x86_64-linux anymore 5.4 hasn't configured successfully on x86_64-linux for months. People don't seem to care, but the 5.4 packages clutter failure lists on Hydra + tools. https://hydra.nixos.org/job/nixpkgs/trunk/linux_5_4_hardened.x86_64-linux/all Perhaps surprisingly, it works on aarch64-linux and also on older kernels. --- pkgs/os-specific/linux/kernel/hardened/config.nix | 3 ++- pkgs/top-level/linux-kernels.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 3e3cd149c4d9..0beab0725f6a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -8,13 +8,14 @@ # # See also -{ lib, version }: +{ stdenv, lib, version }: with lib; with lib.kernel; with (lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); +assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4"); { # Report BUG() conditions and kill the offending process. diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index e2e20726525b..5c78eb12f105 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -36,7 +36,7 @@ let modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion; in kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit lib version; + inherit stdenv lib version; }; argsOverride = { inherit version; From a20e4b808a256498c0950da10f5056fccedfddb8 Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Tue, 16 Aug 2022 15:48:54 +0100 Subject: [PATCH 049/167] jetbrains: update --- .../editors/jetbrains/default.nix | 5 + .../editors/jetbrains/versions.json | 266 +++++++++--------- 2 files changed, 138 insertions(+), 133 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 4e6a91b603a5..3ec39fa071fd 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, callPackage, fetchurl , jdk, cmake, gdb, zlib, python3 +, lldb , dotnet-sdk_6 , maven , autoPatchelfHook @@ -45,6 +46,7 @@ let python3 stdenv.cc.cc libdbusmenu + lldb ]; dontAutoPatchelf = true; postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' @@ -56,6 +58,9 @@ let # bundled gdb does not find libcrypto 10 rm -rf bin/gdb/linux ln -s ${gdb} bin/gdb/linux + # bundled lldb does not find libssl + rm -rf bin/lldb/linux + ln -s ${lldb} bin/lldb/linux autoPatchelf $PWD/bin diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index c38506432fff..19fefe9ad6a0 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,157 +3,157 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.1.3", - "sha256": "6f0234d41c4ca1cf8eaa4ea5585ba4cfc17d86c16c78edc59501e0ca05a80d56", - "url": "https://download.jetbrains.com/cpp/CLion-2022.1.3.tar.gz", + "version": "2022.2.1", + "sha256": "a0d9e77ad4afbb5f7d69e23cf84ccf132eed6ead6c3a7cd442b33924e6931656", + "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.1.5", - "sha256": "688fcb5996d9bdffd0735e14d10171cfefc72bc482dd773102dcc9e28e245ab8", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5.tar.gz", + "version": "2022.2.1", + "sha256": "4015bfa478f7ee33914975b530f13930bc32eff86223e9256f2610497f95825f", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.tar.gz", "version-major-minor": "2022.1.1", - "build_number": "221.5787.39" + "build_number": "222.3345.126" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.1.3", - "sha256": "b96a1cb1b6be1d1e55c85de551fbd94b9a8c0566193d784f3bc408da60e6904e", - "url": "https://download.jetbrains.com/go/goland-2022.1.3.tar.gz", + "version": "2022.2.2", + "sha256": "c3cfc300f55adc3a52528d13a1133bffd2aa7c2d20ea301cd20e3aff52d87609", + "url": "https://download.jetbrains.com/go/goland-2022.2.2.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5921.26" + "build_number": "222.3739.57" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.1.3", - "sha256": "f8a14e3ab100cf745dc7e329e13bd31961cd728c6b7676493b9ffb4e290a9543", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3.tar.gz", + "version": "2022.2.1", + "sha256": "93eb9391a898aad164ca47965e0445cbf0f04d7062b6875c4e4a3136799ee6cf", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5921.22" + "build_number": "222.3739.54" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", - "version": "2022.1.3", - "sha256": "97748cd2dacf74701eb4ec30227d96a9b5ab5c09afc7e59443669ab839d20d02", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3-no-jbr.tar.gz", + "version": "2022.2.1", + "sha256": "43eee4b9ea9aed7601252823689e7232b39829784a9bab5e8b5462f55eecc83a", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-no-jbr.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5921.22" + "build_number": "222.3739.54" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", "version": "2021.3.1", "sha256": "b7d41c4362e71f30adeaed9f0ec30afd5ac0e6eea9650ee4a19d70a5783db3e6", - "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.1.tar.gz", + "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1.tar.gz", "version-major-minor": "2021.3", "build_number": "213.7172.958" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.1.3", - "sha256": "ea5d005f3aee2588dd725bd3aa87d5e3beb51ac87b1505f34263f9da3babd360", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3.tar.gz", + "version": "2022.2.1", + "sha256": "dc463578e879f958cae3c5fc775170dd0a6a89347c02aa087126f03cc7a63f79", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5921.28" + "build_number": "222.3739.61" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.1.3", - "sha256": "888595caa9510d31fd1b56009b6346fd705e8e7cd36d07205f8bf510b92f26a5", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3.tar.gz", + "version": "2022.2.1", + "sha256": "fc91b134b6899a09ce8cbdc1ebdbdcfe1c1ffb6dbe756b30b24d7ad131bf27c8", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.56" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.1.3", - "sha256": "f8b9a761529358e97d1b77510a8ef81314bccdfb0fa450f2adcd466ba1fd0bf5", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3.tar.gz", + "version": "2022.2.1", + "sha256": "a23ffa7b617ab27d3c8abb0689b4d03b5370534193152cd4cfe4196c7d150751", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.56" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.1.2", - "sha256": "4513e55d3db013986bdfda52854f89fb127a153f2588ae456d6e7a182987b741", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2.tar.gz", + "version": "2022.2.1", + "sha256": "3f61c5fbdf46b94a5cb772ad51dda5a9cad8a9c7ad78dbcacf01daa2226a5633", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5787.36" + "build_number": "222.3739.37" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.1.3", - "sha256": "9d9c729bd1908a865c72c215b25525e3b82ffee46986b58b747cb502dc6ec2f4", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3.tar.gz", + "version": "2022.2", + "sha256": "4300570552fb94932fe4311b6f8c7a071296e0c0c84246039f26f1b37dda9f0a", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5921.22" + "build_number": "222.3345.111" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.1.3", - "sha256": "cc32c57753f1846f2679cef27a365aebcdacfbbffaea9f33bef1d0da6032ed6c", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3.tar.gz", + "version": "2022.2.1", + "sha256": "508fe7272dd049875d848b52a2908e4d228ce576d4dde5f56f51a8c346b12a2c", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.tar.gz", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.57" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.1.3", - "sha256": "6358b42546906c43e46499ea176f901df83ed8c922af65aad068ed048248138d", - "url": "https://download.jetbrains.com/cpp/CLion-2022.1.3.dmg", + "version": "2022.2.1", + "sha256": "ba2a8fcf9a1f080ca6b2ef832b13104c440077b9e6a2bb6e26bc97bdea373208", + "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.1.5", - "sha256": "ac96ab12d7b4593df21cd466b3cea26bcce0db2c2eb92b5d31456887f500032b", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5.dmg", + "version": "2022.2.1", + "sha256": "7cd7bcdc7588a88459dcda5bab0e7c97751b8d7a87a37c5af8e08072fc9beb03", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.dmg", "version-major-minor": "2022.1.1", - "build_number": "221.5787.39" + "build_number": "222.3345.126" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.1.3", - "sha256": "5a6821d54cd8777c937fe4dc1ef1d6cab528a24419ac0c751df6bd877a264610", - "url": "https://download.jetbrains.com/go/goland-2022.1.3.dmg", + "version": "2022.2.2", + "sha256": "e11f07aebf849ed942c4b8658c11c70ce81b4138186a0301c0ec7cd236f1ff51", + "url": "https://download.jetbrains.com/go/goland-2022.2.2.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.26" + "build_number": "222.3739.57" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.1.3", - "sha256": "63637f764018d50717a54c7088be6038f14fbdc8240b3e84fddecf9747471f01", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3.dmg", + "version": "2022.2.1", + "sha256": "9c1402f8682ecefe84ae9494c65b80da1b763664624a7f6b0104b044b4cb687a", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.22" + "build_number": "222.3739.54" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.1.3", - "sha256": "7297867bb7c5041015ff2e68415e35537c37bf500c53a5e003c82fc6af9515ab", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3.dmg", + "version": "2022.2.1", + "sha256": "e54a026da11d05d9bb0172f4ef936ba2366f985b5424e7eecf9e9341804d65bf", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.22" + "build_number": "222.3739.54" }, "mps": { "update-channel": "MPS RELEASE", @@ -167,103 +167,103 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.1.3", - "sha256": "306e3bb8224bfb538d02fa33c777d744d369814f460fe254150d722507827abf", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3.dmg", + "version": "2022.2.1", + "sha256": "ba9cc863c2247e6404b015fac085e8b3427b29aba3d7cb07940840f7c5e3b647", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.28" + "build_number": "222.3739.61" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.1.3", - "sha256": "d653aaf52be86d7327d566f03a61a5ce4dfd8059948d1d612833215410dde09b", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3.dmg", + "version": "2022.2.1", + "sha256": "8c2b322cab74cbf52dbe33e0fd9be63fe320d1ade2446790c4eec7309b590eea", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.56" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.1.3", - "sha256": "af7594948effdbe5c9a704185d8abd65a23aab5098059f3fbfef4f29c777fd98", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3.dmg", + "version": "2022.2.1", + "sha256": "6636139dc9c0e28b90517e91d1c1924e218b5d33d9418cca888b05c11fbf54d9", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.56" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.1.2", - "sha256": "ddcf6544e7302632a117ec00cf2e20688b53a47319114418fa55f7304bf49b82", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2.dmg", + "version": "2022.2.1", + "sha256": "13cdaa0f83e645a0a08bc3dd05522441e591b247af853b22c8ca5bbce047a125", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.dmg", "version-major-minor": "2022.1", - "build_number": "221.5787.36" + "build_number": "222.3739.37" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.1.3", - "sha256": "1088ef00fef9e63cc3b24c90b4b86e20a473b1d3c72c18b0926e76a41218956f", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3.dmg", + "version": "2022.2", + "sha256": "d806254af68425089d40a7a302ce10c87283a25399e7b667e8d261b3958f4fbb", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.22" + "build_number": "222.3345.111" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.1.3", - "sha256": "85c73a9c5415eecb18d11e22e8b6aced4c16908aaec129c5a1a7241e5f354c2a", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3.dmg", + "version": "2022.2.1", + "sha256": "7d57692ce83dd6c853c80c457bdb8239dd833cf5535c600154a7ebc0be18a05d", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.57" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.1.3", - "sha256": "60f3f83cc1e526f126c89c444928c2ab5dfaf26aab109de5f05baca2fdf20a24", - "url": "https://download.jetbrains.com/cpp/CLion-2022.1.3-aarch64.dmg", + "version": "2022.2.1", + "sha256": "af36f7f9a98881d37d89757083875494c472e60d14bd70fe0d08533d284dd4e1", + "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.1.5", - "sha256": "31df43a4f1adab562730adade212916091fc7f7090121001840c1453d2037694", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5-aarch64.dmg", + "version": "2022.2.1", + "sha256": "01d8de1225fb4a74f22752edf74038405f02d27565f01816d8e751d7989a75bb", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1-aarch64.dmg", "version-major-minor": "2022.1.1", - "build_number": "221.5787.39" + "build_number": "222.3345.126" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.1.3", - "sha256": "5e29fbd0b2ed2ea06445ee378fd12f8172cfffb122652d26579b7dfea6c774e5", - "url": "https://download.jetbrains.com/go/goland-2022.1.3-aarch64.dmg", + "version": "2022.2.2", + "sha256": "7098f05847c0524bc90b00766c71c2f1cc1442983da956c79ee1445b48da73fd", + "url": "https://download.jetbrains.com/go/goland-2022.2.2-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.26" + "build_number": "222.3739.57" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.1.3", - "sha256": "b436120ee2bb380f30e29582c3958e110d9c85186bde6af6fe5c571c75e99df8", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3-aarch64.dmg", + "version": "2022.2.1", + "sha256": "4bf843152fe009838dbb5e5a1d8e39ebf98df5f6771254cf1f26ff0b299798fd", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.22" + "build_number": "222.3739.54" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.1.3", - "sha256": "0f0ec167c0394b7d4969cb0b95e08e2b469e811a1aa515971bc84d5ef4d54def", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3-aarch64.dmg", + "version": "2022.2.1", + "sha256": "f7b56525adf96d0ac290eebebd08a53b962a799db65942e07cd437aef655fa0e", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.22" + "build_number": "222.3739.54" }, "mps": { "update-channel": "MPS RELEASE", @@ -277,56 +277,56 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.1.3", - "sha256": "68c6093701f86b6a31601e159569629ceea87c7db20b8b98089bf8efadb0310e", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3-aarch64.dmg", + "version": "2022.2.1", + "sha256": "b553e1f0249b4d7f89cacdac7bada758895cd35aec8ddac5f81017f61ddc44fb", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.28" + "build_number": "222.3739.61" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.1.3", - "sha256": "0d578b5ab3140ac20e6a0250c2733cc2fa6888b8ab478a046181c273ac6a66cb", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3-aarch64.dmg", + "version": "2022.2.1", + "sha256": "c3abc618614be830dbf41479b74ae489aa44290d9bbb11e3c4d2cdffb4d569b6", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.56" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.1.3", - "sha256": "88bcc8acc6bb7bc189466da427cc049df62062e8590108f17b080208a8008a07", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3-aarch64.dmg", + "version": "2022.2.1", + "sha256": "416ca961042b9c3ae8b23039cc3b84b64e941c1d82478bca3e327089efa4f4d2", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.56" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.1.2", - "sha256": "81ce9020cc2b20f50ce73efe80969b054fce2a62a1736aed877a1141eaf07d4b", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2-aarch64.dmg", + "version": "2022.2.1", + "sha256": "96e539ba43d7dcecb9e709c1b1483b4c832fbff4b9fd77f6e91b266a91125a55", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5787.36" + "build_number": "222.3739.37" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.1.3", - "sha256": "ed4b77ad69207872190b3200143c8bca50234c19539fcaaf55bfa4643e7be3b0", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3-aarch64.dmg", + "version": "2022.2", + "sha256": "c7650443f16ab9cc0b3f6fc701164633bab079f11eeb7aa93b78f2ddc73640a0", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.22" + "build_number": "222.3345.111" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.1.3", - "sha256": "60de3524c32fbc6dde2989b7ffcfce861c069ce79bded6206dbc587c94f411a2", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3-aarch64.dmg", + "version": "2022.2.1", + "sha256": "fa790240b0d00cb134bf0e87c6a85d5a749b73b3f577a9564a890e5819926e53", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "221.5921.27" + "build_number": "222.3739.57" } } } From 42ddae4fe4a25f5c87aff7fe687b62123327c4e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Aug 2022 13:55:35 +0000 Subject: [PATCH 050/167] pyradio: 0.8.9.22 -> 0.8.9.25 --- pkgs/applications/audio/pyradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 9309ea2f8152..3c7b603d62cd 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.22"; + version = "0.8.9.25"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-QBgXg2SNEQX1ngY+cEWqStC0zsFZ0Er81tuhTszbHWM="; + sha256 = "sha256-bkZ+zgFtENQUjks9HwVcqHIREcKQ5XCt3AEh3QAyiEc="; }; nativeBuildInputs = [ installShellFiles ]; From 3c3e5cfcbfbb16cbb560e365d150a9e154c27249 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Aug 2022 17:32:15 +0000 Subject: [PATCH 051/167] rekor-cli: 0.10.0 -> 0.11.0 --- pkgs/tools/security/rekor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 0343c389e5f3..44b47dc6568b 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "sha256-jwV6qPItuNrXl3rknY2RVIw3f3VwyiEefomnvGKiluI="; + sha256 = "sha256-55socfx7qTQ3F5JcDgPTHQP+96X7lwFJ8IIz52hFxow="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -23,7 +23,7 @@ let ''; }; - vendorSha256 = "sha256-qT1vY+YLmehQYS+jiCEx7vOJACIGPcl7VNfUEMc8w0U="; + vendorSha256 = "sha256-A3fG756BoUSJwxyGdfpJlbb+nVQgzo39mjT+QD4knlk="; nativeBuildInputs = [ installShellFiles ]; From fcb99b4efa646f42d2a20698db11f5fe90944d6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Aug 2022 19:37:20 +0000 Subject: [PATCH 052/167] python310Packages.sqlite-fts4: 1.0.1 -> 1.0.3 --- pkgs/development/python-modules/sqlite-fts4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-fts4/default.nix b/pkgs/development/python-modules/sqlite-fts4/default.nix index 4342eb6e206a..0498a207e9df 100644 --- a/pkgs/development/python-modules/sqlite-fts4/default.nix +++ b/pkgs/development/python-modules/sqlite-fts4/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sqlite-fts4"; - version = "1.0.1"; + version = "1.0.3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "simonw"; repo = pname; - rev = version; - sha256 = "15r1mijk306fpm61viry5wjhqyxlbqqdk4nfcd901qarx7vqypgy"; + rev = "refs/tags/${version}"; + sha256 = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU="; }; checkInputs = [ From c9aaee902c9e48b2ab07738e9eb783abc7fee63d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Aug 2022 16:05:58 +0200 Subject: [PATCH 053/167] python310Packages.sqlite-fts4: add pythonImportsCheck - update disabled --- .../python-modules/sqlite-fts4/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-fts4/default.nix b/pkgs/development/python-modules/sqlite-fts4/default.nix index 0498a207e9df..748587ed5ad0 100644 --- a/pkgs/development/python-modules/sqlite-fts4/default.nix +++ b/pkgs/development/python-modules/sqlite-fts4/default.nix @@ -1,31 +1,36 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "sqlite-fts4"; version = "1.0.3"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU="; + hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU="; }; checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "sqlite_fts4" + ]; + meta = with lib; { description = "Custom Python functions for working with SQLite FTS4"; homepage = "https://github.com/simonw/sqlite-fts4"; license = licenses.asl20; maintainers = with maintainers; [ meatcar ]; }; - } From a48bd06a09c5836eed9a0a20672470bc0c1ad57b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Aug 2022 21:16:55 +0000 Subject: [PATCH 054/167] metabase: 0.43.3 -> 0.44.1 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index a44ff181389e..ed51f11ad557 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.43.3"; + version = "0.44.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-XUJNnyzBGYC3jMi1pVvdMNRo8zxkFcxzdHjytmCAVqM="; + hash = "sha256-TIQrmzdLD/pwMbd1dyLh3d2bauu7Wv6C2CtuuXMNN5E="; }; nativeBuildInputs = [ makeWrapper ]; From 13bec6b5b71c8f4ad0772d0246a7c7a0320dbaf7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Aug 2022 22:54:07 +0000 Subject: [PATCH 055/167] opera: 84.0.4316.42 -> 90.0.4480.48 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index a891708c6582..71b755e60d82 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "84.0.4316.42"; + version = "90.0.4480.48"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-ZjVuw30YfHQ69BVxPvIde6VuOcqtnXrGwhZpA26vLpw="; + sha256 = "sha256-nFReaBvtIQ1N5lfOJHoayiI4TWlfmGocNWirbvPRbnM="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; From 988f4d10f51045d61b8382a6e0f4f34f4488f83e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Aug 2022 23:33:32 +0000 Subject: [PATCH 056/167] owncloud-client: 2.10.1.7187 -> 2.11.0.8354 --- pkgs/applications/networking/owncloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 992058bdb305..16abab431bd3 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.10.1.7187"; + version = "2.11.0.8354"; src = fetchurl { url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "sha256-SNabKv5z7viDI3XDQ2mWjEgFKAGSR5K9sI3Tu5eZbwU="; + sha256 = "sha256-YraWvGgeF5b1+3i5Jlk+bwvAULr7KFOSX8y0ZoPpljI="; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; From 950a497439aa8776a4ff56f1f18b0e3a2adfb9a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Aug 2022 02:09:57 +0000 Subject: [PATCH 057/167] python310Packages.pywlroots: 0.15.19 -> 0.15.20 --- pkgs/development/python-modules/pywlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index ec9b925982eb..60ff8dec451c 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.19"; + version = "0.15.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ch8ddN9J8STw3qjAwP9sAta5YBgEg/2wSYgDyWEAXhU="; + sha256 = "sha256-hHZzMK7ge2Hs7tzHo4LV3rumEoEoL2OODRQRM60Vlz0="; }; nativeBuildInputs = [ pkg-config ]; From 1d143536d38e33f84184ee994297fca41796d750 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Sat, 20 Aug 2022 18:35:05 +0300 Subject: [PATCH 058/167] python310Packages.scikitimage: 0.18.3 -> 0.19.3 Also marked `python3Packages.imgaug` as broken. --- pkgs/development/python-modules/imgaug/default.nix | 3 +++ .../python-modules/scikit-image/default.nix | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 50faf89d600a..2c84f5c00c50 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -77,5 +77,8 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; platforms = platforms.linux; + # Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0 + # and https://github.com/scikit-image/scikit-image/issues/6093 + broken = lib.versionAtLeast scikitimage.version "0.19"; }; } diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 45239f64fbef..9098724da42a 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , python , cython +, pythran , numpy , scipy , matplotlib @@ -16,25 +17,24 @@ , imageio , tifffile , pytestCheckHook -, doCheck ? false }: let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; - version = "0.18.3"; + version = "0.19.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh"; + sha256 = "sha256-zvXgZdvYycFbbMsBFSqMDzLanEtF9+JuVSQ3AM8/LQk="; }; patches = [ ./add-testing-data.patch ]; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ cython pythran ]; propagatedBuildInputs = [ cloudpickle @@ -51,7 +51,7 @@ let ]; # test suite is very cpu intensive, move to passthru.tests - inherit doCheck; + doCheck = false; checkInputs = [ pytestCheckHook ]; # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; From 2cf76d7f89a589c8b20980569fd009443274dc23 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 21 Aug 2022 18:29:31 +0200 Subject: [PATCH 059/167] ugrep: 3.9.1 -> 3.9.2 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 42711a2c5913..0cf5c77544b7 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KDAuGFoUJxaa0noW739+gxeHKZeouu14EDla0lWwaIQ="; + sha256 = "sha256-9c4PoDJLfUH6ySNIxJDg5m2M2WFxNtuqCVKF6FvOHzY="; }; buildInputs = [ From 95a77857ef1db1825cbd02d038bacf02a3913111 Mon Sep 17 00:00:00 2001 From: Xavier Lambein Date: Sun, 21 Aug 2022 23:31:13 +0200 Subject: [PATCH 060/167] google-cloud-sdk: add support for components This commit adds a set of Google Cloud SDK components in `pkgs.google-cloud-sdk.components` which can be installed along with the SDK through `pkgs.google-cloud-sdk.withExtraComponents [ ... ]`. --- .../admin/google-cloud-sdk/components.nix | 175 ++++++++++++++++++ pkgs/tools/admin/google-cloud-sdk/data.nix | 5 + pkgs/tools/admin/google-cloud-sdk/default.nix | 12 +- pkgs/tools/admin/google-cloud-sdk/update.sh | 15 +- .../google-cloud-sdk/withExtraComponents.nix | 61 ++++++ 5 files changed, 266 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/admin/google-cloud-sdk/components.nix create mode 100644 pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix new file mode 100644 index 000000000000..1deaffcc114e --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -0,0 +1,175 @@ +{ stdenv +, lib +, google-cloud-sdk +, system +, snapshotPath +, ... +}: + +let + # Mapping from GCS component architecture names to Nix archictecture names + arches = { + x86 = "i686"; + x86_64 = "x86_64"; + # TODO arm + }; + + # Mapping from GCS component operating systems to Nix operating systems + oses = { + LINUX = "linux"; + MACOSX = "darwin"; + WINDOWS = "windows"; + CYGWIN = "cygwin"; + }; + + # Convert an archicecture + OS to a Nix platform + toNixPlatform = arch: os: + let + arch' = builtins.getAttr arch arches; + os' = builtins.getAttr os oses; + in + if (builtins.hasAttr arch arches && builtins.hasAttr os oses) + then "${arch'}-${os'}" + else throw "unsupported architecture '${arch}' and/or os '${os}'"; + + # All architectures that are supported + allArches = builtins.attrValues arches; + + # A description of all available google-cloud-sdk components. + # It's a JSON file with a list of components, along with some metadata + snapshot = builtins.fromJSON (builtins.readFile snapshotPath); + + # Generate a snapshot file for a single component. It has the same format as + # `snapshot`, but only contains a single component. These files are + # installed with google-cloud-sdk to let it know which components are + # available. + snapshotFromComponent = + { component + , revision + , schema_version + , version + }: + builtins.toJSON { + components = [ component ]; + inherit revision schema_version version; + }; + + # Generate a set of components from a JSON file describing these components + componentsFromSnapshot = + { components + , revision + , schema_version + , version + , ... + }: + lib.fix ( + self: + builtins.listToAttrs ( + builtins.map + (component: { + name = component.id; + value = componentFromSnapshot self { inherit component revision schema_version version; }; + }) + components + ) + ); + + # Generate a single component from its snapshot, along with a set of + # available dependencies to choose from. + componentFromSnapshot = + # Component derivations that can be used as dependencies + components: + # This component's snapshot + { component + , revision + , schema_version + , version + } @ attrs: + let + baseUrl = builtins.dirOf schema_version.url; + # Architectures supported by this component. Defaults to all available + # architectures. + architectures = builtins.filter + (arch: builtins.elem arch (builtins.attrNames arches)) + (lib.attrByPath [ "platform" "architectures" ] allArches component); + # Operating systems supported by this component + operating_systems = builtins.filter + (os: builtins.elem os (builtins.attrNames oses)) + component.platform.operating_systems; + in + mkComponent + { + name = component.id; + version = component.version.version_string; + src = + if lib.hasAttrByPath [ "data" "source" ] component + then "${baseUrl}/${component.data.source}" + else ""; + sha256 = lib.attrByPath [ "data" "checksum" ] "" component; + dependencies = builtins.map (dep: builtins.getAttr dep components) component.dependencies; + platforms = + if component.platform == { } + then lib.platforms.all + else + builtins.concatMap + (arch: builtins.map (os: toNixPlatform arch os) operating_systems) + architectures; + snapshot = snapshotFromComponent attrs; + }; + + # Filter out dependencies not supported by current system + filterForSystem = builtins.filter (drv: builtins.elem system drv.meta.platforms); + + # Make a google-cloud-sdk component + mkComponent = + { name + , version + # Source tarball, if any + , src ? "" + # Checksum for the source tarball, if there is a source + , sha256 ? "" + # Other components this one depends on + , dependencies ? [ ] + # Short text describing the component + , description ? "" + # Platforms supported + , platforms ? lib.platforms.all + # The snapshot corresponding to this component + , snapshot + }: stdenv.mkDerivation { + inherit name version snapshot; + src = + if src != "" then + builtins.fetchurl + { + url = src; + inherit sha256; + } else ""; + phases = [ "installPhase" "fixupPhase" ]; + installPhase = '' + mkdir -p $out/google-cloud-sdk/.install + + # If there is a source, unpack it + if [ ! -z "$src" ]; then + tar -xf $src -C $out/google-cloud-sdk/ + + # If the source has binaries, link them to `$out/bin` + if [ -d "$out/google-cloud-sdk/bin" ]; then + mkdir $out/bin + find $out/google-cloud-sdk/bin/ -type f -exec ln -s {} $out/bin/ \; + fi + fi + + # Write the snapshot file to the `.install` folder + cp $snapshotPath $out/google-cloud-sdk/.install/${name}.snapshot.json + ''; + passthru = { + dependencies = filterForSystem dependencies; + }; + passAsFile = [ "snapshot" ]; + meta = { + inherit description platforms; + }; + }; +in +componentsFromSnapshot snapshot diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index f4992b63d5d5..31061a525d83 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -28,5 +28,10 @@ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86.tar.gz"; sha256 = "1xw4jzl85didin26q9sg7j1pip4bmap5d0ac9ywbj0vni71mqx26"; }; + components = + { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/components-v397.0.0.json"; + sha256 = "1bm3z63lh0z8scfsvjxwvprbrbl5iciz6pbl1hkklxhbc0k9axbc"; + }; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index c1627ae18b86..52c88b0a201d 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,7 +7,7 @@ # 3) used by `google-cloud-sdk` only on GCE guests # -{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, with-gce ? false }: +{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, callPackage, with-gce ? false }: let pythonEnv = python.withPackages (p: with p; [ @@ -21,6 +21,12 @@ let sources = system: data.googleCloudSdkPkgs.${system} or (throw "Unsupported system: ${system}"); + components = callPackage ./components.nix { + snapshotPath = builtins.fetchurl data.googleCloudSdkPkgs.components; + }; + + withExtraComponents = callPackage ./withExtraComponents.nix { inherit components; }; + in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; inherit (data) version; @@ -105,6 +111,10 @@ in stdenv.mkDerivation rec { $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}" ''; + passthru = { + inherit components withExtraComponents; + }; + meta = with lib; { description = "Tools for the google cloud platform"; longDescription = "The Google Cloud SDK. This package has the programs: gcloud, gsutil, and bq"; diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh index d58220dc10c0..29bba851d954 100755 --- a/pkgs/tools/admin/google-cloud-sdk/update.sh +++ b/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -1,7 +1,8 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nix -BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk" +CHANNEL_URL="https://dl.google.com/dl/cloudsdk/channels/rapid" +BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk" # Version of Google Cloud SDK from # https://cloud.google.com/sdk/docs/release-notes @@ -17,6 +18,15 @@ function genMainSrc() { echo " };" } +function genComponentsSrc() { + local url="${CHANNEL_URL}/components-v${VERSION}.json" + local sha256 + sha256=$(nix-prefetch-url "$url") + echo " {" + echo " url = \"${url}\";" + echo " sha256 = \"${sha256}\";" + echo " };" +} { cat < component_list.txt + for comp in ${builtins.toString compNames}; do + if [ ! grep ... component_list.txt | grep "Not Installed" ]; then + echo "Failed to install component '$comp'" + exit 1 + fi + done + ''; +} + '' + mkdir -p $out + + # Install each component + for comp in $(cat $compsPath); do + echo "installing component $comp" + cp -dRf $comp/. $out + find $out -type d -exec chmod 744 {} + + done + + # Replace references to the original google-cloud-sdk with this one + find $out/google-cloud-sdk/bin/ -type f -exec sed -i -e "s#${google-cloud-sdk}#$out#" {} \; + '' From 4d9bdff8258755c98e9187f02c4bdffc31a0e3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 22 Aug 2022 09:38:43 +0200 Subject: [PATCH 061/167] knot-dns: 3.1.9 -> 3.2.0 This version brings various XDP-related features and improvements (namely QUIC and TCP) and many more: https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.2.0 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 23fefe80e764..eeb3e51188b9 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.9"; + version = "3.2.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "sha256-s8pPHUROlf8n0gltPMWkfBDB1poeSIWuipcngfYnnYI="; + sha256 = "426d120994daf93af348aa6c48428e583dd286656415de4daf7a59106fd98631"; }; outputs = [ "bin" "out" "dev" ]; From 72119420672a64f5b51e083f8eeb08f896242d16 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Mon, 22 Aug 2022 11:05:44 +0200 Subject: [PATCH 062/167] amdvlk: 2022.Q2.2 -> 2022.Q3.3 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index cafa505da621..68cb1dd3e339 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q2.2"; + version = "2022.Q3.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "4LV6g2snT1usY+Ic9Hb/IwXAJQ97I9DigZCah6mwewA="; + sha256 = "jbx6R6tDaVWD5jLVW2IiNaw+VwFkQ9EG2FvpAj/bfZ4="; }; buildInputs = [ From 8682bd0a81797f64a825c8941272df2a6342bb5c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 22 Aug 2022 02:05:50 -0700 Subject: [PATCH 063/167] build-support/rust: toTargetArch: strip off endianness `toTargetArch` in `pkgs/build-support/rust/lib/default.nix` is used to set `CARGO_CFG_TARGET_ARCH`. This environment variable is supposed to be the `` portion of an LLVM-style platform name: ``` -- ``` Note that the pointer-width (the "64" in "x86_64" and "mips64") is part of ``, but the endianness (the `_be` in `aarch64_be`) is *not*. Unfortunately at the moment nixpkgs' parsed `cpuType` has no way to query for the three subparts (name, pointer-width, and subarch/endianness), nor any way to ask for just the first two parts. For now, this commit simply fixes the problem in the two cases that matter: `mips64el` and `powerpc64le`, which I believe are the only two platforms supported by both rust and nixpkgs which have a "subarchitecture". --- pkgs/build-support/rust/lib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index 34aaa8c516a9..2be0c2567879 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -5,6 +5,8 @@ rec { toTargetArch = platform: /**/ if platform ? rustc.platform then platform.rustc.platform.arch else if platform.isAarch32 then "arm" + else if platform.isMips64 then "mips64" # never add "el" suffix + else if platform.isPower64 then "powerpc64" # never add "le" suffix else platform.parsed.cpu.name; # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os From 48d8b7fe412e0da25ebc60b0a90d5958b7bf7016 Mon Sep 17 00:00:00 2001 From: Xavier Lambein Date: Mon, 22 Aug 2022 12:24:31 +0200 Subject: [PATCH 064/167] google-cloud-sdk: simplify `toNixPlatform` implementation Co-authored-by: Jonas Chevalier --- pkgs/tools/admin/google-cloud-sdk/components.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index 1deaffcc114e..99069fe4fd9e 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -25,12 +25,10 @@ let # Convert an archicecture + OS to a Nix platform toNixPlatform = arch: os: let - arch' = builtins.getAttr arch arches; - os' = builtins.getAttr os oses; + arch' = arches.${arch} or (throw "unsupported architecture '${arch}'"); + os' = oses.${os} or (throw "unsupported OS '${os}'"); in - if (builtins.hasAttr arch arches && builtins.hasAttr os oses) - then "${arch'}-${os'}" - else throw "unsupported architecture '${arch}' and/or os '${os}'"; + "${arch'}-${os'}"; # All architectures that are supported allArches = builtins.attrValues arches; From 1d3dbb45f26121585277b569b1705527156270d1 Mon Sep 17 00:00:00 2001 From: Xavier Lambein Date: Mon, 22 Aug 2022 12:33:40 +0200 Subject: [PATCH 065/167] google-cloud-sdk: add components.json to the repository --- .../admin/google-cloud-sdk/components.json | 6910 +++++++++++++++++ pkgs/tools/admin/google-cloud-sdk/data.nix | 5 - pkgs/tools/admin/google-cloud-sdk/default.nix | 2 +- pkgs/tools/admin/google-cloud-sdk/update.sh | 14 +- 4 files changed, 6913 insertions(+), 18 deletions(-) create mode 100644 pkgs/tools/admin/google-cloud-sdk/components.json diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json new file mode 100644 index 000000000000..f1c51c68d2f0 --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -0,0 +1,6910 @@ +{ + "components": [ + { + "data": { + "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", + "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", + "size": 800, + "source": "components/google-cloud-sdk-alpha-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core" + ], + "details": { + "description": "Alpha version of gcloud commands.", + "display_name": "gcloud Alpha Commands" + }, + "id": "alpha", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "2022.08.05" + } + }, + { + "dependencies": [ + "anthos-auth-darwin-arm", + "anthos-auth-darwin-x86_64", + "anthos-auth-linux-arm", + "anthos-auth-linux-x86_64", + "anthos-auth-windows-x86_64" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for Anthos clusters.", + "display_name": "anthos-auth" + }, + "id": "anthos-auth", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "9a11f7c85ffff2fd7ad4946b5c1ea97a1162e687b559244ee21228c8154d90dd", + "contents_checksum": "2cd31930d0f1326c8f3e0be44bb9ab3c5335ed38c170090f7105ba7accccb4a1", + "size": 19054806, + "source": "components/google-cloud-sdk-anthos-auth-darwin-arm-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthos-auth" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for Anthos clusters.", + "display_name": "anthos-auth" + }, + "id": "anthos-auth-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "e04c7143047fd26430e26e3e67fa1768413d8ed1d6e014a0d96c6075559ce3aa", + "contents_checksum": "f7b242bfa64f2c78d388ce361a829f6d0bfd53e8f0fabfc6b4b14fa6e3ef4682", + "size": 19911349, + "source": "components/google-cloud-sdk-anthos-auth-darwin-x86_64-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthos-auth" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for Anthos clusters.", + "display_name": "anthos-auth" + }, + "id": "anthos-auth-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "030fa3615f5a7833a642047bdf531936c8d8fa827f5dbc44384de1a9e85df254", + "contents_checksum": "5119864e84d03d45dc0c00713072a8c34ecf95f18ac4633c938b581dbad86a28", + "size": 18716150, + "source": "components/google-cloud-sdk-anthos-auth-linux-arm-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthos-auth" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for Anthos clusters.", + "display_name": "anthos-auth" + }, + "id": "anthos-auth-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "b3377c443f135a112ace343bb6ab6c20bf763e29512947f95bb239a381ee9b86", + "contents_checksum": "4543d98cd25e05c6bfb9e36d89b7b34a226218e5ce3feee07276377fde8f5967", + "size": 20095013, + "source": "components/google-cloud-sdk-anthos-auth-linux-x86_64-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthos-auth" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for Anthos clusters.", + "display_name": "anthos-auth" + }, + "id": "anthos-auth-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "29c9c078662d94e48a601c2916ca9030e0d81f8f442e3e11a654c90ff0816838", + "contents_checksum": "78662933c423257a0aaafd07a1bcbf1eed864015a5e42ffbfb0d4caa30d9b5f0", + "size": 20093409, + "source": "components/google-cloud-sdk-anthos-auth-windows-x86_64-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthos-auth" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for Anthos clusters.", + "display_name": "anthos-auth" + }, + "id": "anthos-auth-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "dependencies": [ + "anthoscli-darwin-arm", + "anthoscli-darwin-x86", + "anthoscli-darwin-x86_64", + "anthoscli-linux-arm", + "anthoscli-linux-x86", + "anthoscli-linux-x86_64", + "anthoscli-windows-x86", + "anthoscli-windows-x86_64" + ], + "details": { + "description": "The cli for Anthos infrastructure.", + "display_name": "anthoscli" + }, + "id": "anthoscli", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "0.2.28" + } + }, + { + "data": { + "checksum": "9e6a78c4747f425c93933e61635a2caf7685ae750adc065bf1ddd70f018e3f29", + "contents_checksum": "bc2e1ce26d099e6b384b732e452e3c784cfc234a96292c446bd6856bce555337", + "size": 48898452, + "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20220617150114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthoscli" + ], + "details": { + "description": "The cli for Anthos infrastructure.", + "display_name": "anthoscli" + }, + "id": "anthoscli-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220617150114, + "version_string": "0.2.28" + } + }, + { + "data": { + "checksum": "1040e5510117e0759085bb099d661462b7ae8dfe48ec919a56e5261d127be25f", + "contents_checksum": "9be893eceb503735424483a74cf5fc9eb6f255975ceff37b9088129a2437a583", + "size": 53541169, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20200717144158.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthoscli" + ], + "details": { + "description": "The cli for Anthos infrastructure.", + "display_name": "anthoscli" + }, + "id": "anthoscli-darwin-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20200717144158, + "version_string": "0.2.4" + } + }, + { + "data": { + "checksum": "d4c9ff15fac4fa8ad75c3dd972b0271b073999ead2ddd8f5881a6e2cf271f1a5", + "contents_checksum": "50a63d70cb7ee41503ee66649ab65d1a18eea756a67a674a0ea1eae54b1240dc", + "size": 50295536, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20220617150114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthoscli" + ], + "details": { + "description": "The cli for Anthos infrastructure.", + "display_name": "anthoscli" + }, + "id": "anthoscli-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220617150114, + "version_string": "0.2.28" + } + }, + { + "data": { + "checksum": "95410d27b5d587ba3388b9f38c328a358b292df154008480189a3e21a542f204", + "contents_checksum": "654021667b0b0be6df14e3df31f57c5374b2291670172bd9dd83c05606fce1d5", + "size": 46826425, + "source": "components/google-cloud-sdk-anthoscli-linux-arm-20220617150114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthoscli" + ], + "details": { + "description": "The cli for Anthos infrastructure.", + "display_name": "anthoscli" + }, + "id": "anthoscli-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220617150114, + "version_string": "0.2.28" + } + }, + { + "data": { + "checksum": "4aa7db2210073b098e96a550a2fd8148ca57d7ec9f9f4d6290faffee52390d5f", + "contents_checksum": "1dc52de4cfd28caa1218869a997759f5f7e3a41b5fab7802155cec397b914125", + "size": 47889870, + "source": "components/google-cloud-sdk-anthoscli-linux-x86-20220617150114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthoscli" + ], + "details": { + "description": "The cli for Anthos infrastructure.", + "display_name": "anthoscli" + }, + "id": "anthoscli-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220617150114, + "version_string": "0.2.28" + } + }, + { + "data": { + "checksum": "3f51ff8c11103daa5e771ca5152ac77c3243d24cbb7157807d13b4b4b07308d7", + "contents_checksum": "2c5e0483a0e2d2f54563b4fb37f10499c0fcd0197c62b2e62be03be2109c7874", + "size": 49978629, + "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20220617150114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthoscli" + ], + "details": { + "description": "The cli for Anthos infrastructure.", + "display_name": "anthoscli" + }, + "id": "anthoscli-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220617150114, + "version_string": "0.2.28" + } + }, + { + "data": { + "checksum": "a343d442a43feb9f9500b3cd9d4f57a7a1e7bf32e8d6505316a6cc0982d37ba3", + "contents_checksum": "cacbe5eb27fd9383ff8c7db63ae089f2b2cb5480102066043cf8cdcb61483dff", + "size": 48905650, + "source": "components/google-cloud-sdk-anthoscli-windows-x86-20220617150114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthoscli" + ], + "details": { + "description": "The cli for Anthos infrastructure.", + "display_name": "anthoscli" + }, + "id": "anthoscli-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220617150114, + "version_string": "0.2.28" + } + }, + { + "data": { + "checksum": "d012a903e88f92e6a1638f396d05cfb7ae592f79c388d84d2ac559fa9fd8b74c", + "contents_checksum": "d0d54c5ac6c2f1b6109a28b6ae29e327082d35259db4d84aed9ca90605841b81", + "size": 49983739, + "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20220617150114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "anthoscli" + ], + "details": { + "description": "The cli for Anthos infrastructure.", + "display_name": "anthoscli" + }, + "id": "anthoscli-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220617150114, + "version_string": "0.2.28" + } + }, + { + "dependencies": [ + "app-engine-go-darwin-arm", + "app-engine-go-darwin-x86_64", + "app-engine-go-linux-arm", + "app-engine-go-linux-x86", + "app-engine-go-linux-x86_64", + "app-engine-go-windows-x86", + "app-engine-go-windows-x86_64", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the tools to develop Go applications on App Engine.", + "display_name": "App Engine Go Extensions" + }, + "id": "app-engine-go", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.9.72" + } + }, + { + "data": { + "checksum": "7eb024d38ca4287ae4b801f0406ddf96ec9a038a24b44ff47e08598043fffcb5", + "contents_checksum": "edf102f8324654513dbbda4c2ef08e4c326da5e07fded3812cdda40dcc6a3779", + "size": 4164730, + "source": "components/google-cloud-sdk-app-engine-go-darwin-arm-20220107150005.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-go", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the tools to develop Go applications on App Engine.", + "display_name": "App Engine Go Extensions" + }, + "id": "app-engine-go-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220107150005, + "version_string": "1.9.72" + } + }, + { + "data": { + "checksum": "a6bd5fe9b82e6e48592bffe7c319c042644d2935f422653d6ca6962d1607593f", + "contents_checksum": "7e3ea0397ca5204f324f96bd98f4cb3c66081dc692336ab834aa51f052f3b88f", + "size": 4320254, + "source": "components/google-cloud-sdk-app-engine-go-darwin-x86_64-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-go", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the tools to develop Go applications on App Engine.", + "display_name": "App Engine Go Extensions" + }, + "id": "app-engine-go-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.9.72" + } + }, + { + "data": { + "checksum": "b1db6b942bc01f490a6299a9f115f4e11249125d5d50145385bbb6cfb8df3854", + "contents_checksum": "cad0737a0c9c29e686b230c13324c74dd64c28add244ba8cd3cba7b2027c0444", + "size": 4124968, + "source": "components/google-cloud-sdk-app-engine-go-linux-arm-20220107150005.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-go", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the tools to develop Go applications on App Engine.", + "display_name": "App Engine Go Extensions" + }, + "id": "app-engine-go-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220107150005, + "version_string": "1.9.72" + } + }, + { + "data": { + "checksum": "700fc1f67d85f439e70ea74f5900d0810fd43225416f54c6712e5b5b5c6fa63c", + "contents_checksum": "05f6c1ca0bed61e98dd6ed38824c3fa3205e519801e39778f36ca4c043e2a866", + "size": 4419403, + "source": "components/google-cloud-sdk-app-engine-go-linux-x86-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-go", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the tools to develop Go applications on App Engine.", + "display_name": "App Engine Go Extensions" + }, + "id": "app-engine-go-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.9.72" + } + }, + { + "data": { + "checksum": "61d3e66633a172238431d30209e646667b5608b623ea0d31a2397704b09f47a0", + "contents_checksum": "9bd4b565d108db2fbe7cc8150cba9e8774380c898409c6bfd3a96b51513dc47d", + "size": 4407886, + "source": "components/google-cloud-sdk-app-engine-go-linux-x86_64-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-go", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the tools to develop Go applications on App Engine.", + "display_name": "App Engine Go Extensions" + }, + "id": "app-engine-go-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.9.72" + } + }, + { + "data": { + "checksum": "0a36462f03981be984ed591f7655fe0a01763b42d8cea40aaec727f2a3627f90", + "contents_checksum": "28164bba9a55357f09f2682e6e628e1b3860a434ceefdd697d7bb3fc04f864cf", + "size": 4412927, + "source": "components/google-cloud-sdk-app-engine-go-windows-x86-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-go", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the tools to develop Go applications on App Engine.", + "display_name": "App Engine Go Extensions" + }, + "id": "app-engine-go-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.9.72" + } + }, + { + "data": { + "checksum": "e96f10ecd585eb69d9a8a296e8963cb22a1613d63a94b88e54d9108d088a868b", + "contents_checksum": "e504a1ab5135fcfb597f22739fe3595337887603d1908b77c755616b9d923310", + "size": 4365713, + "source": "components/google-cloud-sdk-app-engine-go-windows-x86_64-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-go", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the tools to develop Go applications on App Engine.", + "display_name": "App Engine Go Extensions" + }, + "id": "app-engine-go-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.9.72" + } + }, + { + "dependencies": [ + "app-engine-grpc-darwin-x86_64", + "app-engine-grpc-linux-x86", + "app-engine-grpc-linux-x86_64", + "app-engine-grpc-windows-x86", + "app-engine-grpc-windows-x86_64", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the gRPC Python library for App Engine.", + "display_name": "gRPC Python library" + }, + "id": "app-engine-grpc", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.20.0" + } + }, + { + "data": { + "checksum": "ab866ccff1a9da0ea3a8e71c432c2f3c768827971192de9466938bb9e80a632e", + "contents_checksum": "e2eb0eec683ba513ac95ffa535cebccff326998033155cfb187eb2677f216e0c", + "size": 1957787, + "source": "components/google-cloud-sdk-app-engine-grpc-darwin-x86_64-20190426144518.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-grpc", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the gRPC Python library for App Engine.", + "display_name": "gRPC Python library" + }, + "id": "app-engine-grpc-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20190426144518, + "version_string": "1.20.0" + } + }, + { + "data": { + "checksum": "7da7ca03d04b770d96efbbf55a7b0e992328e947215d00ca702aaed8f5a27161", + "contents_checksum": "9f1bf2b01845ba427f5c833e3995c8919b98719a89c841269f15c55482012567", + "size": 2104919, + "source": "components/google-cloud-sdk-app-engine-grpc-linux-x86-20190426144518.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-grpc", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the gRPC Python library for App Engine.", + "display_name": "gRPC Python library" + }, + "id": "app-engine-grpc-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20190426144518, + "version_string": "1.20.0" + } + }, + { + "data": { + "checksum": "e6f65a8ec8192f024e59a093279b2be53d36d77862d63a9173a637a4533ad3bb", + "contents_checksum": "1b1cfad1979caf370bd308a725e30623f6f65fea5370481b39fe9e3ebe23f6a2", + "size": 2153684, + "source": "components/google-cloud-sdk-app-engine-grpc-linux-x86_64-20190426144518.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-grpc", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the gRPC Python library for App Engine.", + "display_name": "gRPC Python library" + }, + "id": "app-engine-grpc-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20190426144518, + "version_string": "1.20.0" + } + }, + { + "data": { + "checksum": "c0c878b429d2ca9ee5196bb348576547062da65b144aac4bbd8cd4c5a1dde1d6", + "contents_checksum": "a3edadedc0287b30caaf1db8c27f85e5c9311de3b555a0dfb7c276b3348ab132", + "size": 1615365, + "source": "components/google-cloud-sdk-app-engine-grpc-windows-x86-20190426144518.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-grpc", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the gRPC Python library for App Engine.", + "display_name": "gRPC Python library" + }, + "id": "app-engine-grpc-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20190426144518, + "version_string": "1.20.0" + } + }, + { + "data": { + "checksum": "ff3c75c9b459610c33c2dcc4060598bd5edec06ed01d916ded1e429e8defed5d", + "contents_checksum": "f6f05b6c3d087ff4e98c1cf9d841319adc30255e08dfff3fa85992238cb0f6a6", + "size": 1616022, + "source": "components/google-cloud-sdk-app-engine-grpc-windows-x86_64-20190426144518.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-grpc", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the gRPC Python library for App Engine.", + "display_name": "gRPC Python library" + }, + "id": "app-engine-grpc-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20190426144518, + "version_string": "1.20.0" + } + }, + { + "data": { + "checksum": "975bcefab33d4e48823a743fbfd727033e47635639768354bc3151ffa962b49b", + "contents_checksum": "1b13d5c165be0138d5c94024129d36373442ae1f86a8f0745a43375fd3ef9ad3", + "size": 53824926, + "source": "components/google-cloud-sdk-app-engine-java-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the tools required to develop Java applications using gcloud.", + "display_name": "gcloud app Java Extensions" + }, + "id": "app-engine-java", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220722145557, + "version_string": "1.9.98" + } + }, + { + "dependencies": [ + "app-engine-php-darwin", + "app-engine-php-windows", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the PHP runtimes for the dev_appserver.", + "display_name": "gcloud app PHP Extensions" + }, + "id": "app-engine-php", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "operating_systems": [ + "CYGWIN", + "MACOSX", + "MSYS", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "" + } + }, + { + "data": { + "checksum": "9d6d9d232739c8de9dcd7b35b7f8021136138e7892697229d3c04cb4a7aab494", + "contents_checksum": "5682195caf966a52c95bb865a3c2b607237ed97c36952b479ef358370401aaeb", + "size": 22985548, + "source": "components/google-cloud-sdk-app-engine-php-darwin-20170915105257.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-php", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the PHP runtimes for the dev_appserver.", + "display_name": "gcloud app PHP Extensions" + }, + "id": "app-engine-php-darwin", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20170915105257, + "version_string": "2017.09.15" + } + }, + { + "data": { + "checksum": "c1f560a660d36d2bca873c01ca37a0790888713b2e056dfeeff3ea03f037235c", + "contents_checksum": "d11e66fd28ac784e4ef57b315bf626f01974db5cdbbc5e69f8e2689d4dc4de55", + "size": 20074666, + "source": "components/google-cloud-sdk-app-engine-php-windows-20170915105257.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-php", + "app-engine-python", + "core" + ], + "details": { + "description": "Provides the PHP runtimes for the dev_appserver.", + "display_name": "gcloud app PHP Extensions" + }, + "id": "app-engine-php-windows", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "CYGWIN", + "MSYS", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20170915105257, + "version_string": "2017.09.15" + } + }, + { + "data": { + "checksum": "bfff4dc45ced105e5010076dfea392f3d6a5e14a8c5289a8b2af77db2fe9632f", + "contents_checksum": "0438831ce5792c465cc5e704862dbe55d29cf2c529ca656070854d6c7f945f8c", + "size": 8153872, + "source": "components/google-cloud-sdk-app-engine-python-20220401142023.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-grpc", + "cloud-datastore-emulator", + "core" + ], + "details": { + "description": "Provides the tools required to develop Python and PHP applications using gcloud.", + "display_name": "gcloud app Python Extensions" + }, + "id": "app-engine-python", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220401142023, + "version_string": "1.9.100" + } + }, + { + "data": { + "checksum": "83b1c2df408816a9d51d9a0301eb97e30d61d729c987ba585806a444a6785ffc", + "contents_checksum": "5d88b8454d9e5d39fb3f4d7a4bb16e296eb6883c325c17622050bf7b73ef8ff0", + "size": 27709995, + "source": "components/google-cloud-sdk-app-engine-python-extras-20211015142804.tar.gz", + "type": "tar" + }, + "dependencies": [ + "app-engine-python", + "core" + ], + "details": { + "description": "Extra libraries for the App Engine Python Extensions.", + "display_name": "gcloud app Python Extensions (Extra Libraries)" + }, + "id": "app-engine-python-extras", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20211015142804, + "version_string": "1.9.96" + } + }, + { + "dependencies": [ + "appctl-darwin-x86", + "appctl-darwin-x86_64", + "appctl-linux-x86", + "appctl-linux-x86_64", + "appctl-windows-x86", + "appctl-windows-x86_64" + ], + "details": { + "description": "Provides appctl executable.", + "display_name": "Appctl" + }, + "id": "appctl", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "0.1.12" + } + }, + { + "data": { + "checksum": "dc1346aa497ab9856a61d4baadb999d46a025616b0fb941499930e8cd2bb08ef", + "contents_checksum": "dc9f7c06e11b6368358bc374d1a281896df26bc2b5d8403e27645452d551db54", + "size": 19669923, + "source": "components/google-cloud-sdk-appctl-darwin-x86-20200626165905.tar.gz", + "type": "tar" + }, + "dependencies": [ + "appctl" + ], + "details": { + "description": "Provides appctl executable.", + "display_name": "Appctl" + }, + "id": "appctl-darwin-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20200626165905, + "version_string": "0.1.12" + } + }, + { + "data": { + "checksum": "73702c9e36f3fa25d3cba2f5b747ccaf40d4439a4beca2187c775cf0b87b5ba0", + "contents_checksum": "8f6243a30cde23bea18034fe4b1dcd8373a2e410d92fc784d5708ffb817bb418", + "size": 19381598, + "source": "components/google-cloud-sdk-appctl-darwin-x86_64-20200626165905.tar.gz", + "type": "tar" + }, + "dependencies": [ + "appctl" + ], + "details": { + "description": "Provides appctl executable.", + "display_name": "Appctl" + }, + "id": "appctl-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20200626165905, + "version_string": "0.1.12" + } + }, + { + "data": { + "checksum": "f9e00574acdc98da65aa7167a11bb1d349e8811f4aabc7a9cad231959a578017", + "contents_checksum": "bec7f3d72271d31f4be1516919207d8ab9a5364546339aa6361d47a06e764d44", + "size": 20215575, + "source": "components/google-cloud-sdk-appctl-linux-x86-20200626165905.tar.gz", + "type": "tar" + }, + "dependencies": [ + "appctl" + ], + "details": { + "description": "Provides appctl executable.", + "display_name": "Appctl" + }, + "id": "appctl-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20200626165905, + "version_string": "0.1.12" + } + }, + { + "data": { + "checksum": "1017488e55a6316d6fb51ebfa8306cc58b2f6f24186686f6258c46b2b39d6781", + "contents_checksum": "9db848fc1e8721f80b5937dea801d18912d22aeed5682671e77f6d29959be483", + "size": 22041660, + "source": "components/google-cloud-sdk-appctl-linux-x86_64-20200626165905.tar.gz", + "type": "tar" + }, + "dependencies": [ + "appctl" + ], + "details": { + "description": "Provides appctl executable.", + "display_name": "Appctl" + }, + "id": "appctl-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20200626165905, + "version_string": "0.1.12" + } + }, + { + "data": { + "checksum": "1d4bffafcbc0f1a378048123fd838cfaebab55c73c286e7b5128328750268262", + "contents_checksum": "908ec0c86e7f779641888f42b7f3b39f98fb91de8c68f4a24d360b1d3050d646", + "size": 19638844, + "source": "components/google-cloud-sdk-appctl-windows-x86-20200626165905.tar.gz", + "type": "tar" + }, + "dependencies": [ + "appctl" + ], + "details": { + "description": "Provides appctl executable.", + "display_name": "Appctl" + }, + "id": "appctl-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20200626165905, + "version_string": "0.1.12" + } + }, + { + "data": { + "checksum": "3ecd725f24eef4715946387442e06af0f9ced436f37d1c9428480fdaa2df034b", + "contents_checksum": "0cfec25922905ba72982b630f026045233a0f567220262b3b0aec169559b0732", + "size": 19657321, + "source": "components/google-cloud-sdk-appctl-windows-x86_64-20200626165905.tar.gz", + "type": "tar" + }, + "dependencies": [ + "appctl" + ], + "details": { + "description": "Provides appctl executable.", + "display_name": "Appctl" + }, + "id": "appctl-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20200626165905, + "version_string": "0.1.12" + } + }, + { + "data": { + "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", + "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", + "size": 797, + "source": "components/google-cloud-sdk-beta-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core" + ], + "details": { + "description": "Beta version of gcloud commands.", + "display_name": "gcloud Beta Commands" + }, + "id": "beta", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "2022.08.05" + } + }, + { + "dependencies": [ + "bigtable-darwin-arm", + "bigtable-darwin-x86", + "bigtable-darwin-x86_64", + "bigtable-linux-arm", + "bigtable-linux-x86", + "bigtable-linux-x86_64", + "bigtable-windows-x86", + "bigtable-windows-x86_64", + "core" + ], + "details": { + "description": "Provides a tool for local Cloud Bigtable emulation.", + "display_name": "Cloud Bigtable Emulator" + }, + "id": "bigtable", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "" + } + }, + { + "data": { + "checksum": "7d209506db2a83c5718976816fff6ac31de6c28edfbd4306ab40dbe356479c64", + "contents_checksum": "ee39a485611ad8d2455ea8c24f283e6064b98f5565423759fc1f71439689e891", + "size": 6002688, + "source": "components/google-cloud-sdk-bigtable-darwin-arm-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bigtable", + "core" + ], + "details": { + "description": "Provides a tool for local Cloud Bigtable emulation.", + "display_name": "Cloud Bigtable Emulator" + }, + "id": "bigtable-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "" + } + }, + { + "data": { + "checksum": "be895d4ef5e80c918c49aabb257226192fccaf54933de967725a7a5ad31ec849", + "contents_checksum": "d3291c80aa740ddf5ab17943262c2af6eff226508aa0d48b1a5b5c5cbd913962", + "size": 6730815, + "source": "components/google-cloud-sdk-bigtable-darwin-x86-20190830142709.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bigtable", + "core" + ], + "details": { + "description": "Provides a tool for local Cloud Bigtable emulation.", + "display_name": "Cloud Bigtable Emulator" + }, + "id": "bigtable-darwin-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20190830142709, + "version_string": "2019.08.30" + } + }, + { + "data": { + "checksum": "72c16c86308c3b202528d40f73af0fc15dc97d10c4456712078aea83e79039cd", + "contents_checksum": "98b665df4c937ac84ae9115a0da3491b62691e4e7e1fb98d4b4672078f7d185d", + "size": 6190366, + "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bigtable", + "core" + ], + "details": { + "description": "Provides a tool for local Cloud Bigtable emulation.", + "display_name": "Cloud Bigtable Emulator" + }, + "id": "bigtable-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "" + } + }, + { + "data": { + "checksum": "7d8985de0c53340c58bdedeb75d4ffd10f4a55bb94391f6cb4d2c6b1df70101e", + "contents_checksum": "d6178d34b99ae088658df06ab27fa990073f0b3d2e1b515ce49036822b71b615", + "size": 5877132, + "source": "components/google-cloud-sdk-bigtable-linux-arm-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bigtable", + "core" + ], + "details": { + "description": "Provides a tool for local Cloud Bigtable emulation.", + "display_name": "Cloud Bigtable Emulator" + }, + "id": "bigtable-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "" + } + }, + { + "data": { + "checksum": "4e487d1d370fa6ac500fa7a6a8451af5d69db83767157683c45ff763069119da", + "contents_checksum": "3519180cff8988049ac04f273e912613ad5ed82ef947bbbdd9ffb0917b29b39e", + "size": 6023473, + "source": "components/google-cloud-sdk-bigtable-linux-x86-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bigtable", + "core" + ], + "details": { + "description": "Provides a tool for local Cloud Bigtable emulation.", + "display_name": "Cloud Bigtable Emulator" + }, + "id": "bigtable-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "" + } + }, + { + "data": { + "checksum": "7500ab3fcfb74e5b9979d56678154aabf6e10e70f12d4a05daa88be92cd7bba3", + "contents_checksum": "4a874d418499ef66ebb3e77849017d9924f13fdc267cfb4542b7bf72e90197aa", + "size": 6334742, + "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bigtable", + "core" + ], + "details": { + "description": "Provides a tool for local Cloud Bigtable emulation.", + "display_name": "Cloud Bigtable Emulator" + }, + "id": "bigtable-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "" + } + }, + { + "data": { + "checksum": "050132fe1d123604b1b76754354bf9c3d159886efee74ac754cf46c835b28948", + "contents_checksum": "b10643a676f3046e14d75249401b8dc80b6dc32256c3406f1a9f45ced9a472e2", + "size": 5991791, + "source": "components/google-cloud-sdk-bigtable-windows-x86-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bigtable", + "core" + ], + "details": { + "description": "Provides a tool for local Cloud Bigtable emulation.", + "display_name": "Cloud Bigtable Emulator" + }, + "id": "bigtable-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "" + } + }, + { + "data": { + "checksum": "f10b8f3075e3defa81027e59323089ab50ddf2cb2a450cdc88696303b49686a0", + "contents_checksum": "c0cdf344a3699f5f4d1bef3fc2df9a143ffa0a48c448f4744cb230868ff1554c", + "size": 6226583, + "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bigtable", + "core" + ], + "details": { + "description": "Provides a tool for local Cloud Bigtable emulation.", + "display_name": "Cloud Bigtable Emulator" + }, + "id": "bigtable-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "" + } + }, + { + "data": { + "checksum": "00ee91abb4d06c1bd3e61b621a5139dbc0358629223010503b8513ae720f83c9", + "contents_checksum": "4e9be9dfb23ff2071f8a51128a4e84cad77fb0ce5befa1ffd875ea0aa2a1bea0", + "size": 1630286, + "source": "components/google-cloud-sdk-bq-20220610143733.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bq-nix", + "bq-win", + "core" + ], + "details": { + "description": "Provides the bq tool for interacting with the BigQuery service.", + "display_name": "BigQuery Command Line Tool" + }, + "id": "bq", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220610143733, + "version_string": "2.0.75" + } + }, + { + "data": { + "checksum": "31be1877239d6dcb9113966dbeea4ff62f2526f0e39a860c34f141a150ef78c5", + "contents_checksum": "73f7b6b5d91c4b7ec7cd49116af97ac4e806c983850dadf9ac5b9c5364068d78", + "size": 1816, + "source": "components/google-cloud-sdk-bq-nix-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bq", + "core" + ], + "details": { + "description": "Provides the bq tool for interacting with the BigQuery service.", + "display_name": "BigQuery Command Line Tool (Platform Specific)" + }, + "id": "bq-nix", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "CYGWIN", + "LINUX", + "MACOSX", + "MSYS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "2.0.75" + } + }, + { + "data": { + "checksum": "5ae0ba4bdf9b217a5f51f8787ba5cf2ee80ded38d7aa3a49d7040cb7302858de", + "contents_checksum": "68c4a31b0e8314777157a20aafb03af681d38b1ff7c95fd9b709a0e378203495", + "size": 2567, + "source": "components/google-cloud-sdk-bq-win-20210430141114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bq", + "core" + ], + "details": { + "description": "Provides the bq tool for interacting with the BigQuery service.", + "display_name": "BigQuery Command Line Tool (Platform Specific)" + }, + "id": "bq-win", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210430141114, + "version_string": "2.0.67" + } + }, + { + "dependencies": [ + "bundled-python-windows-x86", + "bundled-python-windows-x86_64", + "bundled-python3", + "core" + ], + "details": { + "description": "Provides stand-alone Python 2.7 install.", + "display_name": "Bundled Python 2.7" + }, + "id": "bundled-python", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86", + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "2.7.13" + } + }, + { + "data": { + "checksum": "8b179d2ffd01bd29d3252feb638de41662ad853f4a109143c45cfbeb221d466b", + "contents_checksum": "649ff2cbb21688bb04ccf2c6366bff8008975f7b94848fcfd0e2200dfaca442e", + "size": 12763722, + "source": "components/google-cloud-sdk-bundled-python-windows-x86-20200605144945.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bundled-python", + "bundled-python3", + "core" + ], + "details": { + "description": "Provides stand-alone Python 2.7 install.", + "display_name": "Bundled Python 2.7" + }, + "id": "bundled-python-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20200605144945, + "version_string": "2.7.13" + } + }, + { + "data": { + "checksum": "6345eae40bebdbbce12f0ccf75161a32c040cd017d43aa697a1cf38a237a3a6f", + "contents_checksum": "29e7c3624d567ef8f63fad1f6863391b6e0577dc7f9034433ece3fc6949363bc", + "size": 13965732, + "source": "components/google-cloud-sdk-bundled-python-windows-x86_64-20200605144945.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bundled-python", + "bundled-python3", + "core" + ], + "details": { + "description": "Provides stand-alone Python 2.7 install.", + "display_name": "Bundled Python 2.7" + }, + "id": "bundled-python-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20200605144945, + "version_string": "2.7.13" + } + }, + { + "dependencies": [ + "bundled-python3-windows-x86", + "bundled-python3-windows-x86_64", + "core" + ], + "details": { + "description": "Provides stand-alone Python 3.9.12 install.", + "display_name": "Bundled Python 3.9" + }, + "id": "bundled-python3", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86", + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "3.9.12" + } + }, + { + "dependencies": [ + "bundled-python3-unix-linux-x86_64", + "core" + ], + "details": { + "description": "Provides stand-alone Python 3.9.12 installation for UNIX.", + "display_name": "Bundled Python 3.9" + }, + "id": "bundled-python3-unix", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "3.9.12" + } + }, + { + "data": { + "checksum": "34e4c2a1c15f45e6142b059f9e13813aa5a49c5a0a32ae4aa2b787fb1144f1fe", + "contents_checksum": "2aa3b48f270bdc5b8e2bbf512b7ff80b36f2bbadd57c61628b19b623d71ebed4", + "size": 65223088, + "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20220506143240.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bundled-python3-unix", + "core" + ], + "details": { + "description": "Provides stand-alone Python 3.9.12 installation for UNIX.", + "display_name": "Bundled Python 3.9" + }, + "id": "bundled-python3-unix-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220506143240, + "version_string": "3.9.12" + } + }, + { + "data": { + "checksum": "67eea3b181e7de3ac9133214bc03c0784aa746a55172a3935e07c26d0b27a3cf", + "contents_checksum": "054233368a0de21a5bdc38275418db4ed263191adc85f5e1196795169ef56c0d", + "size": 20496613, + "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20220506143240.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bundled-python3", + "core" + ], + "details": { + "description": "Provides stand-alone Python 3.9.12 install.", + "display_name": "Bundled Python 3.9" + }, + "id": "bundled-python3-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220506143240, + "version_string": "3.9.12" + } + }, + { + "data": { + "checksum": "ba15e08bfb91ea0bbefbee8e1cd74fec52ecc10ae318f592dc9c78fd7658d9d7", + "contents_checksum": "dea9551901841c338e21f4891f6aa5c969f868fb2bb6db3670b31a9efe608aa9", + "size": 22319841, + "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20220506143240.tar.gz", + "type": "tar" + }, + "dependencies": [ + "bundled-python3", + "core" + ], + "details": { + "description": "Provides stand-alone Python 3.9.12 install.", + "display_name": "Bundled Python 3.9" + }, + "id": "bundled-python3-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220506143240, + "version_string": "3.9.12" + } + }, + { + "dependencies": [ + "cbt-darwin-arm", + "cbt-darwin-x86", + "cbt-darwin-x86_64", + "cbt-linux-arm", + "cbt-linux-x86", + "cbt-linux-x86_64", + "cbt-windows-x86", + "cbt-windows-x86_64" + ], + "details": { + "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", + "display_name": "Cloud Bigtable Command Line Tool" + }, + "id": "cbt", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "0.12.0" + } + }, + { + "data": { + "checksum": "d1b87b622b52227749950bdac78c4fde7273e6be7d933da829909e41b1fbe162", + "contents_checksum": "bddf5cd1addcbd5873284a80d24003894d959447a8d5a2b8f332b9e0262d4654", + "size": 9711886, + "source": "components/google-cloud-sdk-cbt-darwin-arm-20220408151416.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cbt" + ], + "details": { + "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", + "display_name": "Cloud Bigtable Command Line Tool" + }, + "id": "cbt-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220408151416, + "version_string": "0.12.0" + } + }, + { + "data": { + "checksum": "730929dfb7fb308bea5206037004409db36c098ee60e25e5a3792fdbb062899f", + "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "size": 94, + "source": "components/google-cloud-sdk-cbt-darwin-x86-20220527165258.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cbt" + ], + "details": { + "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", + "display_name": "Cloud Bigtable Command Line Tool" + }, + "id": "cbt-darwin-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220527165258, + "version_string": "0.12.0" + } + }, + { + "data": { + "checksum": "7c9db850cffc8cf3023741fee07a29e258663171eba94c439a8293a05d5c5628", + "contents_checksum": "2a5f5bf0e4077f21ee492da47b78f5c84d38721e5e1f1f556970a9f9ca2f9311", + "size": 10005464, + "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20220408151416.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cbt" + ], + "details": { + "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", + "display_name": "Cloud Bigtable Command Line Tool" + }, + "id": "cbt-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220408151416, + "version_string": "0.12.0" + } + }, + { + "data": { + "checksum": "7cc16862e33b712ebb4d7a3e37930a6cec0621f12d06e8371f6be0b2f1d5c4fc", + "contents_checksum": "39020c4b1541d32e3e3a2171ef99026e1b913d4bdfff881949c32b821f451ea2", + "size": 9596153, + "source": "components/google-cloud-sdk-cbt-linux-arm-20220408151416.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cbt" + ], + "details": { + "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", + "display_name": "Cloud Bigtable Command Line Tool" + }, + "id": "cbt-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220408151416, + "version_string": "0.12.0" + } + }, + { + "data": { + "checksum": "a6fd809346f8a67ed3fb9721285343ab0d2bd974c80c8fc63e465d6d7a28a92f", + "contents_checksum": "973b6d95455dae468b2a4710613805fd20709fded4745e6c3499ef2ae9657659", + "size": 10080639, + "source": "components/google-cloud-sdk-cbt-linux-x86-20220408151416.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cbt" + ], + "details": { + "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", + "display_name": "Cloud Bigtable Command Line Tool" + }, + "id": "cbt-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220408151416, + "version_string": "0.12.0" + } + }, + { + "data": { + "checksum": "7fa96c548bc2ebb0caaebfb22e6a3ee5868d862e382f79b08ba4cbcb36c31607", + "contents_checksum": "7c99951de391710e7054252a2a488db9bdd6a1c8174447a04d06e0e7b8be9cc0", + "size": 10226666, + "source": "components/google-cloud-sdk-cbt-linux-x86_64-20220408151416.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cbt" + ], + "details": { + "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", + "display_name": "Cloud Bigtable Command Line Tool" + }, + "id": "cbt-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220408151416, + "version_string": "0.12.0" + } + }, + { + "data": { + "checksum": "5d3cc750386887dffd3e2037587a25c99d704c8a39a63d5bdb4515916de3d286", + "contents_checksum": "dacd1b1b498bbcbb4b5d27f2e30d744f43e167dffb2e162ffd1c73247de5e94a", + "size": 10069922, + "source": "components/google-cloud-sdk-cbt-windows-x86-20220408151416.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cbt" + ], + "details": { + "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", + "display_name": "Cloud Bigtable Command Line Tool" + }, + "id": "cbt-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220408151416, + "version_string": "0.12.0" + } + }, + { + "data": { + "checksum": "8cce87fbc5230dd7e9d6852dc9b0e1080dd43b9924ffe0b8af8fc0895d84049d", + "contents_checksum": "9f793cbc4bb6c5df4729836eccc40c7374e61634c5a3610a1f38fcd69915eeff", + "size": 10087793, + "source": "components/google-cloud-sdk-cbt-windows-x86_64-20220408151416.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cbt" + ], + "details": { + "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", + "display_name": "Cloud Bigtable Command Line Tool" + }, + "id": "cbt-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220408151416, + "version_string": "0.12.0" + } + }, + { + "dependencies": [ + "cloud-build-local-darwin-x86_64", + "cloud-build-local-linux-x86", + "cloud-build-local-linux-x86_64" + ], + "details": { + "description": "Provides cloud-build-local executable. See https://github.com/GoogleCloudPlatform/cloud-build-local", + "display_name": "Google Cloud Build Local Builder" + }, + "id": "cloud-build-local", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "0.5.2" + } + }, + { + "data": { + "checksum": "d96d493deac9ee5e6153072a3e8cc89e752be3b00aa3d23deded8656b0a46298", + "contents_checksum": "1f75c89816240cd2be9a6be6485f339e855c414aa329d9c263a10eb252371718", + "size": 6461890, + "source": "components/google-cloud-sdk-cloud-build-local-darwin-x86_64-20201023143012.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-build-local" + ], + "details": { + "description": "Provides cloud-build-local executable. See https://github.com/GoogleCloudPlatform/cloud-build-local", + "display_name": "Google Cloud Build Local Builder" + }, + "id": "cloud-build-local-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20201023143012, + "version_string": "0.5.2" + } + }, + { + "data": { + "checksum": "c61eb8ad5125db4f22c8eab4b76b92432e872842ca0df19ef7f38174cc964c14", + "contents_checksum": "e2a36220cdfb3043d711657e22228d597f8f937e7da0ab56cce168676ba9fa8f", + "size": 6346956, + "source": "components/google-cloud-sdk-cloud-build-local-linux-x86-20201023143012.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-build-local" + ], + "details": { + "description": "Provides cloud-build-local executable. See https://github.com/GoogleCloudPlatform/cloud-build-local", + "display_name": "Google Cloud Build Local Builder" + }, + "id": "cloud-build-local-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20201023143012, + "version_string": "0.5.2" + } + }, + { + "data": { + "checksum": "3916fed470f06ee12e123781f1e11979d35e363556e64ec601a013f0973683e1", + "contents_checksum": "c6a30f889ddb1c00a78a68127b9c9b9d5196f345b5558389da1ab85f019e2503", + "size": 6591757, + "source": "components/google-cloud-sdk-cloud-build-local-linux-x86_64-20201023143012.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-build-local" + ], + "details": { + "description": "Provides cloud-build-local executable. See https://github.com/GoogleCloudPlatform/cloud-build-local", + "display_name": "Google Cloud Build Local Builder" + }, + "id": "cloud-build-local-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20201023143012, + "version_string": "0.5.2" + } + }, + { + "data": { + "checksum": "7c98eaacbee43daec9ba3ce54133657c6e49ce089310a2fc780de549c678d1c7", + "contents_checksum": "7f3e86a3cf39f484009dac34ee13b66fd389927cd4b71566df227d740f67f07b", + "size": 36712826, + "source": "components/google-cloud-sdk-cloud-datastore-emulator-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core" + ], + "details": { + "description": "Provides a local emulator of Cloud Datastore.", + "display_name": "Cloud Datastore Emulator" + }, + "id": "cloud-datastore-emulator", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "2.2.2" + } + }, + { + "data": { + "checksum": "ca78b8ebadd0bf5ce42bde5975bbd0f8f79df4dd926ba6ab6bd68b2e12367ec2", + "contents_checksum": "2f8fe1680cea2e545ae13628c7d26af6e22d249b892da0243b10461b928884ce", + "size": 42140696, + "source": "components/google-cloud-sdk-cloud-firestore-emulator-20220708145531.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core" + ], + "details": { + "description": "Provides a local emulator of Cloud Firestore.", + "display_name": "Cloud Firestore Emulator" + }, + "id": "cloud-firestore-emulator", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220708145531, + "version_string": "1.14.4" + } + }, + { + "dependencies": [ + "cloud-run-proxy-darwin-arm", + "cloud-run-proxy-darwin-x86_64", + "cloud-run-proxy-linux-arm", + "cloud-run-proxy-linux-x86_64", + "cloud-run-proxy-windows-x86_64" + ], + "details": { + "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", + "display_name": "Cloud Run Proxy" + }, + "id": "cloud-run-proxy", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "0.3.0" + } + }, + { + "data": { + "checksum": "8b6f1e898426170cc9d828d56c65077a2030a2ef4cc1c3acd2faa041ddc11eab", + "contents_checksum": "254e6455954c6fbe7edc20e36df09b1a5430e47d3ef6ba855fa64f23558be77e", + "size": 7735939, + "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-arm-20220310160002.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-run-proxy" + ], + "details": { + "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", + "display_name": "Cloud Run Proxy" + }, + "id": "cloud-run-proxy-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220310160002, + "version_string": "0.3.0" + } + }, + { + "data": { + "checksum": "20ae1978957d1686c6e47eeec2eb3374304b87000a4ac9d38aaa48ed0d6a9a78", + "contents_checksum": "b84b90138765c10084ad1822c198d2b4e4264effdb6301c8e3cddec2f64ebfda", + "size": 8024792, + "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-x86_64-20220310160002.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-run-proxy" + ], + "details": { + "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", + "display_name": "Cloud Run Proxy" + }, + "id": "cloud-run-proxy-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220310160002, + "version_string": "0.3.0" + } + }, + { + "data": { + "checksum": "4605882aaef70f337c2b92ebc993396d4565edaf0f85dff31c0dc0d553c6cf85", + "contents_checksum": "1c8d5c6c77d0cc304ecb562aa887ccc72d8f7cf00dd3c6495fa5e5c1041a22f6", + "size": 7670643, + "source": "components/google-cloud-sdk-cloud-run-proxy-linux-arm-20220310160002.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-run-proxy" + ], + "details": { + "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", + "display_name": "Cloud Run Proxy" + }, + "id": "cloud-run-proxy-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220310160002, + "version_string": "0.3.0" + } + }, + { + "data": { + "checksum": "8d5d6af2bc3b912e7b5b0575ef9b5255f33be284065035728b1318c39fdbe4b2", + "contents_checksum": "f3fb71ce6c6082cfc4d985a39df76b3a4ba01b326ada09d9c2b68a87b92041e9", + "size": 9387984, + "source": "components/google-cloud-sdk-cloud-run-proxy-linux-x86_64-20220310160002.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-run-proxy" + ], + "details": { + "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", + "display_name": "Cloud Run Proxy" + }, + "id": "cloud-run-proxy-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220310160002, + "version_string": "0.3.0" + } + }, + { + "data": { + "checksum": "25fb7bb66dc08fcebc2471e9a040c4a6eab8e5e13c917674f3d108762b399562", + "contents_checksum": "b710b3a69fe57881ff1940a28466950d245885a064d7c0c6060fdb313f1e6cda", + "size": 7998283, + "source": "components/google-cloud-sdk-cloud-run-proxy-windows-x86_64-20220310160002.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-run-proxy" + ], + "details": { + "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", + "display_name": "Cloud Run Proxy" + }, + "id": "cloud-run-proxy-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220310160002, + "version_string": "0.3.0" + } + }, + { + "dependencies": [ + "cloud-spanner-emulator-linux-x86_64", + "core" + ], + "details": { + "description": "Provides a local emulator of Cloud Spanner.", + "display_name": "Cloud Spanner Emulator" + }, + "id": "cloud-spanner-emulator", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "70917c386da1adc19e650b58285b73e5c0ae487748b926edb68e506f3be27c33", + "contents_checksum": "78a0616222d1caca2dae4ccec6f0f030af2c70b49b2369b002bfbe265b6e5399", + "size": 28519205, + "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20220719210002.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-spanner-emulator", + "core" + ], + "details": { + "description": "Provides a local emulator of Cloud Spanner.", + "display_name": "Cloud Spanner Emulator" + }, + "id": "cloud-spanner-emulator-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220719210002, + "version_string": "1.4.3" + } + }, + { + "dependencies": [ + "cloud_sql_proxy-darwin-arm", + "cloud_sql_proxy-darwin-x86_64", + "cloud_sql_proxy-linux-arm", + "cloud_sql_proxy-linux-x86", + "cloud_sql_proxy-linux-x86_64", + "cloud_sql_proxy-windows-x86", + "cloud_sql_proxy-windows-x86_64" + ], + "details": { + "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", + "display_name": "Cloud SQL Proxy" + }, + "id": "cloud_sql_proxy", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.27.0" + } + }, + { + "data": { + "checksum": "53f6eba831fdd16a75b290315be4753e826f6b3b2abb8458c95e5af85470279d", + "contents_checksum": "2be63d10873f39e791dfae2507a6010de222a142df63354e46ad03370260a040", + "size": 7700917, + "source": "components/google-cloud-sdk-cloud_sql_proxy-darwin-arm-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud_sql_proxy" + ], + "details": { + "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", + "display_name": "Cloud SQL Proxy" + }, + "id": "cloud_sql_proxy-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.27.0" + } + }, + { + "data": { + "checksum": "36c550fc7cd33f22688e5859a3e4c93e7aaf503c5171b0b37f90d155baca4174", + "contents_checksum": "e1f2fabffeb3a93961c32a19fbe728599f9ef5f602bc9302dddf3491dbfc9f67", + "size": 7986647, + "source": "components/google-cloud-sdk-cloud_sql_proxy-darwin-x86_64-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud_sql_proxy" + ], + "details": { + "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", + "display_name": "Cloud SQL Proxy" + }, + "id": "cloud_sql_proxy-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.27.0" + } + }, + { + "data": { + "checksum": "36daf7fcd3097dd871c4d7cae925a6f4dee94b9bf342ce6bc5fdc28bc39308e3", + "contents_checksum": "c50c0af3d040a47218548822bac4e2f8ddbfb734037ea5769614d2953d6ca232", + "size": 7503669, + "source": "components/google-cloud-sdk-cloud_sql_proxy-linux-arm-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud_sql_proxy" + ], + "details": { + "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", + "display_name": "Cloud SQL Proxy" + }, + "id": "cloud_sql_proxy-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.27.0" + } + }, + { + "data": { + "checksum": "0dee101a9fa6edcc449a85e7ea19ba3047f3c16c5108321df5ab7c47eb97b575", + "contents_checksum": "caed77ba8b8c3a2f999ef9e68dce4cf85e793460013f0e32857f3950b4b066b9", + "size": 7691309, + "source": "components/google-cloud-sdk-cloud_sql_proxy-linux-x86-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud_sql_proxy" + ], + "details": { + "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", + "display_name": "Cloud SQL Proxy" + }, + "id": "cloud_sql_proxy-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.27.0" + } + }, + { + "data": { + "checksum": "a43e22a2b8494ceb3b637b1abde7c3a6192eaaa602ea4b577aa129a0b36e7a2e", + "contents_checksum": "ed70eb92475f99513c52a40a5137c30fccf0e96e254905d1af4ff8b9ff919aa0", + "size": 8154678, + "source": "components/google-cloud-sdk-cloud_sql_proxy-linux-x86_64-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud_sql_proxy" + ], + "details": { + "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", + "display_name": "Cloud SQL Proxy" + }, + "id": "cloud_sql_proxy-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.27.0" + } + }, + { + "data": { + "checksum": "22746a14a7687df9a4f681c2b8df1215e89446bb16dcd390c0cb6c30a2698ae4", + "contents_checksum": "83569a21f534b605f9dc3a41a07a230ea3b161ff8aec1beee91a528a9235e292", + "size": 7381389, + "source": "components/google-cloud-sdk-cloud_sql_proxy-windows-x86-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud_sql_proxy" + ], + "details": { + "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", + "display_name": "Cloud SQL Proxy" + }, + "id": "cloud_sql_proxy-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.27.0" + } + }, + { + "data": { + "checksum": "cb47a4c839401c2755e16ee09986ae4c6bdff71e1dd8162fd70f181b7c1e3e82", + "contents_checksum": "1e2a0a4304009f4c066956e3fae8065ee0d3eaf5aabb7fac19726f9b8c6bf6ac", + "size": 7718129, + "source": "components/google-cloud-sdk-cloud_sql_proxy-windows-x86_64-20211210155428.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud_sql_proxy" + ], + "details": { + "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", + "display_name": "Cloud SQL Proxy" + }, + "id": "cloud_sql_proxy-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211210155428, + "version_string": "1.27.0" + } + }, + { + "dependencies": [ + "config-connector-darwin-arm", + "config-connector-darwin-x86_64", + "config-connector-linux-arm", + "config-connector-linux-x86_64", + "config-connector-windows-x86_64" + ], + "details": { + "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", + "display_name": "config-connector" + }, + "id": "config-connector", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.91.0" + } + }, + { + "data": { + "checksum": "8a5c84aaa997c0fce5abc3080b49d0385f20d17b72d7467d7718eb1de291e172", + "contents_checksum": "f5b1d75e99ddf0cd2d2700e140bb9a8725bb5353ddd57dfed46528edfa82352a", + "size": 58043186, + "source": "components/google-cloud-sdk-config-connector-darwin-arm-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "config-connector" + ], + "details": { + "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", + "display_name": "config-connector" + }, + "id": "config-connector-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.91.0" + } + }, + { + "data": { + "checksum": "26d1826db0040b76e6143a3c3a85092b64ce3634c55bac41513a16fbc75db1bb", + "contents_checksum": "4b4067694172d9c85f722fa75f2c449cd4d67aad192514993c3108cf4d5d8739", + "size": 59625932, + "source": "components/google-cloud-sdk-config-connector-darwin-x86_64-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "config-connector" + ], + "details": { + "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", + "display_name": "config-connector" + }, + "id": "config-connector-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.91.0" + } + }, + { + "data": { + "checksum": "974604a14f8ab9d4146cbf3c70b974a7b45eb9f3060de98a3647926ecd675359", + "contents_checksum": "31f6186d634e8e7541d1b9a157bb865a6fb259b83b5ada22f6cb6828b871c973", + "size": 54420510, + "source": "components/google-cloud-sdk-config-connector-linux-arm-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "config-connector" + ], + "details": { + "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", + "display_name": "config-connector" + }, + "id": "config-connector-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.91.0" + } + }, + { + "data": { + "checksum": "b1a296624de7ced067375268c0796aba27c7250102526e98cf6ef7bd095d80c6", + "contents_checksum": "1ad0f7c85b4738ce88dc44020714da73379d45e87079e623ac47ac861f168d94", + "size": 59194241, + "source": "components/google-cloud-sdk-config-connector-linux-x86_64-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "config-connector" + ], + "details": { + "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", + "display_name": "config-connector" + }, + "id": "config-connector-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.91.0" + } + }, + { + "data": { + "checksum": "2feefddab47150f6bb9a10ad6799f865bc1e1ddaa59b8585b0251e2345b199b4", + "contents_checksum": "9493d18fbaadd734d35116b20419e7bbb55c949d1ece5d760ff0d5924ba980d3", + "size": 59353671, + "source": "components/google-cloud-sdk-config-connector-windows-x86_64-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "config-connector" + ], + "details": { + "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", + "display_name": "config-connector" + }, + "id": "config-connector-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.91.0" + } + }, + { + "data": { + "checksum": "21664b6bffac84c8239b217e70217850e33331980b62e2531e93c9e737589071", + "contents_checksum": "fa7efddd74122403cee90c15c0f6bf4801f3e11b16197b8c79c040a7a28a8cc7", + "size": 25447400, + "source": "components/google-cloud-sdk-core-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core-nix", + "core-win", + "gcloud-deps", + "ssh-tools" + ], + "details": { + "description": "Handles all core functionality for the Google Cloud CLI.", + "display_name": "Google Cloud CLI Core Libraries" + }, + "id": "core", + "is_configuration": false, + "is_hidden": false, + "is_required": true, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "2022.08.05" + } + }, + { + "data": { + "checksum": "8b588bd281f23c083d797c5144da4f856edf23c86131efbabc8ab389ce740fdc", + "contents_checksum": "8f1c24d273122da4020ac2106e439187e5d1d2769c75ccff72359fd4e892746f", + "size": 2202, + "source": "components/google-cloud-sdk-core-nix-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-deps", + "ssh-tools" + ], + "details": { + "description": "Handles all core functionality for the Google Cloud CLI.", + "display_name": "Google Cloud CLI Core Libraries (Platform Specific)" + }, + "id": "core-nix", + "is_configuration": false, + "is_hidden": true, + "is_required": true, + "platform": { + "operating_systems": [ + "CYGWIN", + "LINUX", + "MACOSX", + "MSYS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "2022.08.05" + } + }, + { + "data": { + "checksum": "03fca068cee37d376a81d01475541c099c9e1d11c52a4c9c39f962e20f6edce5", + "contents_checksum": "ccd1995010434f506a75d8140fa9b54e8009de81fcbc93b6b35d083db40dc01f", + "size": 3087, + "source": "components/google-cloud-sdk-core-win-20210430141114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-deps", + "ssh-tools" + ], + "details": { + "description": "Handles all core functionality for the Google Cloud CLI.", + "display_name": "Google Cloud CLI Core Libraries (Platform Specific)" + }, + "id": "core-win", + "is_configuration": false, + "is_hidden": true, + "is_required": true, + "platform": { + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210430141114, + "version_string": "2021.04.30" + } + }, + { + "data": { + "checksum": "be642bd7b9efb920807c74e98fbce1510734f6f125177e18d97e4e64bf9d97e6", + "contents_checksum": "a0c6cef6ae50c3f9f756a478a837497a6e33ec0ea7c7c01ee73de308263d87f9", + "size": 101325922, + "source": "components/google-cloud-sdk-dataflow-sql-20180716155816.tar.gz", + "type": "tar" + }, + "dependencies": [ + "alpha", + "core", + "dataflow-sql-nix", + "dataflow-sql-win" + ], + "details": { + "description": "Dataflow SQL Shell", + "display_name": "Dataflow SQL Shell" + }, + "id": "dataflow-sql", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20180716155816, + "version_string": "20180711" + } + }, + { + "data": { + "checksum": "85315f1aa4992df190762349d735080dfa74cbb4ba3a9e0e24104df164d6482e", + "contents_checksum": "f75bd0240fa748e3f779b7ea4bd19fc7f35ed47fb9eb62705a244c920efd0690", + "size": 1839, + "source": "components/google-cloud-sdk-dataflow-sql-nix-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "alpha", + "core", + "dataflow-sql" + ], + "details": { + "description": "Dataflow SQL Shell", + "display_name": "Dataflow SQL Shell (Platform Specific)" + }, + "id": "dataflow-sql-nix", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "CYGWIN", + "LINUX", + "MACOSX", + "MSYS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "20180711" + } + }, + { + "data": { + "checksum": "6379500528f324f547d502fe17054f7ee11f4e34fe8cd5e11649a109dfaaf7d9", + "contents_checksum": "2822a81f487d4db182c830642336381ec043109ac38cf085fad6b49abeeafc52", + "size": 2598, + "source": "components/google-cloud-sdk-dataflow-sql-win-20210430141114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "alpha", + "core", + "dataflow-sql" + ], + "details": { + "description": "Dataflow SQL Shell", + "display_name": "Dataflow SQL Shell (Platform Specific)" + }, + "id": "dataflow-sql-win", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210430141114, + "version_string": "20180711" + } + }, + { + "data": { + "checksum": "14a35a0d77ace272dc527d47da52e8179d108896e0c4ae26fc53ad7823d0ce80", + "contents_checksum": "e20f84db8e9b863aa4eac38e273c21c79f4e1ab6afb93743b667caf79c66fedb", + "size": 74849, + "source": "components/google-cloud-sdk-datalab-20190614191715.tar.gz", + "type": "tar" + }, + "dependencies": [ + "alpha", + "beta", + "core", + "datalab-nix", + "datalab-win", + "gcloud" + ], + "details": { + "description": "Provides the datalab tool for managing Google Cloud Datalab instances.", + "display_name": "Cloud Datalab Command Line Tool" + }, + "id": "datalab", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20190614191715, + "version_string": "20190610" + } + }, + { + "data": { + "checksum": "ede6475214e26c5237656f3381b267609bb1470303bea118bd4d85025105da25", + "contents_checksum": "e15062374974a0b422807965f10d3599cfe3caf0643d62aee2d0cc5e46bc96cf", + "size": 1832, + "source": "components/google-cloud-sdk-datalab-nix-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "alpha", + "beta", + "core", + "datalab", + "gcloud" + ], + "details": { + "description": "Provides the datalab tool for managing Google Cloud Datalab instances.", + "display_name": "Cloud Datalab Command Line Tool (Platform Specific)" + }, + "id": "datalab-nix", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "CYGWIN", + "LINUX", + "MACOSX", + "MSYS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "20190610" + } + }, + { + "data": { + "checksum": "7f5703ef6932516dc1ad1324ae6f46ead4397fe265a3cb944f25ee3dfa3ecc45", + "contents_checksum": "ec6a4a4955c462149dd72c50090455ea579dc6c7e3b465b7f6449700cde8ddb4", + "size": 1433, + "source": "components/google-cloud-sdk-datalab-win-20210430141114.tar.gz", + "type": "tar" + }, + "dependencies": [ + "alpha", + "beta", + "core", + "datalab", + "gcloud" + ], + "details": { + "description": "Provides the datalab tool for managing Google Cloud Datalab instances.", + "display_name": "Cloud Datalab Command Line Tool (Platform Specific)" + }, + "id": "datalab-win", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210430141114, + "version_string": "20190610" + } + }, + { + "dependencies": [ + "docker-credential-gcr-darwin-x86", + "docker-credential-gcr-darwin-x86_64", + "docker-credential-gcr-linux-arm", + "docker-credential-gcr-linux-x86", + "docker-credential-gcr-linux-x86_64", + "docker-credential-gcr-windows-x86", + "docker-credential-gcr-windows-x86_64" + ], + "details": { + "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", + "display_name": "Google Container Registry's Docker credential helper" + }, + "id": "docker-credential-gcr", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.5.0" + } + }, + { + "data": { + "checksum": "42563a3d7d05e960b1fe05708b7923e01cc99ec2f9577041a4290e213c2c6c4c", + "contents_checksum": "19ab65926272397722708696135651d1f8f0b384d5f1f921b5936c8ab06da764", + "size": 1790467, + "source": "components/google-cloud-sdk-docker-credential-gcr-darwin-x86-20180618122334.tar.gz", + "type": "tar" + }, + "dependencies": [ + "docker-credential-gcr" + ], + "details": { + "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", + "display_name": "Google Container Registry's Docker credential helper" + }, + "id": "docker-credential-gcr-darwin-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20180618122334, + "version_string": "1.5.0" + } + }, + { + "data": { + "checksum": "ac6df1b36972a1160d93c493978e7ad3e061722300808ec10104d703a2dbf66f", + "contents_checksum": "13f423113bb0ef0b356aa23b4b01327ec23667a710e98bc88430e2dcd2f5a7bb", + "size": 2266831, + "source": "components/google-cloud-sdk-docker-credential-gcr-darwin-x86_64-20210205155736.tar.gz", + "type": "tar" + }, + "dependencies": [ + "docker-credential-gcr" + ], + "details": { + "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", + "display_name": "Google Container Registry's Docker credential helper" + }, + "id": "docker-credential-gcr-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210205155736, + "version_string": "1.5.0" + } + }, + { + "data": { + "checksum": "e8218f7e508d944f8654e8c9a547f4be81ce6fa128e15bd27703e51e4ebcfe86", + "contents_checksum": "2ff30360e7aaf1219a493b3743979af5cdb8dadb0a2b2a4883d8835cbfaafd85", + "size": 2079984, + "source": "components/google-cloud-sdk-docker-credential-gcr-linux-arm-20210212155704.tar.gz", + "type": "tar" + }, + "dependencies": [ + "docker-credential-gcr" + ], + "details": { + "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", + "display_name": "Google Container Registry's Docker credential helper" + }, + "id": "docker-credential-gcr-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210212155704, + "version_string": "1.5.0" + } + }, + { + "data": { + "checksum": "9fc85ad26ca64564b41cacacb0d5a5fe46d4cc6e2ef07cd6d57633a461247365", + "contents_checksum": "5cbd9d9e990c575e1c96ce02a5ac01e0a04d32644bb86ff50203d572103c42ad", + "size": 1800324, + "source": "components/google-cloud-sdk-docker-credential-gcr-linux-x86-20180618122334.tar.gz", + "type": "tar" + }, + "dependencies": [ + "docker-credential-gcr" + ], + "details": { + "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", + "display_name": "Google Container Registry's Docker credential helper" + }, + "id": "docker-credential-gcr-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20180618122334, + "version_string": "1.5.0" + } + }, + { + "data": { + "checksum": "f7548568d4c898128e1a76a96d0fb1081d1d762db4e489fcb93e7d6f220981fc", + "contents_checksum": "cae6e3cb5a89bfc5e034cf46db18212cec86db1139c9b29b150fa3317c6bd80a", + "size": 1900431, + "source": "components/google-cloud-sdk-docker-credential-gcr-linux-x86_64-20180618122334.tar.gz", + "type": "tar" + }, + "dependencies": [ + "docker-credential-gcr" + ], + "details": { + "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", + "display_name": "Google Container Registry's Docker credential helper" + }, + "id": "docker-credential-gcr-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20180618122334, + "version_string": "1.5.0" + } + }, + { + "data": { + "checksum": "234f4b1028ce46c205b6794f33542d51501645628959aef8739020ba63de913d", + "contents_checksum": "72c0ccc5ecd3191f0117633d15f9de18363a597d4f618d6feb1420356efeb3b0", + "size": 1748011, + "source": "components/google-cloud-sdk-docker-credential-gcr-windows-x86-20180618122334.tar.gz", + "type": "tar" + }, + "dependencies": [ + "docker-credential-gcr" + ], + "details": { + "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", + "display_name": "Google Container Registry's Docker credential helper" + }, + "id": "docker-credential-gcr-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20180618122334, + "version_string": "1.5.0" + } + }, + { + "data": { + "checksum": "ee6e6b15ff38dd6b32bb55ea7d014715bb361ea3eba4efcaa0fb9db52d6d851b", + "contents_checksum": "dfb8381b7d79460caa07f1cf27e1511bb56b7e04dfdabac8f6e8d76b1dc715ac", + "size": 1849342, + "source": "components/google-cloud-sdk-docker-credential-gcr-windows-x86_64-20180618122334.tar.gz", + "type": "tar" + }, + "dependencies": [ + "docker-credential-gcr" + ], + "details": { + "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", + "display_name": "Google Container Registry's Docker credential helper" + }, + "id": "docker-credential-gcr-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20180618122334, + "version_string": "1.5.0" + } + }, + { + "dependencies": [ + "core" + ], + "details": { + "description": "Default set of gcloud commands.", + "display_name": "Default set of gcloud commands" + }, + "id": "gcloud", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "" + } + }, + { + "dependencies": [ + "gcloud-crc32c-darwin-arm", + "gcloud-crc32c-darwin-x86", + "gcloud-crc32c-darwin-x86_64", + "gcloud-crc32c-linux-arm", + "gcloud-crc32c-linux-x86", + "gcloud-crc32c-linux-x86_64", + "gcloud-crc32c-windows-x86", + "gcloud-crc32c-windows-x86_64" + ], + "details": { + "description": "Command line tool that calculates CRC32C hashes on local files.", + "display_name": "Google Cloud CRC32C Hash Tool" + }, + "id": "gcloud-crc32c", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "a93bc825b66488f72ffcc76e8d2345c7f56c78bddf7d12a540b9dd87d6417703", + "contents_checksum": "7571adfa15a0bc8612015fd522065ba3730c5863b10f8bb117951e81a3b24979", + "size": 1211045, + "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-arm-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gcloud-crc32c" + ], + "details": { + "description": "Command line tool that calculates CRC32C hashes on local files.", + "display_name": "Google Cloud CRC32C Hash Tool" + }, + "id": "gcloud-crc32c-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "1921da0b8ce346094cf85d30c76fe8dcdc49a2c1a7024e2b92fc921f1e8f4ae6", + "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "size": 104, + "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gcloud-crc32c" + ], + "details": { + "description": "Command line tool that calculates CRC32C hashes on local files.", + "display_name": "Google Cloud CRC32C Hash Tool" + }, + "id": "gcloud-crc32c-darwin-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "766f6271d8ad1de1b2b803e7aca680abc445344e30dbb448ead0b98b041ad70a", + "contents_checksum": "b8e4eee009bbb6e2d521353569e20f32a66a9f5decd79915baee05eb64b2ac1a", + "size": 1250758, + "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86_64-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gcloud-crc32c" + ], + "details": { + "description": "Command line tool that calculates CRC32C hashes on local files.", + "display_name": "Google Cloud CRC32C Hash Tool" + }, + "id": "gcloud-crc32c-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "43b90a729bd21d0e8063ad03c6c00d9436b09e970d4804cdf466e93d514a5ace", + "contents_checksum": "f61c2a2be9bde67f61846e8d574cd67ab944b6b164fe5d4851cef363b3221477", + "size": 1167442, + "source": "components/google-cloud-sdk-gcloud-crc32c-linux-arm-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gcloud-crc32c" + ], + "details": { + "description": "Command line tool that calculates CRC32C hashes on local files.", + "display_name": "Google Cloud CRC32C Hash Tool" + }, + "id": "gcloud-crc32c-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "eceb82509b4f08e31e21029f3689d2a08b58d27f7cb65211332292c8ea35c5f1", + "contents_checksum": "8b2a3c3cda6062cf9b6701f6bb538f12db7fcb8a22b9d17f7de118a949ae7bc4", + "size": 1232763, + "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gcloud-crc32c" + ], + "details": { + "description": "Command line tool that calculates CRC32C hashes on local files.", + "display_name": "Google Cloud CRC32C Hash Tool" + }, + "id": "gcloud-crc32c-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "bee81c890b02fe9a29a76cd982dc06b24f3b8d05a85e26c0d0da64480cb06e02", + "contents_checksum": "1448cbc3797bc44b38c69697134c647a52ae4fbb66aed4789d29e2b06435b080", + "size": 1243294, + "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86_64-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gcloud-crc32c" + ], + "details": { + "description": "Command line tool that calculates CRC32C hashes on local files.", + "display_name": "Google Cloud CRC32C Hash Tool" + }, + "id": "gcloud-crc32c-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "4dd1d66aa2f129cb6366dcbd9298ea2ceb1f610e70478da9598a253b5cd7ce3f", + "contents_checksum": "93e3ffa333c01eb6697be5ccacc8660ded75b06d37c7e1610de853b1a64a70db", + "size": 1302328, + "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gcloud-crc32c" + ], + "details": { + "description": "Command line tool that calculates CRC32C hashes on local files.", + "display_name": "Google Cloud CRC32C Hash Tool" + }, + "id": "gcloud-crc32c-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "1a4c5f17ec212e15b7c3bc4151d541c33738bb8ae51fbd287dfcc9eb1410ce95", + "contents_checksum": "42b91d49eecb27a445b03945dc7a51f17c70b8f0214f2b291984e15ba5f9e8d3", + "size": 1308403, + "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86_64-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gcloud-crc32c" + ], + "details": { + "description": "Command line tool that calculates CRC32C hashes on local files.", + "display_name": "Google Cloud CRC32C Hash Tool" + }, + "id": "gcloud-crc32c-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "50db9a088c2db1a16fdbe3d293a321e4e79d17c680476abc1b6946b6261ebfd2", + "contents_checksum": "ffdaad055d9f57c6b991133fb0bfa0e5a8c55ee937fd7cf4cffae7d8d3e833c2", + "size": 11787747, + "source": "components/google-cloud-sdk-gcloud-deps-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-deps-darwin-x86", + "gcloud-deps-darwin-x86_64", + "gcloud-deps-linux-x86", + "gcloud-deps-linux-x86_64", + "gcloud-deps-windows-x86", + "gcloud-deps-windows-x86_64" + ], + "details": { + "description": "Set of third_party gcloud cli dependencies.", + "display_name": "gcloud cli dependencies" + }, + "id": "gcloud-deps", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "2022.07.29" + } + }, + { + "data": { + "checksum": "b575e593cbd8489f6ecbf055288040242113895b166c0d08a19153ecdc216b69", + "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "size": 102, + "source": "components/google-cloud-sdk-gcloud-deps-darwin-x86-20210416153011.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-deps" + ], + "details": { + "description": "Set of third_party gcloud cli dependencies.", + "display_name": "gcloud cli dependencies" + }, + "id": "gcloud-deps-darwin-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210416153011, + "version_string": "2021.04.16" + } + }, + { + "data": { + "checksum": "6935f9a74112a8e4b1479d5d0016e4ab311324d3143fc03c9c5309595b22792f", + "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "size": 105, + "source": "components/google-cloud-sdk-gcloud-deps-darwin-x86_64-20210416153011.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-deps" + ], + "details": { + "description": "Set of third_party gcloud cli dependencies.", + "display_name": "gcloud cli dependencies" + }, + "id": "gcloud-deps-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210416153011, + "version_string": "2021.04.16" + } + }, + { + "data": { + "checksum": "b4f579ee674cc273abb8043ada9579976b4bc46cbbe44633d91355331f5a058c", + "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "size": 101, + "source": "components/google-cloud-sdk-gcloud-deps-linux-x86-20210416153011.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-deps" + ], + "details": { + "description": "Set of third_party gcloud cli dependencies.", + "display_name": "gcloud cli dependencies" + }, + "id": "gcloud-deps-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210416153011, + "version_string": "2021.04.16" + } + }, + { + "data": { + "checksum": "685b7bb8f41d7958efc2ed4d0b7f73056150b2e201663520804a4828e2b18213", + "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "size": 104, + "source": "components/google-cloud-sdk-gcloud-deps-linux-x86_64-20210416153011.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-deps" + ], + "details": { + "description": "Set of third_party gcloud cli dependencies.", + "display_name": "gcloud cli dependencies" + }, + "id": "gcloud-deps-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210416153011, + "version_string": "2021.04.16" + } + }, + { + "data": { + "checksum": "3b1bff61b17e0d3dcde7520d9fc1cf9252d21d1c67ce44f843a0cbb5c5a30439", + "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "size": 103, + "source": "components/google-cloud-sdk-gcloud-deps-windows-x86-20210416153011.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-deps" + ], + "details": { + "description": "Set of third_party gcloud cli dependencies.", + "display_name": "gcloud cli dependencies" + }, + "id": "gcloud-deps-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210416153011, + "version_string": "2021.04.16" + } + }, + { + "data": { + "checksum": "b3198f563ee7e6af472b1d934db648c94e805ab7561c80ca0ac569b2a65b7cba", + "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "size": 106, + "source": "components/google-cloud-sdk-gcloud-deps-windows-x86_64-20210416153011.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-deps" + ], + "details": { + "description": "Set of third_party gcloud cli dependencies.", + "display_name": "gcloud cli dependencies" + }, + "id": "gcloud-deps-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20210416153011, + "version_string": "2021.04.16" + } + }, + { + "dependencies": [ + "core", + "gcloud-man-pages-nix" + ], + "details": { + "description": "Man pages for gcloud commands.", + "display_name": "Man pages" + }, + "id": "gcloud-man-pages", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "CYGWIN", + "LINUX", + "MACOSX", + "MSYS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "" + } + }, + { + "data": { + "checksum": "24f72a91f2b4588cad97cfd35534021b920319360fa9f9634ef4479b64312a5f", + "contents_checksum": "9ea399de12fab3b13f1ce70b292e08613eb6a862a4380a4ab9f96b4763b87fc6", + "size": 5057361, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gcloud-man-pages" + ], + "details": { + "description": "Man pages for gcloud commands.", + "display_name": "Man pages (Platform Specific)" + }, + "id": "gcloud-man-pages-nix", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "CYGWIN", + "LINUX", + "MACOSX", + "MSYS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "" + } + }, + { + "dependencies": [ + "gke-gcloud-auth-plugin-darwin-arm", + "gke-gcloud-auth-plugin-darwin-x86_64", + "gke-gcloud-auth-plugin-linux-arm", + "gke-gcloud-auth-plugin-linux-x86", + "gke-gcloud-auth-plugin-linux-x86_64", + "gke-gcloud-auth-plugin-windows-x86", + "gke-gcloud-auth-plugin-windows-x86_64" + ], + "details": { + "description": "The auth plugin for Kubectl on GKE.", + "display_name": "gke-gcloud-auth-plugin" + }, + "id": "gke-gcloud-auth-plugin", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "671c488a87f4901023e8d53c6a48b2e95feccf29d1205218a896a297b3c697d3", + "contents_checksum": "b354a76976c829c807953730cdb506e01ea591bdd5d4d515879bc0f743e7249c", + "size": 3926436, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20220415194303.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin" + ], + "details": { + "description": "The auth plugin for Kubectl on GKE.", + "display_name": "gke-gcloud-auth-plugin" + }, + "id": "gke-gcloud-auth-plugin-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220415194303, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "13246b33bc9a08cba1e351188c132fec130dbb9699b69b4867dbfde61742809a", + "contents_checksum": "cb1344e446dc64eb0d7cad0e8193fb46fd6724de6fabc9e782ffe4b93c9a84e3", + "size": 4005591, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20220415194303.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin" + ], + "details": { + "description": "The auth plugin for Kubectl on GKE.", + "display_name": "gke-gcloud-auth-plugin" + }, + "id": "gke-gcloud-auth-plugin-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220415194303, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "d11927a60ab40d5af8c2f350dbf4743234e02396e6700b32bbbfee35713b78d7", + "contents_checksum": "abbc8837093fa9c44ba8d8650267311a00b3c177ab008348c923093bf37eba57", + "size": 3680423, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20220415194303.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin" + ], + "details": { + "description": "The auth plugin for Kubectl on GKE.", + "display_name": "gke-gcloud-auth-plugin" + }, + "id": "gke-gcloud-auth-plugin-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220415194303, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "61432985d9b2fff2715b0c6b5d4322b886f5e090edc9bec9fc7e1c4524172104", + "contents_checksum": "8793c98cda22c6d50af6030058adabf21a5a69bd1ef309a9aaaea8f82a9cc941", + "size": 3760097, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20220415194303.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin" + ], + "details": { + "description": "The auth plugin for Kubectl on GKE.", + "display_name": "gke-gcloud-auth-plugin" + }, + "id": "gke-gcloud-auth-plugin-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220415194303, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "77f398eaedda9d6ae7f33a91495f3728089b2e540ea350bac78eee7c894fab69", + "contents_checksum": "b8695b9133a150e05b963f7859135ca8ce39d47fbc68f6524f05606e0902ae8a", + "size": 4030889, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20220415194303.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin" + ], + "details": { + "description": "The auth plugin for Kubectl on GKE.", + "display_name": "gke-gcloud-auth-plugin" + }, + "id": "gke-gcloud-auth-plugin-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220415194303, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "aefb869aa6b77a45f811ea3ae73a79df23c701e8ed2d80e65b86e438c2bc21b2", + "contents_checksum": "9fcb071624de3ed495b03b999df73b74a80b37d2d04ff8635d67d770285c7e3d", + "size": 3747135, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20220415194303.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin" + ], + "details": { + "description": "The auth plugin for Kubectl on GKE.", + "display_name": "gke-gcloud-auth-plugin" + }, + "id": "gke-gcloud-auth-plugin-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220415194303, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "e1dd018badb1e13a94fb288fea9a3c8759e72a2958d45850da12cb8c5efa2393", + "contents_checksum": "d750e5aa521dea77b9eb73566a8e4defcaf00f9de35c36a179941cd2c0207486", + "size": 4035265, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20220415194303.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin" + ], + "details": { + "description": "The auth plugin for Kubectl on GKE.", + "display_name": "gke-gcloud-auth-plugin" + }, + "id": "gke-gcloud-auth-plugin-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220415194303, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "75402f8c37812b0c918e2203ada4354a59dbcf7ff21a090fded513e51e6d6e62", + "contents_checksum": "f75df7e60be8c0325cc510393e896b1006e4adad99687d9d9d486bc1dc84030b", + "size": 16233224, + "source": "components/google-cloud-sdk-gsutil-20220719210002.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gsutil-nix", + "gsutil-win" + ], + "details": { + "description": "Provides the gsutil tool for interacting with Google Cloud Storage.", + "display_name": "Cloud Storage Command Line Tool" + }, + "id": "gsutil", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220719210002, + "version_string": "5.11" + } + }, + { + "data": { + "checksum": "8dedc4501d4c44664dbe4bf403e7ca33d772eb92fe31622e1b0100fd7333eb06", + "contents_checksum": "cfed152cbb1c3bd59b818004578584d95049de6ae963f0ecfda786b7feca12f3", + "size": 1831, + "source": "components/google-cloud-sdk-gsutil-nix-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gsutil" + ], + "details": { + "description": "Provides the gsutil tool for interacting with Google Cloud Storage.", + "display_name": "Cloud Storage Command Line Tool (Platform Specific)" + }, + "id": "gsutil-nix", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "CYGWIN", + "LINUX", + "MACOSX", + "MSYS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "5.11" + } + }, + { + "data": { + "checksum": "d8619ff9a346685d60cb3c9092cecc640bc3b426079454ba78d5a57f6001006c", + "contents_checksum": "9dce4185b8d842133a744c2582b9d1910d358cc4b9f7b2699cbd56ea65f81c94", + "size": 3898, + "source": "components/google-cloud-sdk-gsutil-win-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "gsutil" + ], + "details": { + "description": "Provides the gsutil tool for interacting with Google Cloud Storage.", + "display_name": "Cloud Storage Command Line Tool (Platform Specific)" + }, + "id": "gsutil-win", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "5.11" + } + }, + { + "dependencies": [ + "harbourbridge-linux-x86_64" + ], + "details": { + "description": "Performs database migrations to Cloud Spanner databases.", + "display_name": "Cloud Spanner Migration Tool" + }, + "id": "harbourbridge", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.0.0" + } + }, + { + "data": { + "checksum": "42c9dbf6b3835f9aebc69d2c335515dc07d05ab58568335493a3d539c8108c22", + "contents_checksum": "97b66d6b86f066f1ff0ef51e1a15939c7014f3166ba50913d624838a3bd571a9", + "size": 15545662, + "source": "components/google-cloud-sdk-harbourbridge-linux-x86_64-20220719210002.tar.gz", + "type": "tar" + }, + "dependencies": [ + "harbourbridge" + ], + "details": { + "description": "Performs database migrations to Cloud Spanner databases.", + "display_name": "Cloud Spanner Migration Tool" + }, + "id": "harbourbridge-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220719210002, + "version_string": "1.0.0" + } + }, + { + "dependencies": [ + "kpt-darwin-arm", + "kpt-darwin-x86_64", + "kpt-linux-arm", + "kpt-linux-x86_64" + ], + "details": { + "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", + "display_name": "kpt" + }, + "id": "kpt", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.0.0-beta.15" + } + }, + { + "data": { + "checksum": "54832faecd651a195238c6769687db952ed26ba736e29377163d31ad0be6e4d9", + "contents_checksum": "a321f891eac8fd81725f524d07767f67e36be8a40b480da63a184da270165926", + "size": 13177521, + "source": "components/google-cloud-sdk-kpt-darwin-arm-20220603151008.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kpt" + ], + "details": { + "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", + "display_name": "kpt" + }, + "id": "kpt-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220603151008, + "version_string": "1.0.0-beta.15" + } + }, + { + "data": { + "checksum": "ae18833566971dee8d785446f45f57885461a2bd835d7a77e46ec88912f49d23", + "contents_checksum": "3558c012738e15fe73e38f32199a11f0e19de060f3ab297f0b5877afdc0cdc05", + "size": 13379861, + "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20220603151008.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kpt" + ], + "details": { + "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", + "display_name": "kpt" + }, + "id": "kpt-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220603151008, + "version_string": "1.0.0-beta.15" + } + }, + { + "data": { + "checksum": "c1bdac760bab48215aaa91e3f71be4ca05a7c0be728f837bc949ab179b4cfd07", + "contents_checksum": "bc5c05fcb5584a521f797f2a21178eb90dd9cd021243a50db8816f27424f7705", + "size": 11513185, + "source": "components/google-cloud-sdk-kpt-linux-arm-20220603151008.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kpt" + ], + "details": { + "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", + "display_name": "kpt" + }, + "id": "kpt-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220603151008, + "version_string": "1.0.0-beta.15" + } + }, + { + "data": { + "checksum": "0b1e44f5cdbcf03cd576965438952c01961e90da0d54a4e2c7f6cf29d77a3a04", + "contents_checksum": "73478069f5dfeab0b2cb1ad9be1f324b588f431ba754ecad2dacf21ebc937155", + "size": 12734504, + "source": "components/google-cloud-sdk-kpt-linux-x86_64-20220603151008.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kpt" + ], + "details": { + "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", + "display_name": "kpt" + }, + "id": "kpt-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220603151008, + "version_string": "1.0.0-beta.15" + } + }, + { + "data": { + "checksum": "53aae2e2d03d7593bd1737217c1f7ab0d4fd983fb834ec0ceb2c8a47ed4afe3e", + "contents_checksum": "04f1f05cc75156a6240a0e8d3e56bab4a6e1e73b80ba4449ad317f5361749a75", + "size": 48204, + "source": "components/google-cloud-sdk-kubectl-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin", + "kubectl-darwin-arm", + "kubectl-darwin-x86_64", + "kubectl-linux-arm", + "kubectl-linux-x86", + "kubectl-linux-x86_64", + "kubectl-windows-x86", + "kubectl-windows-x86_64" + ], + "details": { + "description": "Provides kubectl executables.", + "display_name": "kubectl" + }, + "id": "kubectl", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": true, + "version": { + "build_number": 20220722145557, + "version_string": "1.22.12" + } + }, + { + "data": { + "checksum": "183a93dc2868f125fd74ac0907d8314806af95bcdee7dfedd2a0d6693e38220a", + "contents_checksum": "5cc81a6770bf326c6f9dce82a620a6a6210319969e3a4de91d567eab2b21acb8", + "size": 68347897, + "source": "components/google-cloud-sdk-kubectl-darwin-arm-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin", + "kubectl" + ], + "details": { + "description": "Provides kubectl executables.", + "display_name": "kubectl" + }, + "id": "kubectl-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": true, + "version": { + "build_number": 20220722145557, + "version_string": "1.22.12" + } + }, + { + "data": { + "checksum": "f08c5e917c04dce420d4fb5fc98e4f0dbb234ed00ba81c11c7dcf6ba05da1c71", + "contents_checksum": "4f1cdd27d68a22e9fd4bc762f6d8d4ab6a079b2c6e52c3c2ba8f9de82b099b0d", + "size": 95973956, + "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin", + "kubectl" + ], + "details": { + "description": "Provides kubectl executables.", + "display_name": "kubectl" + }, + "id": "kubectl-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": true, + "version": { + "build_number": 20220722145557, + "version_string": "1.22.12" + } + }, + { + "data": { + "checksum": "68a90b93bcc95518e57f627fd3db2d949ac290ba457645633c6c92f22d5a02aa", + "contents_checksum": "e023599a6381690ffdf61952d8183b1010d0c445b5ca3f5543650cb56b31bd43", + "size": 84739879, + "source": "components/google-cloud-sdk-kubectl-linux-arm-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin", + "kubectl" + ], + "details": { + "description": "Provides kubectl executables.", + "display_name": "kubectl" + }, + "id": "kubectl-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": true, + "version": { + "build_number": 20220722145557, + "version_string": "1.22.12" + } + }, + { + "data": { + "checksum": "dbb20121a8590ae23b9b4570d9bbe1ed4ef75c0301fb5c82ba8f39d8204e3dc9", + "contents_checksum": "c164f5f80d3d6a6fb34faefa4a5e2f30203870fe258de483ff9da2daa636bba6", + "size": 85216084, + "source": "components/google-cloud-sdk-kubectl-linux-x86-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin", + "kubectl" + ], + "details": { + "description": "Provides kubectl executables.", + "display_name": "kubectl" + }, + "id": "kubectl-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": true, + "version": { + "build_number": 20220722145557, + "version_string": "1.22.12" + } + }, + { + "data": { + "checksum": "cad7f2a1e918a582f849e2a7680a901f844b67fc13185ab81ddf0df644d73a2e", + "contents_checksum": "ce7711c4e5f89e79ce85cfe25e733911a67a8e20de9ac19794f4a84d083f754d", + "size": 91318082, + "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin", + "kubectl" + ], + "details": { + "description": "Provides kubectl executables.", + "display_name": "kubectl" + }, + "id": "kubectl-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": true, + "version": { + "build_number": 20220722145557, + "version_string": "1.22.12" + } + }, + { + "dependencies": [ + "kubectl-oidc-darwin-arm", + "kubectl-oidc-darwin-x86_64", + "kubectl-oidc-linux-arm", + "kubectl-oidc-linux-x86_64", + "kubectl-oidc-windows-x86_64" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for GKE clusters.", + "display_name": "kubectl-oidc" + }, + "id": "kubectl-oidc", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "2ec95a80a5c1c165488702eecfe84a17f51c8dd0ea96e5b5b10e805bb45f61a5", + "contents_checksum": "2d1d1a849782dcf64e1b187387e2335277cb6801cf657e91eebd2d8582f2fe19", + "size": 19054821, + "source": "components/google-cloud-sdk-kubectl-oidc-darwin-arm-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl-oidc" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for GKE clusters.", + "display_name": "kubectl-oidc" + }, + "id": "kubectl-oidc-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "f9f5fba90117efb21a256ced62d431d1c1257855052ca53066cb52dbaf76c960", + "contents_checksum": "72cdd4ed404e24c506ddddaaff6c5ea19a222dac673a21ac4a288bedc267a2f3", + "size": 19911397, + "source": "components/google-cloud-sdk-kubectl-oidc-darwin-x86_64-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl-oidc" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for GKE clusters.", + "display_name": "kubectl-oidc" + }, + "id": "kubectl-oidc-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "b75f04ad05de495342265e6b3b65d9146cd6a0c32aa8d3c8af9cdf29ef9396a3", + "contents_checksum": "bd186ff699cd4a85dea551e3b2a98f9bc6b17f3c1bde5ab26de3a8013cd1b48f", + "size": 18716163, + "source": "components/google-cloud-sdk-kubectl-oidc-linux-arm-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl-oidc" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for GKE clusters.", + "display_name": "kubectl-oidc" + }, + "id": "kubectl-oidc-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "a961eb557b60f2b4f85efaf1178bb2b2c00dc76aad4428e52e4675ac433b39f9", + "contents_checksum": "02d55ba02e330737d36b164642c351579a90d96a2618b313a36b069f3dc9eb62", + "size": 20095032, + "source": "components/google-cloud-sdk-kubectl-oidc-linux-x86_64-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl-oidc" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for GKE clusters.", + "display_name": "kubectl-oidc" + }, + "id": "kubectl-oidc-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "58504d03cb89202ae39a199cd099d52bd370698a231dcc69636c583d58cda6f0", + "contents_checksum": "61fea21e4e483439b865217a3d6cffc20ece1e596415d1ed2fe5cf0157873332", + "size": 20093462, + "source": "components/google-cloud-sdk-kubectl-oidc-windows-x86_64-20220729144039.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl-oidc" + ], + "details": { + "description": "Configure kubectl with OIDC credentials for GKE clusters.", + "display_name": "kubectl-oidc" + }, + "id": "kubectl-oidc-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220729144039, + "version_string": "1.4.3" + } + }, + { + "data": { + "checksum": "a4ab96118718d8deb17e4a6366e710016cd724e0f9aa748b12337f692f2a3560", + "contents_checksum": "4ef9d705ffbbe3a250f977e96144284b6eb5de741022baf9cf891b3701f3b1ae", + "size": 89788788, + "source": "components/google-cloud-sdk-kubectl-windows-x86-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin", + "kubectl" + ], + "details": { + "description": "Provides kubectl executables.", + "display_name": "kubectl" + }, + "id": "kubectl-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "CYGWIN", + "MSYS", + "WINDOWS" + ] + }, + "platform_required": true, + "version": { + "build_number": 20220722145557, + "version_string": "1.22.12" + } + }, + { + "data": { + "checksum": "a6b1959aebd022162d6fdbc83c98112a7a7fd8fc1a9d753c8c76720b94e44875", + "contents_checksum": "3159a9b26c49fd74a95e88235d7d0ce4c9424639121557870161d94ae4c1cc91", + "size": 92776963, + "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "gke-gcloud-auth-plugin", + "kubectl" + ], + "details": { + "description": "Provides kubectl executables.", + "display_name": "kubectl" + }, + "id": "kubectl-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "CYGWIN", + "MSYS", + "WINDOWS" + ] + }, + "platform_required": true, + "version": { + "build_number": 20220722145557, + "version_string": "1.22.12" + } + }, + { + "dependencies": [ + "kustomize-darwin-arm", + "kustomize-darwin-x86_64", + "kustomize-linux-arm", + "kustomize-linux-x86_64" + ], + "details": { + "description": "Provides kustomize executable.", + "display_name": "Kustomize" + }, + "id": "kustomize", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "4.4.0" + } + }, + { + "data": { + "checksum": "b95afa06b03f17e547147d8cdbb580d2f2aed61bcaeca54ea36c36831fe650d3", + "contents_checksum": "b43056bfa3c4617bda2639f6cd8ab0158d426e2e2f7efcfece1c603b525dc644", + "size": 7742264, + "source": "components/google-cloud-sdk-kustomize-darwin-arm-20211105152221.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kustomize" + ], + "details": { + "description": "Provides kustomize executable.", + "display_name": "Kustomize" + }, + "id": "kustomize-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211105152221, + "version_string": "4.4.0" + } + }, + { + "data": { + "checksum": "3249a57333c76820058bbce9e5c1092cc236d9dd92eec06c7bd96ae5daa2ffce", + "contents_checksum": "2240a0c0c35f660fbf17fd02f75a042fa8476898b757b6be09e6fca83ecd744b", + "size": 7961940, + "source": "components/google-cloud-sdk-kustomize-darwin-x86_64-20211105152221.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kustomize" + ], + "details": { + "description": "Provides kustomize executable.", + "display_name": "Kustomize" + }, + "id": "kustomize-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211105152221, + "version_string": "4.4.0" + } + }, + { + "data": { + "checksum": "bc7d4df4872108f616b8aa3fc73542c0659dc6497c02f47c08c89a1020d033a1", + "contents_checksum": "64a057772ce8a7e0ced2c8aa25137e00a4bceaf8734502ddb7933f3c9c7daf23", + "size": 4099867, + "source": "components/google-cloud-sdk-kustomize-linux-arm-20211105152221.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kustomize" + ], + "details": { + "description": "Provides kustomize executable.", + "display_name": "Kustomize" + }, + "id": "kustomize-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211105152221, + "version_string": "4.4.0" + } + }, + { + "data": { + "checksum": "baa11714bcd75fef7bdf156e36b3f6fd52efef4f849bb0fd490d5287c85b3524", + "contents_checksum": "565e74944c349441370287bed68e8972531ba4e29f9c91aecd19ee53840a4c71", + "size": 4534871, + "source": "components/google-cloud-sdk-kustomize-linux-x86_64-20211105152221.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kustomize" + ], + "details": { + "description": "Provides kustomize executable.", + "display_name": "Kustomize" + }, + "id": "kustomize-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211105152221, + "version_string": "4.4.0" + } + }, + { + "dependencies": [ + "local-extract-darwin-arm", + "local-extract-darwin-x86_64", + "local-extract-linux-arm", + "local-extract-linux-x86_64" + ], + "details": { + "description": "Locally extract packages/versions from a container image.", + "display_name": "On-Demand Scanning API extraction helper" + }, + "id": "local-extract", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.5.3" + } + }, + { + "data": { + "checksum": "a6a9d97bbd8f47f60c931b4afa61e604d1dfd55bb82192ab32d9eb2d295b36b5", + "contents_checksum": "8306b904f95f187528c7d1a9357ca1122aebb87f738449edd3b4f608773c3ba2", + "size": 11400102, + "source": "components/google-cloud-sdk-local-extract-darwin-arm-20220527165258.tar.gz", + "type": "tar" + }, + "dependencies": [ + "local-extract" + ], + "details": { + "description": "Locally extract packages/versions from a container image.", + "display_name": "On-Demand Scanning API extraction helper" + }, + "id": "local-extract-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220527165258, + "version_string": "1.5.3" + } + }, + { + "data": { + "checksum": "3744e613cd9c218a8ad0c713cea4c30c8bd4d34bddc2a4c1bff1208f8a6dcd2f", + "contents_checksum": "ae929c4c03575117c4c36d00fad3f9f417b54e03765091865ef2b449725dcc0c", + "size": 11814678, + "source": "components/google-cloud-sdk-local-extract-darwin-x86_64-20220527165258.tar.gz", + "type": "tar" + }, + "dependencies": [ + "local-extract" + ], + "details": { + "description": "Locally extract packages/versions from a container image.", + "display_name": "On-Demand Scanning API extraction helper" + }, + "id": "local-extract-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220527165258, + "version_string": "1.5.3" + } + }, + { + "data": { + "checksum": "86d0e6748dad80a1268b8e2835065e5982ebddc3a8048d55bbf301337a632e82", + "contents_checksum": "eff9cd2906e8c3b751b3c435e8ead1daf01aa68acb81f226a26da8404bc8fc6a", + "size": 11256244, + "source": "components/google-cloud-sdk-local-extract-linux-arm-20220527165258.tar.gz", + "type": "tar" + }, + "dependencies": [ + "local-extract" + ], + "details": { + "description": "Locally extract packages/versions from a container image.", + "display_name": "On-Demand Scanning API extraction helper" + }, + "id": "local-extract-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220527165258, + "version_string": "1.5.3" + } + }, + { + "data": { + "checksum": "c6ea29aebff7fc85fe5359111e7de402fb782e0a030676f978b897d335f1025b", + "contents_checksum": "b6cc9c0ff16c99643373b4c98f7956008fe31fe3a8762d2809848f372846a619", + "size": 13350856, + "source": "components/google-cloud-sdk-local-extract-linux-x86_64-20220527165258.tar.gz", + "type": "tar" + }, + "dependencies": [ + "local-extract" + ], + "details": { + "description": "Locally extract packages/versions from a container image.", + "display_name": "On-Demand Scanning API extraction helper" + }, + "id": "local-extract-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220527165258, + "version_string": "1.5.3" + } + }, + { + "dependencies": [ + "minikube-darwin-arm", + "minikube-darwin-x86_64", + "minikube-linux-arm", + "minikube-linux-x86_64", + "minikube-windows-x86_64" + ], + "details": { + "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", + "display_name": "Minikube" + }, + "id": "minikube", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.26.1" + } + }, + { + "data": { + "checksum": "27a35a1156344d63a44e376956e024a8031b1eeaf8adc0c1833b10d838bf7afe", + "contents_checksum": "e4101d218a7ce1f361ebffa3b2940dc45e496796e29415ad8f6913b8d2c06ab4", + "size": 30786798, + "source": "components/google-cloud-sdk-minikube-darwin-arm-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "minikube" + ], + "details": { + "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", + "display_name": "Minikube" + }, + "id": "minikube-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.26.1" + } + }, + { + "data": { + "checksum": "e851e190b2a4747d32f72ba2caaf9cda7bbf6a67b1c357a221598ee9af04eb52", + "contents_checksum": "40b12f79e6446f3d5cbbc3133069cd7349e0ce7744959362b235345329aae84e", + "size": 31814476, + "source": "components/google-cloud-sdk-minikube-darwin-x86_64-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "minikube" + ], + "details": { + "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", + "display_name": "Minikube" + }, + "id": "minikube-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.26.1" + } + }, + { + "data": { + "checksum": "793a34c028e32ed307023aed42012f89bf1677e8ef004b785b10816bd3c1347d", + "contents_checksum": "eeea49fc6d42b8b6aca0b5cbcc18e594042d24bdda142e530b7b4ca5b250c100", + "size": 30251095, + "source": "components/google-cloud-sdk-minikube-linux-arm-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "minikube" + ], + "details": { + "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", + "display_name": "Minikube" + }, + "id": "minikube-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.26.1" + } + }, + { + "data": { + "checksum": "f8018c1c90f3aaa7d6d16ebdd6fc9f9f4fe1278278257dc8baedbea8faaea055", + "contents_checksum": "c9a2f9ed229eab8c0bae77fd9eaa2bd1c287383db3f4395cf5131a8bb20abbe2", + "size": 32405345, + "source": "components/google-cloud-sdk-minikube-linux-x86_64-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "minikube" + ], + "details": { + "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", + "display_name": "Minikube" + }, + "id": "minikube-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.26.1" + } + }, + { + "data": { + "checksum": "1b3a3552de1ec3cf7b23b4add0a225272122953bc1588f24022fc68fbb331bed", + "contents_checksum": "1e5745e14161ac8df58286ceab2412c42ba9612b7ca689c5175b32c49384bc04", + "size": 32246442, + "source": "components/google-cloud-sdk-minikube-windows-x86_64-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "minikube" + ], + "details": { + "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", + "display_name": "Minikube" + }, + "id": "minikube-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "1.26.1" + } + }, + { + "dependencies": [ + "nomos-darwin-x86_64", + "nomos-linux-x86_64" + ], + "details": { + "description": "Provides nomos executable.", + "display_name": "Nomos CLI" + }, + "id": "nomos", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.12.1-rc.3" + } + }, + { + "data": { + "checksum": "94b193a4a7acffd284c5feb704cc32ae452bb67cf98f70cd856d05f7e7f358bf", + "contents_checksum": "0d7d9a897459caf53567691cf1d746a6e43501afa673bea83d4112af919527ff", + "size": 25577150, + "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "nomos" + ], + "details": { + "description": "Provides nomos executable.", + "display_name": "Nomos CLI" + }, + "id": "nomos-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220722145557, + "version_string": "1.12.1-rc.3" + } + }, + { + "data": { + "checksum": "e5195285ab44143b5953b2364d91ab09e1390780a27879b463e3956069867fc9", + "contents_checksum": "deef246aecb75a2157c43d2211be9c60732ffccacc0c0848a2bb521f665521af", + "size": 26179386, + "source": "components/google-cloud-sdk-nomos-linux-x86_64-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "nomos" + ], + "details": { + "description": "Provides nomos executable.", + "display_name": "Nomos CLI" + }, + "id": "nomos-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220722145557, + "version_string": "1.12.1-rc.3" + } + }, + { + "dependencies": [ + "package-go-module-darwin-x86_64", + "package-go-module-linux-x86_64", + "package-go-module-windows-x86_64" + ], + "details": { + "description": "Package a Go module zip file from Go source code.", + "display_name": "Artifact Registry Go Module Package Helper" + }, + "id": "package-go-module", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "9f29cc600b38245897cbcc5e3bb8d2e9519fcb7e534b476d9eb5543bab6b4ee3", + "contents_checksum": "88bcd25ebaece120c436e76e59bc7036d03b16269056b5f5303bd590cfbb8ec4", + "size": 834432, + "source": "components/google-cloud-sdk-package-go-module-darwin-x86_64-20220624143124.tar.gz", + "type": "tar" + }, + "dependencies": [ + "package-go-module" + ], + "details": { + "description": "Package a Go module zip file from Go source code.", + "display_name": "Artifact Registry Go Module Package Helper" + }, + "id": "package-go-module-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220624143124, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "b76e2ad34599a5ca779dcfde906b98ce54f84b48fb9e8341b8a0a366fe141646", + "contents_checksum": "f6bb7e482d6a1cd2cc8ac541a7a7d3c447ba1e35f158e98f6dc5855dd7178ccf", + "size": 835647, + "source": "components/google-cloud-sdk-package-go-module-linux-x86_64-20220624143124.tar.gz", + "type": "tar" + }, + "dependencies": [ + "package-go-module" + ], + "details": { + "description": "Package a Go module zip file from Go source code.", + "display_name": "Artifact Registry Go Module Package Helper" + }, + "id": "package-go-module-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220624143124, + "version_string": "0.2.0" + } + }, + { + "data": { + "checksum": "b523eb4afbe2332941a5c983ababf1719b18137c479c27fb316b53774d12ddd3", + "contents_checksum": "1e9e5b4c5711a741356616939b9d82029668ba91bf14a3446d29012dce805d84", + "size": 841003, + "source": "components/google-cloud-sdk-package-go-module-windows-x86_64-20220624143124.tar.gz", + "type": "tar" + }, + "dependencies": [ + "package-go-module" + ], + "details": { + "description": "Package a Go module zip file from Go source code.", + "display_name": "Artifact Registry Go Module Package Helper" + }, + "id": "package-go-module-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220624143124, + "version_string": "0.2.0" + } + }, + { + "dependencies": [ + "appctl", + "kpt", + "kustomize", + "nomos" + ], + "details": { + "description": "Kubernetes Resource Model (KRM) package management tools utilites & commands.", + "display_name": "pkg" + }, + "id": "pkg", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "" + } + }, + { + "dependencies": [ + "core", + "powershell-windows" + ], + "details": { + "description": "PowerShell cmdlets for the Google Cloud Platform.", + "display_name": "Cloud Tools for PowerShell" + }, + "id": "powershell", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.0.1.10" + } + }, + { + "data": { + "checksum": "b002c3d9da22c0060a14f2957b27bd72c062d1e2e63dfa0077242a7a5e152c07", + "contents_checksum": "287fc9400eae35d186cd1d39a74b7f8d088f12da7f40b0a041f41b9275b8aff9", + "size": 18745914, + "source": "components/google-cloud-sdk-powershell-windows-20180924183125.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core", + "powershell" + ], + "details": { + "description": "PowerShell cmdlets for the Google Cloud Platform.", + "display_name": "Cloud Tools for PowerShell" + }, + "id": "powershell-windows", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20180924183125, + "version_string": "1.0.1.10" + } + }, + { + "data": { + "checksum": "383219987c3253d47f553cd24996c1f9ef14c2013a13b097968255a7e5d84e5b", + "contents_checksum": "5fd097686d48c73aae81a0446b84e0d7aa050cfb60be6ca549ba5b1c227c181a", + "size": 63681617, + "source": "components/google-cloud-sdk-pubsub-emulator-20220722145557.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core" + ], + "details": { + "description": "Provides the Pub/Sub emulator.", + "display_name": "Cloud Pub/Sub Emulator" + }, + "id": "pubsub-emulator", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220722145557, + "version_string": "0.7.0" + } + }, + { + "dependencies": [ + "kubectl", + "skaffold-darwin-arm", + "skaffold-darwin-x86_64", + "skaffold-linux-arm", + "skaffold-linux-x86_64", + "skaffold-windows-x86_64" + ], + "details": { + "description": "Provides skaffold executable. See https://skaffold.dev/", + "display_name": "Skaffold" + }, + "id": "skaffold", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "1.39.1" + } + }, + { + "data": { + "checksum": "c83173b24bdb4f78e7950a1593f73c49eec5dfc6ccdb332212e7932bed832245", + "contents_checksum": "6a4be275b2f87e0b703db49a582ae26cbd19e2fdaebb57220d826a7df00f4ad9", + "size": 20226684, + "source": "components/google-cloud-sdk-skaffold-darwin-arm-20220708145531.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl", + "skaffold" + ], + "details": { + "description": "Provides skaffold executable. See https://skaffold.dev/", + "display_name": "Skaffold" + }, + "id": "skaffold-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220708145531, + "version_string": "1.39.1" + } + }, + { + "data": { + "checksum": "fcc5c4cd1f287eb246ee8249bff3c48e4ff4c716e7082674905a644abd4d15d1", + "contents_checksum": "704148fa5cf9538397a9e502f9d6ff384e1e2b0ac998da8ff41baa521947c609", + "size": 21900843, + "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20220708145531.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl", + "skaffold" + ], + "details": { + "description": "Provides skaffold executable. See https://skaffold.dev/", + "display_name": "Skaffold" + }, + "id": "skaffold-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220708145531, + "version_string": "1.39.1" + } + }, + { + "data": { + "checksum": "f56936cce7576225d286db11fe085ae47ca6676d462306319d30b079a04f7909", + "contents_checksum": "90b59d90dc9af7c243e75a678bd5b7e4a2a79e3102ccf4316c57a817d0d3fcbe", + "size": 18444524, + "source": "components/google-cloud-sdk-skaffold-linux-arm-20220708145531.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl", + "skaffold" + ], + "details": { + "description": "Provides skaffold executable. See https://skaffold.dev/", + "display_name": "Skaffold" + }, + "id": "skaffold-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220708145531, + "version_string": "1.39.1" + } + }, + { + "data": { + "checksum": "0e59595854af5e6155764988534936671ec904fe512b3acaefa5616c199b27bb", + "contents_checksum": "4d48dbb52dc3b968043cdd39743fbf11e25e67c51cc972a147aafa49d284820e", + "size": 20095248, + "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20220708145531.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl", + "skaffold" + ], + "details": { + "description": "Provides skaffold executable. See https://skaffold.dev/", + "display_name": "Skaffold" + }, + "id": "skaffold-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220708145531, + "version_string": "1.39.1" + } + }, + { + "data": { + "checksum": "88d815602c3edbc552bc31fbef5c9808b6a500ecef5d17dc094b9cb746c46ee5", + "contents_checksum": "956bc2c21a1bc72e0f34e83ed952e57aed02409025a706fc9762e85b11e6c736", + "size": 20272472, + "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20220708145531.tar.gz", + "type": "tar" + }, + "dependencies": [ + "kubectl", + "skaffold" + ], + "details": { + "description": "Provides skaffold executable. See https://skaffold.dev/", + "display_name": "Skaffold" + }, + "id": "skaffold-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220708145531, + "version_string": "1.39.1" + } + }, + { + "dependencies": [ + "ssh-tools-windows" + ], + "details": { + "description": "Provides Windows command line ssh tools.", + "display_name": "Windows command line ssh tools" + }, + "id": "ssh-tools", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "" + } + }, + { + "data": { + "checksum": "d1e1fda36ce35e058bf23f8cf114acd776c2891227f23cf3b9d78fb35f89b523", + "contents_checksum": "8a106316d2efe6baaa483a8677c9f0f807b43189ad3cbe1cefa8055e7500a318", + "size": 3485676, + "source": "components/google-cloud-sdk-ssh-tools-windows-20211112160846.tar.gz", + "type": "tar" + }, + "dependencies": [ + "ssh-tools" + ], + "details": { + "description": "Provides Windows command line ssh tools.", + "display_name": "Windows command line ssh tools" + }, + "id": "ssh-tools-windows", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20211112160846, + "version_string": "" + } + }, + { + "dependencies": [ + "terraform-tools-darwin-arm", + "terraform-tools-darwin-x86_64", + "terraform-tools-linux-arm", + "terraform-tools-linux-x86_64", + "terraform-tools-windows-x86_64" + ], + "details": { + "description": "Tools for working with Terraform data", + "display_name": "Terraform Tools" + }, + "id": "terraform-tools", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "0.6.2" + } + }, + { + "data": { + "checksum": "2db0f4ccc632952976a8c675915d04e388e5288f1bded0004aa0b4548e5e2f2c", + "contents_checksum": "2bf5561e40bf578793db54c3bbd1ab3cccb1a530867b0dcd01fa8006f902e440", + "size": 52257884, + "source": "components/google-cloud-sdk-terraform-tools-darwin-arm-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "terraform-tools" + ], + "details": { + "description": "Tools for working with Terraform data", + "display_name": "Terraform Tools" + }, + "id": "terraform-tools-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "0.6.2" + } + }, + { + "data": { + "checksum": "ff940b3f7f91e63644da8a8fda134fe13ae65ed9f7f286382005ef762c55eb8d", + "contents_checksum": "e9d997f7dda1a5c7dd0de150573872d096e9ec807106205bd95b95b754ac19ee", + "size": 54400276, + "source": "components/google-cloud-sdk-terraform-tools-darwin-x86_64-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "terraform-tools" + ], + "details": { + "description": "Tools for working with Terraform data", + "display_name": "Terraform Tools" + }, + "id": "terraform-tools-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "0.6.2" + } + }, + { + "data": { + "checksum": "be800db8eba62f286ff49c2ad59c399a6375429bcab4d06285a0f6851b10ee01", + "contents_checksum": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "size": 105, + "source": "components/google-cloud-sdk-terraform-tools-linux-arm-20220325151342.tar.gz", + "type": "tar" + }, + "dependencies": [ + "terraform-tools" + ], + "details": { + "description": "Tools for working with Terraform data", + "display_name": "Terraform Tools" + }, + "id": "terraform-tools-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220325151342, + "version_string": "0.2.1" + } + }, + { + "data": { + "checksum": "c068789f390d63b85fa827c1925b873d7915668afc3f9d1a8206c6b6b033be4d", + "contents_checksum": "4ee8d2c3524ed33a1b182632737bdce9c4bb4388f3687dd9efb73e26ad088ed0", + "size": 54026742, + "source": "components/google-cloud-sdk-terraform-tools-linux-x86_64-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "terraform-tools" + ], + "details": { + "description": "Tools for working with Terraform data", + "display_name": "Terraform Tools" + }, + "id": "terraform-tools-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "0.6.2" + } + }, + { + "data": { + "checksum": "c0a861db3267e3031484f56cb57a79b788e8c6dd1ae54e7ae641ae57199c5f0a", + "contents_checksum": "347ce25567f86f1b4c1ddea26309960f5f16fe6b4880881f11805a5502e1c615", + "size": 54067583, + "source": "components/google-cloud-sdk-terraform-tools-windows-x86_64-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "terraform-tools" + ], + "details": { + "description": "Tools for working with Terraform data", + "display_name": "Terraform Tools" + }, + "id": "terraform-tools-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "0.6.2" + } + }, + { + "data": { + "checksum": "976b46cc3e4533ddaa6f9f08960a33e49298ef59a362ad0acf6e7bd4998dc2e6", + "contents_checksum": "655fcf038c69bc6f661d32b9a7c59b6eb5e5a76259924dfbf127aac56311dde2", + "size": 36186213, + "source": "components/google-cloud-sdk-tests-20220805142045.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core" + ], + "details": { + "description": "Collection of tests used to verity Google Cloud CLI", + "display_name": "Google Cloud CLI tests" + }, + "id": "tests", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20220805142045, + "version_string": "2022.08.05" + } + } + ], + "gcloud_rel_path": "lib/gcloud.py", + "notifications": [ + { + "condition": { + "check_components": true + }, + "id": "default", + "notification": {}, + "trigger": { + "frequency": 86400 + } + } + ], + "post_processing_command": "components post-process", + "release_notes_url": "RELEASE_NOTES", + "revision": 20220805142045, + "schema_version": { + "no_update": false, + "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", + "version": 3 + }, + "version": "397.0.0" +} \ No newline at end of file diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 31061a525d83..f4992b63d5d5 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -28,10 +28,5 @@ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86.tar.gz"; sha256 = "1xw4jzl85didin26q9sg7j1pip4bmap5d0ac9ywbj0vni71mqx26"; }; - components = - { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/components-v397.0.0.json"; - sha256 = "1bm3z63lh0z8scfsvjxwvprbrbl5iciz6pbl1hkklxhbc0k9axbc"; - }; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 52c88b0a201d..356867b421af 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -22,7 +22,7 @@ let data.googleCloudSdkPkgs.${system} or (throw "Unsupported system: ${system}"); components = callPackage ./components.nix { - snapshotPath = builtins.fetchurl data.googleCloudSdkPkgs.components; + snapshotPath = ./components.json; }; withExtraComponents = callPackage ./withExtraComponents.nix { inherit components; }; diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh index 29bba851d954..2630df9bcec1 100755 --- a/pkgs/tools/admin/google-cloud-sdk/update.sh +++ b/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -18,15 +18,6 @@ function genMainSrc() { echo " };" } -function genComponentsSrc() { - local url="${CHANNEL_URL}/components-v${VERSION}.json" - local sha256 - sha256=$(nix-prefetch-url "$url") - echo " {" - echo " url = \"${url}\";" - echo " sha256 = \"${sha256}\";" - echo " };" -} { cat <data.nix + +curl "${CHANNEL_URL}/components-v${VERSION}.json" > components.json From ba0632d2480d83245afbc258d0d7a484730567e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Aug 2022 14:12:40 +0200 Subject: [PATCH 066/167] pgpool: remove broken libmemcached, update download URL libmemcache support is broken since 2015 https://github.com/NixOS/nixpkgs/commit/9308b8e1216186053e1a5a94ee1b462f39de4a6b --- pkgs/servers/sql/pgpool/default.nix | 22 ++++++++++++++++------ pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 16502571375a..436217f2e63e 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,23 +1,32 @@ -{ lib, stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }: +{ lib +, stdenv +, fetchurl +, postgresql +, openssl +, withPam ? stdenv.isLinux +, pam +}: stdenv.mkDerivation rec { pname = "pgpool-II"; version = "4.3.3"; src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz"; + url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz"; + name = "pgpool-II-${version}.tar.gz"; sha256 = "sha256-bHNDS67lgThqlVX+WWKL9GeCD31b2+M0F2g5mgOCyXk="; }; - buildInputs = [ postgresql openssl pam libmemcached ]; + buildInputs = [ + postgresql + openssl + ] ++ lib.optional withPam pam; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-openssl" - ] ++ lib.optional (pam != null) "--with-pam" - ++ lib.optional (libmemcached != null) "--with-memcached=${libmemcached}"; + ] ++ lib.optional withPam "--with-pam"; installFlags = [ "sysconfdir=\${out}/etc" @@ -30,5 +39,6 @@ stdenv.mkDerivation rec { description = "A middleware that works between postgresql servers and postgresql clients"; license = licenses.free; platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99ca3ec35085..c6ce626d14ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23160,10 +23160,7 @@ with pkgs; pgbouncer = callPackage ../servers/sql/pgbouncer { }; - pgpool = callPackage ../servers/sql/pgpool { - pam = if stdenv.isLinux then pam else null; - libmemcached = null; # Detection is broken upstream - }; + pgpool = callPackage ../servers/sql/pgpool { }; tang = callPackage ../servers/tang { asciidoc = asciidoc-full; From ebc2a0f139c871352bf73fa2d33c6a8f363f6071 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 22 Aug 2022 15:15:32 +0200 Subject: [PATCH 067/167] raspberrypi-eeprom: unstable-2022-03-10 -> 2022.04.26-138a1 https://github.com/raspberrypi/rpi-eeprom/releases/tag/v2022.04.26-138a1 --- pkgs/os-specific/linux/raspberrypi-eeprom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index c2ce195faf1c..5fd6fd45b357 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "raspberrypi-eeprom"; - version = "unstable-2022-03-10"; + version = "2022.04.26-138a1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "e8927007e3800db3a72100ee6cd38b0d9b687c16"; - hash = "sha256-/hn6l5gheh6E3zoANwU1SXYgdry2IjOT9Muw2jkrtCU="; + rev = "v${version}"; + hash = "sha256-/Y+EaAxJQofDRE67HY8AVqAdOPdFI01/EhYCAT5qlSM="; }; buildInputs = [ python3 ]; From 2004e2a97da04d418431ccee3a4b34e63c9e64c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Mon, 6 Jun 2022 19:14:55 +0200 Subject: [PATCH 068/167] swift: 5.5.3 -> 5.6.2 --- pkgs/development/compilers/swift/default.nix | 146 +++++++++++++----- ...presets-linux-don-t-build-extra-libs.patch | 16 +- .../0007-build-presets-linux-os-stdlib.patch | 13 ++ 3 files changed, 128 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 5e78d606c730..a8b57ca71216 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -9,25 +9,19 @@ , ninja , pkg-config , sqlite -, swig , libxml2 -, clang_10 +, clang_13 , python3 , ncurses , libuuid -, libbsd , icu , libgcc -, autoconf -, libtool -, automake , libblocksruntime , curl , rsync , git , libgit2 , fetchFromGitHub -, fetchpatch , makeWrapper , gnumake , file @@ -50,11 +44,13 @@ let # - integration-tests versions = { - swift = "5.5.3"; + swift = "5.6.2"; yams = "4.0.2"; - argumentParser = "0.4.3"; - format = "swift-5.5-branch"; + argumentParser = "1.0.3"; + format = "release/5.6"; crypto = "1.1.5"; + nio = "2.31.2"; + nio-ssl = "2.15.0"; }; fetchAppleRepo = { repo, rev, sha256 }: @@ -77,56 +73,82 @@ let swift = fetchSwiftRelease { repo = "swift"; - sha256 = "0ma96sfvwiv2f4qhzrvcwxi9igzd80930gnaw4r7ra4w190cnag7"; + sha256 = "sha256-wiRXAXWEksJuy+YQQ+B7tzr2iLkSVkgV6o+wIz7yKJA="; }; cmark = fetchSwiftRelease { repo = "swift-cmark"; - sha256 = "0340j9x2n40yx61ma2pgqfbn3a9ijrh20iwzd1zxqq87rr76hh3z"; + sha256 = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw="; }; llbuild = fetchSwiftRelease { repo = "swift-llbuild"; - sha256 = "1xmiv7yp9r9iscx3fc3zdp25mriz134k9ny2rchxzi4kifz8h0zc"; + sha256 = "sha256-SQ6V0zVshIYMjayx+ZpYuLijgQ89tqRnPlXBPf2FYqM="; }; driver = fetchSwiftRelease { repo = "swift-driver"; - sha256 = "1pb7fidgdqxzragqkillkv03vdilrwmcx6x2r4czqvdqj37gy6b6"; + sha256 = "sha256-D5/C4Rbv5KIsKpy6YbuMxGIGaQkn80PD4Cp0l6bPKzY="; }; toolsSupportCore = fetchSwiftRelease { repo = "swift-tools-support-core"; - sha256 = "0a63193nycir4lffvmb3ky8cfly5kdr2libki2gx4fn6fxmb3a2f"; + sha256 = "sha256-FbtQCq1sSlzrskCrgzD4iYuo5eGaXrAUUxoNX/BiOfg="; }; swiftpm = fetchSwiftRelease { repo = "swift-package-manager"; - sha256 = "0z90mg837jzwh516pypn48r3wsjf0lqymsyigdhgr7j2sgcckrr1"; + sha256 = "sha256-esO4Swz3UYngbVgxoV+fkhSC0AU3IaxVjWkgK/s3x68="; }; syntax = fetchSwiftRelease { repo = "swift-syntax"; - sha256 = "0kdgh9a8n28yh12hj8lbz2j66ag83l0lcfyfdg7zdr614zs6i3p1"; + sha256 = "sha256-C9FPCtq49BvKXtTWWeReYWNrU70pHzT2DhAv3NiTbPU="; }; corelibsXctest = fetchSwiftRelease { repo = "swift-corelibs-xctest"; - sha256 = "12fp3xzsqwcrmyc55h91d3dm64wn3wln47x2fl7sj0s8cn7q12b3"; + sha256 = "sha256-0hizfnKJaUUA+jXuXzXWk72FmlSyc+UGEf7BTLdJrx4="; }; corelibsFoundation = fetchSwiftRelease { repo = "swift-corelibs-foundation"; - sha256 = "06gkdliihl1l86jx5khzwkjmjk45fq290x033rscramzcdxh7d1b"; + sha256 = "sha256-8sCL8Ia6yb6bRsJZ52gUJH0jN3lwClM573G8jgUdEhw="; }; corelibsLibdispatch = fetchSwiftRelease { repo = "swift-corelibs-libdispatch"; - sha256 = "1bim5x9z9bqfgs6gdm4nlz1zrwl2x7xh4dn6i5md9ygsplr4ibzf"; + sha256 = "sha256-1tIskUMnfblnvZaFDQPUMBfWTmBYG98s7rEww7PwZO8="; fetchSubmodules = true; }; indexstoreDb = fetchSwiftRelease { repo = "indexstore-db"; - sha256 = "1l1xlzf5kx7x80kf4b7r36glv0jc64d08d1688kmzjq1cfgn6gm2"; + sha256 = "sha256-/PO4eMiASZN3pjFjBQ1r8vYwGRn6xm3SWaB2HDZlkPs="; }; sourcekitLsp = fetchSwiftRelease { repo = "sourcekit-lsp"; - sha256 = "00fcmd7x5v62n6ajsc0dmzwz6nzy2p72mcs9w6p90adcx7pffqkn"; + sha256 = "sha256-ttgUC4ZHD3P/xLHllEbACtHVrJ6HXqeVWccXcoPMkts="; }; llvmProject = fetchSwiftRelease { repo = "llvm-project"; - sha256 = "18rn5xg5hpxxsacs0ygjmjpzpc8pq85898kknzc0s0z5m55h45z8"; + sha256 = "sha256-YVs3lKV2RlaovpYkdGO+vzypolrmXmbKBBP4+osNMYw="; + }; + docc = fetchSwiftRelease { + repo = "swift-docc"; + sha256 = "sha256-rWiaNamZoHTO1bKpubxuT7m1IBOl7amT5M71mNauilY="; + }; + docc-render-artifact = fetchSwiftRelease { + repo = "swift-docc-render-artifact"; + sha256 = "sha256-AX+rtDLhq8drk7N6/hoH3fQioudmmTCnEhR45bME8uU="; + }; + docc-symbolkit = fetchSwiftRelease { + repo = "swift-docc-symbolkit"; + sha256 = "sha256-Xy1TQ5ucDW+MnkeOvVznsATBmwcQ3p1x+ofQ22ofk+o="; + }; + lmdb = fetchSwiftRelease { + repo = "swift-lmdb"; + sha256 = "sha256-i2GkWRWq1W5j8rF4PiHwWgT4Dur5FCY2o44HvUU3vtQ="; + }; + markdown = fetchSwiftRelease { + repo = "swift-markdown"; + sha256 = "sha256-XtFSBiNHhmULjS4OqSpMgUetLu3peRg7l6HpjwVsTj8="; + }; + + cmark-gfm = fetchAppleRepo { + repo = "swift-cmark"; + rev = "swift-${versions.swift}-RELEASE-gfm"; + sha256 = "sha256-g28iKmMR2W0r1urf8Fk1HBxAp5OlonNYSVN3Ril66tQ="; }; # Projects that have their own versions during each release @@ -134,23 +156,33 @@ let argumentParser = fetchAppleRepo { repo = "swift-argument-parser"; rev = "${versions.argumentParser}"; - sha256 = "1jkq72fphxzsnynjxk72azp0iz5r2ji7adxrz6w1y2a19pgjdqrp"; + sha256 = "sha256-vNqkuAwSZNCWvwe6E5BqbXQdIbmIia0dENmmSQ9P8Mo="; }; format = fetchAppleRepo { repo = "swift-format"; rev = "${versions.format}"; - sha256 = "1hg888ps3fk23q2zf6djkvxyk6zndqvwypmy0s800hmnyf0hzgv4"; + sha256 = "sha256-1f5sIrv9IbPB7Vnahq1VwH8gT41dcjWldRwvVEaMdto="; }; crypto = fetchAppleRepo { repo = "swift-crypto"; rev = "${versions.crypto}"; - sha256 = "0918pj3x3wgli3bnrjbvpzck2n6qz5n6f4yc5kljky45wd15f34g"; + sha256 = "sha256-jwxXQuOF+CnpLMwTZ2z52Fgx2b97yWzXiPTx0Ye8KCQ="; + }; + nio = fetchAppleRepo { + repo = "swift-nio"; + rev = versions.nio; + sha256 = "sha256-FscOA/S7on31QCR/MZFjg4ZB3FGJ+rdptZ6MRZJXexE="; + }; + nio-ssl = fetchAppleRepo { + repo = "swift-nio-ssl"; + rev = versions.nio-ssl; + sha256 = "sha256-5QGkmkCOXhG3uOdf0bd3Fo1MFekB8/WcveBXGhtVZKo="; }; yams = fetchFromGitHub { owner = "jpsim"; repo = "Yams"; rev = versions.yams; - sha256 = "1nk9b7l6m3wwjkl81npl2l1iwpsxaxb9za53jpwwsbbi1h1h4fbi"; + sha256 = "sha256-cTkCAwxxLc35laOon1ZXXV8eAxX02oDolJyPauhZado="; name = "Yams-${versions.yams}-src"; }; }; @@ -160,14 +192,12 @@ let glibc icu libblocksruntime - libbsd libedit libgcc libuuid libxml2 ncurses sqlite - swig ]; python = (python3.withPackages (ps: [ps.six])); @@ -184,11 +214,8 @@ stdenv.mkDerivation { version = versions.swift; nativeBuildInputs = [ - autoconf - automake cmake git - libtool makeWrapper ninja perl @@ -198,7 +225,7 @@ stdenv.mkDerivation { which ]; buildInputs = devInputs ++ [ - clang_10 + clang_13 ]; # TODO: Revisit what needs to be propagated and how. @@ -233,6 +260,14 @@ stdenv.mkDerivation { cp -r ${sources.format} swift-format cp -r ${sources.crypto} swift-crypto cp -r ${sources.llvmProject} llvm-project + cp -r ${sources.cmark-gfm} swift-cmark-gfm + cp -r ${sources.docc} swift-docc + cp -r ${sources.docc-render-artifact} swift-docc-render-artifact + cp -r ${sources.docc-symbolkit} swift-docc-symbolkit + cp -r ${sources.lmdb} swift-lmdb + cp -r ${sources.markdown} swift-markdown + cp -r ${sources.nio} swift-nio + cp -r ${sources.nio-ssl} swift-nio-ssl chmod -R u+w . ''; @@ -254,6 +289,7 @@ stdenv.mkDerivation { patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} patch -p1 -d swift -i ${./patches/0003-build-presets-linux-don-t-build-extra-libs.patch} patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} + patch -p1 -d swift -i ${./patches/0007-build-presets-linux-os-stdlib.patch} substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \ --replace '/usr/include' "${stdenv.cc.libc.dev}/include" sed -i swift/utils/build-presets.ini \ @@ -268,7 +304,6 @@ stdenv.mkDerivation { # LLVM toolchain patches. patch -p1 -d llvm-project/clang -i ${./patches/0005-clang-toolchain-dir.patch} patch -p1 -d llvm-project/clang -i ${./patches/0006-clang-purity.patch} - patch -p1 -d llvm-project/compiler-rt -i ${../llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch} substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ @@ -295,6 +330,27 @@ stdenv.mkDerivation { "swiftbuild_path = os.path.join(args.toolchain, \"bin\", \"swift-build\")" substituteInPlace swift-corelibs-xctest/build_script.py \ --replace usr "$PREFIX" + + # Can be removed in later swift-docc versions, see + # https://github.com/apple/swift-docc/commit/bff70b847008f91ac729cfd299a85481eef3f581 + substituteInPlace swift-docc/build-script-helper.py \ + --replace \ + "subprocess.check_output(cmd, env=env).strip(), 'docc')" \ + "subprocess.check_output(cmd, env=env).strip().decode(), 'docc')" + + # Can be removed in later Swift versions, see + # https://github.com/apple/swift/pull/58755 + substituteInPlace swift/utils/process-stats-dir.py \ + --replace \ + "type=argparse.FileType('wb', 0)," \ + "type=argparse.FileType('w', 0)," + + # Apply Python 3 fix, see + # https://github.com/apple/swift/commit/ec6bc595092974628b27b114a472e84162261bbd + substituteInPlace swift/utils/swift_build_support/swift_build_support/productpipeline_list_builder.py \ + --replace \ + "filter(lambda x: x is not None, pipeline)" \ + "[p for p in pipeline if p is not None]" ''; configurePhase = '' @@ -312,14 +368,14 @@ stdenv.mkDerivation { buildPhase = '' # Explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib. - export NIX_CFLAGS_COMPILE="$(< ${clang_10}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="$(< ${clang_13}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" # During the Swift build, a full local LLVM build is performed and the resulting clang is # invoked. This compiler is not using the Nix wrappers, so it needs some help to find things. export NIX_LDFLAGS_BEFORE="-rpath ${gccForLibs.lib}/lib -L${gccForLibs.lib}/lib $NIX_LDFLAGS_BEFORE" # However, we want to use the wrapped compiler whenever possible. - export CC="${clang_10}/bin/clang" + export CC="${clang_13}/bin/clang" $SWIFT_SOURCE_ROOT/swift/utils/build-script \ --preset=buildbot_linux \ @@ -353,6 +409,17 @@ stdenv.mkDerivation { # TODO: Fix issue with ld.gold invoked from script finding crtbeginS.o and crtendS.o. rm $SWIFT_SOURCE_ROOT/swift/test/IRGen/ELF-remove-autolink-section.swift + # The following two tests fail because we use don't use the bundled libicu: + # [SOURCE_DIR/utils/build-script] ERROR: can't find source directory for libicu (tried /build/src/icu) + rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/default_build_still_performs_epilogue_opts_after_split.test + rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift + + # TODO: This test fails for some unknown reason + rm $SWIFT_SOURCE_ROOT/swift/test/Serialization/restrict-swiftmodule-to-revision.swift + + # This test was flaky in ofborg, see #186476 + rm $SWIFT_SOURCE_ROOT/swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift + # TODO: consider using stress-tester and integration-test. # Match the wrapped version of Swift to be installed. @@ -379,20 +446,21 @@ stdenv.mkDerivation { --set CC $out/bin/clang \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} + --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} \ + --suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]} wrapProgram $out/bin/swiftc \ --set CC $out/bin/clang \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} + --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} \ + --suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]} ''; # Hack to avoid build and install directories in RPATHs. preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR"; meta = with lib; { - broken = true; description = "The Swift Programming Language"; homepage = "https://github.com/apple/swift"; maintainers = with maintainers; [ dtzWill trepetti dduan ]; diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch index 7d626e187755..eb522ac96f7e 100644 --- a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch +++ b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch @@ -2,22 +2,22 @@ Disable targets, where we use Nix packages. --- a/utils/build-presets.ini +++ b/utils/build-presets.ini -@@ -776,8 +776,6 @@ - llbuild +@@ -818,8 +818,6 @@ swiftpm + swift-driver xctest -libicu -libcxx - - dash-dash - -@@ -785,9 +785,7 @@ - install-llbuild + swiftdocc + + # build-ninja +@@ -830,9 +828,7 @@ install-swiftpm + install-swift-driver install-xctest -install-libicu install-prefix=%(install_prefix)s -install-libcxx install-sourcekit-lsp + install-swiftdocc build-swift-static-stdlib - build-swift-static-sdk-overlay diff --git a/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch b/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch new file mode 100644 index 000000000000..46da01635540 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch @@ -0,0 +1,13 @@ +Use os-stdlib in tests. + +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -872,7 +872,7 @@ + indexstore-db + sourcekit-lsp + swiftdocc +-lit-args=-v --time-tests ++lit-args=-v --time-tests --param use_os_stdlib + + # rdar://problem/31454823 + lldb-test-swift-only From 4c5110be76f1ccb5831eb077e7893b110ac3abc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Sat, 13 Aug 2022 23:12:41 +0200 Subject: [PATCH 069/167] swift: add myself as maintainer --- pkgs/development/compilers/swift/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index a8b57ca71216..4109d6ee6dac 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -463,7 +463,7 @@ stdenv.mkDerivation { meta = with lib; { description = "The Swift Programming Language"; homepage = "https://github.com/apple/swift"; - maintainers = with maintainers; [ dtzWill trepetti dduan ]; + maintainers = with maintainers; [ dtzWill trepetti dduan trundle ]; license = licenses.asl20; # Swift doesn't support 32-bit Linux, unknown on other platforms. platforms = platforms.linux; From e5b6cb2bff47fc7c9f083bae7ea443be4b613e86 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 23 Aug 2022 10:31:12 +0900 Subject: [PATCH 070/167] pulumi-bin: 3.37.2 -> 3.38.0 --- pkgs/tools/admin/pulumi/data.nix | 370 +++++++++++++++--------------- pkgs/tools/admin/pulumi/update.sh | 2 +- 2 files changed, 186 insertions(+), 186 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 49f7ee8835ee..f6473c07404d 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,49 +1,49 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.37.2"; + version = "3.38.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-linux-x64.tar.gz"; - sha256 = "0zdln1zw92brg17dbcwms3ak3sigj1s3x52vk41maqikxcjza1k5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.38.0-linux-x64.tar.gz"; + sha256 = "1335rb4aki9pj5m8v6c90mg8wwj8afnzj8mk5q2hj5p48fhzv1ry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-linux-amd64.tar.gz"; - sha256 = "1zyd967mgk2bk7kazj6ds4yqmnpc3nh3j40a4zlrjpj03njjmv9i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.3.1-linux-amd64.tar.gz"; + sha256 = "025573virxpcak26blq5l40dqznaipkbgdmibxkkzhb8jhzwy8rp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-linux-amd64.tar.gz"; sha256 = "0anmkwqwwnk44069d01crrj3y73nrwa5hknxc8fh3x1vwc2jzvfc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-linux-amd64.tar.gz"; - sha256 = "1by8qg9yrm2l0i7hkmgan26hhcjjvbyifyhfcq69d32n20i32ksv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-amd64.tar.gz"; + sha256 = "1hbjni74gqyfsp4amn1mimz53v89fhrmpq3aa46a6mgvv47215ks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-linux-amd64.tar.gz"; - sha256 = "1wjk0033xh1nhq2b76nsxb43jfraf1jm257m3z1gqzyqpjnpc2cp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.6.1-linux-amd64.tar.gz"; + sha256 = "10bckr3lr4yxfhd41wlhngskmz56kfsscjjjkvnbijg7g6ijxz2z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-linux-amd64.tar.gz"; - sha256 = "18ds6znrr96qhg01c3ldk5l5a16d6f09gn1h2ln3lhxygxjjjzda"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.12.0-linux-amd64.tar.gz"; + sha256 = "1hydlkbqxx7wn2dmzgnb7j7pshsy3mp4klmr8nn2qc8w8g0b4f2w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-linux-amd64.tar.gz"; - sha256 = "1fcvi8ms400qlmgzcniw5pvj46si2rk4jzn57vr5a96qyy1qrpsy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.11.0-linux-amd64.tar.gz"; + sha256 = "1ggqrmdrhs2rj9vzxghb0900w1mw93cygxiididnrq6774wna19v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-linux-amd64.tar.gz"; - sha256 = "0ail3jy9msc8ximkm1i47zca36vrrw99p9qsnp37gp9y6nr2z65y"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-linux-amd64.tar.gz"; - sha256 = "01i43wi9h5693px5mvg55xim6hbf85nzi1maz0p7ys5sicglzng4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.27.0-linux-amd64.tar.gz"; + sha256 = "04ya7a9gfng3vlfxd0536a44gc0dvpvdmpf81n0c5rc09w96q77a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-amd64.tar.gz"; sha256 = "12sxvvjzf9761cag1kah7sdvjg98mi05jrfy0g06xf7lghlyxpcr"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.16.0-linux-amd64.tar.gz"; + sha256 = "1xlb55nk9sm149qf8lbgnkvdygw9bzz2637j8rh3psijknj9m7m4"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-linux-amd64.tar.gz"; sha256 = "0fhbp72nr3pjzkw3iq495h1p7lp6h02rw8hbnm0jqlz32i68z07b"; @@ -57,12 +57,12 @@ sha256 = "1y9kpr1kafjp8hvrvpx0mp6i23sf2m5f229kw5hr1h718pnkymwc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-linux-amd64.tar.gz"; - sha256 = "1s20aknj8vlfp5zh9n959xjhyb106aldiw25yzhj77zp598n7rql"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.1-linux-amd64.tar.gz"; + sha256 = "0g1msaiirzwz5cz2hmid53lj9a5a82psxmv7fskfmhsv2w0zy4k4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-linux-amd64.tar.gz"; - sha256 = "08hy3qcf8dg36s3p9jm1mbknqp139izjdnr5ic4i8c3vycid0r1i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-amd64.tar.gz"; + sha256 = "0nxbbkk98w35dxsibfc67m6y5b2h48kckk62i2qw0ix2v8qgmcks"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; @@ -73,32 +73,32 @@ sha256 = "1f2ivpqd6vhwq6pz1gh69fdzh7qh4sicnlwmmqspvw5wl1zxi42p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-linux-amd64.tar.gz"; - sha256 = "0y07fifkgnxdl9fqvx9y5mm19fkkp7gfv9z7mspn7s9qf1c9bjzz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.34.0-linux-amd64.tar.gz"; + sha256 = "10skfvwhbs1zaa37849ba5798f2jn2cccz27ivvhkbk14yihgnw9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-linux-amd64.tar.gz"; - sha256 = "0ckwvnidp6n7rvccs36966fab0mg6rk5y0ip7l806r7bx7w61aaj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.16.0-linux-amd64.tar.gz"; + sha256 = "13sdprhj4wi49cfgabaf2w171bqc97as592wrzsbda546przxk1c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-linux-amd64.tar.gz"; - sha256 = "0fhwi0d136zmppcq1mbf8hnsk9l28vk1qs30fs2p045qdadbzjg9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-linux-amd64.tar.gz"; + sha256 = "08kal2cwbaaxif0hxzxylrqkg0msz1jw1l65dzp3r903jclwc1zx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-linux-amd64.tar.gz"; - sha256 = "17lr9cf0fgw063y9zx87m54h8fzq0iiagm8b90264csdk2gppqdq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.23.0-linux-amd64.tar.gz"; + sha256 = "16cigqfls82z80a43sx3q71qchr0wnww5ryw0vqiqjb8kkzfb8lx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-linux-amd64.tar.gz"; - sha256 = "1af284q58vvrzny91f0x3cmam5nwipvcpn6m4sxvyb8a35h08w4d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-linux-amd64.tar.gz"; + sha256 = "09i6lh9wfsfpa5jkj2nb80f3gvmpg3m3flfgfcc794khlrikqmib"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-linux-amd64.tar.gz"; - sha256 = "192f1nn5xyfld26llcg11708bgc1dfq0nsl90cgywy05fx65p1py"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.5-linux-amd64.tar.gz"; + sha256 = "1kg57mhm8yhrxipznhlvv1wa2mg0jxybsv5y97sh42zz2ybf60w6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-linux-amd64.tar.gz"; - sha256 = "18x4pyn4riscg3cfb1n7nylm1q8rmm82g1kchx6nys26jqcllp7a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.0-linux-amd64.tar.gz"; + sha256 = "1w47s1bkjn4xj12b6ygj7qhawd4svycwq7f5lj3l2dsyf1q17ynd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-linux-amd64.tar.gz"; @@ -109,28 +109,28 @@ sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-linux-amd64.tar.gz"; - sha256 = "111q7jxkjni1091m3kp9c2n1zqlkiy7lrfsrqk4bzpcf67krk9vj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-linux-amd64.tar.gz"; + sha256 = "1yva7q0xbgz03807cmk0p7glzw6amsr259r230hhkx1iyx4mdj1m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.5.0-linux-amd64.tar.gz"; sha256 = "08wyx9j5q9pn1jya849wg35v2d7kagzj77h8qr94j8w7agf6ds2a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-linux-amd64.tar.gz"; - sha256 = "1jk6kjqkm1x1jmx3bfsskirk6if97c5pg0b0jxn0v36j09x6k3as"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-linux-amd64.tar.gz"; + sha256 = "0vxspn9rjb928ax4755086kil6j3616ga5zn3d6xrwm9cvmal0kb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-linux-amd64.tar.gz"; - sha256 = "0n1chk9dnr8yrbfgcvhgfd6cl7yqh8cvwflwrcr5k7lym6hnd06b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-linux-amd64.tar.gz"; + sha256 = "1ymcbqb2rx8g1nsvppasqlc2ws00jzrx33k6cghy14yjkd82n6pv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-amd64.tar.gz"; sha256 = "0rdvz6ibk41dhyfsqblfj56ib5hrr6vsx0z9kgzz5qamyjd1580h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-linux-amd64.tar.gz"; - sha256 = "0p1vh1hp90niqdr3scmh4pwb177lv6d3nqp6apcjabsg5w5nmim9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-linux-amd64.tar.gz"; + sha256 = "1i5y1kqyc84v90c7lh5gaydk5qvvs62gc6xxd6n8zzmn9ygkr0c4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-linux-amd64.tar.gz"; @@ -141,8 +141,8 @@ sha256 = "1jx1h7p72wacplnqdvjqrzkgfc6fsrpjx6xl4f6dyvnvc9sgv7l9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.5.0-linux-amd64.tar.gz"; - sha256 = "1rif5ilxh84qzp2p19wal8k3xczppwv9rqk2ynhh82pp316hwf0a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-linux-amd64.tar.gz"; + sha256 = "10irh4gfljyiqhf1dw2v3g129yxp9lfglwz1lbwxba8ql9m40vcd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-amd64.tar.gz"; @@ -163,45 +163,45 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-darwin-x64.tar.gz"; - sha256 = "1z0s2wnspfgcn5qhfi40mrjlw59cv1kq5a86nrf4lg42rr04kk43"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.38.0-darwin-x64.tar.gz"; + sha256 = "1g4hs6f3xri5z2cr8rf7hl91bzr2snpny12rngw27ilw4r7fw3k0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-darwin-amd64.tar.gz"; - sha256 = "0pd34fs95vml7a87zvdb2ap476bd8mh0qgy0p0ppcv50yv3jwp79"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.3.1-darwin-amd64.tar.gz"; + sha256 = "1q0ij0cib2n58yjfkq7sdjha8i5230pfw8rsdsr4rcsjcyw2mk67"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-darwin-amd64.tar.gz"; sha256 = "156qwg2isv1dflij4y1w3kb31wkn3g0q0ajcy753d7vn8dmwycxr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-darwin-amd64.tar.gz"; - sha256 = "0yp1akw598c6p3997d0j7c7a1qc1qczjd0r5lr2krkqdak4vzfzn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-amd64.tar.gz"; + sha256 = "127b62pznybyp4scv1avwpw4ni540496yki0h0k4blm5gnrvr600"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-darwin-amd64.tar.gz"; - sha256 = "0cmnwx65s345775zwkmnkl8wr9cjc9iwmylsmjxn4jyqvy22jhj5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.6.1-darwin-amd64.tar.gz"; + sha256 = "1i17a1s2ixnpvc3lmyy0kpr1ljw0dwl79yzkzm81x6kfq54l94sz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-darwin-amd64.tar.gz"; - sha256 = "1vxmvfdybi6pp3czqwkhcvr63n5pym4x44sbzhhs4i8mj3m5sfrr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.12.0-darwin-amd64.tar.gz"; + sha256 = "0ppkpbhl6l875rcfsr3hgsg61ambk7j3lyrqcbyn490xvv8xv407"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-darwin-amd64.tar.gz"; - sha256 = "1vmvqr07k865wizw4z9zcrs40s3rfa46nk0imisg51hyajp7gf9b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.11.0-darwin-amd64.tar.gz"; + sha256 = "0jj09ng5ksr36ipjmlnyn34jjd27mlmvhc27457bh7jyd5pvsxhw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-darwin-amd64.tar.gz"; - sha256 = "14j2xn6kaw5rm3fcxb6v29b78sgfq7drqi2clnag6b3iggq4spji"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-darwin-amd64.tar.gz"; - sha256 = "0575vcgz00i72ip45y98ikrvqlry8rchwypdiynd0bagfpj297jz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.27.0-darwin-amd64.tar.gz"; + sha256 = "0gvycn3dx6r7f4qzdhlf2p166q7lpsfmnqh098gq1l2zq0vrw5zb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-amd64.tar.gz"; sha256 = "026i7hxa80b7mipw792anv1wplmz2w23irfy26bsh77an36hk46y"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.16.0-darwin-amd64.tar.gz"; + sha256 = "1wlqwm0661ksslzkn345qznqqj4acdawrwq30nkdf4xn998hnvx7"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-darwin-amd64.tar.gz"; sha256 = "0ipfaq8bv4z63krrbday20nv5968k3gs8srkj9vfaw8nmzf6p4n5"; @@ -215,12 +215,12 @@ sha256 = "097357wf3bcywyy46y6prl2q4dcfdhm299hhfjvn3vv610a04c3d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-darwin-amd64.tar.gz"; - sha256 = "11rg0z3mhaikwkjx3xz8j5smxs45kqw5q80ixczrj1hbysijfrq4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.1-darwin-amd64.tar.gz"; + sha256 = "0y569cycmdgwapis05n1509krbihi00r9iqlxqpd8iaw9n07myry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1s5zkdf6zf1l4nkmd8pl1mvr2sjj4bw3vcqnr4y9xmmxicjz9d0d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-amd64.tar.gz"; + sha256 = "17qxlhqnxnkvgsym4cgymnpg38pgg83xq6jcjk28ap7d31ginzmg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; @@ -231,32 +231,32 @@ sha256 = "0mq9xak9m6qw6wzd33b20dapqandi23hid79ysry179p8hjg0dgy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-darwin-amd64.tar.gz"; - sha256 = "00hcah3rjd4x7xi2alpxd1f1bx380ipcmqdwvig81cr6bq3mpfr3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.34.0-darwin-amd64.tar.gz"; + sha256 = "0h0p796qdx5ghbjslh0yzjlncrky0kx3xf1x19j0cd5xpqzakdp1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-darwin-amd64.tar.gz"; - sha256 = "0nfa7ygc39g7ayl1gl3kazmhdxmjq8g41ql8vxqcxv6zp5d6b32l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.16.0-darwin-amd64.tar.gz"; + sha256 = "0bdz83vz8acad39fqcws26qm8wzr7pc1wwclh79vp8caav3hnbza"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-darwin-amd64.tar.gz"; - sha256 = "1s8mk8v5x3z6szdqn9c74cpgfqx46whj2nm78mjbqbs7rh9vgw1f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-darwin-amd64.tar.gz"; + sha256 = "1z9kg9h1gw4s9k1qypir62hv4flx4njrxbxfkknawx29dps3wkff"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-darwin-amd64.tar.gz"; - sha256 = "084qvn4lwn7ss84sb9c7bxpxal4x65d6y3vgn4hbnvvarsmvn6zs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.23.0-darwin-amd64.tar.gz"; + sha256 = "0cagqdbg8gpihfy3qx31w0hgj96mv33paycwsgi53ra96vsz63hx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-darwin-amd64.tar.gz"; - sha256 = "0gswf93qapcwc3dv617gjdyhn9w5hhzdcs3w31sqrlzfa2sb790p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-darwin-amd64.tar.gz"; + sha256 = "1jp9cfw8jj1wms73b5d1xhkmnylly061fxilxzvnpd49glam7da6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-darwin-amd64.tar.gz"; - sha256 = "1ii5sjilczp6bdrz050prg5chbpd49znk1hjzzp2kbsxcf319rsq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.5-darwin-amd64.tar.gz"; + sha256 = "058rbm195zdm8x5757r2i07ilayx5wbd0zfm0kxhqp3c4lrhz7a5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-darwin-amd64.tar.gz"; - sha256 = "1ick0q427dv8hqwfng0g6kv2praa67cl9qz1zi23aa998yn4dg1z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.0-darwin-amd64.tar.gz"; + sha256 = "11p3qa49nqaz2s30izhs9dbqz668fx36y88hs1llk59z0crj8x75"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-darwin-amd64.tar.gz"; @@ -267,28 +267,28 @@ sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-darwin-amd64.tar.gz"; - sha256 = "13qxwzfsy0hmvgazry0q3qna0jk7llharcvdwz302fj4ad98s71j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-darwin-amd64.tar.gz"; + sha256 = "0a42rdjzircqkmhmw1m7qbs30vn1if48j4440daw5sr1r8gamcmf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.5.0-darwin-amd64.tar.gz"; sha256 = "0d1w1zak2ma701w26va74ahi3lmsjywsk2x84ds4l4mj8ckpl2va"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-darwin-amd64.tar.gz"; - sha256 = "0s4jpy4csjvqk9l7xjypbnpbnlx53p1sm6pyw5drddah8aaj47vx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-darwin-amd64.tar.gz"; + sha256 = "0086l2ch5wdhdilwipln9clq09lnj2njgpp2wn8mxvd69xjccsz0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-darwin-amd64.tar.gz"; - sha256 = "0nfpqp6yyhyckhz38z4g07g4znj3c738rgd1daprmdyl6yifvi72"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-darwin-amd64.tar.gz"; + sha256 = "1imgmpn2n9daghpaca6qlww7bp3dmw894fv54j43cpxkm6z29kjk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-amd64.tar.gz"; sha256 = "1p27dsar8jl7krqz2vrzics45g8s85l4xx3216207x2hq7qbdfb5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-darwin-amd64.tar.gz"; - sha256 = "0y1lcafl477ja9kib00zprz7gamfx821mdj5nyiyjkggwylp0lwl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-darwin-amd64.tar.gz"; + sha256 = "0yv03kh209cwzi1b47bhsbxslmnk454qkx5lqcn6qnjyc7ij7k6x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-darwin-amd64.tar.gz"; @@ -299,8 +299,8 @@ sha256 = "16dxc4pkb5arb8qb6gg45m59jn20is3fcn0d1lc66d6sh35z7lsb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.5.0-darwin-amd64.tar.gz"; - sha256 = "0w8s908ny5zdn0i8j0klaq2ig7f8vnzx88cm5r110573ya3l9b1m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-darwin-amd64.tar.gz"; + sha256 = "0z06di24mdzdkv8zvpxbzcvp9k8w5yqkskc2gigxl2iv608glmn6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-amd64.tar.gz"; @@ -321,45 +321,45 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-linux-arm64.tar.gz"; - sha256 = "10ll8axayljsjkq9lzr34dgii5fjckvdm7pp0wmwdhx2xfh9kmcg"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.38.0-linux-arm64.tar.gz"; + sha256 = "11nikfjvpc95cn4250wb19d4cvbr94mhi2fjhcafcha6xddyzpkl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-linux-arm64.tar.gz"; - sha256 = "0ps22ngimrbgh24gm66h0jgs1bfafbizknxbpxrwavyrc26nhgy9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.3.1-linux-arm64.tar.gz"; + sha256 = "0qyk51xrfdvlhj2fqyx1b8zsg68i0pvsv85ms34nhgiwzavgga0x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-linux-arm64.tar.gz"; sha256 = "16jkz0qrp2pvz60388n97bf59idmfv5j0hg0dzp78j1dhpy1aqnn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-linux-arm64.tar.gz"; - sha256 = "1bnsfbqq6gcdkxfz83x7chhi4z760zslvqw1a9nikcsdl54qk5bc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-arm64.tar.gz"; + sha256 = "1qrg5sq8fqyn9vq92xmdx0pql7hy4dhha3lxjp5ka386bf6jmamc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-linux-arm64.tar.gz"; - sha256 = "062f4f6n7x83gi4hzd0ixnqm7yar93hhg53lw4wkmad8c9cq93kv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.6.1-linux-arm64.tar.gz"; + sha256 = "1584q22a6k5idvcya8a40xsaqj2r1yqwi9wq170l0ra05c716y5y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-linux-arm64.tar.gz"; - sha256 = "1vmf5fdv3n6cgwhb4i2mgv445bk4zhzcwxgivpgdnddc5dfy3ixj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.12.0-linux-arm64.tar.gz"; + sha256 = "0kzcham4g6hymjkmmk0gidj5516fi01hw8apks6cqw98ms7wijj2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-linux-arm64.tar.gz"; - sha256 = "0ar7kbxsfn64bx5n8hf11vx3779jklc75c4fy39c2j552k03444m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.11.0-linux-arm64.tar.gz"; + sha256 = "17ifmpxpn900rd95s22h77dvvwzgiilpwgkqywfpd4mbg5v1n2fr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-linux-arm64.tar.gz"; - sha256 = "01x3milrkkfa8yrbzbh0pild7qn73q6ayr0i4908b9na8ia247dz"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-linux-arm64.tar.gz"; - sha256 = "1cxnwqkzz725i03pdmxqhlfasja1z5hjf9cxkbwyyhli8zpy3grb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.27.0-linux-arm64.tar.gz"; + sha256 = "1qwrd49dwvalc08l9sbdxv6qy4m9y2v5cmpa2xrvbiab68azw3q8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-arm64.tar.gz"; sha256 = "1bxrh89hkw9b0g20d4apwhswl1dxb4v4nn5rkkkjd91ykin5idp2"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.16.0-linux-arm64.tar.gz"; + sha256 = "0yzzch8mr8xfaymsjgvmvdn7dwmzpvc1cjqv83d1x7wqgjj241kx"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-linux-arm64.tar.gz"; sha256 = "0ikjbbhfb84b2zwm3wi6ffav5dfhgdkr9ks58i3xicrbc3swarfc"; @@ -373,12 +373,12 @@ sha256 = "0ykrfa4r7xhjbpbm8mnc2ry58a3h7zynbn8gxnspg0493znx1lva"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-linux-arm64.tar.gz"; - sha256 = "19hy6hpf3440ys3gs5a0zyza23i1dcgmz3gx19sj258qw01vsr5k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.1-linux-arm64.tar.gz"; + sha256 = "1hz0hm3prwklkj8gjmkqvljjwcn7wrrsqga6mc53p6ljd370kn4k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-linux-arm64.tar.gz"; - sha256 = "1a935hi2zdd7bis2d1y818l1gl2dcq9dclbakvzczabksjdf731q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-arm64.tar.gz"; + sha256 = "1bh1ikp9dvs1akc9qqs65mdcakkmxcx2ki5pvh7sc0zdgp6ppm76"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; @@ -389,32 +389,32 @@ sha256 = "0i32s062nmayj5dxl4ridblkz8h7rrvxdid16880m8x992apdrrs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-linux-arm64.tar.gz"; - sha256 = "1cw37b2kwjvnjmaxdn0k0i8dqhl1kksm1nhp3k70349mz3lvrksc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.34.0-linux-arm64.tar.gz"; + sha256 = "10cf1ki69ps21z905xd05rsvb42y4dp71g3rz5r3qibdsqc9rd8x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-linux-arm64.tar.gz"; - sha256 = "0z94s45rbm42x89dp7a70p2l646sqwvm5wkhaz19mggd8p5d4p01"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.16.0-linux-arm64.tar.gz"; + sha256 = "0hxbv264rp9iv5xng1q5wqwddazk9jqxll7as4pnlm9wcmf0inf6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-linux-arm64.tar.gz"; - sha256 = "1ih70j8qsq8wamj9zdf1fvqj7laadpl2i79gr74k5f3xsf2rgsim"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-linux-arm64.tar.gz"; + sha256 = "1w0azz06rhj04gs0bvfxn0a37z16jywhsyiyhimimynwpawh2amn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-linux-arm64.tar.gz"; - sha256 = "18kkxjgm0ivrbgypk34jajlidslbf1bvlnhlcgjxjwbgl7f48krs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.23.0-linux-arm64.tar.gz"; + sha256 = "1vx4gchka3kzrzwasmil180ji3756pakaha6fm85h49skgiwk59f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-linux-arm64.tar.gz"; - sha256 = "02hmd5kdg34xrvmximxza5n9bb7i14c2d19pr0gf4gx6f6hg8yw2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-linux-arm64.tar.gz"; + sha256 = "0gis39k5kgdxl0i4afy78hkcmwpzm1shh4x713p7dg6h8w0afdmi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-linux-arm64.tar.gz"; - sha256 = "07gssf982y6plabw951cycwyfi42swkpv8h5044j8avg764fnmpy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.5-linux-arm64.tar.gz"; + sha256 = "1df84xy6b13k9injjg11zxad8jn2xk66cizv2qphlwa1xripz7xw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-linux-arm64.tar.gz"; - sha256 = "0akw7fb0la3v5zwcnnpvs6p41qrpgq83lf12rb7vr311blzhzl4c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.0-linux-arm64.tar.gz"; + sha256 = "1sj7bxd415j1gr0p6rwg8k4z9vhjc1kc6vw4gj2cbnaby6mv43mr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-linux-arm64.tar.gz"; @@ -425,28 +425,28 @@ sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-linux-arm64.tar.gz"; - sha256 = "0dh28hhg2lbvbgw2yadw0ig68z2pcg51h38v74yczblm24k97jvq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-linux-arm64.tar.gz"; + sha256 = "1kqwb8i0gra5as5bd9r1swp1fwrfrr7x3vyag5xb0lmyljlcm4cb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.5.0-linux-arm64.tar.gz"; sha256 = "0lky1gchcmjn6nxlasjqviq89hi2k9fi8lx7ac7hy6x6b7wl40sf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-linux-arm64.tar.gz"; - sha256 = "0v5kqps6p6b9j8sv9f01i1dx8hsv8mshn45y1km8vm4i6vkcanqc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-linux-arm64.tar.gz"; + sha256 = "1djc9ar4x6rmi49grl4nxhycc2fbfvk9h1g2xnzl67adxh2cbgj9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-linux-arm64.tar.gz"; - sha256 = "0vkik9dghpk8jn07w57023vgfllw9zszl6j5szjfbxd15idq4ihs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-linux-arm64.tar.gz"; + sha256 = "0bpmmfgmi0061xrfadpijskw1hsgxk64l4kl4vrvc9l9iwjnbk64"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-arm64.tar.gz"; sha256 = "0nn7xj38injiwla8vss4nj25r53ddj0p0mplwqrk1r92l2vcihix"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-linux-arm64.tar.gz"; - sha256 = "1fdg6sl2rchmzcsxyfbml33cq34slpf6bbr4s2cx7k2bwfvc8wwl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-linux-arm64.tar.gz"; + sha256 = "1b9nw8q5m30csgxq0mg6npzwbsna4nwkwh7b33gax6fimalbcpal"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-linux-arm64.tar.gz"; @@ -457,8 +457,8 @@ sha256 = "0mnw1cbi789c9iqnxg67pw1v6rgp6s0g2w3yvnbllbdafvd6pp3b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.5.0-linux-arm64.tar.gz"; - sha256 = "09jbs7mvbf3bbrf6b4m1nfj52zybxawza2ccsvz99yc4g5r2ixj8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-linux-arm64.tar.gz"; + sha256 = "0lc6394fvqs62rxmf4ryrvj9v5237wdrmypyyqjibk5rd72n8xfg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-arm64.tar.gz"; @@ -479,45 +479,45 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-darwin-arm64.tar.gz"; - sha256 = "1727qhjcpjjbdi9bz1ja3npzkmwrgvl2gpzfky158ywzhjdk7a1b"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.38.0-darwin-arm64.tar.gz"; + sha256 = "1h2l13x40iqdxdiys5714pb8l2vscwmc5c2gcyvdf2zhm2rwasv2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-darwin-arm64.tar.gz"; - sha256 = "0pk2ql1pcnypl3w6ypiq1pz5rxbc8b1h1gsgq0rkz7hf2y4k40m0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.3.1-darwin-arm64.tar.gz"; + sha256 = "16hkkcrv25xa74dz7sh5fppvz68smm6c70a8cph01pbxxr7gyamy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-darwin-arm64.tar.gz"; sha256 = "050p3lizllnszdf9w55wq9dsn8acbvfn5gh0qpyw7kknf67xjz77"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-darwin-arm64.tar.gz"; - sha256 = "0dc6iwzkvlpr64qbmhym477pwrq6zqg8bh9ln4z17vyx6x3apg7n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-arm64.tar.gz"; + sha256 = "10wjnyrwrmg1qjsqlizf9g85wadss3nxmdsh87cjvdbkfb3crp3b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-darwin-arm64.tar.gz"; - sha256 = "1w62rxxjy2f9c7kjqmnlhmahji31ikg8rd89qyfxz07bc55r1cq5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.6.1-darwin-arm64.tar.gz"; + sha256 = "1qkbmig8831iwgnmygaj1055np49m6gl59lfvwd2yj6dz12fqxdi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-darwin-arm64.tar.gz"; - sha256 = "11xzhm0qpm3xm5qja2vpzn4q782bcc31lqs2jl48rwrh9nhs0crz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.12.0-darwin-arm64.tar.gz"; + sha256 = "04jjxdlsywps3d03l4g37s5b7rlk97w35qjpnsf60nygxzxmvjk2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-darwin-arm64.tar.gz"; - sha256 = "0m3m5z3ldnxf44lz0ywjrhkf22hq0bxldrdhm4gpr8kfc2dy354a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.11.0-darwin-arm64.tar.gz"; + sha256 = "1b3m5ndabhyh6fklbb9flgl07zqy3c82skfjd94021q7slp6hwaf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-darwin-arm64.tar.gz"; - sha256 = "1jgffcn8cpz9zvzqgylqkj7m5rybxcn9njp440iag403i8hmb34x"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-darwin-arm64.tar.gz"; - sha256 = "0ib3a6y3c4hlyicv4v2vg5cs88bb34w58yxjffw00ljyxb66csy2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.27.0-darwin-arm64.tar.gz"; + sha256 = "011ryplg6ca1a5xal3bcv36rgwxgzf89h36k9nvwd8dsjq1qwrik"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-arm64.tar.gz"; sha256 = "030fyfj5yd4p0f7ffwdsqvkjwxihz96vgy2qqibhyyv3p6ymdpym"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.16.0-darwin-arm64.tar.gz"; + sha256 = "0ilfxh9wghhyb62si2saxanb5gm2yipr4fh7zrjr1cl3qsh3qrsl"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-darwin-arm64.tar.gz"; sha256 = "0z1c0di0p35hn30di2vv93rzdfzqrswy4gg35ngqq4h1bwn7lszi"; @@ -531,12 +531,12 @@ sha256 = "1vgck2nwargd7rrmfgxd2j9qahhalas5fsad8szwj83anxi6r1jn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-darwin-arm64.tar.gz"; - sha256 = "0d6zbzs3qlzrwvyjrhsr1xbd3w7w144fa2jjjlr19b4rjh6blf80"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.1-darwin-arm64.tar.gz"; + sha256 = "0vg38pn14h9sw7mcylbwnk78kz7yvnl78a0za11lybgl6qqybc8b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-darwin-arm64.tar.gz"; - sha256 = "0ayg0w61lqv22nln95vd02kjhhqi5k3ncpdcxbh2rd09b74bbxvf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-arm64.tar.gz"; + sha256 = "1ph2vnx5ayzckgbdgmjzbs0i9qf1bkmp29794v82582f0hdmz97q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; @@ -547,32 +547,32 @@ sha256 = "11frjymm7k2lgrdiwjsa5hcak1z3mdjjfmzdz6a0sv84bqlxjj0j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-darwin-arm64.tar.gz"; - sha256 = "0mzw1vgl5c9f1m03j813n68ffmy95hzc27kxslb51cghxgld1pbj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.34.0-darwin-arm64.tar.gz"; + sha256 = "0clsx0bsprqbv3rs3d960w1l40b9i8md9hqf7fm5k9dwjs0330by"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-darwin-arm64.tar.gz"; - sha256 = "1g6zdcdwzpg2xwa275j9alj3vhip2s4sznr79yswgl0hzfmv8xsr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.16.0-darwin-arm64.tar.gz"; + sha256 = "0l1jwmiscfwbh61q22gjx9yhng7dc5rvnln8licvih48193hqvbw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-darwin-arm64.tar.gz"; - sha256 = "0nz0frfnrpancc2vd9i263ck0h29p5fs04gjp4lfxcb7hwij8idg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-darwin-arm64.tar.gz"; + sha256 = "02jkpzz7kyb9i8mqis4ckqz5mwpwcgas1br7vmiipk8mw1pzwhyw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-darwin-arm64.tar.gz"; - sha256 = "0wbpz9yljwsj4bhi6n39klrpkmirdixi04yhr58m7crmj0if9bki"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.23.0-darwin-arm64.tar.gz"; + sha256 = "0gp6a9rbnlvi1g5ms7m7pd8g97lsi1rwp95p4rb3yv3fzypx5gh8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-darwin-arm64.tar.gz"; - sha256 = "0zsr560dc4wz4vhc8nbkd9171l0n926rv80gicg2x54bab1kmd9g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-darwin-arm64.tar.gz"; + sha256 = "1679zpv2r3i2acjmx2a6i7dc47p73gf3jw1k1aclasd5cyjf46jf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-darwin-arm64.tar.gz"; - sha256 = "03yw4lkb818nanjrjd9k0n12fgrx8nj0cqjr6c0sw0xkv1lbfcgb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.5-darwin-arm64.tar.gz"; + sha256 = "151i1733ab4v93zm61kbzqj76h87vx6pgmysf7vjmzbpxjg1dida"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-darwin-arm64.tar.gz"; - sha256 = "1ii48p9g20518374q0pbrv2yq8xjfgizhr3v0ib8769sry2nndf3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.0-darwin-arm64.tar.gz"; + sha256 = "1gqmpy46w49hi3d71qkvmps3mq1wkdrcfbcb04x0sjdhirbyapq9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-darwin-arm64.tar.gz"; @@ -583,28 +583,28 @@ sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-darwin-arm64.tar.gz"; - sha256 = "0xqxk9xp49s0l5cxxz9wg26fg4fj57h4yjpvs4xs8fpaqa1saynd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-darwin-arm64.tar.gz"; + sha256 = "0kgakfslwy4pz5k74d9ciywapdw7a2zq9y9cs8rigyq97m4vphwf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.5.0-darwin-arm64.tar.gz"; sha256 = "0im3ydgkm4vjia17c03szv1i77jq7abczq0a023k0kw8r3dgd8xc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-darwin-arm64.tar.gz"; - sha256 = "0gc9zjf41l44d33jj1y4py1m7l6rgs21w1v0a8kjamdxvfabyzv3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-darwin-arm64.tar.gz"; + sha256 = "1j6c83xvcanyzp1q8zwa952dplvvi0f4psfdscpplbsgzmq5v54n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-darwin-arm64.tar.gz"; - sha256 = "1jmc5d4arkh6x6nc4j0qkms9p9l4vawz1ajwil51xshaj82k2vwg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-darwin-arm64.tar.gz"; + sha256 = "0pvfnycvnz3ram5lpvaggbhfn7lxbi74rbcndw5xw0ihpk31kjim"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-arm64.tar.gz"; sha256 = "149isdz4fs052z1r7jfhx1mq18j8s4wrfgvbabil3wchfkgcqr8f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-darwin-arm64.tar.gz"; - sha256 = "1k52qh6z068s2np1gcg7wp8vvw5rig8c877m8x9qq5xy72w3mzgg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-darwin-arm64.tar.gz"; + sha256 = "09vg056rjzrp8zqh4kjjlq4dnkkzxz32kzawmaj8fxi6ds1s9y9i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-darwin-arm64.tar.gz"; @@ -615,8 +615,8 @@ sha256 = "143qpa51q6fl2s759fjhfq6z2fqwkqcwfpzmzsxdjh74mfqz5xpz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.5.0-darwin-arm64.tar.gz"; - sha256 = "170iwzg3dnr8ysj882ws6c7vwkziw5a04bsddkrmy7j7d37r8gla"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-darwin-arm64.tar.gz"; + sha256 = "02n0crpb2vf8b3ih658f6576r13ly4v02a4kwbrpifmk3c27yhv6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index a0e315d4e5da..3f8edcb6fe11 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.37.2" +VERSION="3.38.0" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. From 3291bda7b6aca51b1e2644e1adc7824c89530dc0 Mon Sep 17 00:00:00 2001 From: marius david Date: Tue, 23 Aug 2022 13:09:33 +0200 Subject: [PATCH 071/167] buildRustCrate: Do not compile binaries if all the requiredFeatures aren't enabled. --- .../rust/build-rust-crate/build-crate.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index b24398665a10..37bf3ec26f77 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -69,7 +69,15 @@ - ${lib.optionalString (lib.length crateBin > 0) (lib.concatMapStringsSep "\n" (bin: '' + ${lib.optionalString (lib.length crateBin > 0) (lib.concatMapStringsSep "\n" (bin: + let + haveRequiredFeature = if bin ? requiredFeatures then + # Check that all element in requiredFeatures are also present in crateFeatures + lib.intersectLists bin.requiredFeatures crateFeatures == bin.requiredFeatures + else + true; + in + if haveRequiredFeature then '' mkdir -p target/bin BIN_NAME='${bin.name or crateName}' ${if !bin ? path then '' @@ -79,6 +87,8 @@ BIN_PATH='${bin.path}' ''} ${build_bin} "$BIN_NAME" "$BIN_PATH" + '' else '' + echo Binary ${bin.name or crateName} not compiled due to not having all of the required features -- ${lib.escapeShellArg (builtins.toJSON bin.requiredFeatures)} -- enabled. '') crateBin)} ${lib.optionalString buildTests '' From 9ebe582bd43f6a8a44061d3a694108929ab954be Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 23 Aug 2022 13:14:49 +0200 Subject: [PATCH 072/167] prometheus: 2.36.0 -> 2.38.0 --- pkgs/servers/monitoring/prometheus/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 34f51f607193..62fdba7baf33 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -19,6 +19,7 @@ , enableLinode ? true , enableMarathon ? true , enableMoby ? true +, enableNomad ? true , enableOpenstack ? true , enablePuppetDB ? true , enableScaleway ? true @@ -30,10 +31,10 @@ }: let - version = "2.36.0"; + version = "2.38.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - sha256 = "sha256-C+Np2mqAYQ1RUqYmql0eudPD/SpWmxdMQLe85SenIA4="; + sha256 = "sha256-0CcWHJYso9iI1isCa2ZKYtNpfqcUt5sj23xkufxv6rw="; }; in buildGoModule rec { @@ -44,10 +45,10 @@ buildGoModule rec { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "sha256-FJXNCGIVj1OVWXwbXY6k65lXJCe1MqiqK7tw8nGWrEg="; + sha256 = "sha256-5s2Q3xjublHAQSB6MaxZTMOPS0T6/Bn5Ki8NCkBYM2E="; }; - vendorSha256 = "sha256-kmAQGRFmGRJ3LuGLMcSc0bJuwMsKhYVUIqQ9vDSH0Cc="; + vendorSha256 = "sha256-wfHdfW4D4ESbglUUjAl5a93aJqLuQkqKHMChHGnCmCg="; excludedPackages = [ "documentation/prometheus-mixin" ]; @@ -85,6 +86,8 @@ buildGoModule rec { "echo - github.com/prometheus/prometheus/discovery/marathon"} ${lib.optionalString (enableMoby) "echo - github.com/prometheus/prometheus/discovery/moby"} + ${lib.optionalString (enableNomad) + "echo - github.com/prometheus/prometheus/discovery/nomad"} ${lib.optionalString (enableOpenstack) "echo - github.com/prometheus/prometheus/discovery/openstack"} ${lib.optionalString (enablePuppetDB) From e8a34a3cbfbd0d359bc74b7c3c2eb6f966356a2f Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 23 Aug 2022 09:35:30 -0400 Subject: [PATCH 073/167] add maintainer: oberblastmeister --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6e677fe04b7d..a4b2f6466719 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9686,6 +9686,12 @@ githubId = 3359345; name = "obadz"; }; + oberblastmeister = { + email = "littlebubu.shu@gmail.com"; + github = "oberblastmeister"; + githubId = 61095988; + name = "Brian Shu"; + }; obsidian-systems-maintenance = { name = "Obsidian Systems Maintenance"; email = "maintainer@obsidian.systems"; From 6606e3daddb3b2e2ce73a8b64fd50ed49cfc3c1e Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 23 Aug 2022 09:39:30 -0400 Subject: [PATCH 074/167] trashy: init at 1.0.3 --- pkgs/tools/misc/trashy/default.nix | 31 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/trashy/default.nix diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/tools/misc/trashy/default.nix new file mode 100644 index 000000000000..7d3b3952a7ca --- /dev/null +++ b/pkgs/tools/misc/trashy/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "trashy"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "oberblastmeister"; + repo = "trashy"; + rev = "v${version}"; + sha256 = "sha256-b50Q7knJzXKDfM1kw6wLvXunhgOXVs+zYvZx/NYqMdk="; + }; + + cargoSha256 = "sha256-2hNNLXuAHd1bquhHimniqryTVMfBmPAOossggICScqQ="; + + nativeBuildInputs = [ installShellFiles ]; + + preFixup = '' + installShellCompletion --cmd trash \ + --bash <($out/bin/trash completions bash) \ + --fish <($out/bin/trash completions fish) \ + --zsh <($out/bin/trash completions zsh) \ + ''; + + meta = with lib; { + description = "A simple, fast, and featureful alternative to rm and trash-cli."; + homepage = "https://github.com/oberblastmeister/trashy"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ oberblastmeister ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7e51dae0ca1..289cbb688fd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11574,6 +11574,8 @@ with pkgs; trash-cli = callPackage ../tools/misc/trash-cli { }; + trashy = callPackage ../tools/misc/trashy { }; + trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { inherit (xorg) libXxf86vm; }; From 0b464c376f093b031c9a1cb7d6f8517bd632877f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 23 Aug 2022 16:18:21 +0200 Subject: [PATCH 075/167] knot-dns: patch an issue in i686-linux tests --- pkgs/servers/dns/knot-dns/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index eeb3e51188b9..427bdb597aa9 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , autoreconfHook, nixosTests, knot-resolver +, fetchpatch }: stdenv.mkDerivation rec { @@ -21,6 +22,11 @@ stdenv.mkDerivation rec { ]; patches = [ + (fetchpatch { + name = "test-32bit-xdp.patch"; + url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/325dfeefdfd8a3dd318cfe0ab52cd7efbf839ccd.diff"; + sha256 = "E5J2Jf4/m5H59Xn6TyATu2gKs3CgShYlMF2Qj1SW1zw="; + }) # Don't try to create directories like /var/lib/knot at build time. # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch From 480e4bd0a524779897a60250b5a501d516db18e4 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 23 Aug 2022 15:40:45 +0100 Subject: [PATCH 076/167] prusa-slicer: remove duplcate desktop items --- .../misc/prusa-slicer/default.nix | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 5343b529b339..936efd60e95b 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -3,8 +3,6 @@ , binutils , fetchFromGitHub , cmake -, copyDesktopItems -, makeDesktopItem , pkg-config , wrapGAppsHook , boost @@ -54,7 +52,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - copyDesktopItems pkg-config wrapGAppsHook ]; @@ -153,27 +150,6 @@ stdenv.mkDerivation rec { ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" ''; - desktopItems = [ - (makeDesktopItem { - name = "prusa-slicer"; - exec = "prusa-slicer"; - icon = "PrusaSlicer"; - comment = "G-code generator for 3D printers"; - desktopName = "PrusaSlicer"; - genericName = "3D printer tool"; - categories = [ "Development" ]; - }) - (makeDesktopItem { - name = "prusa-gcodeviewer"; - exec = "prusa-gcodeviewer"; - icon = "PrusaSlicer-gcodeviewer"; - comment = "G-code viewer for 3D printers"; - desktopName = "PrusaSlicer G-code Viewer"; - genericName = "G-code Viewer"; - categories = [ "Development" ]; - }) - ]; - meta = with lib; { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; From 1d8eaba0c1003e17622eab29ea389c4e5819dec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= Date: Thu, 7 Jul 2022 09:24:41 +0200 Subject: [PATCH 077/167] python310Packages.pyisbn: init at 1.3.1 --- .../python-modules/pyisbn/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pyisbn/default.nix diff --git a/pkgs/development/python-modules/pyisbn/default.nix b/pkgs/development/python-modules/pyisbn/default.nix new file mode 100644 index 000000000000..7e2be12fd259 --- /dev/null +++ b/pkgs/development/python-modules/pyisbn/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchPypi +, hypothesis +, pythonOlder +, pytestCheckHook +, lib +, pytest +}: + +buildPythonPackage rec { + pname = "pyisbn"; + version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "06fm9rn31cb4b61hzy63cnwfjpppgyy517k8a04gzcv9g60n7xbh"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov pyisbn --cov-report term-missing --no-cov-on-fail" "" + ''; + + checkInputs = [ pytestCheckHook hypothesis ]; + + pythonImportsCheck = [ "pyisbn" ]; + + meta = with lib; { + license = licenses.gpl3Plus; + homepage = "https://github.com/JNRowe/pyisbn"; + description = "Python module for working with 10- and 13-digit ISBNs"; + maintainers = with maintainers; [ eigengrau ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cb622c1c02a..b6304567c942 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7748,6 +7748,8 @@ in { pyiqvia = callPackage ../development/python-modules/pyiqvia { }; + pyisbn = callPackage ../development/python-modules/pyisbn { }; + pyjet = callPackage ../development/python-modules/pyjet { }; pyjks = callPackage ../development/python-modules/pyjks { }; From 46af51f647219b33d1295ebf4c0a6972c3f27d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ho=C5=82ubowicz?= Date: Tue, 23 Aug 2022 22:14:38 +0200 Subject: [PATCH 078/167] tidal-hifi: 4.1.0 -> 4.1.1 --- pkgs/applications/audio/tidal-hifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 1af5357cf0eb..b9336105b240 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "1lvdym7wcg9042an03zxvckq6kmcd5v5snp2ma54f4knj9kmzwyf"; + sha256 = "1l8axsf9d7a370fs96j16bnsi8fcdgwq036yxc4r4ykpnnskf1ds"; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; From f600b6ff90a949b67e07571fbc4ed2ba2876d46e Mon Sep 17 00:00:00 2001 From: Benno Zeeman Date: Tue, 23 Aug 2022 10:23:36 +0200 Subject: [PATCH 079/167] rust-analyzer-unwrapped: 2022-08-01 -> 2022-08-22 rust-analyzer introduced the rust-analyzer-proc-macro-srv binary a few releases ago, output and test for that package. The patch file in the build is replaced by using a test flag to skip that test, this is easier to maintain. --- .../tools/rust/rust-analyzer/default.nix | 17 ++++++++--------- .../rust-analyzer/ignore-rustfmt-test.patch | 10 ---------- 2 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index cb6d8305b93f..a975bb8bd52e 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,23 +12,22 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-08-01"; - cargoSha256 = "sha256-7ZYrIFSIOlL1JojtaQBIvvlfvjZGlR40PKVjmEtMBMo="; + version = "2022-08-22"; + cargoSha256 = "sha256-A1oH2He1nEmVmBBTfMsZpJNKNtIQpmNx3AE56e9Z1qk="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-OUezy1BkIoqpkTE5wOtsjJ/Gy48Ql8EL1/t6MZzRkWw="; + sha256 = "sha256-G/IElEE6eetQcLpESXCQtuYED/uTrsdeZj8fkqC3FSM="; }; - patches = [ - # Code format check requires more dependencies but don't really matter for packaging. - # So just ignore it. - ./ignore-rustfmt-test.patch - ]; + cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; + cargoTestFlags = [ "--package" "rust-analyzer" "--package" "proc-macro-srv-cli" ]; - buildAndTestSubdir = "crates/rust-analyzer"; + # Code format check requires more dependencies but don't really matter for packaging. + # So just ignore it. + checkFlags = ["--skip=tidy::check_code_formatting"]; nativeBuildInputs = lib.optional useMimalloc cmake; diff --git a/pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch b/pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch deleted file mode 100644 index fd7e83355781..000000000000 --- a/pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/crates/rust-analyzer/tests/slow-tests/tidy.rs -+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs -@@ -6,6 +6,7 @@ use std::{ - use xshell::{cmd, pushd, pushenv, read_file}; - - #[test] -+#[ignore] - fn check_code_formatting() { - let _dir = pushd(sourcegen::project_root()).unwrap(); - let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); \ No newline at end of file From 399f115fcd2d043a8c42a9db5b744c80cd738c61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Aug 2022 22:41:19 +0000 Subject: [PATCH 080/167] qmplay2: 22.06.16 -> 22.08.21 --- pkgs/applications/video/qmplay2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index d51b32bbb19c..8b2af2b9f915 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation rec { pname = "qmplay2"; - version = "22.06.16"; + version = "22.08.21"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = version; - sha256 = "sha256-nSlmbBCfN+yZlCcgTujBSkZc1uOO0wYpMPUwgLudJEY="; + sha256 = "sha256-UQf1aJGoUlXBo2lejw8A3lF6rFOKK6LUGDxRY9207Dw="; fetchSubmodules = true; }; From d20c9d7a881e5693f549fb8eecea861fa83e8b32 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 24 Aug 2022 08:37:44 +0800 Subject: [PATCH 081/167] emacs: Set recurseIntoAttrs on package set In the past the motivation to not recurse into Emacs packages was that it added quite a lot of packages to the evalution and they were so fast to build locally that substituting them from a binary cache didn't make sense. With native compilation this equation has changed drastically, build times are much longer and build closures are larger so the utility of having cached packages has gone way up. Additionally, it looks to me like Emacs is the only ecosystem in nixpkgs to ever care about evaluation performance like this. Every other extensible editor ecosystem has recurseIntoAttrs set to true on their respective package sets. --- pkgs/applications/editors/emacs/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 1f49c3c23af0..4243ad47a243 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -11,7 +11,7 @@ , libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests -, dontRecurseIntoAttrs, emacsPackagesFor +, recurseIntoAttrs, emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , fetchFromSavannah , systemd ? null @@ -216,7 +216,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { passthru = { inherit nativeComp; - pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs); + pkgs = recurseIntoAttrs (emacsPackagesFor emacs); tests = { inherit (nixosTests) emacs-daemon; }; }; From 3071f2debcb61a7211705325b52569e45af94223 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 24 Aug 2022 08:44:12 +0800 Subject: [PATCH 082/167] emacs: Move emacsPackages alias from aliases.nix to all-packages.nix This alias should live in aliases.nix but that would cause Hydra not to evaluate/build the packages. To be honest I don't particularly like this change, but it seems the most practical way forward to get Hydra to build Emacs packages. --- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0358d6d80999..cc7428064931 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -384,7 +384,6 @@ mapAliases ({ emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 - emacsPackages = emacs.pkgs; # Added 2020-12-18 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e9df668d10d..fb45ce8a1cbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27007,6 +27007,9 @@ with pkgs; pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; + # This alias should live in aliases.nix but that would cause Hydra not to evaluate/build the packages. + emacsPackages = emacs.pkgs; + inherit (gnome) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; From eb0ba2452f267f67a7a79c891e35681cf93c6313 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 00:59:48 +0000 Subject: [PATCH 083/167] so: 0.4.5 -> 0.4.8 --- pkgs/development/tools/so/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix index a23fa445c2fd..da52f7247a2c 100644 --- a/pkgs/development/tools/so/default.nix +++ b/pkgs/development/tools/so/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "so"; - version = "0.4.5"; + version = "0.4.8"; src = fetchFromGitHub { owner = "samtay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KiIffq8olpNpynmV4lwdY0yu2ch4MAwp5VspfLZtkf4="; + sha256 = "sha256-LVhYcxXhjFNtmGKapZrmN/5PxCZO6RF9/Wqavg5JLFg="; }; - cargoSha256 = "sha256-VBuWKit50cSHYg7WzUP5ein3MEoZN/KFfm+YEEu544Q="; + cargoSha256 = "sha256-b+ftdRreGS2weVeZF9zZjkNX28qh+WC6TcMhTumFU3g="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ From 9829e92a19b69f4755f87f213899fcd1f61968a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 06:36:45 +0000 Subject: [PATCH 084/167] python310Packages.snowflake-sqlalchemy: 1.4.0 -> 1.4.1 --- .../python-modules/snowflake-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 6d30f143ce22..84009008e9af 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.4.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9IooTfzXRmOE22huBSduM4kX8ltI6F50nvkUnXRkAFo="; + sha256 = "sha256-dJK1biZ6rEpS4kTncfJzHjBLktDZSsqvSGekbmfhves="; }; propagatedBuildInputs = [ From a22f4b0bb938968c4c56300021d3285b62e4d453 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Aug 2022 08:43:22 +0200 Subject: [PATCH 085/167] python310Packages.fjaraskupan: 1.0.2 -> 2.0.0 --- .../development/python-modules/fjaraskupan/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fjaraskupan/default.nix b/pkgs/development/python-modules/fjaraskupan/default.nix index 3e7cccd90fcb..9eb9e814981e 100644 --- a/pkgs/development/python-modules/fjaraskupan/default.nix +++ b/pkgs/development/python-modules/fjaraskupan/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fjaraskupan"; - version = "1.0.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "elupus"; repo = pname; rev = version; - sha256 = "sha256-nUrgV4keJpYRkKZE+udvmPdCW3O3YQTS1ye40IdA7vA="; + hash = "sha256-ohadGQxtW8YcSDIF7xZhy84xu0Vi5yj/QEVi8WRRBSI="; }; propagatedBuildInputs = [ @@ -30,10 +30,12 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "fjaraskupan" ]; + pythonImportsCheck = [ + "fjaraskupan" + ]; meta = with lib; { - description = "Python module for controlling Fjäråskupan kitchen fans"; + description = "Module for controlling Fjäråskupan kitchen fans"; homepage = "https://github.com/elupus/fjaraskupan"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; From 099d02ad502233f457d8c907ebaef52d0dc77367 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 06:46:44 +0000 Subject: [PATCH 086/167] python310Packages.sphinx-design: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/sphinx-design/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 8b4c91061fd8..bbba0cadc8d1 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinx-design"; - version = "0.2.0"; + version = "0.3.0"; format = "flit"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_design"; - sha256 = "b148a5258061a46ee826d57ea0729260f29b4e9131d2a681545e0d4f3c0f19ee"; + sha256 = "sha256-cYP6H65Vs37wG9pRJaIe6EH1u8v1mjU4K+WYGAxM77o="; }; nativeBuildInputs = [ flit-core ]; From 76cab430e4d797582168fa93c347cb3c5d1e16b9 Mon Sep 17 00:00:00 2001 From: Kevin Brubeck Unhammer Date: Wed, 24 Aug 2022 09:22:14 +0200 Subject: [PATCH 087/167] maintainers: add unhammer --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8eac070f26c1..bd7a3b2a2fa7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13349,6 +13349,15 @@ fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; }]; }; + unhammer = { + email = "unhammer@fsfe.org"; + github = "unhammer"; + githubId = 56868; + name = "Kevin Brubeck Unhammer"; + keys = [{ + fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C"; + }]; + }; uniquepointer = { email = "uniquepointer@mailbox.org"; matrix = "@uniquepointer:matrix.org"; From 44cf3379a246449adb150ab7143798d31f9cb925 Mon Sep 17 00:00:00 2001 From: Kevin Brubeck Unhammer Date: Wed, 3 Aug 2022 11:48:22 +0200 Subject: [PATCH 088/167] cg3: init at version 1.3.7 --- pkgs/development/interpreters/cg3/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/interpreters/cg3/default.nix diff --git a/pkgs/development/interpreters/cg3/default.nix b/pkgs/development/interpreters/cg3/default.nix new file mode 100644 index 000000000000..27db9bebcd0c --- /dev/null +++ b/pkgs/development/interpreters/cg3/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, runCommand +, dieHook +, cmake +, icu +, boost +}: + +let cg3 = stdenv.mkDerivation rec { + pname = "cg3"; + version = "1.3.7"; + + src = fetchFromGitHub { + owner = "GrammarSoft"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "Ena3dGoZsXOIY6mbvnfI0H7QqRifoxWIBKQrK3yQSmY="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + icu + boost + ]; + + doCheck = true; + + passthru.tests.minimal = runCommand "${pname}-test" { + buildInputs = [ + cg3 + dieHook + ]; + } '' + echo 'DELIMITERS = "."; ADD (tag) (*);' >grammar.cg3 + printf '""\n\t"a" tag\n\n' >want.txt + printf '""\n\t"a"\n\n' | vislcg3 -g grammar.cg3 >got.txt + diff -s want.txt got.txt || die "Grammar application did not produce expected parse" + touch $out + ''; + + + # TODO, consider optionals: + # - Enable tcmalloc unless darwin? + # - Enable python bindings? + + meta = with lib; { + homepage = "https://github.com/GrammarSoft/cg3"; + description = "Constraint Grammar interpreter, compiler and applicator vislcg3"; + maintainers = with maintainers; [ unhammer ]; + license = licenses.gpl3Plus; + platforms = platforms.all; + }; +}; + +in + cg3 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19d7b5f54c77..006c54fbb4b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14587,6 +14587,8 @@ with pkgs; ceptre = callPackage ../development/interpreters/ceptre { }; + cg3 = callPackage ../development/interpreters/cg3 { }; + cling = callPackage ../development/interpreters/cling { }; clips = callPackage ../development/interpreters/clips { }; From 706f65099a49aaea47e44639710fd2067a55d906 Mon Sep 17 00:00:00 2001 From: Marek Generowicz Date: Wed, 24 Aug 2022 11:21:23 +0300 Subject: [PATCH 089/167] ledger-live-desktop: 2.45.1 -> 2.46.0 ledger-live-desktop: 2.45.1 -> 2.46.0 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 1fc4170ffed0..7e84dd43893f 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.45.1"; + version = "2.46.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-KUp7ZQZ+THjioOSe3A40Zj+5OteWxEv+dnSbTUM8qME="; + hash = "sha256-QbCiOzASqicd0Tns1sV9ZVoc/GmuoohB9wB/g0Z6uFA="; }; appimageContents = appimageTools.extractType2 { From a05e98e540f34c54118089ea2201f15847f071f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 09:39:19 +0000 Subject: [PATCH 090/167] cloud-nuke: 0.17.0 -> 0.19.0 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 6d28a2056c94..d401af96ef88 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8rp0bfgqPl48RHIPSp3rpDAmPQ0eZnvAbO66jbp6TCk="; + sha256 = "sha256-NZFjocmmrOFGnGvLcgJPuUpzfG27FM+CnjUCjxI4l7M="; }; - vendorSha256 = "sha256-4Hm8zqeRNhIX2aN7JdEX1GruqbEafpBjY1r/vijPs8M="; + vendorSha256 = "sha256-DJmN7KAOgKYIzcsOyW3v7PTbuNgFaH0JSdRPDqi0q+w="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; From 2150676323270d083080ada35ec2037de8954aa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 10:46:38 +0000 Subject: [PATCH 091/167] fulcio: 0.5.2 -> 0.5.3 --- pkgs/tools/security/fulcio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index e1e0353847bd..4d04d791e20d 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jNsW4eUpqa1a1itEnY1932ta3UpjLxhbHz9byM6/Rxo="; + sha256 = "sha256-X943wqbgFX4Y15kCf+bxQP7OOTWksmmYghlAWPC2zVs="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-L+20HvkRAs00tbD5q1ATeLrKoa7VFQlrXChh7AtK0PI="; + vendorSha256 = "sha256-1BsnNDZAIdLj13e/qL//bPrhYKrTIBvtC1C65WmGHY0="; nativeBuildInputs = [ installShellFiles ]; From cec5b5003be84e97c390c71d6e11b3cc8b52f661 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 11:05:53 +0000 Subject: [PATCH 092/167] gitoxide: 0.14.0 -> 0.15.0 --- pkgs/applications/version-management/gitoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 22004d76365e..8afa6cfa73d0 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-lppg5x2VMzRo4SqAFgtiklc1WfTXi/jty92Z91CxZPM="; + sha256 = "sha256-6U2B+L/42okpYJrJ6gjS8tRxstFq1QBFq4ZZtzwOwac="; }; - cargoSha256 = "sha256-j4riS3OzfbEriAlqcjq6GcyTrK5sjFEopMesmWTGxp4="; + cargoSha256 = "sha256-cOQ9GRoQxZInoijRW4BtsNPEVipa8YcBo8aj5D2u+u0="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin From 01d9154cc5e98b8507fe057337cc7744bb431e5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 11:13:16 +0000 Subject: [PATCH 093/167] grpc-gateway: 2.11.2 -> 2.11.3 --- pkgs/development/tools/grpc-gateway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 8f076fe40c04..a1028a243dc8 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.11.2"; + version = "2.11.3"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-ouL3qxBzhsQYXTHTeNM3Ezxo72XY9KwTXNYPlLUr4nU="; + sha256 = "sha256-FGRuThptgcNttciYxNLUiY5oVoiODnXgMDiw1hz71mM="; }; - vendorSha256 = "sha256-1db3Ar3UtHS/MkhiaLt7wHuCCg8qGGL7jOHZXh1TywI="; + vendorSha256 = "sha256-8mFTswOgBTSDypgtfovJT9Xsykis7Q1CCQL751SuTY8="; meta = with lib; { description = From d831b5e8dc295beed8e81ae14baa88bb8ab11480 Mon Sep 17 00:00:00 2001 From: Erlend Hamberg Date: Wed, 24 Aug 2022 14:41:09 +0200 Subject: [PATCH 094/167] erlang-ls: 0.35.0 -> 0.41.2 --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index a2739e4b6f6f..a0e3b142a0fc 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.35.0"; + version = "0.41.2"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-5pGFLatcNqxpQZtu/qgwX88C8TZvk+U8ez2IGf+jgRA="; + sha256 = "sha256-LUgiQtK0OsdTmg1jEdxJ0x+39U3PXoFYsGlOv4l7/Ig="; rev = version; }; releaseType = "escript"; From 682e6b0f9e94d158be1818ffc882faf88d561b9b Mon Sep 17 00:00:00 2001 From: Erlend Hamberg Date: Wed, 24 Aug 2022 14:41:30 +0200 Subject: [PATCH 095/167] =?UTF-8?q?Fix=20redbug=20build=20error=20with=20E?= =?UTF-8?q?rlang/OTP=20=E2=89=A5=2025?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/beam-modules/erlang-ls/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index a2739e4b6f6f..4bd4a43b7832 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -11,6 +11,9 @@ let proper = super.proper.overrideAttrs (_: { configurePhase = "true"; }); + redbug = super.redbug.overrideAttrs (_: { + patchPhase = "sed -i 's/, warnings_as_errors//' rebar.config"; + }); }); }; in From caf4a8ba22813fd1fc0022703f83817290175a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Tue, 23 Aug 2022 16:27:22 -0300 Subject: [PATCH 096/167] swayws: init at unstable-2022-03-10 --- pkgs/applications/window-managers/sway/ws.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/window-managers/sway/ws.nix diff --git a/pkgs/applications/window-managers/sway/ws.nix b/pkgs/applications/window-managers/sway/ws.nix new file mode 100644 index 000000000000..babb252d7452 --- /dev/null +++ b/pkgs/applications/window-managers/sway/ws.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitLab, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayws"; + version = "unstable-2022-03-10"; + + src = fetchFromGitLab { + owner = "w0lff"; + repo = pname; + rev = "514f3c664439cf2c11bb9096c7e1d3b8c0b898a2"; + sha256 = "sha256-vUnbn79v08riYLMBI8BxeBPpe/pHOWlraG7QAaohw3s="; + }; + + cargoSha256 = "sha256-PvKpcTewajvbzUHPssBahWVcAQB3V/aMmOJ/wA0Nrv4="; + + # swayws does not have any tests + doCheck = false; + + meta = with lib; { + description = "A sway workspace tool which allows easy moving of workspaces to and from outputs"; + homepage = "https://gitlab.com/w0lff/swayws"; + license = licenses.mit; + maintainers = [ maintainers.atila ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 341b397f1b45..f3000afcf50b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28167,6 +28167,7 @@ with pkgs; swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; + swayws = callPackage ../applications/window-managers/sway/ws.nix { }; swaywsr = callPackage ../applications/window-managers/sway/wsr.nix { }; sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { }); From 689d6788f2108e93ca09f8f364a33fda3b3a16d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 16:39:50 +0000 Subject: [PATCH 097/167] mill: 0.10.5 -> 0.10.6 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 496ca7a56067..faeafa6e9528 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.5"; + version = "0.10.6"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-oz61tJYNwGQEImeg2fMIKHIKVA2Ic6nF5VG5eQt3cAY="; + hash = "sha256-4lbW755RLgWyihjeb/KB5CwQsBwXBzDT4PUSyBQiSpE="; }; nativeBuildInputs = [ makeWrapper ]; From 611a4bff158ee2dbc4dfef755cc08790aaf8cb07 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 25 Aug 2022 01:58:23 +0900 Subject: [PATCH 098/167] maintainers: add bitnomial team --- maintainers/team-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 13936b4fd5a5..fbd7972cb2bb 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -74,6 +74,15 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + bitnomial = { + # Verify additions to this team with at least one already existing member of the team. + members = [ + cdepillabout + ]; + scope = "Group registration for packages maintained by Bitnomial."; + shortName = "Bitnomial employees"; + }; + blockchains = { members = [ mmahut From d593085390ac8b9720314696bc6a0efd57d94b37 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 25 Aug 2022 01:59:27 +0900 Subject: [PATCH 099/167] aptly: 1.4.0 -> 1.5.0 --- pkgs/tools/misc/aptly/default.nix | 48 ++++++++++++++----------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 7f82aebabe4a..e14370da4d42 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -1,47 +1,43 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz, testers, aptly }: -let +buildGoModule rec { + pname = "aptly"; + version = "1.5.0"; - version = "1.4.0"; - rev = "v${version}"; - - aptlySrc = fetchFromGitHub { - inherit rev; + src = fetchFromGitHub { owner = "aptly-dev"; repo = "aptly"; - sha256 = "06cq761r3bxybb9xn58jii0ggp79mcp3810z1r2z3xcvplwhwnhy"; + rev = "v${version}"; + sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk="; }; - aptlyCompletionSrc = fetchFromGitHub { - rev = "1.0.1"; - owner = "aptly-dev"; - repo = "aptly-bash-completion"; - sha256 = "0dkc4z687yk912lpv8rirv0nby7iny1zgdvnhdm5b47qmjr1sm5q"; - }; - -in - -buildGoPackage { - pname = "aptly"; - inherit version; - - src = aptlySrc; - - goPackagePath = "github.com/aptly-dev/aptly"; + vendorSha256 = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs="; nativeBuildInputs = [ installShellFiles makeWrapper ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + postInstall = '' - installShellCompletion --bash ${aptlyCompletionSrc}/aptly + installShellCompletion --bash --name aptly completion.d/aptly + installShellCompletion --zsh --name _aptly completion.d/_aptly wrapProgram "$out/bin/aptly" \ --prefix PATH ":" "${lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = aptly; + command = "aptly version"; + }; + meta = with lib; { homepage = "https://www.aptly.info"; description = "Debian repository management tool"; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.montag451 ]; + maintainers = with maintainers; [ montag451 ]; + changelog = + "https://github.com/aptly-dev/aptly/releases/tag/v${version}"; }; } From 2c245c5dd398e7841c1049ffc3455fa69c02a84f Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 25 Aug 2022 01:59:49 +0900 Subject: [PATCH 100/167] aptly: add bitnomial members as maintainers --- pkgs/tools/misc/aptly/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index e14370da4d42..e42d4871e117 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Debian repository management tool"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ montag451 ]; + maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members; changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${version}"; }; From ec62674cb06b8c37b94acc56b4a7e7e847c33da5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Aug 2022 19:46:23 +0200 Subject: [PATCH 101/167] python310Packages.pyisbn: remove unused input --- .../python-modules/pyisbn/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyisbn/default.nix b/pkgs/development/python-modules/pyisbn/default.nix index 7e2be12fd259..e14dadcfe1a7 100644 --- a/pkgs/development/python-modules/pyisbn/default.nix +++ b/pkgs/development/python-modules/pyisbn/default.nix @@ -1,10 +1,9 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi , hypothesis , pythonOlder , pytestCheckHook -, lib -, pytest }: buildPythonPackage rec { @@ -24,14 +23,19 @@ buildPythonPackage rec { --replace "--cov pyisbn --cov-report term-missing --no-cov-on-fail" "" ''; - checkInputs = [ pytestCheckHook hypothesis ]; + checkInputs = [ + hypothesis + pytestCheckHook + ]; - pythonImportsCheck = [ "pyisbn" ]; + pythonImportsCheck = [ + "pyisbn" + ]; meta = with lib; { - license = licenses.gpl3Plus; - homepage = "https://github.com/JNRowe/pyisbn"; description = "Python module for working with 10- and 13-digit ISBNs"; + homepage = "https://github.com/JNRowe/pyisbn"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ eigengrau ]; }; } From 87a688bb18eb68f5ae795af24887d2e0fbde9636 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 24 Aug 2022 11:04:50 -0700 Subject: [PATCH 102/167] openai: 0.22.1 -> 0.23.0 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index a95d63b830b3..15d3b79e0bbc 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.22.1"; + version = "0.23.0"; disabled = pythonOlder "3.7.1"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-QUnsm0ui1BFlLqAlH1bp7uDbhiRigePrAPAkSRjftM4="; + sha256 = "sha256-VH1XR2FocRX5AYpCruAKwQUXjXqvdJsVwKdtot5Bo+Y="; }; propagatedBuildInputs = [ From 4a70e004c0cce9cc9802e3a0a3d4a37210c94f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 24 Aug 2022 08:11:37 -0500 Subject: [PATCH 103/167] =?UTF-8?q?scala:=203.1.0=20=E2=86=92=203.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release notes: - https://github.com/lampepfl/dotty/releases/tag/3.1.1 - https://github.com/lampepfl/dotty/releases/tag/3.1.2 - https://github.com/lampepfl/dotty/releases/tag/3.1.3 --- pkgs/development/compilers/scala/bare.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix index 40a70ef2baa4..098d9c7edf2c 100644 --- a/pkgs/development/compilers/scala/bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "3.1.0"; + version = "3.1.3"; pname = "scala-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; - sha256 = "9bsZ2FtIb6AvA3W3r2Vv0dPNicuYjMBz3X48z45Avv8="; + sha256 = "sha256-nh7v3Kt3stKpBXs9b3gwFZHpwnUTySQT88NTp3CT8tc="; }; propagatedBuildInputs = [ jre ncurses.dev ] ; From 2461a6233430ce84fbd79958ab290318521de865 Mon Sep 17 00:00:00 2001 From: Max Schorradt Date: Wed, 24 Aug 2022 20:17:58 +0200 Subject: [PATCH 104/167] nvidia: remove deleted useGlamor option --- nixos/modules/hardware/video/nvidia.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 8c6c97f9b21d..c51f9c0b214b 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -260,8 +260,6 @@ in # - Configure the display manager to run specific `xrandr` commands which will # configure/enable displays connected to the Intel iGPU / AMD APU. - services.xserver.useGlamor = mkDefault offloadCfg.enable; - services.xserver.drivers = let in optional primeEnabled { name = igpuDriver; From c555ac19049c0c91b4a917a0949859c194c8b9ff Mon Sep 17 00:00:00 2001 From: squalus Date: Wed, 24 Aug 2022 12:35:13 -0700 Subject: [PATCH 105/167] prometheus: fix cross compile Fix the go generate command so it can run on the build platform --- pkgs/servers/monitoring/prometheus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 34f51f607193..6cf9d7919b80 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -105,7 +105,7 @@ buildGoModule rec { ''; preBuild = '' - if [[ -d vendor ]]; then make -o assets assets-compress plugins; fi + if [[ -d vendor ]]; then GOARCH= make -o assets assets-compress plugins; fi ''; tags = [ "builtinassets" ]; From bbe876ee06ec27e3f9e815584c484d5321556dfe Mon Sep 17 00:00:00 2001 From: Erlend Hamberg Date: Wed, 24 Aug 2022 21:54:09 +0200 Subject: [PATCH 106/167] Use `substituteInPlace` instead of calling sed --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 4bd4a43b7832..9a54ab8445c0 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -12,7 +12,9 @@ let configurePhase = "true"; }); redbug = super.redbug.overrideAttrs (_: { - patchPhase = "sed -i 's/, warnings_as_errors//' rebar.config"; + patchPhase = '' + substituteInPlace rebar.config --replace ", warnings_as_errors" "" + ''; }); }); }; From 4e7b43dd39b454adbe1b59c65b03cf3b1d510679 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Wed, 24 Aug 2022 22:18:40 +0200 Subject: [PATCH 107/167] cargo-generate: fix darwin build fixes #186766 --- pkgs/development/tools/rust/cargo-generate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 64a17d807112..337ff0dda753 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # - favorites_default_to_git_if_not_defined: requires network access to github.com # - should_canonicalize: the test assumes that it will be called from the /Users// folder on darwin variant. checkFlags = [ "--skip favorites::favorites_default_to_git_if_not_defined" ] - ++ lib.optionals stdenv.isDarwin [ "--skip git::should_canonicalize" ]; + ++ lib.optionals stdenv.isDarwin [ "--skip git::utils::should_canonicalize" ]; meta = with lib; { description = "cargo, make me a project"; From 3fca4ba5ea4df268b437429e4931744d6520dd22 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Wed, 24 Aug 2022 23:29:35 +0200 Subject: [PATCH 108/167] hostctl: 1.1.2 -> 1.1.3 Signed-off-by: Mark Sagi-Kazar --- pkgs/tools/system/hostctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/tools/system/hostctl/default.nix index bf3a25118581..7fe68aa9e2d0 100644 --- a/pkgs/tools/system/hostctl/default.nix +++ b/pkgs/tools/system/hostctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hostctl"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "guumaster"; repo = pname; rev = "v${version}"; - hash = "sha256-rvUm31WRSLusM9VGsIHKGTH6Vs8LWPtzPDs3azA710w="; + hash = "sha256-3CfUU74e79eilu7WP+EeoGlXUYnxmRpjb8RaH/XXjxo="; }; - vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M="; + vendorSha256 = "sha256-3UM9w3o3qSlUvgg0k87aODJXqx1ryFvxHs6hlovBILY="; nativeBuildInputs = [ installShellFiles From 38e0579ecf83219c8acaefd121b9f4395505b7ef Mon Sep 17 00:00:00 2001 From: squalus Date: Wed, 24 Aug 2022 15:33:29 -0700 Subject: [PATCH 109/167] apr: fix cross compile Added more answers to configure tests. Verified that the answers are the same as the x86_64-linux and aarch64-linux native builds. Added a patch to work around the /dev/zero mmap detection logic that doesn't work in the cross case. --- pkgs/development/libraries/apr/default.nix | 29 ++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index e2db4db80e29..7c565c834a69 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch"; sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm"; }) + + # Cross fix. Patch the /dev/zero mmapable detection logic. https://bugs.gentoo.org/show_bug.cgi?id=830833 + (fetchpatch { + url = "https://830833.bugs.gentoo.org/attachment.cgi?id=761676"; + name = "cross-assume-dev-zero-mmappable.patch"; + sha256 = "sha256-rsouJp1o7p0d+AJ5KvyhUU79vAJOcVHEuwSEKaCEGa8="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; # This test needs the net @@ -43,9 +50,27 @@ stdenv.mkDerivation rec { ''; configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + # For cross builds, provide answers to the configure time tests. + # These answers are valid on x86_64-linux and aarch64-linux. "ac_cv_file__dev_zero=yes" - "ac_cv_func_setpgrp_void=0" - "apr_cv_tcp_nodelay_with_cork=1" + "ac_cv_func_setpgrp_void=yes" + "apr_cv_tcp_nodelay_with_cork=yes" + "ac_cv_define_PTHREAD_PROCESS_SHARED=yes" + "apr_cv_process_shared_works=yes" + "apr_cv_mutex_robust_shared=yes" + "ap_cv_atomic_builtins=yes" + "apr_cv_mutex_recursive=yes" + "apr_cv_epoll=yes" + "apr_cv_epoll_create1=yes" + "apr_cv_dup3=yes" + "apr_cv_accept4=yes" + "apr_cv_sock_cloexec=yes" + "ac_cv_struct_rlimit=yes" + "ac_cv_func_sem_open=yes" + "ac_cv_negative_eai=yes" + "apr_cv_gai_addrconfig=yes" + "ac_cv_o_nonblock_inherited=no" + "apr_cv_pthreads_lib=-lpthread" "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc" ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ # Including the Windows headers breaks unistd.h. From 153f2f6f067dcf6b56c8c0f44591f48370603203 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Sun, 20 Feb 2022 10:18:36 +0200 Subject: [PATCH 110/167] wasmtime: build c-api, bump version to 0.40.0 * build wasmtime c-api libraries & headers as the "dev" output. * bump wasmtime source version to 0.40.0. --- .../interpreters/wasmtime/default.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index db113b2a4816..d3d4516ca3eb 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.39.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cU03wm1+V++mV7j7VyMtjAYrPldzTysNzpJ8m0q4Rx8="; + sha256 = "sha256-i3dtjKy5YTyNkEaDcGxsrd4lbyUBd25OARESbJVK9uY="; fetchSubmodules = true; }; - cargoSha256 = "sha256-DnThste0SbBdpGAUYhmwbdQFNEB3LozyDf0X8r2A90Q="; + cargoSha256 = "sha256-wlcYdZ8Akkpicyw74sh4CNwSstCtUJxf+oSEL/mUtKc="; + + cargoBuildFlags = [ + "--package wasmtime-cli" + "--package wasmtime-c-api" + ]; + + outputs = [ "out" "dev" ]; # We disable tests on x86_64-darwin because Hydra runners do not # support SSE3, SSSE3, SSE4.1 and SSE4.2 at this time. This is @@ -31,6 +38,18 @@ rustPlatform.buildRustPackage rec { "--skip=traps::parse_dwarf_info" ]; + postInstall = '' + # move libs from out to dev + install -d -m 0755 $dev/lib + install -m 0644 ''${!outputLib}/lib/* $dev/lib + rm -r ''${!outputLib}/lib + + install -d -m0755 $dev/include/wasmtime + install -m0644 $src/crates/c-api/include/*.h $dev/include + install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime + install -m0644 $src/crates/c-api/wasm-c-api/include/* $dev/include + ''; + meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; homepage = "https://github.com/bytecodealliance/wasmtime"; From e19266972a84b9e94ce5ec75d250774cd32ed0bc Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Wed, 24 Aug 2022 19:05:48 -0400 Subject: [PATCH 111/167] pythonPackages.whitenoise: 6.0.0 -> 6.2.0 --- pkgs/development/python-modules/whitenoise/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index d4d956119409..0f95515c62c6 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -10,16 +10,18 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "6.0.0"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; + __darwinAllowLocalNetworking = true; + src = fetchFromGitHub { owner = "evansd"; repo = pname; rev = version; - hash = "sha256-mUjyX4eQOiMweje6UPyfyJsiHwzF5OQ93KuxFedWxbQ="; + hash = "sha256-HcWWWMIuU8kfcOnntgXUnHD3pFogq8OEAd3wRtCnXjQ="; }; propagatedBuildInputs = [ @@ -50,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Radically simplified static file serving for WSGI applications"; - homepage = "http://whitenoise.evans.io/"; + homepage = "https://whitenoise.evans.io/"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From f28ab51b54ef2518345594a6baf45b9e25378912 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 24 Aug 2022 21:57:52 -0400 Subject: [PATCH 112/167] haskell.lib.makePackageSet: all-cabal-hashes can be a directory (#188203) * all-cabal-hahses can be a directory Motivating problem: we want to use the flake.lock for all-cabal-hashes as a github repository as our revision pin, and then import that to pass as all-cabal-hashes. To do that we need it to accept a directory rather than a tarball. * all-cabal-hashes: add some comments --- .../haskell-modules/make-package-set.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 9d35d198825f..9bbfe4419286 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -21,6 +21,9 @@ , haskellLib , # hashes for downloading Hackage packages + # This is either a directory or a .tar.gz containing the cabal files and + # hashes of Hackage as exemplified by this repository: + # https://github.com/commercialhaskell/all-cabal-hashes/tree/hackage all-cabal-hashes , # compiler to use @@ -136,10 +139,20 @@ let cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" ''; + # Given a package name and version, e.g. name = "async", version = "2.2.4", + # gives its cabal file and hashes (JSON file) as discovered from the + # all-cabal-hashes value. If that's a directory, it will copy the relevant + # files to $out; if it's a tarball, it will extract and move them to $out. all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} '' - tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal} mkdir -p $out - mv */${name}/${version}/${name}.{json,cabal} $out + if [ -d ${all-cabal-hashes} ] + then + cp ${all-cabal-hashes}/${name}/${version}/${name}.json $out + cp ${all-cabal-hashes}/${name}/${version}/${name}.cabal $out + else + tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal} + mv */${name}/${version}/${name}.{json,cabal} $out + fi ''; hackage2nix = name: version: let component = all-cabal-hashes-component name version; in self.haskellSrc2nix { From 312fd31a5827bd998771d212aa08753e77d628e2 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Wed, 24 Aug 2022 20:50:06 +0200 Subject: [PATCH 113/167] nixos/meilisearch: Update tests to reflect API changes in [v0.25.0][1]: Breaking changes of Task API (relevant summarized) - `update` -> `task` - `GET - /indexes/:indexUid/updates/:updateId` -> `/indexes/:indexUid/tasks` - `updateId` -> `uid` of `task` - also: new `GET - /tasks/:taskUid` introduced - `status` values changed in [v0.28.0][2]: Breaking changes in `/indexes` endpoints - `total` now appear in the response body [1]: https://github.com/meilisearch/meilisearch/releases/tag/v0.25.0 [2]: https://github.com/meilisearch/meilisearch/releases/tag/v0.28.0 --- nixos/tests/meilisearch.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/tests/meilisearch.nix b/nixos/tests/meilisearch.nix index 6d7514a1cc0a..c31dcb0559db 100644 --- a/nixos/tests/meilisearch.nix +++ b/nixos/tests/meilisearch.nix @@ -35,20 +35,20 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: with subtest("create index"): machine.succeed( - "curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes --data @${indexJSON}" + "curl -X POST -H 'Content-Type: application/json' ${apiUrl}/indexes --data @${indexJSON}" ) indexes = json.loads(machine.succeed("curl ${apiUrl}/indexes")) - assert len(indexes) == 1, "index wasn't created" + assert indexes["total"] == 1, "index wasn't created" with subtest("add documents"): response = json.loads( machine.succeed( - "curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes/${uid}/documents --data @${moviesJSON}" + "curl -X POST -H 'Content-Type: application/json' ${apiUrl}/indexes/${uid}/documents --data-binary @${moviesJSON}" ) ) - update_id = response["updateId"] + task_uid = response["taskUid"] machine.wait_until_succeeds( - f"curl ${apiUrl}/indexes/${uid}/updates/{update_id} | jq -e '.status == \"processed\"'" + f"curl ${apiUrl}/tasks/{task_uid} | jq -e '.status == \"succeeded\"'" ) with subtest("search"): From a4c43828e965ce6efcbe575e3f92cee276c516be Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Wed, 24 Aug 2022 21:02:24 +0200 Subject: [PATCH 114/167] meilisearch: (Re-)enable nixos tests Tests where disabled in 8931b86 due to errors caused by API changes of meilisearch. Now as the tests are updated accordingly, they can be reenabled. --- pkgs/servers/search/meilisearch/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 7b83e1eb8e0a..9dca908a0773 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -23,11 +23,9 @@ rustPlatform.buildRustPackage { # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ]; - # Test fail at the moment. - # > Test "create index" failed with error: "index wasn't created" - # passthru.tests = { - # meilisearch = nixosTests.meilisearch; - # }; + passthru.tests = { + meilisearch = nixosTests.meilisearch; + }; # Tests will try to compile with mini-dashboard features which downloads something from the internet. doCheck = false; From fa325eafe8dd351b8d2c1672bde04385690a6f43 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Fri, 19 Aug 2022 11:51:28 +0200 Subject: [PATCH 115/167] elixir-ls: 0.10.0 -> 0.11.0 --- pkgs/development/beam-modules/elixir-ls/pin.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/elixir-ls/pin.json b/pkgs/development/beam-modules/elixir-ls/pin.json index a10bee67d893..a87393890a15 100644 --- a/pkgs/development/beam-modules/elixir-ls/pin.json +++ b/pkgs/development/beam-modules/elixir-ls/pin.json @@ -1,5 +1,5 @@ { - "version": "0.10.0", - "sha256": "sha256-3/Ndf7cOZZ9H+Oq6LQgoMcbtUNoBaDuiy5YKT40yA3E=", - "depsSha256": "sha256-6FghRXKNXgwxwtGeW+ejVsbaCN7rrCDYu3AZgJCYODU=" + "version": "0.11.0", + "sha256": "sha256-z2KkhTjw8AumD1FWbTCxYB6PHZIWmUPnwBnxKbpHfRQ=", + "depsSha256": "sha256-BMi9bVnQjbcvfIi1xup3sZ7QrPtHAdHqdcGlzKw+YbE=" } From 3f79f06b19c885bcef468bb50d5b54ee8c56dd79 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 23 Aug 2022 17:51:20 +0200 Subject: [PATCH 116/167] python310Packages.allure-behave: 2.9.45 -> 2.10.0 --- pkgs/development/python-modules/allure-behave/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix index e7cd81d5b5d5..000c51359f54 100644 --- a/pkgs/development/python-modules/allure-behave/default.nix +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "allure-behave"; - version = "2.9.45"; + version = "2.10.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aK0SgQIXpuUoSTz8jg5IPKQM2Xvk2EfkSGigsy/GFNo="; + sha256 = "sha256-BzDu/LJBstuchkvUAeCDSIDIiFLZmC4y0s3d+1paGxs="; }; nativeBuildInputs = [ From 36469b5564dcddaef0f23359ad23ea59646a7f89 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 23 Aug 2022 17:52:11 +0200 Subject: [PATCH 117/167] python310Packages.allure-pytest: 2.9.45 -> 2.10.0 --- pkgs/development/python-modules/allure-pytest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix index 49b5f683a6b4..273aa38b02a4 100644 --- a/pkgs/development/python-modules/allure-pytest/default.nix +++ b/pkgs/development/python-modules/allure-pytest/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "allure-pytest"; - version = "2.9.45"; + version = "2.10.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "18ys5gi64jlfya6a7shj5lqhwc6cplwgyq3s2n5mg5x513g0yqi0"; + sha256 = "sha256-Oyq2din0y9hher2BfSsiKSxut+/VWE+ZLRr4FDrqbuc="; }; buildInputs = [ From 9e0027666b63a4635a31fd40c2304b3f8ecd55de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 24 Aug 2022 02:27:41 +0200 Subject: [PATCH 118/167] open-vm-tools: 12.0.5 -> 12.1.0 https://www.vmware.com/security/advisories/VMSA-2022-0024.html https://www.openwall.com/lists/oss-security/2022/08/23/3 Fixes: CVE-2022-31676 --- pkgs/applications/virtualization/open-vm-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 02c25dd86bd4..d62964d10959 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.0.5"; + version = "12.1.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg="; + hash = "sha256-PgrLu0Bm9Vom5WNl43312QFWKojdXDAGn3Nvj4hzPrQ="; }; sourceRoot = "${src.name}/open-vm-tools"; From c33bbab891720583126ece1f7a31dd437dafc691 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 22 Aug 2022 10:47:01 +0800 Subject: [PATCH 119/167] msmtp: we always provide a path to msmtp --- pkgs/applications/networking/msmtp/paths.patch | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/msmtp/paths.patch b/pkgs/applications/networking/msmtp/paths.patch index 7114dc4eca15..9298519e4da3 100644 --- a/pkgs/applications/networking/msmtp/paths.patch +++ b/pkgs/applications/networking/msmtp/paths.patch @@ -1,8 +1,18 @@ -35cab741af069571cf4c55e0ce1ae96617d5778c nixify diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq -index d8b4039..1ab89f8 100755 +index d8b4039..1f2a7b5 100755 --- a/scripts/msmtpq/msmtpq +++ b/scripts/msmtpq/msmtpq +@@ -60,8 +60,8 @@ err() { dsp '' "$@" '' ; exit 1 ; } + ## e.g. ( export MSMTP=/path/to/msmtp ) + if [ "$MSMTP" = "" ] ; then # If MSMTP is unset or empty... + MSMTP=msmtp +-elif [ ! -x "$MSMTP" ] ; then +- log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit ++# elif [ ! -x "$MSMTP" ] ; then ++# log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit + fi + ## + ## set the queue var to the location of the msmtp queue directory @@ -71,7 +71,7 @@ fi ## ( chmod 0700 msmtp.queue ) ## From a95c28a95cc4f7970f614542d47e63901ca40cf4 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 25 Aug 2022 00:38:53 -0300 Subject: [PATCH 120/167] tabnine: 4.4.98 -> 4.4.123 --- pkgs/development/tools/tabnine/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index 25ff528c6b9a..c413ebed6013 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -2,19 +2,19 @@ let # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` # There's a handy prefetch script in ./fetch-latest.sh - version = "4.4.98"; + version = "4.4.123"; supportedPlatforms = { "x86_64-linux" = { name = "x86_64-unknown-linux-musl"; - hash = "sha256-AYgv/XrHjEOhtyx8QeOhssdsc/fssShZcA+15fFgI1g="; + hash = "sha256-mkG7Fd82L5vnS/K1UQF/JZCdQYsnPZ1iTISqFjXXnq0="; }; "x86_64-darwin" = { name = "x86_64-apple-darwin"; - hash = "sha256-XUd97ZUUb8XqMrlnSBER68fU3+58zpwKnzZ+i3dlWIs="; + hash = "sha256-+B9Oobhh1TmDoRhNlObn5jYrDgsjvpTKguwj3wbkaO0="; }; "aarch64-darwin" = { name = "aarch64-apple-darwin"; - hash = "sha256-L2r4fB4OtJJUvwnFP7zYAm8RLf8b7r6kDNGlwZRkLnw="; + hash = "sha256-HNZSQaVd8530sM4JpUTWfo7aTfKaJHg00u+M/x/pKdQ="; }; }; platform = From fe26049786d1827d2deecc3dcfdedc7b52e14882 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 24 Aug 2022 20:50:14 -0700 Subject: [PATCH 121/167] Revert "wxGTK31-gtk2: 3.1.5 -> 3.2.0" --- pkgs/development/libraries/wxwidgets/wxGTK31.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index a3c89113c9d3..5bce6250c74f 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.0"; + version = "3.1.5"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-8rOnIyNADQsZBmiofrxRc52WWNFH5u39gH/1FKKF4ZQ="; + hash = "sha256-2zMvcva0GUDmSYK0Wk3/2Y6R3F7MgdqGBrOhmWgVA6g="; fetchSubmodules = true; }; From dd845813dbea7850b7d295752d27542f7d58300e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 25 Aug 2022 04:20:00 +0000 Subject: [PATCH 122/167] nodejs-18_x: 18.7.0 -> 18.8.0 https://github.com/nodejs/node/releases/tag/v18.8.0 --- pkgs/development/web/nodejs/v18.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index dd6028edcaa9..27d9022f31dd 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, python3, fetchpatch, enableNpm ? true }: +{ callPackage, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -7,17 +7,9 @@ let in buildNodejs { inherit enableNpm; - version = "18.7.0"; - sha256 = "sha256-iDSjPJLf5rqJA+ZxXK6qJd/0ZX5wPFTNBuwRNJPiw8I="; + version = "18.8.0"; + sha256 = "sha256-K12YJdBe3mYU8WaKjZfXdP6S68gQiOxf31gYTc48hrk="; patches = [ ./disable-darwin-v8-system-instrumentation.patch - # Fix npm silently fail without a HOME directory https://github.com/npm/cli/issues/4996 - (fetchpatch { - url = "https://github.com/npm/cli/commit/9905d0e24c162c3f6cc006fa86b4c9d0205a4c6f.patch"; - sha256 = "sha256-RlabXWtjzTZ5OgrGf4pFkolonvTDIPlzPY1QcYDd28E="; - includes = [ "deps/npm/lib/npm.js" "deps/npm/lib/utils/log-file.js" ]; - stripLen = 1; - extraPrefix = "deps/npm/"; - }) ]; } From 05f8c0d68a4ff959e29b1e7276a05e02e0ed8a60 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Aug 2022 08:53:01 +0200 Subject: [PATCH 123/167] python310Packages.hahomematic: 2022.8.13 -> 2022.8.14 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 912fb17c4e47..888933a709d7 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.13"; + version = "2022.8.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-c2If/ZCbq7wha/wTO9XTOde+UZu+e75mn9zr40xUKm8="; + sha256 = "sha256-//qtDLU5wXE0ZrkxYI+rOgIu9cLwCbeuMtM57cE1CxA="; }; propagatedBuildInputs = [ From 855c555b7b4a3f5f6c667515d30b5972d5684e70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Aug 2022 08:53:49 +0200 Subject: [PATCH 124/167] python310Packages.hahomematic: 2022.8.14 -> 2022.8.15 --- pkgs/development/python-modules/hahomematic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 888933a709d7..4dd83f11192e 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.14"; + version = "2022.8.15"; format = "pyproject"; disabled = pythonOlder "3.9"; From 01cde92abb95d30c118f661f5c9494daf79d79ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Aug 2022 08:54:26 +0200 Subject: [PATCH 125/167] python310Packages.sensor-state-data: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index c9b113c9a121..986436cacbeb 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.3.1"; + version = "2.3.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-jAg/xz7HqXiQuC/fNtUS1gKHdISduHfiWPaWucGAPMY="; + hash = "sha256-aWmcAFBLb8YGmZo5xJl5mwYFg8U30pAyTsqte0BwzVg="; }; nativeBuildInputs = [ From 33a0ad9b36a0ab8c9f1e96af65d4d9bab4fe01a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Aug 2022 08:55:46 +0200 Subject: [PATCH 126/167] python310Packages.bthome-ble: 0.3.6 -> 0.3.6 --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 7a99b1ad0f2c..7337049b6f58 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "0.3.5"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-Us7tKFrTVD5q9ukxV83MrbMTYzp6w35RLgjSQ0cl6Dw="; + hash = "sha256-Y8BKBi5DZYpUtcJS6lLD+dVPhtL2xavQcPymVhdl7Zw="; }; nativeBuildInputs = [ From 7da6a2ac8d3973fdb35ce82ebadcd42623fdd429 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Aug 2022 09:08:32 +0200 Subject: [PATCH 127/167] python310Packages.slowapi: 0.1.5 -> 0.1.6 --- pkgs/development/python-modules/slowapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix index 430c17dfb61e..6880053f4900 100644 --- a/pkgs/development/python-modules/slowapi/default.nix +++ b/pkgs/development/python-modules/slowapi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "slowapi"; - version = "0.1.5"; + version = "0.1.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "laurentS"; repo = pname; rev = "v${version}"; - sha256 = "1wjnlhjfgil86h6i5yij723ncg18rqdprs1q6i68w4msaspwpxg9"; + sha256 = "sha256-3ZkQnroHMCHuTPH/cvi/iWndvdyQ/ZJQ2Qtu1CZyeGg="; }; nativeBuildInputs = [ From 590822ee4f0af03b55bb87b1bd6f967c47aa60ec Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 25 Aug 2022 07:51:38 +0100 Subject: [PATCH 128/167] ucx: pull upstream fix for binutils-2.39 `binutils-2.39` dropped `#define PTR void*` compaibility macro. Without this change build fails as: debug/debug.c: In function 'load_file': debug/debug.c:275:53: error: 'PTR' undeclared (first use in this function) 275 | symcount = bfd_read_minisymbols(file->abfd, 0, (PTR)&file->syms, &size); | ^~~ --- pkgs/development/libraries/ucx/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 4c1728868568..7a5f57b42299 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, doxygen , numactl, rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin , enableCuda ? false , cudatoolkit @@ -22,6 +22,16 @@ in stdenv.mkDerivation rec { sha256 = "sha256-DWiOmqxBAAH8DE7H0teoKyp+m3wYEo652ac7ey43Erg="; }; + patches = [ + # Pull upstream fix for binutils-2.39: + # https://github.com/openucx/ucx/pull/8450 + (fetchpatch { + name = "binutils-2.39.patch"; + url = "https://github.com/openucx/ucx/commit/6b6128efd416831cec3a1820f7d1c8e648b79448.patch"; + sha256 = "sha256-ci00nZG8iOUEFXbmgr/5XkIfiw4eAAdG1wcEYjQSiT8="; + }) + ]; + nativeBuildInputs = [ autoreconfHook doxygen ]; buildInputs = [ From 28433de6b20a6dcd66d2a0f263cef37a936039fc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 25 Aug 2022 07:59:37 +0100 Subject: [PATCH 129/167] kcov: pin to binutils-2.38 until upstream ports to 2.39 Without the change build fails on binutils-2.39 branch as: /build/source/src/parsers/bfd-disassembler.cc: In constructor 'BfdDisassembler::BfdDisassembler()': /build/source/src/parsers/bfd-disassembler.cc:78:38: error: too few arguments to function 'void init_disassemble_info(disassemble_info*, void*, fprintf_ftype, fprintf_styled_ftype)' 78 | init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic); | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/development/tools/analysis/kcov/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index a708c88ee9ee..922524ac4d5b 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -8,7 +8,9 @@ , elfutils , python3 , libiberty -, libopcodes +# TODO: switch back to latest versions when upstream ports +# to binutils-2.39: https://github.com/SimonKagstrom/kcov/issues/381 +, libopcodes_2_38 , runCommand , gcc , rustc @@ -30,7 +32,7 @@ let preConfigure = "patchShebangs src/bin-to-c-source.py"; nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ curl zlib elfutils libiberty libopcodes ]; + buildInputs = [ curl zlib elfutils libiberty libopcodes_2_38 ]; strictDeps = true; From 67843259ad477affa54a9c30e31b75f7fc2762c3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 25 Aug 2022 08:09:14 +0100 Subject: [PATCH 130/167] bpftrace: pull upstream fix for binutils-2.39 Without the change build fails on binutils-2.39 branch as: jit_disasm.c:105:17: error: too few arguments to function 'init_disassemble_info' 105 | init_disassemble_info(&info, stdout, | ^~~~~~~~~~~~~~~~~~~~~ --- pkgs/os-specific/linux/bpftrace/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 6cc9e40bdbf7..2772c587ca89 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , cmake, pkg-config, flex, bison , llvmPackages, elfutils , libbfd, libbpf, libopcodes, bcc @@ -36,6 +36,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg="; }; + patches = [ + # Pull upstream fix for binutils-2.39: + # https://github.com/iovisor/bpftrace/pull/2328 + (fetchpatch { + name = "binutils-2.39.patch"; + url = "https://github.com/iovisor/bpftrace/commit/3be6e708d514d3378a4fe985ab907643ecbc77ee.patch"; + sha256 = "sha256-WWEh8ViGw8053nEG/29KeKEHV5ossWPtL/AAV/l+pnY="; + excludes = [ "CHANGELOG.md" ]; + }) + ]; + buildInputs = with llvmPackages; [ llvm libclang elfutils bcc From 78d14c7a0ef0009b31cda12ab4ebd10e37560a81 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 25 Aug 2022 08:44:58 +0200 Subject: [PATCH 131/167] mimeo: 2021.11 -> 2022.7 Also make license field more specific. --- pkgs/tools/misc/mimeo/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 46e0ce92809a..3888c17da14b 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,12 +1,13 @@ { lib, fetchurl, desktop-file-utils, file, python3Packages }: -python3Packages.buildPythonApplication rec { +let version = "2022.7"; +in python3Packages.buildPythonApplication { pname = "mimeo"; - version = "2021.11"; + inherit version; src = fetchurl { - url = "https://xyne.dev/projects/mimeo/src/${pname}-${version}.tar.xz"; - sha256 = "1fi8svn4hg2hmvv28j026sks1hc0v8wh974g7ixcwfcg2xda6c4p"; + url = "https://xyne.dev/projects/mimeo/src/mimeo-${version}.tar.xz"; + hash = "sha256-xzWPMtlKj35mkE04jcGalbf/94qEOOUi9pvZgSPgdj8="; }; buildInputs = [ file desktop-file-utils ]; @@ -31,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Open files by MIME-type or file name using regular expressions"; homepage = "https://xyne.dev/projects/mimeo/"; - license = [ licenses.gpl2 ]; + license = [ licenses.gpl2Only ]; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; }; From d2ffb555115a3443c3c5444bcb64f875f6f2e973 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 25 Aug 2022 07:26:31 +0000 Subject: [PATCH 132/167] binaryen: add patch from upstream for newer nodejs --- pkgs/development/compilers/binaryen/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 6aeaeac8a1ea..96483df724c7 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { url = "https://github.com/WebAssembly/binaryen/commit/93b8849d9f98ef7ed812938ff0b3219819c2be77.patch"; sha256 = "sha256-Duan/B9A+occ5Lj2SbRX793xIfhzHbdYPI5PyTNCZoU="; }) + # https://github.com/WebAssembly/binaryen/pull/4913 + (fetchpatch { + url = "https://github.com/WebAssembly/binaryen/commit/b70fe755aa4c90727edfd91dc0a9a51febf0239d.patch"; + sha256 = "sha256-kjPLbdiMVQepSJ7J1gK6dRSMI/2SsH39k7W5AMOIrkM="; + }) ]; nativeBuildInputs = [ cmake python3 ]; From 3bf810a750983d8d5fc36e7cb25df60891eb3a55 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 25 Aug 2022 08:30:29 +0100 Subject: [PATCH 133/167] honggfuzz: pin to binutils-2.38 until upstream ports to 2.39 Without the change build fails on binutils-2.39 branch as: linux/bfd.c: In function 'arch_bfdDisasm': linux/bfd.c:231:5: error: too few arguments to function 'init_disassemble_info' 231 | init_disassemble_info(&info, instr, arch_bfdFPrintF); | ^~~~~~~~~~~~~~~~~~~~~ --- pkgs/tools/security/honggfuzz/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 300e41750bab..5d709a4441d3 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper, clang, llvm, libbfd -, libopcodes, libunwind, libblocksruntime }: +{ lib +, stdenv +, fetchFromGitHub +, callPackage +, makeWrapper +, clang +, llvm +# TODO: switch to latest versions when 2.6 release is out to include +# https://github.com/google/honggfuzz/commit/90fdf81006614664ef05e5e3c6f94d91610f11b2 +, libbfd_2_38, libopcodes_2_38 +, libunwind +, libblocksruntime }: stdenv.mkDerivation rec { pname = "honggfuzz"; @@ -21,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm ]; - propagatedBuildInputs = [ libbfd libopcodes libunwind libblocksruntime ]; + propagatedBuildInputs = [ libbfd_2_38 libopcodes_2_38 libunwind libblocksruntime ]; makeFlags = [ "PREFIX=$(out)" ]; From 8df4066b7fdb127d360d0e38b3f959be1d10415c Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 Aug 2022 07:37:51 +0000 Subject: [PATCH 134/167] =?UTF-8?q?n8n:=200.191.0=20=E2=86=92=200.192.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/n8n/node-packages.nix | 321 ++++++++++-------- 1 file changed, 177 insertions(+), 144 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 3f02ea67c8f8..2077c05f593d 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -220,13 +220,13 @@ let sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; }; }; - "@babel/parser-7.18.11" = { + "@babel/parser-7.18.13" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.11"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz"; - sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz"; + sha512 = "dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg=="; }; }; "@babel/runtime-7.18.9" = { @@ -292,13 +292,13 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@js-joda/core-5.3.0" = { + "@js-joda/core-5.3.1" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.3.0.tgz"; - sha512 = "3uObVJ08i0vSbtsTWQ8omy8XUlVDnoest5MOLp6delLUZev8bu++S+3Aua7xWPPWzQt9pcuwDqjEOKslQVDj8g=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.3.1.tgz"; + sha512 = "iHHyIRLEfXLqBN+BkyH8u8imMYr4ihRbFDEk8toqTwUECETVQFCTh2U59Sw2oMoRVaS3XRIb7pyCulltq2jFVA=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -409,13 +409,13 @@ let sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; }; }; - "@oclif/core-1.14.1" = { + "@oclif/core-1.16.0" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.14.1"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.14.1.tgz"; - sha512 = "FgAjfY3Cvzj+i8j08WiD/8adJhZvclFESXAE8Kcp7qglErFKUFK9XY9BS2NyIzLN1NCKc52A64pWunVvPv8g3w=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.16.0.tgz"; + sha512 = "xtqhAbjQHBcz+xQpEHJ3eJEVfRQ4zl41Yw5gw/N+D1jgaIUrHTxCY/sfTvhw93LAQo7B++ozHzSb7DISFXsQFQ=="; }; }; "@oclif/errors-1.3.5" = { @@ -463,13 +463,13 @@ let sha512 = "S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ=="; }; }; - "@opentelemetry/api-1.1.0" = { + "@opentelemetry/api-1.2.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.1.0.tgz"; - sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz"; + sha512 = "0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g=="; }; }; "@rudderstack/rudder-sdk-node-1.0.6" = { @@ -688,22 +688,22 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; - "@types/jsonwebtoken-8.5.8" = { + "@types/jsonwebtoken-8.5.9" = { name = "_at_types_slash_jsonwebtoken"; packageName = "@types/jsonwebtoken"; - version = "8.5.8"; + version = "8.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz"; - sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; + url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz"; + sha512 = "272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg=="; }; }; - "@types/lodash-4.14.183" = { + "@types/lodash-4.14.184" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.183"; + version = "4.14.184"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.183.tgz"; - sha512 = "UXavyuxzXKMqJPEpFPri6Ku5F9af6ZJXUneHhvQJxavrEjuHkFp2YnDWHcxJiG7hk8ZkWqjcyNeW1s/smZv5cw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.184.tgz"; + sha512 = "RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q=="; }; }; "@types/lodash.intersection-4.4.7" = { @@ -733,13 +733,13 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/minimatch-3.0.5" = { + "@types/minimatch-5.1.0" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; - version = "3.0.5"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"; - sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.0.tgz"; + sha512 = "0RJHq5FqDWo17kdHe+SMDJLfxmLaqHbWnqZ6gNKzDvStUlrmx/eKIY17+ifLS1yybo7X86aUshQMlittDOVNnw=="; }; }; "@types/multer-1.4.7" = { @@ -751,13 +751,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.7.6" = { + "@types/node-18.7.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.7.6"; + version = "18.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz"; - sha512 = "EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.7.13.tgz"; + sha512 = "46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw=="; }; }; "@types/node-fetch-2.6.2" = { @@ -868,13 +868,13 @@ let sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ=="; }; }; - "@vue/compiler-sfc-2.7.8" = { + "@vue/compiler-sfc-2.7.10" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.8"; + version = "2.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz"; - sha512 = "2DK4YWKfgLnW9VDR9gnju1gcYRk3flKj8UNsms7fsRmFcg35slVTZEkqwBtX+wJBXaamFfn6NxSsZh3h12Ix/Q=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz"; + sha512 = "55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q=="; }; }; "abbrev-1.1.1" = { @@ -1264,13 +1264,13 @@ let sha512 = "vkyt1+sj6qaD9oMtqqLE2pZ2IcHI66kFx8lpnVuXp55SnNPjKghfOhVfZpaDwDPpY0oVWP3Qu1uHZWxF3E856A=="; }; }; - "aws-sdk-2.1196.0" = { + "aws-sdk-2.1202.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1196.0"; + version = "2.1202.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1196.0.tgz"; - sha512 = "iOGhCY5IqGfHCJ70p0H/uxkXDh/96KanAMfhnGGbIKbpVliuEV7SYxTfsWORaaUHey+N8FE6OMKfzo7F4X+wQg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1202.0.tgz"; + sha512 = "fFoEX+Id8/h/RIHw/gTZl3GnFF+RaXRmXueF7qCOqHm4g7mFOOgUUbc4BLbZ4gCDYRiyxNlGgija/je8EhLNRw=="; }; }; "aws-sign2-0.7.0" = { @@ -1300,6 +1300,15 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; + "axios-0.24.0" = { + name = "axios"; + packageName = "axios"; + version = "0.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; + sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + }; + }; "axios-0.27.2" = { name = "axios"; packageName = "axios"; @@ -2245,13 +2254,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.24.1" = { + "core-js-3.25.0" = { name = "core-js"; packageName = "core-js"; - version = "3.24.1"; + version = "3.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz"; - sha512 = "0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz"; + sha512 = "CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA=="; }; }; "core-util-is-1.0.2" = { @@ -3181,13 +3190,13 @@ let sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; }; - "flatted-3.2.6" = { + "flatted-3.2.7" = { name = "flatted"; packageName = "flatted"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz"; - sha512 = "0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"; + sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; }; }; "fn.name-1.1.0" = { @@ -4315,13 +4324,13 @@ let sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "isbot-3.5.0" = { + "isbot-3.5.2" = { name = "isbot"; packageName = "isbot"; - version = "3.5.0"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.5.0.tgz"; - sha512 = "QOFF7IE7hUdzo8pbhCubeiMzKdLZt+W/UwRZWwg+zghmnqXoMwh2V0bi5UT+oIvoD0IWCWjzAtp30ZrrRwJVCg=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.5.2.tgz"; + sha512 = "7iXQPDK1GBKvWS9N71bNnQ2KMcqwlMhdLkPma/EBn+8ZRkCbhun3yqqS1hmRqysTwJLGvJrUTmRIHibLWrXQQA=="; }; }; "isexe-2.0.0" = { @@ -4630,13 +4639,13 @@ let sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; }; }; - "libphonenumber-js-1.10.12" = { + "libphonenumber-js-1.10.13" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.12"; + version = "1.10.13"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.12.tgz"; - sha512 = "xTFBs3ipFQNmjCUkDj6ZzRJvs97IyazFHBKWtrQrLiYs0Zk0GANob1hkMRlQUQXbJrpQGwnI+/yU4oyD4ohvpw=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.13.tgz"; + sha512 = "b74iyWmwb4GprAUPjPkJ11GTC7KX4Pd3onpJfKxYyY8y9Rbb4ERY47LvCMEDM09WD3thiLDMXtkfDK/AX+zT7Q=="; }; }; "libqp-1.1.0" = { @@ -5269,13 +5278,13 @@ let sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; - "moment-timezone-0.5.34" = { + "moment-timezone-0.5.35" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.34"; + version = "0.5.35"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz"; - sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.35.tgz"; + sha512 = "cY/pBOEXepQvlgli06ttCTKcIf8cD1nmNwOKQQAdHBqYApQSpAqotBMX0RJZNgMp6i0PlZuf1mFtnlyEkwyvFw=="; }; }; "monaco-editor-0.30.1" = { @@ -5350,13 +5359,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mssql-8.1.3" = { + "mssql-8.1.4" = { name = "mssql"; packageName = "mssql"; - version = "8.1.3"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-8.1.3.tgz"; - sha512 = "XGxNNNeKZMMTM71na2M4eLMkPWKckcfZtMiCKR1mLzN887x31NisekNhoBAoRpqizErUZxSW8gSDZc8PVig7Kw=="; + url = "https://registry.npmjs.org/mssql/-/mssql-8.1.4.tgz"; + sha512 = "nqkYYehETWVvFLB9zAGJV2kegOsdtLjUnkHA52aFhlE0ZIoOXC3BL8pLERwFicFypM4i3DX1hYeuM726EEIxjQ=="; }; }; "multer-1.4.5-lts.1" = { @@ -5395,49 +5404,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.131.0" = { + "n8n-core-0.132.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.131.0"; + version = "0.132.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.131.0.tgz"; - sha512 = "XDR0udjVD1t16DZKT3Bx0oFa/qnDjv9KSJRmzUxcTzU2QzcLJ3nv3mi/E7AObUGOvXsKgKRSdsFyWoMcPGb5cQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.132.0.tgz"; + sha512 = "MfP86+vK7fF7T5Qvq55ej5Uq0Lt1kGlCdvfxhukDDIqM+I5UwRjoyaU+8NIN+BEs5jNrfgJtA9iTKGB7pvx9IQ=="; }; }; - "n8n-design-system-0.31.0" = { + "n8n-design-system-0.32.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.31.0"; + version = "0.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.31.0.tgz"; - sha512 = "RvE18Fv4tzvsuDZwszWuEodzVoHcKVxYdAA57qIKZyxLbwtLYe2MoBtmOeKlQBvYaZBIwxLFbPnm2fZvIfMdsA=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.32.0.tgz"; + sha512 = "zyVpImrrIt9KgHn7GTGfAMJD5nD53Y+JYU/m96uoT7QJS3VPoAm22uvPEhn+rhLgFN+4znG24g8cFbt6hX2b7g=="; }; }; - "n8n-editor-ui-0.157.0" = { + "n8n-editor-ui-0.158.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.157.0"; + version = "0.158.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.157.0.tgz"; - sha512 = "SzS6xCIa7D1nDnvV0p6OOOc2s9gxuJNkQ3UzWw3VG6C5vtsBhpKDsUZ2BKlCLip2jLZgeNAFHCmttSmXHmm9Lg=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.158.0.tgz"; + sha512 = "FN6uzwSR6xA4S270uCxTrDJ/gaHAnA3wnV+l7lBwgwvZC0yRJj5S8ogCoSpj/wJt/uKUJ6ufrfh31zSSnN4QsA=="; }; }; - "n8n-nodes-base-0.189.0" = { + "n8n-nodes-base-0.190.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.189.0"; + version = "0.190.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.189.0.tgz"; - sha512 = "8Xdbtz26wpvO5MguARdc/vOflmKyOCazV9rt9OMsT6HJLTFq1U4xgEw85VWB9GQJPbDvXPRPqilTedKgM9POlw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.190.0.tgz"; + sha512 = "jdL3V9FGZA/xQIFtQhdZ5BUCjUyH4IwPDYuTd3epu1wKW0SdnUNjATiBF1AjX0/+axZjTLwm43gSN3JA8ZK+Wg=="; }; }; - "n8n-workflow-0.113.0" = { + "n8n-workflow-0.114.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.113.0"; + version = "0.114.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.113.0.tgz"; - sha512 = "ajeZR9etpx9Tjy10X/bbmKYEBp8edUMUrUTL5qLmQLEODoua/NV7C7NCZwlVUtsTbIeTq9Osas2tYhDI74Cubw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.114.0.tgz"; + sha512 = "fLYrprWB8P3GyJmKN/St8H7t0DxLQv/ozuVjYeWlXkJoDbKXT7S6OCzAx55YhUF6zf1MSQT1+UR3YVR20m0utw=="; }; }; "named-placeholders-1.1.2" = { @@ -6268,13 +6277,13 @@ let sha512 = "7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA=="; }; }; - "pg-8.7.3" = { + "pg-8.8.0" = { name = "pg"; packageName = "pg"; - version = "8.7.3"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.7.3.tgz"; - sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz"; + sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; }; }; "pg-connection-string-2.5.0" = { @@ -6304,13 +6313,13 @@ let sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; - "pg-pool-3.5.1" = { + "pg-pool-3.5.2" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz"; - sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz"; + sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; }; }; "pg-promise-10.11.1" = { @@ -6475,6 +6484,15 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; + "posthog-node-1.3.0" = { + name = "posthog-node"; + packageName = "posthog-node"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-1.3.0.tgz"; + sha512 = "2+VhqiY/rKIqKIXyvemBFHbeijHE25sP7eKltnqcFqAssUE6+sX6vusN9A4luzToOqHQkUZexiCKxvuGagh7JA=="; + }; + }; "prelude-ls-1.1.2" = { name = "prelude-ls"; packageName = "prelude-ls"; @@ -7411,13 +7429,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.12.0" = { + "simple-git-3.13.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.12.0.tgz"; - sha512 = "cy1RSRFHGZSrlYa3MnUuNVOXLUdifEZD2X8+AZjg8mKCdRvtCFSga6acq5N2g0ggb8lH3jBi369MrFZ+Y6sfsA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.13.0.tgz"; + sha512 = "VYrs3joeHvWGcN3K135RpGpPjm4AHYeOrclwew6LlfHgq6ozQYIW2yMnmjf4PCgVOuSYCbXkdUjyiFawuJz8MA=="; }; }; "simple-lru-cache-0.0.2" = { @@ -7465,13 +7483,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.12" = { + "snowflake-sdk-1.6.13" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.12"; + version = "1.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.12.tgz"; - sha512 = "nkwtsWsZr4KrloLgpMpLgCnJIxfcuWlD4sqR53kn8BQRmhOi6cSBgnvZmoYcFvW2arVvfHh/Dc3vOQ/4OuRSLg=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.13.tgz"; + sha512 = "X/eiT4v/yw6+aLdEJK85te4lvkB45lkTzad2CtJdofzxWqtfi1CB2hafTJTfXoDKKJTxLTyYVo+zIYhvhcEarA=="; }; }; "socks-2.7.0" = { @@ -7798,13 +7816,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.13.2" = { + "swagger-ui-dist-4.14.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.13.2"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.13.2.tgz"; - sha512 = "jHL6UyIYpvEI7NsuWd0R3hJaPQTg6Oo4qSBo+oVfOEkv6rrQm/475RGSMmZgV6ajp+Sgrp9CqrDjQYAgQqiv1A=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.14.0.tgz"; + sha512 = "TBzhheU15s+o54Cgk9qxuYcZMiqSm/SkvKnapoGHOF66kz0Y5aGjpzj5BT/vpBbn6rTPJ9tUYXQxuDWfsjiGMw=="; }; }; "swagger-ui-express-4.5.0" = { @@ -8050,13 +8068,13 @@ let sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; }; }; - "tough-cookie-4.0.0" = { + "tough-cookie-4.1.1" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz"; - sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.1.tgz"; + sha512 = "Ns3k8QxkEzIfLZbRwLOrMPDqRa1BEAl4BzNNAOYY4BhBmEkf+HvP467F4NrD9loK3NcYflWOpUH3LJg0ehq/rQ=="; }; }; "tr46-0.0.3" = { @@ -8257,6 +8275,15 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; + "universalify-0.2.0" = { + name = "universalify"; + packageName = "universalify"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz"; + sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="; + }; + }; "universalify-2.0.0" = { name = "universalify"; packageName = "universalify"; @@ -8482,13 +8509,13 @@ let sha512 = "AuECTSvwu2OHLAZYhG716YzwodKCIJxB6u1zG7PgSQwIgAlEaoXH52bxdcvT8GkGjnYK7r7yWDW0m0sOsPuBjQ=="; }; }; - "vue-2.7.8" = { + "vue-2.7.10" = { name = "vue"; packageName = "vue"; - version = "2.7.8"; + version = "2.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.8.tgz"; - sha512 = "ncwlZx5qOcn754bCu5/tS/IWPhXHopfit79cx+uIlLMyt3vCMGcXai5yCG5y+I6cDmEj4ukRYyZail9FTQh7lQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz"; + sha512 = "HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg=="; }; }; "vue-color-2.8.1" = { @@ -8938,10 +8965,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.191.0"; + version = "0.192.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.191.0.tgz"; - sha512 = "HnnhsQqWcx4azUB9DZHtdT+nJBr7gWEr5c/sr7PFrcZwLoF1fW8ydxTGj6weyl62GggrE+RBR4MuKRVRNY7hcg=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.192.0.tgz"; + sha512 = "5Rv7u7cMKaThA6py4MSa/nIPmWEmyIa9x2r0xxMhaMFzsfbRWDokXYdsYVW+/ICSi6frZLFFjCmhSP5Evj/YyQ=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-8.0.0" @@ -8971,9 +8998,9 @@ in (sources."@azure/core-http-2.2.6" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tough-cookie-4.0.0" + sources."tough-cookie-4.1.1" sources."tslib-2.4.0" - sources."universalify-0.1.2" + sources."universalify-0.2.0" ]; }) sources."@azure/core-http-compat-1.3.0" @@ -9031,7 +9058,7 @@ in sources."tslib-2.4.0" ]; }) - sources."@babel/parser-7.18.11" + sources."@babel/parser-7.18.13" sources."@babel/runtime-7.18.9" sources."@colors/colors-1.5.0" (sources."@dabh/diagnostics-2.0.3" // { @@ -9050,7 +9077,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."@js-joda/core-5.3.0" + sources."@js-joda/core-5.3.1" sources."@jsdevtools/ono-7.1.3" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -9066,7 +9093,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."@oclif/core-1.14.1" // { + (sources."@oclif/core-1.16.0" // { dependencies = [ (sources."chalk-4.1.2" // { dependencies = [ @@ -9101,7 +9128,7 @@ in ]; }) sources."@oclif/screen-3.0.2" - sources."@opentelemetry/api-1.1.0" + sources."@opentelemetry/api-1.2.0" sources."@rudderstack/rudder-sdk-node-1.0.6" sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.6.0" @@ -9124,14 +9151,14 @@ in sources."@types/glob-7.2.0" sources."@types/json-diff-0.5.2" sources."@types/json-schema-7.0.11" - sources."@types/jsonwebtoken-8.5.8" - sources."@types/lodash-4.14.183" + sources."@types/jsonwebtoken-8.5.9" + sources."@types/lodash-4.14.184" sources."@types/lodash.intersection-4.4.7" sources."@types/lossless-json-1.0.1" sources."@types/mime-3.0.1" - sources."@types/minimatch-3.0.5" + sources."@types/minimatch-5.1.0" sources."@types/multer-1.4.7" - sources."@types/node-18.7.6" + sources."@types/node-18.7.13" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -9148,7 +9175,7 @@ in sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" sources."@types/yamljs-0.2.31" - sources."@vue/compiler-sfc-2.7.8" + sources."@vue/compiler-sfc-2.7.10" sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."access-control-1.0.1" @@ -9207,7 +9234,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.5" - (sources."aws-sdk-2.1196.0" // { + (sources."aws-sdk-2.1202.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -9375,7 +9402,7 @@ in sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.24.1" + sources."core-js-3.25.0" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."cron-1.7.2" @@ -9505,7 +9532,7 @@ in ]; }) sources."find-up-4.1.0" - sources."flatted-3.2.6" + sources."flatted-3.2.7" sources."fn.name-1.1.0" sources."follow-redirects-1.15.1" sources."for-each-0.3.3" @@ -9666,7 +9693,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isbot-3.5.0" + sources."isbot-3.5.2" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isstream-0.1.2" @@ -9714,7 +9741,7 @@ in sources."iconv-lite-0.6.3" ]; }) - sources."libphonenumber-js-1.10.12" + sources."libphonenumber-js-1.10.13" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-4.0.0" @@ -9814,7 +9841,7 @@ in ]; }) sources."moment-2.29.4" - sources."moment-timezone-0.5.34" + sources."moment-timezone-0.5.35" sources."monaco-editor-0.30.1" sources."mongodb-3.7.3" sources."moo-0.5.1" @@ -9831,7 +9858,7 @@ in ]; }) sources."ms-2.1.2" - (sources."mssql-8.1.3" // { + (sources."mssql-8.1.4" // { dependencies = [ sources."commander-9.4.0" ]; @@ -9845,15 +9872,15 @@ in ]; }) sources."mz-2.7.0" - sources."n8n-core-0.131.0" - sources."n8n-design-system-0.31.0" - sources."n8n-editor-ui-0.157.0" - (sources."n8n-nodes-base-0.189.0" // { + sources."n8n-core-0.132.0" + sources."n8n-design-system-0.32.0" + sources."n8n-editor-ui-0.158.0" + (sources."n8n-nodes-base-0.190.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.113.0" + sources."n8n-workflow-0.114.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -9972,11 +9999,11 @@ in }) sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - sources."pg-8.7.3" + sources."pg-8.8.0" sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" - sources."pg-pool-3.5.1" + sources."pg-pool-3.5.2" (sources."pg-promise-10.11.1" // { dependencies = [ sources."pg-8.7.1" @@ -10003,6 +10030,12 @@ in sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" + (sources."posthog-node-1.3.0" // { + dependencies = [ + sources."axios-0.24.0" + sources."ms-2.1.3" + ]; + }) sources."prelude-ls-1.1.2" sources."printj-1.1.2" sources."process-0.11.10" @@ -10149,7 +10182,7 @@ in }) sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.12.0" + sources."simple-git-3.13.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" @@ -10159,7 +10192,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."snowflake-sdk-1.6.12" // { + (sources."snowflake-sdk-1.6.13" // { dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" @@ -10216,7 +10249,7 @@ in sources."supports-color-7.2.0" sources."supports-hyperlinks-2.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.13.2" + sources."swagger-ui-dist-4.14.0" sources."swagger-ui-express-4.5.0" (sources."tar-6.1.11" // { dependencies = [ @@ -10344,7 +10377,7 @@ in ]; }) sources."vm2-3.9.10" - sources."vue-2.7.8" + sources."vue-2.7.10" sources."vue-color-2.8.1" sources."vue-fragment-1.5.1" sources."vue-i18n-8.27.2" From 79b926ebb609c4b0ff38845d5952ff2672e52010 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Aug 2022 10:08:46 +0200 Subject: [PATCH 135/167] python310Packages.twilio: 7.12.1 -> 7.13.0 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 078f6dbde76b..f20ca0436e47 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.12.1"; + version = "7.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-gM4P65YMT61kCkvUJPc0fvs+CNYGdgD1dkJ8h3qYzWs="; + hash = "sha256-FlleulcjroFyzI6JWr1sUe/jgXlevHwzZZpyAvCQRu8="; }; propagatedBuildInputs = [ From 3c0eff60c09f4f1923fbf9c394cf23d1a7ad47fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Aug 2022 10:10:46 +0200 Subject: [PATCH 136/167] python310Packages.weconnect: 0.47.0 -> 0.47.1 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 734f6ed37a45..9dbc68140e80 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.47.0"; + version = "0.47.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-wQBl8oxU+Dfsgs+udxcb01hquny+AFKnu4J7AULYOdc="; + hash = "sha256-qxE8hX6HBmP6s+NivwSgbrPWzUDr8RW9HAyQ21WTiZE="; }; propagatedBuildInputs = [ From 1cd8fb018195d5331883605c1bcba9b54231e593 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Aug 2022 10:10:57 +0200 Subject: [PATCH 137/167] python310Packages.weconnect-mqtt: 0.39.1 -> 0.39.2 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 672e761562f3..9ebe6caea218 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.39.1"; + version = "0.39.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-Mmv4rIABg8jlk7a2VYn3lozCdZtAy3w5tK+3z8bwqZA="; + hash = "sha256-htLyf7ouy/psG/BJr3nATQjd+bTFETjGEWQYs2uMtSM="; }; propagatedBuildInputs = [ From e88391420f76b7602de9580fe87f899aa6281ca9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Aug 2022 10:19:35 +0200 Subject: [PATCH 138/167] python310Packages.pubnub: 6.5.1 -> 7.0.0 --- pkgs/development/python-modules/pubnub/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 80db92ca6b2b..c5c0b9fe4ec4 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.5.1"; + version = "7.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "python"; - rev = "refs/tags/v${version}"; - hash = "sha256-+x58aEvemav0Pz2jeICLFG36FTtZCu5dk/arb+j5nmo="; + rev = "refs/tags/${version}"; + hash = "sha256-+uW6fsYsn/3PGK4wTQLKcoq+NFNI8SjJ9cL6Q3Fh2uQ="; }; propagatedBuildInputs = [ From 1307bb7a2ed8bf45995a7a73a84c56a0f5044962 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 25 Aug 2022 12:13:09 +0200 Subject: [PATCH 139/167] git-blame-ignore-revs: fix commit hash After #184931 was merged by rebasing, the commit hash changed. --- .git-blame-ignore-revs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 9564ce907fee..bf350b0cf8b3 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -38,4 +38,4 @@ d08ede042b74b8199dc748323768227b88efcf7c d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3 # fix indentation in meteor default.nix -f76b359e4a55267ddd4e9e149e7cc13ae5cad98a +a37a6de881ec4c6708e6b88fd16256bbc7f26bbd From d4e573cde41dd92d897c9bfaa46498aa10e460c2 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 25 Aug 2022 13:10:44 +0200 Subject: [PATCH 140/167] transifex-client: Fix build --- pkgs/tools/text/transifex-client/default.nix | 32 ++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 1174c2f382e3..ae23e5775592 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -1,24 +1,36 @@ -{ lib, buildPythonApplication, fetchPypi -, python-slugify, requests, urllib3, six, setuptools, GitPython }: +{ lib +, buildPythonApplication +, fetchPypi +, python-slugify +, requests +, urllib3 +, six +, setuptools +, GitPython +, pythonRelaxDepsHook +}: buildPythonApplication rec { pname = "transifex-client"; version = "0.14.4"; - propagatedBuildInputs = [ - urllib3 requests python-slugify six setuptools GitPython - ]; - src = fetchPypi { inherit pname version; sha256 = "11dc95cefe90ebf0cef3749c8c7d85b9d389c05bd0e3389bf117685df562bd5c"; }; # https://github.com/transifex/transifex-client/issues/323 - prePatch = '' - substituteInPlace requirements.txt \ - --replace "python-slugify<5.0.0" "python-slugify" - ''; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "python-slugify" ]; + + propagatedBuildInputs = [ + GitPython + python-slugify + requests + setuptools + six + urllib3 + ]; # Requires external resources doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 087d384479b7..b6ff5da1d143 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11585,7 +11585,7 @@ with pkgs; transcrypt = callPackage ../applications/version-management/git-and-tools/transcrypt { }; - transifex-client = python3.pkgs.callPackage ../tools/text/transifex-client { }; + transifex-client = python39.pkgs.callPackage ../tools/text/transifex-client { }; translate-shell = callPackage ../applications/misc/translate-shell { }; From 5e9296c30ac0e5ec2d39104ef51a4de6e3f955b3 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 20 Aug 2022 13:21:59 +0200 Subject: [PATCH 141/167] python310Packages.mne-python: 1.0.3 -> 1.1.0 --- .../python-modules/mne-python/default.nix | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index cfebe532375f..c1bd721fc118 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -1,53 +1,63 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 , numpy , scipy , pytestCheckHook -, pytest-cov , pytest-timeout , h5py , matplotlib , nibabel , pandas , scikit-learn +, decorator +, jinja2 +, pooch +, tqdm +, setuptools }: buildPythonPackage rec { pname = "mne-python"; - version = "1.0.3"; - - disabled = isPy27; + version = "1.1.0"; # PyPI dist insufficient to run tests src = fetchFromGitHub { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-6eDS/hKqEQqUxJtnfsPhxw9b4p5CC1ifnxVCRBmVVA8="; + sha256 = "sha256-p4brwO6uERM2vJdkJ34GdeAKk07QeVEmQrZMPcDjI2I="; }; - propagatedBuildInputs = [ numpy scipy ]; - - # all tests pass, but Pytest hangs afterwards - probably some thread hasn't terminated - doCheck = false; - checkInputs = [ - pytestCheckHook - pytest-cov - pytest-timeout - h5py + propagatedBuildInputs = [ + decorator + jinja2 matplotlib + numpy + pooch + scipy + setuptools + tqdm + ]; + + checkInputs = [ + h5py nibabel pandas + pytestCheckHook scikit-learn + pytest-timeout ]; + preCheck = '' export HOME=$TMP export MNE_SKIP_TESTING_DATASET_TESTS=true export MNE_SKIP_NETWORK_TESTS=1 ''; + # all tests pass, but Pytest hangs afterwards - probably some thread hasn't terminated + doCheck = false; + pythonImportsCheck = [ "mne" ]; meta = with lib; { From 195833f20c850013446ada0cec4413f0c38d71f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 14 Aug 2022 20:03:31 +1000 Subject: [PATCH 142/167] tesseract5: fix darwin compilation --- pkgs/applications/graphics/tesseract/default.nix | 6 ++++-- pkgs/applications/graphics/tesseract/tesseract5.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index dc5f97318708..70649d633b85 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,9 +1,11 @@ -{ callPackage, lowPrio }: +{ callPackage, lowPrio, Accelerate, CoreGraphics, CoreVideo}: let base3 = callPackage ./tesseract3.nix {}; base4 = callPackage ./tesseract4.nix {}; - base5 = callPackage ./tesseract5.nix {}; + base5 = callPackage ./tesseract5.nix { + inherit Accelerate CoreGraphics CoreVideo; + }; languages = callPackage ./languages.nix {}; in { diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index dd4d6cb2791d..244eb1e53e40 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config -, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }: +, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch +, Accelerate, CoreGraphics, CoreVideo +}: stdenv.mkDerivation rec { pname = "tesseract"; @@ -27,6 +29,10 @@ stdenv.mkDerivation rec { icu pango opencl-headers + ] ++ lib.optionals stdenv.isDarwin [ + Accelerate + CoreGraphics + CoreVideo ]; meta = { @@ -34,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ anselmschueler ]; - platforms = with lib.platforms; linux ++ darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30dcfec3cc20..c08e0e514eca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30829,7 +30829,9 @@ with pkgs; termtosvg = callPackage ../tools/misc/termtosvg { }; - inherit (callPackage ../applications/graphics/tesseract {}) + inherit (callPackage ../applications/graphics/tesseract { + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; + }) tesseract3 tesseract4 tesseract5; From 05958b228b49cfe97f7faf51de4aaf3ede31894e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 2 Aug 2022 20:39:08 +0200 Subject: [PATCH 143/167] nixos/console: detect unicode properly --- nixos/modules/config/console.nix | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index 7bcbf54cedd6..493411d61836 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -8,14 +8,23 @@ let makeColor = i: concatMapStringsSep "," (x: "0x" + substring (2*i) 2 x); - isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale); + isUnicode = '' \ + LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive \ + LANG=${config.i18n.defaultLocale} \ + LC_IDENTIFICATION=${config.i18n.defaultLocale} \ + locale -k identification-codeset | grep -i UTF-8 \ + ''; optimizedKeymap = pkgs.runCommand "keymap" { - nativeBuildInputs = [ pkgs.buildPackages.kbd ]; + nativeBuildInputs = with pkgs.buildPackages; [ kbd locale ]; LOADKEYS_KEYMAP_PATH = "${consoleEnv pkgs.kbd}/share/keymaps/**"; preferLocalBuild = true; } '' - loadkeys -b ${optionalString isUnicode "-u"} "${cfg.keyMap}" > $out + if ${isUnicode} ; then + loadkeys -b -u "${cfg.keyMap}" > $out + else + loadkeys -b "${cfg.keyMap}" > $out + fi ''; # Sadly, systemd-vconsole-setup doesn't support binary keymaps. @@ -130,7 +139,7 @@ in }) (mkIf setVconsole (mkMerge [ - { environment.systemPackages = [ pkgs.kbd ]; + { environment.systemPackages = with pkgs; [ kbd locale ]; # Let systemd-vconsole-setup.service do the work of setting up the # virtual consoles. @@ -139,8 +148,13 @@ in environment.etc.kbd.source = "${consoleEnv pkgs.kbd}/share"; boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore '' - kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console - printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console + if ${isUnicode} ; then + kbd_mode -u -C /dev/console + printf "\033%%G" >> /dev/console + else + kbd_mode -a -C /dev/console + printf "\033%%@" >> /dev/console + fi loadkmap < ${optimizedKeymap} ${optionalString cfg.earlySetup '' From cbf9a129d273d203a98c2fefe8bda52af42ab5e3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 25 Aug 2022 21:33:06 +1000 Subject: [PATCH 144/167] gh: 2.14.6 -> 2.14.7 https://github.com/cli/cli/releases/tag/v2.14.7 --- .../version-management/git-and-tools/gh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 4d1f9e8ff892..2da32a6dadc8 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.14.6"; + version = "2.14.7"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-lortdE+qp+ejxu/QJKz+wNzaNqxcG83nHZi1txblr7E="; + sha256 = "sha256-IOpMq9Oyy51UzaPdkGQJQ15jr1JH6iMlvozurIQy0SY="; }; vendorSha256 = "sha256-ZgUU9G9BLjGSDvS15fmSpvGD0POKuX9mTF9+XxYciZI="; From 4d18b3a781ee3f1c2aeb7d142e1679e97f2c9174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 24 Aug 2022 15:57:58 -0300 Subject: [PATCH 145/167] nvidia_x11_vulkan_beta: 470.62.13 -> 515.49.14 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index bc66e3c8b7eb..3aa0ecaa6cd4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -50,14 +50,14 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "470.62.13"; - persistencedVersion = "470.86"; - settingsVersion = "470.86"; - sha256_64bit = "sha256-itBFNPMy+Nn0g8V8qdkRb+ELHj57GRso1lXhPHUxKVI="; - settingsSha256 = "sha256-fq6RlD6g3uylvvTjE4MmaQwxPJYU0u6IMfpPVzks0tI="; - persistencedSha256 = "sha256-eHvauvh8Wd+b8DK6B3ZWNjoWGztupWrR8iog9ok58io="; + version = "515.49.14"; + persistencedVersion = "515.48.07"; + settingsVersion = "515.48.07"; + sha256_64bit = "sha256-xNaqTeIfYQIdCxo841rQ87RQc+br5OhP6K12o4V3I18="; + openSha256 = "sha256-4KvOOAR0RQkHTFJkkG32y6uOSHB85Lh6PyVSgRjU1l4="; + settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU="; + persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY="; url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; - broken = kernel.kernelAtLeast "5.17"; }; # Update note: From 29c68b0600fef97b80194182b765b661d19acdf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 24 Aug 2022 16:03:34 -0300 Subject: [PATCH 146/167] nvidia_x11: expose all open variants --- pkgs/top-level/linux-kernels.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5c78eb12f105..ba84eca34c81 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -364,9 +364,12 @@ in { nvidia_x11_production = nvidiaPackages.production; nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; - # this is not a replacement for nvidia_x11 + # this is not a replacement for nvidia_x11* # only the opensource kernel driver exposed for hydra to build - nvidia_x11_beta_open = nvidiaPackages.beta.open; + nvidia_x11_beta_open = nvidiaPackages.beta.open; + nvidia_x11_production_open = nvidiaPackages.production.open; + nvidia_x11_stable_open = nvidiaPackages.stable.open; + nvidia_x11_vulkan_beta_open = nvidiaPackages.vulkan_beta.open; openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; From 27d72f5abb99ef06a309d8e36ac042f8686ae5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 24 Aug 2022 16:21:07 -0300 Subject: [PATCH 147/167] nvidia_x11: mark broken --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 +++++++- pkgs/os-specific/linux/nvidia-x11/generic.nix | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 3aa0ecaa6cd4..598ac6a4c451 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -13,6 +13,8 @@ let kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; + kernelModVersion = lib.versions.majorMinor kernel.modDirVersion; + selectHighestVersion = a: b: if lib.versionOlder a.version b.version then b else a; @@ -30,6 +32,8 @@ rec { openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI="; settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg="; persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY="; + + brokenOpen = kernelModVersion == "5.4" && kernel.isHardened; }; latest = selectHighestVersion production (generic { @@ -58,6 +62,8 @@ rec { settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU="; persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY="; url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; + + broken = kernelModVersion == "5.4" && kernel.isHardened; }; # Update note: @@ -84,7 +90,7 @@ rec { patches = let patch390 = o: - (lib.optional ((lib.versions.majorMinor kernel.modDirVersion) == o.version) (fetchpatch { + (lib.optional (kernelModVersion == o.version) (fetchpatch { inherit (o) sha256; url = "https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/kernel-${o.version}.patch"; })); diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index d6dcc7ad6cd0..b694dc1fd0ca 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -15,6 +15,7 @@ , prePatch ? "" , patches ? [] , broken ? false +, brokenOpen ? broken }@args: { lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl @@ -104,8 +105,9 @@ let passthru = { open = mapNullable (hash: callPackage ./open.nix { - inherit hash broken; + inherit hash; nvidia_x11 = self; + broken = brokenOpen; }) openSha256; settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) { withGtk2 = preferGtk2; From 1e0e5ad4390d2548d83628a734f4ffaee37d7d93 Mon Sep 17 00:00:00 2001 From: Zenithal Date: Thu, 25 Aug 2022 20:15:58 +0800 Subject: [PATCH 148/167] mill: 0.10.6 -> 0.10.7 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index faeafa6e9528..e654c32bd56f 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.6"; + version = "0.10.7"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-4lbW755RLgWyihjeb/KB5CwQsBwXBzDT4PUSyBQiSpE="; + hash = "sha256-pRyuTxQWRnGBTasdskIZ0F1LGgwE+Y5ksHsE1Rmp1Bg="; }; nativeBuildInputs = [ makeWrapper ]; From 8d5c4efbf8754963a6b0253903fd5f240f989fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Thu, 25 Aug 2022 10:07:21 -0300 Subject: [PATCH 149/167] obs-vkcapture: 1.1.6 -> 1.2.0 --- pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index e3710828cb34..1c7027b9f47c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "obs-vkcapture"; - version = "1.1.6"; + version = "1.2.0"; src = fetchFromGitHub { owner = "nowrep"; repo = pname; rev = "v${version}"; - hash = "sha256-TNXoeNktMde7GfFhZRHXlARdnkJTY4oNZTKA4hu7e3Q="; + hash = "sha256-yaN0am24p9gC+s64Rop+jQ3952UOtZund/KttnVxP48="; }; nativeBuildInputs = [ cmake ninja ]; From 6ea77eef79d135c3fdb2dd06c5da460432b69b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Thu, 25 Aug 2022 10:16:02 -0300 Subject: [PATCH 150/167] obs-vkcapture: added pedrohlc to maintainers --- pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 1c7027b9f47c..9b216c9e4ceb 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OBS Linux Vulkan/OpenGL game capture"; homepage = "https://github.com/nowrep/obs-vkcapture"; - maintainers = with maintainers; [ atila ]; + maintainers = with maintainers; [ atila pedrohlc ]; license = licenses.gpl2Only; platforms = platforms.linux; }; From 4db467f7e921cfe26c499076ea23044bb8a60ad6 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 20 Jun 2022 09:56:34 +0200 Subject: [PATCH 151/167] lib/systems: add MicroBlaze architectures --- lib/systems/default.nix | 2 ++ lib/systems/doubles.nix | 14 ++++++++------ lib/systems/inspect.nix | 1 + lib/systems/parse.nix | 3 +++ lib/tests/systems.nix | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 8f579368d6d3..eaee4ffa2874 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -121,6 +121,8 @@ rec { else if final.isAarch64 then "arm64" else if final.isx86_32 then "i386" else if final.isx86_64 then "x86_64" + # linux kernel does not distinguish microblaze/microblazeel + else if final.isMicroBlaze then "microblaze" else if final.isMips32 then "mips" else if final.isMips64 then "mips" # linux kernel does not distinguish mips32/mips64 else if final.isPower then "powerpc" diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 90a6eb9f35c9..6b2ea63624af 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,9 +26,10 @@ let # Linux "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" - "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "mips64el-linux" - "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" - "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" + "armv7l-linux" "i686-linux" "m68k-linux" "microblaze-linux" + "microblazeel-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux" + "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" + "s390x-linux" "x86_64-linux" # MMIXware "mmix-mmixware" @@ -40,9 +41,9 @@ let # none "aarch64_be-none" "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" - "msp430-none" "or1k-none" "m68k-none" "powerpc-none" "powerpcle-none" - "riscv32-none" "riscv64-none" "rx-none" "s390-none" "s390x-none" "vc4-none" - "x86_64-none" + "microblaze-none" "microblazeel-none" "msp430-none" "or1k-none" "m68k-none" + "powerpc-none" "powerpcle-none" "riscv32-none" "riscv64-none" "rx-none" + "s390-none" "s390x-none" "vc4-none" "x86_64-none" # OpenBSD "i686-openbsd" "x86_64-openbsd" @@ -71,6 +72,7 @@ in { x86 = filterDoubles predicates.isx86; i686 = filterDoubles predicates.isi686; x86_64 = filterDoubles predicates.isx86_64; + microblaze = filterDoubles predicates.isMicroBlaze; mips = filterDoubles predicates.isMips; mmix = filterDoubles predicates.isMmix; riscv = filterDoubles predicates.isRiscV; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index dbffca0300b5..54d398018e0b 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -17,6 +17,7 @@ rec { isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isAarch = { cpu = { family = "arm"; }; }; + isMicroBlaze = { cpu = { family = "microblaze"; }; }; isMips = { cpu = { family = "mips"; }; }; isMips32 = { cpu = { family = "mips"; bits = 32; }; }; isMips64 = { cpu = { family = "mips"; bits = 64; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 9d2571c993a9..be5b1a0892bb 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -88,6 +88,9 @@ rec { i686 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i686"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; arch = "x86-64"; }; + microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; }; + microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 46e7bd992f1e..4175dc68841e 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -31,7 +31,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; From bec06f5bba70771aefa58891e6e055314d2044ec Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 20 Jun 2022 09:57:03 +0200 Subject: [PATCH 152/167] cc-wrapper: disable stackprotector for MicroBlaze This option doesn't seem to be supported in the cross-compiler --- pkgs/build-support/cc-wrapper/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b9dc9fc9a723..ec6bd7855972 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -496,6 +496,8 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" format" '' + optionalString targetPlatform.isWasm '' hardening_unsupported_flags+=" stackprotector fortify pie pic" + '' + optionalString targetPlatform.isMicroBlaze '' + hardening_unsupported_flags+=" stackprotector" '' + optionalString (libc != null && targetPlatform.isAvr) '' From 784686d06c62639c8b5ef6e78524b0d74db85433 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 25 Aug 2022 18:10:47 +0200 Subject: [PATCH 153/167] tree-sitter: Package query files used for syntax highlighting --- pkgs/development/tools/parsing/tree-sitter/grammar.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index 110f37a5aa89..a4d8d7324f99 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { runHook preInstall mkdir $out mv parser $out/ + if [[ -d "$src/queries" ]]; then + cp -r $src/queries $out/ + fi runHook postInstall ''; } From faee7f1311c5dfc2aa80c29ac2558e9f6a4ba792 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 25 Aug 2022 18:40:41 +0200 Subject: [PATCH 154/167] emacs.pkgs.tree-sitter-langs: Link to each grammar's query files Create symlinks to the query files provided by the grammars. This makes syntax highlighting works properly for languages which tree-sitter-langs doesn't provide query files and updates the ones it provides to the latest upstream files. --- .../tree-sitter-langs/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix index e62a37565c83..cb4cec172bac 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix @@ -17,7 +17,8 @@ let inherit (melpaStablePackages) tree-sitter-langs; libSuffix = if stdenv.isDarwin then "dylib" else "so"; - soName = g: lib.removeSuffix "-grammar" (lib.removePrefix "tree-sitter-" g.pname) + "." + libSuffix; + langName = g: lib.removeSuffix "-grammar" (lib.removePrefix "tree-sitter-" g.pname); + soName = g: langName g + "." + libSuffix; grammarDir = runCommand "emacs-tree-sitter-grammars" { # Fake same version number as upstream language bundle to prevent triggering runtime downloads @@ -28,6 +29,7 @@ let '' + lib.concatStringsSep "\n" (map ( g: "ln -s ${g}/parser $out/langs/bin/${soName g}") plugins )); + siteDir = "$out/share/emacs/site-lisp/elpa/${tree-sitter-langs.pname}-${tree-sitter-langs.version}"; in melpaStablePackages.tree-sitter-langs.overrideAttrs(old: { @@ -36,6 +38,19 @@ melpaStablePackages.tree-sitter-langs.overrideAttrs(old: { --replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${grammarDir}/langs\"" ''; + postInstall = + old.postInstall or "" + + lib.concatStringsSep "\n" + (map + (g: '' + if [[ -d "${g}/queries" ]]; then + mkdir -p ${siteDir}/queries/${langName g}/ + for f in ${g}/queries/*; do + ln -sfn "$f" ${siteDir}/queries/${langName g}/ + done + fi + '') plugins); + passthru = old.passthru or {} // { inherit plugins; withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; }; From 59e7439715d441fe4ea8313049ea23d15081443d Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Sun, 17 Apr 2022 10:54:14 -0400 Subject: [PATCH 155/167] maintainers: add rehno-lindeque --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2da9655e1599..2a2366c2a536 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10948,6 +10948,12 @@ githubId = 7226587; name = "Théophane Hufschmitt"; }; + rehno-lindeque = { + email = "rehno.lindeque+code@gmail.com"; + github = "rehno-lindeque"; + githubId = 337811; + name = "Rehno Lindeque"; + }; relrod = { email = "ricky@elrod.me"; github = "relrod"; From 75424ac7939adcdf62cf1a5296f82766a8dfe5d1 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Fri, 15 Apr 2022 09:18:15 -0400 Subject: [PATCH 156/167] hw-probe: init at 1.6.4 --- pkgs/tools/system/hw-probe/default.nix | 140 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 144 insertions(+) create mode 100644 pkgs/tools/system/hw-probe/default.nix diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix new file mode 100644 index 000000000000..72bdbe368af0 --- /dev/null +++ b/pkgs/tools/system/hw-probe/default.nix @@ -0,0 +1,140 @@ +{ config +, stdenv +, lib +, fetchFromGitHub +, makeWrapper +, makePerlPath + +# Perl libraries +, LWP +, LWPProtocolHttps +, HTTPMessage +, HTTPDate +, URI +, TryTiny + +# Required +, coreutils +, curl # Preferred to using the Perl HTTP libs - according to hw-probe. +, dmidecode +, edid-decode +, gnugrep +, gnutar +, hwinfo +, iproute2 +, kmod +, pciutils +, perl +, smartmontools +, usbutils +, xz + +# Conditionally recommended +, systemdSupport ? stdenv.isLinux +, systemd + +# Recommended +, withRecommended ? true # Install recommended tools +, mcelog +, hdparm +, acpica-tools +, drm_info +, mesa-demos +, memtester +, sysstat +, cpuid +, util-linuxMinimal +, xinput +, libva-utils +, inxi +, vulkan-utils +, i2c-tools +, opensc + +# Suggested +, withSuggested ? false # Install (most) suggested tools +, hplip +, sane-backends +# , pnputils # pnputils (lspnp) isn't currently in nixpkgs and appears to be poorly maintained +}: + +stdenv.mkDerivation rec { + pname = "hw-probe"; + version = "1.6.4"; + + src = fetchFromGitHub { + owner = "linuxhw"; + repo = pname; + rev = version; + sha256 = "sha256:028wnhrbn10lfxwmcpzdbz67ygldimv7z1k1bm64ggclykvg5aim"; + }; + + makeFlags = [ "prefix=$(out)" ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ perl ]; + + makeWrapperArgs = + let + requiredPrograms = [ + hwinfo + dmidecode + smartmontools + pciutils + usbutils + edid-decode + iproute2 # (ip) + coreutils # (sort) + gnugrep + curl + gnutar + xz + kmod # (lsmod) + ]; + recommendedPrograms = [ + mcelog + hdparm + acpica-tools + drm_info + mesa-demos + memtester + sysstat # (iostat) + cpuid + util-linuxMinimal # (rfkill) + xinput + libva-utils # (vainfo) + inxi + vulkan-utils + i2c-tools + opensc + ]; + conditionallyRecommendedPrograms = lib.optional systemdSupport systemd; # (systemd-analyze) + suggestedPrograms = [ + hplip # (hp-probe) + sane-backends # (sane-find-scanner) + # pnputils # (lspnp) + ]; + programs = + requiredPrograms + ++ conditionallyRecommendedPrograms + ++ lib.optionals withRecommended recommendedPrograms + ++ lib.optionals withSuggested suggestedPrograms; + in [ + "--set" "PERL5LIB" "${makePerlPath [ LWP LWPProtocolHttps HTTPMessage URI HTTPDate TryTiny ]}" + "--prefix" "PATH" ":" "${lib.makeBinPath programs}" + ]; + + postInstall = '' + wrapProgram $out/bin/hw-probe \ + $makeWrapperArgs + ''; + + meta = with lib; { + description = "Probe for hardware, check operability and find drivers"; + homepage = "https://github.com/linuxhw/hw-probe"; + platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd); + license = with licenses; [ lgpl21 bsdOriginal ]; + maintainers = with maintainers; [ rehno-lindeque ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdb78390032d..02305c098bd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7462,6 +7462,10 @@ with pkgs; hwinfo = callPackage ../tools/system/hwinfo { }; + hw-probe = perlPackages.callPackage ../tools/system/hw-probe { + vulkan-utils = haskell.lib.compose.justStaticExecutables haskellPackages.vulkan-utils; + }; + hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { stdenv = gcc8Stdenv; }; From 864b23a4f91513fe3af4525cdff58192b68e8f30 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Sun, 21 Aug 2022 21:51:49 -0400 Subject: [PATCH 157/167] vulkan-utils: init at 0.5.7 --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02305c098bd3..0cca34ccb165 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7462,9 +7462,7 @@ with pkgs; hwinfo = callPackage ../tools/system/hwinfo { }; - hw-probe = perlPackages.callPackage ../tools/system/hw-probe { - vulkan-utils = haskell.lib.compose.justStaticExecutables haskellPackages.vulkan-utils; - }; + hw-probe = perlPackages.callPackage ../tools/system/hw-probe { }; hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { stdenv = gcc8Stdenv; @@ -21876,6 +21874,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; + vulkan-utils = haskell.lib.compose.justStaticExecutables haskellPackages.vulkan-utils; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; vxl = callPackage ../development/libraries/vxl { }; From b34ed334719c6daf0725dbed492cc65e0e8a62b6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 25 Aug 2022 20:32:39 +0200 Subject: [PATCH 158/167] tracker-miners: add darwin support --- .../libraries/totem-pl-parser/default.nix | 12 ++++++-- .../libraries/tracker-miners/default.nix | 30 +++++++++++++++---- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index 1a180be283fb..871b724029c8 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome, glib }: +{ lib, stdenv, fetchpatch, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome, glib }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "wN8PaNXPnX2kPIHH8T8RFYNYNo+Ywi1Hci870EvTrBw="; }; + patches = [ + # Upstream MR: https://gitlab.gnome.org/GNOME/totem-pl-parser/-/merge_requests/46 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem-pl-parser/-/commit/f4f69c9b99095416aaed18a73f7486ad9eb04aa9.patch"; + sha256 = "sha256-Uya5fgFgauv5rIpVK3CDGCieyMus7VjcLMMe/vQ2WWY="; + }) + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -30,6 +38,6 @@ stdenv.mkDerivation rec { description = "Simple GObject-based library to parse and save a host of playlist formats"; maintainers = teams.gnome.members; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 3224355e0451..846346d534b8 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , asciidoc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -43,6 +44,7 @@ , taglib , upower , totem-pl-parser +, e2fsprogs }: stdenv.mkDerivation rec { @@ -54,6 +56,18 @@ stdenv.mkDerivation rec { sha256 = "Pt3G0nLAKWn6TCwV360MSddtAh8aJ+xwi2m+gCU1PJQ="; }; + # TODO: remove me on 3.4.0 + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/cc655ba0f95022cf35bc6d44cb5155788fee2e24.patch"; + sha256 = "sha256-a85ygtabpkruiDgKbseQxYbFIAQlVDhs3eWkbStJjKs="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/9e613ceb37ec41fd1cd88c3d539e3ee03e8f6ba6.patch"; + sha256 = "sha256-ht7EfZztyl0st0Sv7H92Q37vwXY4T61GQm9WJ8IxTTg="; + }) + ]; + nativeBuildInputs = [ asciidoc docbook-xsl-nons @@ -72,7 +86,6 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 dbus - evolution-data-server exempi giflib glib @@ -95,16 +108,20 @@ stdenv.mkDerivation rec { libjpeg libosinfo libpng - libseccomp libsoup libtiff libuuid libxml2 - networkmanager poppler - systemd taglib + ] ++ lib.optionals stdenv.isLinux [ + evolution-data-server + libseccomp + networkmanager + systemd upower + ] ++ lib.optionals stdenv.isDarwin [ + e2fsprogs ]; mesonFlags = [ @@ -115,6 +132,9 @@ stdenv.mkDerivation rec { # security issue since then. Despite a patch now being availab, we're opting # to be safe due to the general state of the project "-Dminer_rss=false" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dnetwork_manager=disabled" + "-Dsystemd_user_services=false" ]; postInstall = '' @@ -132,6 +152,6 @@ stdenv.mkDerivation rec { description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From f3228e71c86d28393e9474bb4b206e7013ea69fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva=20Quintela=20Soares?= Date: Thu, 25 Aug 2022 16:49:09 -0300 Subject: [PATCH 159/167] halide: 10.0.0 -> 14.0.0 (#180015) --- pkgs/development/compilers/halide/default.nix | 14 ++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 853cf1a663e9..78eca7e84db2 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -15,22 +15,16 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; llvmPackages.stdenv.mkDerivation rec { pname = "halide"; - version = "10.0.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; rev = "v${version}"; - sha256 = "0il71rppjp76m7zd420siidvhs76sqiq26h60ywk812sj9mmgxj6"; + sha256 = "sha256-/7U2TBcpSAKeEyWncAbtW6Vk/cP+rp1CXtbIjvQMmZA="; }; - # clang fails to compile intermediate code because - # of unused "--gcc-toolchain" option - postPatch = '' - sed -i "s/-Werror//" src/CMakeLists.txt - ''; - - cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" ]; + cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" "-DTARGET_WEBASSEMBLY=OFF" ]; # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -54,6 +48,6 @@ llvmPackages.stdenv.mkDerivation rec { homepage = "https://halide-lang.org"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.ck3d ]; + maintainers = with maintainers; [ ck3d atila ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1509aa54d8e..e92f20c50429 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7310,7 +7310,7 @@ with pkgs; halibut = callPackage ../tools/typesetting/halibut { }; halide = callPackage ../development/compilers/halide { - llvmPackages = llvmPackages_9; + llvmPackages = llvmPackages_14; }; harePackages = recurseIntoAttrs (callPackage ../development/compilers/hare { }); From 16db6bc7e4e49ddc03b2b2c10ac1830c5be12f28 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 25 Aug 2022 22:18:10 +0200 Subject: [PATCH 160/167] apr: remove no longer required darwin patch --- pkgs/development/libraries/apr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 7c565c834a69..536c8a5613a9 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { name = "cross-assume-dev-zero-mmappable.patch"; sha256 = "sha256-rsouJp1o7p0d+AJ5KvyhUU79vAJOcVHEuwSEKaCEGa8="; }) - ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; + ]; # This test needs the net postPatch = '' From 901b48436b644a252b391cea44eeb618da88778b Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Fri, 26 Aug 2022 08:24:32 +1200 Subject: [PATCH 161/167] roccat-tools: Fix udev rules (#168463) Co-authored-by: Sandro Co-authored-by: Aidan Gauland --- pkgs/os-specific/linux/roccat-tools/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index bea79c2007db..ef18dda1191d 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, cmake, pkg-config, gettext , dbus, dbus-glib, libgaminggear, libgudev, lua -, harfbuzz +, harfbuzz, runtimeShell, coreutils, kmod }: stdenv.mkDerivation rec { @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { /return/c \ return g_build_path("/", g_get_user_data_dir(), "roccat", NULL); }' libroccat/roccat_helper.c + + substituteInPlace udev/90-roccat-kone.rules \ + --replace "/bin/sh" "${runtimeShell}" \ + --replace "/sbin/modprobe" "${kmod}/bin/modprobe" \ + --replace "/bin/echo" "${coreutils}/bin/echo" ''; nativeBuildInputs = [ cmake pkg-config gettext ]; From 2400c9dca76c19a89c38bb6ced08931821190453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 25 Aug 2022 18:12:36 -0300 Subject: [PATCH 162/167] zen-kernels: 5.19.3 -> 5.19.4 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 8f8be9d20d61..c0758e0a94c6 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.19.3"; #zen + version = "5.19.4"; #zen suffix = "zen1"; #zen - sha256 = "0qkkbj7sifc0vqy4q8fdnadqjh2vcv41rbm90abbrnnqiyanc01g"; #zen + sha256 = "0px5br9220m8s6y6qzk29i0ksmy43h4652d9xx5y2jb5idwf2sj4"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.19.3"; #lqx + version = "5.19.4"; #lqx suffix = "lqx1"; #lqx - sha256 = "1g4kgcqmwrmrxh7s07md74mpd24i1fmrns5m9k140wzjykcv8n7z"; #lqx + sha256 = "1vvc2c35w1xz8zkm79cbcdhwb7dkqxd835w422my5mbi7vhcx7jq"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From a88df802c0f163927f2fdb466144ceb67803ee68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 25 Aug 2022 23:53:27 +0200 Subject: [PATCH 163/167] python310Packages.pyxdg: 0.27 -> 0.28 --- pkgs/development/python-modules/pyxdg/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix index 0ad5777e6377..1a7f5b265eb0 100644 --- a/pkgs/development/python-modules/pyxdg/default.nix +++ b/pkgs/development/python-modules/pyxdg/default.nix @@ -5,24 +5,25 @@ buildPythonPackage rec { pname = "pyxdg"; - version = "0.27"; + version = "0.28"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; repo = pname; rev = "rel-${version}"; - sha256 = "1dg826vrc7ifkk4lnf648h61cqfamaqmngkn9hgmxnf9gqmkbn0k"; + sha256 = "sha256-TrFQzfkXabmfpGYwhxD1UVY1F645KycfSPPrMJFAe+0="; }; # Tests failed (errors=4, failures=4) on NixOS doCheck = false; + pythonImportsCheck = [ "xdg" ]; + meta = with lib; { homepage = "http://freedesktop.org/wiki/Software/pyxdg"; description = "Contains implementations of freedesktop.org standards"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; }; - } From cfe985592fc42bf6e91a9d4e706f0ec85688041c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 26 Aug 2022 08:02:08 +1000 Subject: [PATCH 164/167] runc: 1.1.3 -> 1.1.4 https://github.com/opencontainers/runc/releases/tag/v1.1.4 --- pkgs/applications/virtualization/runc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 5649815a7079..ec078f55aa59 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-s0VRj/hjevtTZ9rUQsAsI2pg4ygahlrBIfFdETWy9W0="; + sha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; }; vendorSha256 = null; From 0f5fe359438daccee9f4d02e38f01e8fe2a9f6e2 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 25 Aug 2022 19:48:46 -0300 Subject: [PATCH 165/167] rtl8189fs: patch for 5.19.2 and 6.0 --- pkgs/os-specific/linux/rtl8189fs/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8189fs/default.nix b/pkgs/os-specific/linux/rtl8189fs/default.nix index c1fe5e9733fa..0a385d0ca39f 100644 --- a/pkgs/os-specific/linux/rtl8189fs/default.nix +++ b/pkgs/os-specific/linux/rtl8189fs/default.nix @@ -1,4 +1,4 @@ -{ lib, kernel, rtl8189es, fetchFromGitHub }: +{ lib, kernel, rtl8189es, fetchFromGitHub, fetchpatch }: # rtl8189fs is a branch of the rtl8189es driver rtl8189es.overrideAttrs (drv: rec { @@ -12,6 +12,13 @@ rtl8189es.overrideAttrs (drv: rec { sha256 = "sha256-JTv+ssSv5toNcZ5wR6p0Cywdk87z9Bdq0ftU0ekr/98="; }; + patches = [ + (fetchpatch { + url = "https://github.com/jwrdegoede/rtl8189ES_linux/pull/81.patch"; + sha256 = "sha256-ovFQBIHLk3wi2uwAyr8VmdbuhPcoHsZ/lpA66obVBK4="; + }) + ]; + meta = with lib; { description = "Driver for Realtek rtl8189fs"; homepage = "https://github.com/jwrdegoede/rtl8189ES_linux/tree/rtl8189fs"; From b483c822f86d0331fd097e925ec090e5a7d93175 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 26 Aug 2022 08:45:01 +1000 Subject: [PATCH 166/167] nomad_1_3: 1.3.3 -> 1.3.4 https://github.com/hashicorp/nomad/releases/tag/v1.3.4 > https://github.com/hashicorp/nomad/commit/c417103e5aca2907bd42d28922f5e338b8068395 > Backport of build: update to go1.19 into release/1.3.x --- pkgs/applications/networking/cluster/nomad/1.3.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix index 8d4c9805b52a..511b3d34decf 100644 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ b/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix { inherit buildGoModule; - version = "1.3.3"; - sha256 = "sha256-/63QGknivXyBel2MhMzbh/rE+UrfV3mb+zPZzOU15WU="; - vendorSha256 = "sha256-5ubJ6hgpdkZd/hwy+u2S6XgQLD5xmgUnaUqJoLdguBQ="; + version = "1.3.4"; + sha256 = "sha256-NeBZVCpylP16dPi68unk3H3/V6gWO/SvJRmjgwwwVts="; + vendorSha256 = "sha256-XIHtAB0js55mbVuTTWdLW5BMhQjd6/GUbcBk8DEYZg8="; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4115bbf78476..60a66681b7d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9123,7 +9123,7 @@ with pkgs; buildGoModule = buildGo117Module; }; nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { - buildGoModule = buildGo118Module; + buildGoModule = buildGo119Module; }; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; From 0f1a17e1a6f9a681383aea2bb4872a03316bc707 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Thu, 25 Aug 2022 15:42:49 -0400 Subject: [PATCH 167/167] python3Packages.django-cryptography: init at 1.1 --- .../django-cryptography/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/django-cryptography/default.nix diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix new file mode 100644 index 000000000000..6443e74aa378 --- /dev/null +++ b/pkgs/development/python-modules/django-cryptography/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage +, cryptography +, django +, django-appconf +, fetchFromGitHub +, lib +, python +, pythonOlder }: + +buildPythonPackage rec { + pname = "django-cryptography"; + version = "1.1"; + disabled = pythonOlder "3.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "georgemarshall"; + repo = "django-cryptography"; + rev = "refs/tags/${version}"; + hash = "sha256-C3E2iT9JdLvF+1g+xhZ8dPDjjh25JUxLAtTMnalIxPk="; + }; + + propagatedBuildInputs = [ + cryptography + django + django-appconf + ]; + + pythonImportsCheck = [ "django_cryptography" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} ./runtests.py + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://github.com/georgemarshall/django-cryptography"; + description = "A set of primitives for performing cryptography in Django"; + license = licenses.bsd3; + maintainers = with maintainers; [ centromere ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d82696a1ce79..022c5428c228 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2489,6 +2489,8 @@ in { django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + django-cryptography = callPackage ../development/python-modules/django-cryptography { }; + django-csp = callPackage ../development/python-modules/django-csp { }; django-debug-toolbar = callPackage ../development/python-modules/django-debug-toolbar { };