From d011ca205fdd40828186d196cc1a678638687211 Mon Sep 17 00:00:00 2001 From: hqurve Date: Sun, 13 Mar 2022 17:44:08 -0400 Subject: [PATCH 001/120] jupyter-kernel: Link extraPaths --- pkgs/applications/editors/jupyter/kernel.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index fba884f5a2fd..0fd59ca391e9 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -39,26 +39,22 @@ in ${concatStringsSep "\n" (mapAttrsToList (kernelName: unfilteredKernel: let - allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64"]; + allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64" "extraPaths"]; kernel = filterAttrs (n: v: (any (x: x == n) allowedKernelKeys)) unfilteredKernel; config = builtins.toJSON ( kernel // {display_name = if (kernel.displayName != "") then kernel.displayName else kernelName;} // (optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; }) ); - logo32 = - if (kernel.logo32 != null) - then "ln -s ${kernel.logo32} 'kernels/${kernelName}/logo-32x32.png';" - else ""; - logo64 = - if (kernel.logo64 != null) - then "ln -s ${kernel.logo64} 'kernels/${kernelName}/logo-64x64.png';" - else ""; + extraPaths = kernel.extraPaths or {} + // lib.optionalAttrs (kernel.logo32 != null) { "logo-32x32.png" = kernel.logo32; } + // lib.optionalAttrs (kernel.logo64 != null) { "logo-64x64.png" = kernel.logo64; } + ; + linkExtraPaths = lib.mapAttrsToList (name: value: "ln -s ${value} 'kernels/${kernelName}/${name}';") extraPaths; in '' mkdir 'kernels/${kernelName}'; echo '${config}' > 'kernels/${kernelName}/kernel.json'; - ${logo32} - ${logo64} + ${lib.concatStringsSep "\n" linkExtraPaths} '') definitions)} mkdir $out From 5536b56135a3d2909651535b7b66ecad2dd8f882 Mon Sep 17 00:00:00 2001 From: hqurve Date: Sun, 13 Mar 2022 17:45:28 -0400 Subject: [PATCH 002/120] nixos/jupyter: Add kernels..extraPaths option --- nixos/modules/services/development/jupyter/default.nix | 3 +++ .../services/development/jupyter/kernel-options.nix | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index bebb3c3f13f0..f8d77a1131e3 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -143,6 +143,9 @@ in { language = "python"; logo32 = "''${env.sitePackages}/ipykernel/resources/logo-32x32.png"; logo64 = "''${env.sitePackages}/ipykernel/resources/logo-64x64.png"; + extraPaths = { + "cool.txt" = pkgs.writeText "cool" "cool content"; + }; }; } ''; diff --git a/nixos/modules/services/development/jupyter/kernel-options.nix b/nixos/modules/services/development/jupyter/kernel-options.nix index 348a8b44b382..0a9eaafa3185 100644 --- a/nixos/modules/services/development/jupyter/kernel-options.nix +++ b/nixos/modules/services/development/jupyter/kernel-options.nix @@ -56,5 +56,14 @@ with lib; Path to 64x64 logo png. ''; }; + + extraPaths = mkOption { + type = types.attrsOf types.path; + default = { }; + example = literalExpression ''"{ examples = ''${env.sitePack}/IRkernel/kernelspec/kernel.js"; }''; + description = '' + Extra paths to link in kernel directory + ''; + }; }; } From 9a409fc5028fa1fc3e448383c08a375b8cb35d66 Mon Sep 17 00:00:00 2001 From: hqurve Date: Sun, 13 Mar 2022 17:45:56 -0400 Subject: [PATCH 003/120] sage: link doc in jupyter kernel --- pkgs/applications/science/math/sage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 70e24e2608d0..a139ee4c11c0 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -9,7 +9,7 @@ # is always preferred, see `sage-src.nix` for that. let - inherit (pkgs) symlinkJoin callPackage nodePackages; + inherit (pkgs) symlinkJoin callPackage nodePackages lib; python3 = pkgs.python3.override { packageOverrides = self: super: { @@ -46,7 +46,7 @@ let # just one 16x16 logo is available logo32 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; logo64 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; - }; + } // lib.optionalAttrs withDoc { extraPaths = { "doc" = "${sagedoc}/share/doc/sage/html/en"; }; }; three = callPackage ./threejs-sage.nix { }; From 69267309a727c4700f2e13a59b1dcc5a76db2c98 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 6 Apr 2022 13:35:52 +0200 Subject: [PATCH 004/120] lsp-plugins: 1.1.31 -> 1.2.1 lsp-plugins: 1.2.0 -> 1.2.1 --- .../audio/lsp-plugins/default.nix | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index f6f3237d6f07..5fc0a94d7576 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,17 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper +{ lib, stdenv, fetchurl, pkg-config, makeWrapper , libsndfile, jack2 , libGLU, libGL, lv2, cairo , ladspaH, php }: stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.31"; + version = "1.2.1"; - src = fetchFromGitHub { - owner = "sadko4u"; - repo = pname; - rev = version; - sha256 = "sha256-P1woSkenSlVUwWr3q0sNv8K2fVtTa6zWwKfSHQgg9Xw="; + src = fetchurl { + url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "sha256-wHibZJbrgy7t0z2rRDe1FUAG38BW/dR0JgoKVWYCn60="; }; nativeBuildInputs = [ pkg-config php makeWrapper ]; @@ -19,22 +17,15 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "ETC_PATH=$(out)/etc" ]; NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; - doCheck = true; - - checkPhase = '' - runHook preCheck - TEST_PATH=$(pwd)".build-test" - make OBJDIR=$TEST_PATH test - $TEST_PATH/lsp-plugins-test utest - runHook postCheck + configurePhase = '' + make config PREFIX=${placeholder "out"} ''; - buildFlags = [ "release" ]; + doCheck = true; enableParallelBuilding = true; From 4eb9c577b7296f37ab35067979c29f3c76c4edb4 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 17 May 2022 21:42:15 -0600 Subject: [PATCH 005/120] perlPackages.AWSSignature4: init at 1.02 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3c97d570a905..2453bb92f407 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1329,6 +1329,21 @@ let buildInputs = [ DBI ]; }; + AWSSignature4 = perlPackages.buildPerlModule { + pname = "AWS-Signature4"; + version = "1.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LD/LDS/AWS-Signature4-1.02.tar.gz"; + sha256 = + "20bbc16cb3454fe5e8cf34fe61f1a91fe26c3f17e449ff665fcbbb92ab443ebd"; + }; + propagatedBuildInputs = with perlPackages; [ LWP TimeDate URI ]; + meta = { + description = "Create a version4 signature for Amazon Web Services"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + autovivification = buildPerlPackage { pname = "autovivification"; version = "0.18"; From 493961541da8dbab36862acd580eb63e5c051e04 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 30 May 2022 11:12:06 +0200 Subject: [PATCH 006/120] airwindows-lv2: 1.0 -> 5.0 --- pkgs/applications/audio/airwindows-lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index c3cc1a21ffc5..90c92d8f421d 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "1.0"; + version = "5.0"; src = fetchFromGitHub { owner = "hannesbraun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xokV4Af0evdo73D9JObzAmY1wD0aUyXiI0Z7BUN0m+M="; + sha256 = "sha256-sLkcEEYez0Z3pkhMCC7raiwe/m9Tk/lFmOuybZvFqSk="; }; nativeBuildInputs = [ cmake pkg-config ]; From 2d92bf2a3c731998a72bf8333a0768f38a33c0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Wed, 8 Jun 2022 11:29:50 +0200 Subject: [PATCH 007/120] audible-cli: 0.1.3 -> 0.2.0 --- pkgs/tools/misc/audible-cli/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/tools/misc/audible-cli/default.nix index 98a34082184e..21e0143ef158 100644 --- a/pkgs/tools/misc/audible-cli/default.nix +++ b/pkgs/tools/misc/audible-cli/default.nix @@ -2,21 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "audible-cli"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mkb79"; repo = pname; rev = "v${version}"; - sha256 = "0i71vwq2bhndndb0mlx21bc5jkv75cr60max5iaxk23agg3xpgwv"; + sha256 = "1dalil8aaywdshf48d45ap4mgzxbyzhklr8nga7qhpwi22w84cgz"; }; - propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools ]; + propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ]; postPatch = '' substituteInPlace setup.py \ - --replace "httpx==0.20.*" "httpx" \ - --replace "audible==0.7.2" "audible" + --replace "httpx>=0.20.0,<0.24.0" "httpx" \ + --replace "audible>=0.8.2" "audible" ''; meta = with lib; { From 4f0cf3d6787d0062634521b68841fd4f34b7efe5 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Tue, 17 May 2022 21:45:08 -0600 Subject: [PATCH 008/120] rex: init at 1.13.4 --- pkgs/tools/system/rex/default.nix | 53 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/perl-packages.nix | 5 ++- 3 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/system/rex/default.nix diff --git a/pkgs/tools/system/rex/default.nix b/pkgs/tools/system/rex/default.nix new file mode 100644 index 000000000000..2bb67333121e --- /dev/null +++ b/pkgs/tools/system/rex/default.nix @@ -0,0 +1,53 @@ +{ pkgs, lib, fetchurl, perlPackages, rsync, ... }: + +perlPackages.buildPerlPackage rec { + pname = "Rex"; + version = "1.13.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FERKI/Rex-${version}.tar.gz"; + sha256 = "a86e9270159b41c9a8fce96f9ddc97c5caa68167ca4ed33e97908bfce17098cf"; + }; + buildInputs = with perlPackages; [ + FileShareDirInstall + ParallelForkManager + StringEscape + TestDeep + TestOutput + TestUseAllModules + + rsync + ]; + + nativeBuildInputs = with perlPackages; [ ParallelForkManager ]; + + propagatedBuildInputs = with perlPackages; [ + AWSSignature4 + DataValidateIP + DevelCaller + DigestHMAC + FileLibMagic + HashMerge + HTTPMessage + IOPty + IOString + JSONMaybeXS + LWP + NetOpenSSH + NetSFTPForeign + SortNaturally + TermReadKey + TextGlob + URI + XMLSimple + YAML + ]; + + doCheck = false; + + meta = { + homepage = "https://www.rexify.org"; + description = "The friendly automation framework"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ qbit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53c335dc5a93..133df448a6bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4140,6 +4140,8 @@ with pkgs; reg = callPackage ../tools/virtualization/reg { }; + rex = callPackage ../tools/system/rex { }; + river = callPackage ../applications/window-managers/river { }; rivercarro = callPackage ../applications/misc/rivercarro { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2453bb92f407..a71cb0e27366 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1334,10 +1334,9 @@ let version = "1.02"; src = fetchurl { url = "mirror://cpan/authors/id/L/LD/LDS/AWS-Signature4-1.02.tar.gz"; - sha256 = - "20bbc16cb3454fe5e8cf34fe61f1a91fe26c3f17e449ff665fcbbb92ab443ebd"; + sha256 = "20bbc16cb3454fe5e8cf34fe61f1a91fe26c3f17e449ff665fcbbb92ab443ebd"; }; - propagatedBuildInputs = with perlPackages; [ LWP TimeDate URI ]; + propagatedBuildInputs = [ LWP TimeDate URI ]; meta = { description = "Create a version4 signature for Amazon Web Services"; license = with lib.licenses; [ artistic1 gpl1Plus ]; From 21738df66b20c274118395cd63460097b0a3e8fd Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 21 Jun 2022 02:24:30 +0300 Subject: [PATCH 009/120] mattermost: 6.3.6 -> 7.0.0 --- pkgs/servers/mattermost/default.nix | 138 +++++++++------------------- 1 file changed, 44 insertions(+), 94 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 55ea22500c56..444aed5a33f5 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,101 +1,51 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv +{ lib +, buildGo118Module +, fetchFromGitHub +, fetchurl +, nixosTests +}: -# The suffix for the Mattermost version. -, versionSuffix ? "nixpkgs" +buildGo118Module rec { + pname = "mattermost"; + version = "7.0.0"; -# The constant build date. -, buildDate ? "1970-01-01" - -# Set to true to set the build hash to the Nix store path. -, storePathAsBuildHash ? false }: - -let - version = "6.3.6"; - - goPackagePath = "github.com/mattermost/mattermost-server"; - - mattermost-server-build = buildGoPackage rec { - pname = "mattermost-server"; - inherit version goPackagePath; - - src = fetchFromGitHub { - owner = "mattermost"; - repo = "mattermost-server"; - rev = "v${version}"; - sha256 = "905zxMucDTxxrLoh5ZoAExW4eFmi+xa98aI3EpJZ2Og="; - }; - - ldflags = [ - "-s" "-w" - "-X ${goPackagePath}/model.BuildNumber=${version}${lib.optionalString (versionSuffix != null) "-${versionSuffix}"}" - "-X ${goPackagePath}/model.BuildDate=${buildDate}" - "-X ${goPackagePath}/model.BuildEnterpriseReady=false" - ]; + src = fetchFromGitHub { + owner = "mattermost"; + repo = "mattermost-server"; + rev = "v${version}"; + sha256 = "sha256-0sjVlN+YZDhIXxch4DUkvBGDS0KUdGFflT87z1/udd4="; }; - mattermost-server = if storePathAsBuildHash then mattermost-server-build.overrideAttrs (orig: { - buildPhase = '' - origGo="$(type -p go)" - - # Override the Go binary to set the build hash in -ldflags to $out. - # Technically this is more accurate than a Git hash! - # nixpkgs does not appear to support environment variables in ldflags - # for go packages, so we have to rewrite -ldflags before calling go. - go() { - local args=() - local ldflags="-X ${goPackagePath}/model.BuildHash=$out" - local found=0 - for arg in "$@"; do - if [[ "$arg" == -ldflags=* ]] && [ $found -eq 0 ]; then - arg="-ldflags=''${ldflags} ''${arg#-ldflags=}" - found=1 - fi - args+=("$arg") - done - "$origGo" "''${args[@]}" - } - - ${orig.buildPhase} - ''; - }) else mattermost-server-build; - - mattermost-webapp = stdenv.mkDerivation { - pname = "mattermost-webapp"; - inherit version; - - src = fetchurl { - url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "JDsCDZEtbeBTYuzOSwrxFNRKXy+9KXirjaCz6ODP5uw="; - }; - - installPhase = '' - mkdir -p $out - tar --strip 1 --directory $out -xf $src \ - mattermost/client \ - mattermost/i18n \ - mattermost/fonts \ - mattermost/templates \ - mattermost/config - - # For some reason a bunch of these files are +x... - find $out -type f -exec chmod -x {} \; - ''; + webapp = fetchurl { + url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; + sha256 = "sha256-O2bJsj2YjeaRfqPrehgwn8bNHaYwqcrcU1htCYurPlw="; }; -in - buildEnv { - name = "mattermost-${version}"; - paths = [ mattermost-server mattermost-webapp ]; + vendorSha256 = "sha256-0sKuk0klxeep8J96RntDP9DHsVM4vrOmsKXiaWurVis="; - meta = with lib; { - description = "Open-source, self-hosted Slack-alternative"; - homepage = "https://www.mattermost.org"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryNativeCode # mattermost-webapp - ]; - license = with licenses; [ agpl3 asl20 ]; - maintainers = with maintainers; [ fpletz ryantm numinit ]; - platforms = platforms.unix; - }; - } + subPackages = [ "cmd/mattermost" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/mattermost/mattermost-server/v6/model.Version=${version}" + ]; + + postInstall = '' + tar --strip 1 --directory $out -xf $webapp \ + mattermost/{client,i18n,fonts,templates,config} + + # For some reason a bunch of these files are executable + find $out/{client,i18n,fonts,templates,config} -type f -exec chmod -x {} \; + ''; + + passthru.tests.mattermost = nixosTests.mattermost; + + meta = with lib; { + description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle"; + homepage = "https://www.mattermost.org"; + license = with licenses; [ agpl3 asl20 ]; + maintainers = with maintainers; [ fpletz ryantm numinit kranzes ]; + platforms = [ "x86_64-linux" ]; + }; +} From ad439443f11aeeff9a63171b604bd8dc6d78321d Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 21 Jun 2022 03:10:26 +0300 Subject: [PATCH 010/120] mmctl: 6.4.2 -> 7.0.0 --- pkgs/tools/misc/mmctl/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix index c9de0bf14ca8..9c1fe59854f4 100644 --- a/pkgs/tools/misc/mmctl/default.nix +++ b/pkgs/tools/misc/mmctl/default.nix @@ -1,24 +1,33 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: + buildGoModule rec { pname = "mmctl"; - version = "6.4.2"; + version = "7.0.0"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-FlqkY4LvAW9Cibs+3UkMDWA+uc62wMh13BllWuxjVZU="; + sha256 = "sha256-X9IvuH3LrysqcL0JZIchE9n51w7eQTFE2NWUTXMnRYs="; }; vendorSha256 = null; checkPhase = "make test"; + ldflags = [ + "-s" + "-w" + "-X github.com/mattermost/mmctl/v6/commands.Version=${version}" + ]; + meta = with lib; { description = "A remote CLI tool for Mattermost"; homepage = "https://github.com/mattermost/mmctl"; license = licenses.asl20; maintainers = with maintainers; [ ppom ]; - platforms = platforms.linux ++ platforms.darwin; }; } From c750d488035c9dc234523f3b5e62575cb784124c Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 24 Jun 2022 18:24:59 +0300 Subject: [PATCH 011/120] mattermost: 7.0.0 -> 7.0.1 --- pkgs/servers/mattermost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 444aed5a33f5..db01a48b61a3 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -7,18 +7,18 @@ buildGo118Module rec { pname = "mattermost"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-0sjVlN+YZDhIXxch4DUkvBGDS0KUdGFflT87z1/udd4="; + sha256 = "sha256-oxZaOOV5pkK9HAi/AQ+MLZgfwvF6d/ArzYrXzUQGTDA="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-O2bJsj2YjeaRfqPrehgwn8bNHaYwqcrcU1htCYurPlw="; + sha256 = "sha256-NWVDPDqdx7mdWCr/qBi8HsUsCJbT63x37UZGecHsZr4="; }; vendorSha256 = "sha256-0sKuk0klxeep8J96RntDP9DHsVM4vrOmsKXiaWurVis="; From 09724b15170081415c1559dc4508584b4de61b42 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 24 Jun 2022 18:27:24 +0300 Subject: [PATCH 012/120] mmctl: 7.0.0 -> 7.0.1 --- pkgs/tools/misc/mmctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix index 9c1fe59854f4..2040d18e5f69 100644 --- a/pkgs/tools/misc/mmctl/default.nix +++ b/pkgs/tools/misc/mmctl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mmctl"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-X9IvuH3LrysqcL0JZIchE9n51w7eQTFE2NWUTXMnRYs="; + sha256 = "sha256-xNj8aM3hpcvxwXCdFCfkXDBagIdCjcjWLGNp43KsV10="; }; vendorSha256 = null; From f025b2340ba4627cc731fb2db5eb44884f614d24 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 24 Jun 2022 23:13:00 +0200 Subject: [PATCH 013/120] sage: depend on python3Packages.notebook --- pkgs/applications/science/math/sage/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index f399099d4dac..eced57706d27 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -113,6 +113,7 @@ let tkinter # optional, as a matplotlib backend (use with `%matplotlib tk`) scipy ipywidgets + notebook # for "sage -n" rpy2 sphinx pillow From 9165cba85ee4eaca13fdb39ce5772f2f7133ba6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 11:43:47 +0000 Subject: [PATCH 014/120] bluejeans-gui: 2.27.0.130 -> 2.29.1.3 --- .../networking/instant-messengers/bluejeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index ddecac073526..c74bffdd5e2a 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.27.0.130"; + version = "2.29.1.3"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-J0BGL03k1NAJLLEUOfvKjZEsBlupeHJR2Bp3c0ANBwg="; + sha256 = "sha256-vWViSJXRPZ4B40LNnoKRZNbxB1YKnaW2ay6GCjnFLGY="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; From 479d8f4fd82b042627d2e6b7e9ffacdcf32b7a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jun 2022 04:30:12 +0000 Subject: [PATCH 015/120] qutebrowser: 2.5.1 -> 2.5.2 https://github.com/qutebrowser/qutebrowser/releases/tag/v2.5.2 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index a9e6436c8da1..ce2392ab4edc 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -32,12 +32,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.5.1"; + version = "2.5.2"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-5ohYhqhM0WamumM3lKWKTGfYccJxiBJ+XdvFJ2127bw="; + hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg="; }; # Needs tox From 40990c35863d38ca49e5d3b136fdc33525699165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Jun 2022 04:55:23 +0000 Subject: [PATCH 016/120] treewide: don't use utillinux alias --- nixos/lib/make-multi-disk-zfs-image.nix | 2 +- nixos/lib/make-single-disk-zfs-image.nix | 2 +- pkgs/applications/backup/timeshift/unwrapped.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix index a84732aa1171..0a894c8b9888 100644 --- a/nixos/lib/make-multi-disk-zfs-image.nix +++ b/nixos/lib/make-multi-disk-zfs-image.nix @@ -128,7 +128,7 @@ let gptfdisk nix parted - utillinux + util-linux zfs ] ); diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix index 9310febd9179..98150584fb3e 100644 --- a/nixos/lib/make-single-disk-zfs-image.nix +++ b/nixos/lib/make-single-disk-zfs-image.nix @@ -116,7 +116,7 @@ let gptfdisk nix parted - utillinux + util-linux zfs ] ); diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 1f34491dafdc..65db24062620 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -8,7 +8,7 @@ , gtk3 , json-glib , libgee -, utillinux +, util-linux , vte , xapps }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postPatch = '' while IFS="" read -r -d $'\0' FILE; do substituteInPlace "$FILE" \ - --replace "/sbin/blkid" "${utillinux}/bin/blkid" + --replace "/sbin/blkid" "${util-linux}/bin/blkid" done < <(find ./src -mindepth 1 -name "*.vala" -type f -print0) substituteInPlace ./src/Utility/IconManager.vala \ --replace "/usr/share" "$out/share" From 65b8af2a7f3f6dcc050af17d0993ba256bece346 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 27 Jun 2022 13:49:29 +0200 Subject: [PATCH 017/120] exim: 4.95 -> 4.96 https://lists.exim.org/lurker/message/20220625.141825.d6de6074.en.html --- pkgs/servers/mail/exim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index c69e699a3a76..30b8309d6bc3 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,4 @@ -{ coreutils, db, fetchurl, openssl, pcre, perl, pkg-config, lib, stdenv +{ coreutils, db, fetchurl, openssl, pcre2, perl, pkg-config, lib, stdenv , enableLDAP ? false, openldap , enableMySQL ? false, libmysqlclient, zlib , enableAuthDovecot ? false, dovecot @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { pname = "exim"; - version = "4.95"; + version = "4.96"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; - sha256 = "0rzi0kc3qiiaw8vnv5qrpwdvvh4sr5chns026xy99spjzx9vd76c"; + hash = "sha256-KZpWknsus0d9qv08W9oCvGflxOWJinrq8nQIdSeM8aM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ coreutils db openssl perl pcre ] + buildInputs = [ coreutils db openssl perl pcre2 ] ++ lib.optional enableLDAP openldap ++ lib.optionals enableMySQL [ libmysqlclient zlib ] ++ lib.optional enableAuthDovecot dovecot From 537dc78c73ebc06d1d863cd5370866391d1fb5c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jun 2022 20:37:28 +0200 Subject: [PATCH 018/120] rizin: 0.3.4 -> 0.4.0 --- pkgs/development/tools/analysis/rizin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index 9b15cdd148d8..c74b63404ab7 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.3.4"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-7qSbOWOHwJ0ZcFqrAqYXzbFWgvymfxAf8rJ+75SnEOk="; + sha256 = "sha256-CeuoaE/oE89Cpxa1mobT1lr84BPX6LJ14UXoSdM2a1o="; }; mesonFlags = [ From 236877bbaa620c252db0678c6054467fecf16ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jun 2022 20:38:55 +0200 Subject: [PATCH 019/120] cutter: 2.0.5 -> 2.1.0 --- pkgs/development/tools/analysis/rizin/cutter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index a6ac4fbce12f..f7c5eae72a84 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-ljws9S7ZxZK/Ou8jgGSoR++vtzFTEBywHMhCC/UOLEs="; + sha256 = "sha256-JfJQuEUeLXCjzm4d0ZNHRVazF0Bk6fVAsNvBb+okoXs="; fetchSubmodules = true; }; From 4684ff771e9433c83d642caf075cbeaa079d6aed Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 28 Jun 2022 12:22:45 +0000 Subject: [PATCH 020/120] nixos/dictd: make dict use local server Seems silly to install this for use with the local server, but to not configure it to use the local server. Otherwise, out of the box we just get an error about no server being configured. --- nixos/modules/services/misc/dictd.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index 96e2a4e7c260..8cb51bb0b7a7 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -45,6 +45,10 @@ in # get the command line client on system path to make some use of the service environment.systemPackages = [ pkgs.dict ]; + environment.etc."dict.conf".text = '' + server localhost + ''; + users.users.dictd = { group = "dictd"; description = "DICT.org dictd server"; From 67496fc37c8f6d7fadef52df232f931d007cb29e Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 28 Jun 2022 15:27:56 +0200 Subject: [PATCH 021/120] prisma-engines: 3.15.1 -> 4.0.0 --- pkgs/development/tools/database/prisma-engines/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index c18fdcabcf0e..e1a2ac340892 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,19 +13,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.15.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-p636B8NUu/XncHLTQTiAYfvBaMbiopLVRwGrFf45BW8="; + sha256 = "sha256-TlKjAfpygQq2c77d6ZoMIBtWC0bAiMiKygFkh5GrBBc="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-miDdP4kokRwhR9tif6llI1PI+F4O6tC4pAWucRRyLNQ="; + cargoSha256 = "sha256-//Kis4lDi3SxeptCCnLi/GWPj+Kyay2pQbILYnlEkXE="; nativeBuildInputs = [ pkg-config ]; From a7d864f07c75a57e658684c05a664a165aad6ab0 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 28 Jun 2022 15:28:19 +0200 Subject: [PATCH 022/120] nodePackages.prisma: 3.15.1 -> 4.0.0 --- pkgs/development/node-packages/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index e18421048590..9d3f74bae7e5 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -350,7 +350,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-MLO3JUGJpe5+EVisA/i47+zlyF8Ug0ivvGYG4B9oSXQcPiUHB1ccmnpxqR7o0Up5SQgmxkBiEU//HgR6UuIKOw=="; + sha512 = "sha512-Dtsar03XpCBkcEb2ooGWO/WcgblDTLzGhPcustbehwlFXuTMliMDRzXsfygsgYwQoZnAUKRd1rhpvBNEUziOVw=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ From 92bde872f7ceb1e85139b18eccb8ff0766fc2b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Jun 2022 01:28:24 +0000 Subject: [PATCH 023/120] python310Packages.safety: 1.10.3 -> 2.0.0 https://github.com/pyupio/safety/blob/2.0.0/CHANGELOG.md --- .../python-modules/safety/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 60c23e3c6a2b..b897d6ced4a3 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -7,28 +7,41 @@ , requests , packaging , dparse +, ruamel-yaml , pytestCheckHook }: buildPythonPackage rec { pname = "safety"; - version = "1.10.3"; + version = "2.0.0"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; - format = "setuptools"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MOOU0CogrEm39lKS0Z04+pJ6j5WCzf060a27xmxkGtU="; + sha256 = "d739d00a9e4203cfaba34540c822a73ca1d327159ed7776b3dce09391f81c35d"; }; + postPatch = '' + substituteInPlace safety/safety.py \ + --replace "telemetry=True" "telemetry=False" + substituteInPlace safety/cli.py \ + --replace "telemetry', default=True" "telemetry', default=False" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ setuptools click requests packaging dparse + ruamel-yaml ]; checkInputs = [ @@ -37,6 +50,7 @@ buildPythonPackage rec { # Disable tests depending on online services disabledTests = [ + "test_announcements_if_is_not_tty" "test_check_live" "test_check_live_cached" ]; @@ -48,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks installed dependencies for known vulnerabilities"; homepage = "https://github.com/pyupio/safety"; + changelog = "https://github.com/pyupio/safety/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ thomasdesr dotlambda ]; }; From 90ea31176120ec417589d8e19b8212f268811800 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 29 Jun 2022 04:20:00 +0000 Subject: [PATCH 024/120] arti: init at 0.5.0 --- pkgs/tools/security/arti/default.nix | 43 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/security/arti/default.nix diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix new file mode 100644 index 000000000000..2c3861d60bad --- /dev/null +++ b/pkgs/tools/security/arti/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitLab +, pkg-config +, sqlite +, openssl +, CoreServices +}: + +rustPlatform.buildRustPackage rec { + pname = "arti"; + version = "0.5.0"; + + src = fetchFromGitLab { + domain = "gitlab.torproject.org"; + group = "tpo"; + owner = "core"; + repo = "arti"; + rev = "arti-v${version}"; + sha256 = "sha256-xze8Frxy9Rv01yz0L8GkEaXUoLlpODv3pEat1HnDIOs="; + }; + + cargoSha256 = "sha256-yCQLSLxEziDQGDNtP7pmXlTImSKzr/O/5sITMHVJg8E="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = [ sqlite ] + ++ lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + + cargoBuildFlags = [ "--package" "arti" ]; + + cargoTestFlags = [ "--package" "arti" ]; + + meta = with lib; { + description = "An implementation of Tor in Rust"; + homepage = "https://gitlab.torproject.org/tpo/core/arti"; + changelog = "https://gitlab.torproject.org/tpo/core/arti/-/raw/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1381c472d22f..a18245bc114c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -257,6 +257,10 @@ with pkgs; activate-linux = callPackage ../applications/misc/activate-linux { }; + arti = callPackage ../tools/security/arti { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + authy = callPackage ../applications/misc/authy { }; authz0 = callPackage ../tools/security/authz0 { }; From 4d62e9dd512ef60bff1c76e458d43882e85f1214 Mon Sep 17 00:00:00 2001 From: Alex Andrews Date: Wed, 29 Jun 2022 22:57:58 +0100 Subject: [PATCH 025/120] minikube: 1.25.2 -> 1.26.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 3ee00d4121a9..11a06f5775e0 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.25.2"; + version = "1.26.0"; - vendorSha256 = "sha256-8QqRIWry15/xwBxEOexMEq57ol8riy+kW8WrQqr53Q8="; + vendorSha256 = "sha256-3ME8bs4TAQRAECko7+ZXBCFf4IyTn1P/+hParpc5QTU="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg="; + sha256 = "sha256-vGlW65jf3XGFNK9aSvsK7V0OmUOCtgJcWeNFOZVuH00="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; From d49c491b9ea7a6a6cff70347f310c5779b71230b Mon Sep 17 00:00:00 2001 From: Leonardo Taglialegne Date: Thu, 30 Jun 2022 00:13:09 +0200 Subject: [PATCH 026/120] spicetify-cli: 2.10.1 -> 2.10.2 --- pkgs/applications/misc/spicetify-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 70063765f0e8..4e540accce23 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { - owner = "khanhas"; + owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d5YuBLCsC7tHSzSa12rUcO0gr5f6gQ2s0wnQ3OMZO3U="; + sha256 = "sha256-chaCz4+RXPUP/MZymxA0h1ATuWYRgru3JMELiWPEBcE="; }; vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng="; @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Command-line tool to customize Spotify client"; - homepage = "https://github.com/khanhas/spicetify-cli/"; + homepage = "https://github.com/spicetify/spicetify-cli/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jonringer ]; }; From f4aa10f82aec3727abf5c61347697f5f80113003 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Thu, 30 Jun 2022 00:33:13 +0200 Subject: [PATCH 027/120] maintainers: add catap --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3393fa320d97..39d331be10a3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2031,6 +2031,12 @@ githubId = 1945; name = "Casey Rodarmor"; }; + catap = { + email = "kirill@korins.ky"; + github = "catap"; + githubId = 37775; + name = "Kirill A. Korinsky"; + }; catern = { email = "sbaugh@catern.com"; github = "catern"; From 07ca6845da48793e39bb4443f1f619f0442db40c Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Thu, 30 Jun 2022 10:56:03 +1000 Subject: [PATCH 028/120] aws-sam-cli: relax overly-restrictive cookiecutter bound --- pkgs/development/tools/aws-sam-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index af2685681f16..52bd88619c99 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -48,6 +48,7 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace requirements/base.txt \ --replace "aws_lambda_builders==" "aws-lambda-builders #" \ --replace "click~=7.1" "click~=8.1" \ + --replace "cookiecutter~=1.7.2" "cookiecutter>=1.7.2" \ --replace "dateparser~=1.0" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "Flask~=1.1.2" "Flask~=2.0" \ From 25473f79481f0f9949618019cbd6334349d4de2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 01:14:38 +0000 Subject: [PATCH 029/120] python310Packages.multitasking: 0.0.10 -> 0.0.11 --- pkgs/development/python-modules/multitasking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multitasking/default.nix b/pkgs/development/python-modules/multitasking/default.nix index 2784a0d2e2ee..c59cfe25089b 100644 --- a/pkgs/development/python-modules/multitasking/default.nix +++ b/pkgs/development/python-modules/multitasking/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "multitasking"; - version = "0.0.10"; + version = "0.0.11"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "810640fa6670be41f4a712b287d9307a14ad849d966f06a17d2cf1593b66c3cd"; + sha256 = "sha256-TWvDzGX5stynL7Wnh4UKiNro9iDCs2rptVJI5RvNYCY="; }; doCheck = false; # No tests included From 133573bd5b79abc728c41f111bb5fb29adf63cbc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 30 Jun 2022 09:20:28 +0800 Subject: [PATCH 030/120] pantheon.switchboard-plug-printers: 2.1.10 -> 2.2.0 --- .../apps/switchboard-plugs/printers/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 40b52affa036..8fbd903002b6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, fetchpatch , meson , ninja , pkg-config @@ -16,24 +15,15 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-printers"; - version = "2.1.10"; + version = "2.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0frvybbx7mcs87kww0if4zn0c6c2gb400cpiqrl8b0294py58xpb"; + sha256 = "sha256-NY52surcvhUtyP+T4RMZ0cd+H7fSwo1V0qEGY//oXGs="; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-printers/pull/153 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-printers/commit/3e2b01378cbb8e666d23daeef7f40fcaa90daa45.patch"; - sha256 = "0b8pq525xnir06pn65rcz68bcp5xdxl0gpbj7p5x1hs23p5dp04n"; - }) - ]; - nativeBuildInputs = [ meson ninja From e2649aef4e48696cc2eaef204a385649ec4c9444 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 02:06:49 +0000 Subject: [PATCH 031/120] python310Packages.pulumi-aws: 5.9.1 -> 5.9.2 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 838422a31a25..c1636998590f 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.9.1"; + version = "5.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-LYWxdqortazhev73JSTItrEyZZYFmeXkAko/2aFKaSw="; + hash = "sha256-5jeLSTG2HITEUdgQB3B9nQLAaNRliGspKnOgzUscCpU="; }; sourceRoot = "${src.name}/sdk/python"; From 89b90fe3d1695d126990be52be9134a4c0a0b897 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Thu, 30 Jun 2022 09:37:08 +0200 Subject: [PATCH 032/120] bookstack: 21.12 -> 22.06.2 --- pkgs/servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 500 +++++++++--------- 2 files changed, 247 insertions(+), 257 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index a1d89f1f8259..9f295cf5197c 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "21.12"; + version = "22.06.2"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "1bfwpvawa3pxpdsdbi3nxpjpdv2z1jmv7nk6cs9gs0210jlairsz"; + sha256 = "17njpfmf5y4h59dvq30rrz1bda81kmbikxfmf7lm892x3vqc0vvx"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index 24220da93581..49280f647982 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -7,7 +7,7 @@ let src = composerEnv.buildZipPackage { name = "aws-aws-crt-php-3942776a8c99209908ee0b287746263725685732"; src = fetchurl { - url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732"; + url = https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732; sha256 = "0g4vjln6s1419ydljn5m64kzid0b7cplbc0nwn3y4cj72408fyiz"; }; }; @@ -15,40 +15,40 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-58fa9d8b522b0afa260299179ff950c783ff0ee1"; + name = "aws-aws-sdk-php-4ff51d01da43aa3bd36eef921a9cd4e0ff843fab"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/58fa9d8b522b0afa260299179ff950c783ff0ee1"; - sha256 = "1d0v1q2c206jfdkci9d5b5sf94a0nbdh472n3hqlh11pb1lzp3fz"; + url = https://api.github.com/repos/aws/aws-sdk-php/zipball/4ff51d01da43aa3bd36eef921a9cd4e0ff843fab; + sha256 = "0hja973aylbd5hhvxi0c3yrb0nr84xww73dcadwa25jnivln5mq7"; }; }; }; "bacon/bacon-qr-code" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "bacon-bacon-qr-code-f73543ac4e1def05f1a70bcd1525c8a157a1ad09"; + name = "bacon-bacon-qr-code-d70c840f68657ce49094b8d91f9ee0cc07fbf66c"; src = fetchurl { - url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f73543ac4e1def05f1a70bcd1525c8a157a1ad09"; - sha256 = "1df22bfrc8q62qz8brrs8p2rmmv5gsaxdyjrd2ln6d6j7i4jkjpk"; + url = https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c; + sha256 = "0k2z8a6qz5xg1p85vwcp58yqbiw8bmnp3hg2pjcaqlimnf65v058"; }; }; }; "barryvdh/laravel-dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-dompdf-5b99e1f94157d74e450f4c97e8444fcaffa2144b"; + name = "barryvdh-laravel-dompdf-de83130d029289e1b59f28b41c314ce1d157b4a0"; src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b"; - sha256 = "1r82fzrnjrjy5jgpyc071miiw1rwhwys9ccj81gs3yydq9hi4crw"; + url = https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/de83130d029289e1b59f28b41c314ce1d157b4a0; + sha256 = "19pv4zxvhka6war0w4s0wfqfjbnpq43qhkj1kxb3agh83ni6jrx0"; }; }; }; "barryvdh/laravel-snappy" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-snappy-1903ab84171072b6bff8d98eb58d38b2c9aaf645"; + name = "barryvdh-laravel-snappy-2c18a3602981bc6f25b32908cf8aaa05952ab2f7"; src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/1903ab84171072b6bff8d98eb58d38b2c9aaf645"; - sha256 = "1awr5kwj482qsh5wpg0q44fjqi7a9q26ghcc9wp1n9zm97y0rx7a"; + url = https://api.github.com/repos/barryvdh/laravel-snappy/zipball/2c18a3602981bc6f25b32908cf8aaa05952ab2f7; + sha256 = "1h3s9g9n1rk3iji0p9m3g21gakjxnp4ciqwd5cdbj0wnh9k7gi2h"; }; }; }; @@ -57,27 +57,17 @@ let src = composerEnv.buildZipPackage { name = "brick-math-ca57d18f028f84f777b2168cd1911b0dee2343ae"; src = fetchurl { - url = "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae"; + url = https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae; sha256 = "1nr1grrb9g5g3ihx94yk0amp8zx8prkkvg2934ygfc3rrv03cq9w"; }; }; }; - "composer/package-versions-deprecated" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "composer-package-versions-deprecated-b174585d1fe49ceed21928a945138948cb394600"; - src = fetchurl { - url = "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600"; - sha256 = "0m5hd3wfaka53n51b9aavyifwc2bdyr3jwywpkmpyrlmmn67c8ax"; - }; - }; - }; "dasprid/enum" = { targetDir = ""; src = composerEnv.buildZipPackage { name = "dasprid-enum-5abf82f213618696dda8e3bf6f64dd042d8542b2"; src = fetchurl { - url = "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2"; + url = https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2; sha256 = "0rs7i1xiwhssy88s7bwnp5ri5fi2xy3fl7pw6l5k27xf2f1hv7q6"; }; }; @@ -85,30 +75,30 @@ let "doctrine/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-cache-331b4d5dbaeab3827976273e9356b3b453c300ce"; + name = "doctrine-cache-1ca8f21980e770095a31456042471a57bc4c68fb"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce"; - sha256 = "1ksr3460a5dpqgq5kgy2l7kdz7fairpvmip8nwaz9y833r5hnnyz"; + url = https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb; + sha256 = "1p8ia9g3mqz71bv4x8q1ng1fgcidmyksbsli1fjbialpgjk9k1ss"; }; }; }; "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-5d54f63541d7bed1156cb5c9b79274ced61890e4"; + name = "doctrine-dbal-9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/5d54f63541d7bed1156cb5c9b79274ced61890e4"; - sha256 = "1mqrijv0rrrcil2wcb5jvryfcl9phskbk4llj5gsf1hmrj0pfsgq"; + url = https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a; + sha256 = "0jf1whbf0d5kizrlzdm29ld5lrk4fgmayr239vyl2dmdzzxyvkhf"; }; }; }; "doctrine/deprecations" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-deprecations-9504165960a1f83cc1480e2be1dd0a0478561314"; + name = "doctrine-deprecations-0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314"; - sha256 = "04kpbzk5iw86imspkg7dgs54xx877k9b5q0dfg2h119mlfkvxil6"; + url = https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de; + sha256 = "1sk1f020n0w7p7r4rsi7wnww85vljrim1i5h9wb0qiz2c4l8jj09"; }; }; }; @@ -117,7 +107,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f"; + url = https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f; sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8"; }; }; @@ -127,7 +117,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-inflector-8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"; + url = https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89; sha256 = "1l83jbj4k59m1agi041gzx1rxix1wzxw9mvnivmg1hqr158149n7"; }; }; @@ -135,30 +125,30 @@ let "doctrine/lexer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-lexer-e864bbf5904cb8f5bb334f99209b48018522f042"; + name = "doctrine-lexer-c268e882d4dbdd85e36e4ad69e02dc284f89d229"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042"; - sha256 = "11lg9fcy0crb8inklajhx3kyffdbx7xzdj8kwl21xsgq9nm9iwvv"; + url = https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229; + sha256 = "12g069nljl3alyk15884nd1jc4mxk87isqsmfj7x6j2vxvk9qchs"; }; }; }; "dompdf/dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-de4aad040737a89fae2129cdeb0f79c45513128d"; + name = "dompdf-dompdf-5031045d9640b38cfc14aac9667470df09c9e090"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/de4aad040737a89fae2129cdeb0f79c45513128d"; - sha256 = "1isjhijd3lxsl0k9lzgp7rzqcak3hb7w04cy4pn62wpxckhcc30i"; + url = https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090; + sha256 = "1ciw3mc6pq3rwpzsgc71gdbwppqjdfcr0fhq3435c27ni5y8z4c5"; }; }; }; "dragonmantank/cron-expression" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dragonmantank-cron-expression-7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c"; + name = "dragonmantank-cron-expression-be85b3f05b46c39bbc0d95f6c071ddff669510fa"; src = fetchurl { - url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c"; - sha256 = "0pl9zrj9254qbwr7vyiilzhmb7bq2ss631iwvlq1mqky2bwinj2l"; + url = https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa; + sha256 = "09k5cj8bay6jkphjl5ngfx7qb17dxnlvpf6918a9ms8am731s2a6"; }; }; }; @@ -167,7 +157,7 @@ let src = composerEnv.buildZipPackage { name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4"; src = fetchurl { - url = "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4"; + url = https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4; sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck"; }; }; @@ -175,10 +165,10 @@ let "filp/whoops" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "filp-whoops-f056f1fe935d9ed86e698905a957334029899895"; + name = "filp-whoops-a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"; src = fetchurl { - url = "https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895"; - sha256 = "1qqznxsrlvjlnxlnr786a39igvq3pslxrvm5ks1v09ni88w44g7g"; + url = https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc; + sha256 = "0hc9zfh3i7br30831grccm4wny9dllpswhaw8hdn988mvg5xrdy0"; }; }; }; @@ -187,7 +177,7 @@ let src = composerEnv.buildZipPackage { name = "graham-campbell-result-type-0690bde05318336c7221785f2a932467f98b64ca"; src = fetchurl { - url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca"; + url = https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca; sha256 = "0a6kj3vxmhr1wh2kggmrl6y41hkg19jc0iq8qw095lf11mr4bd83"; }; }; @@ -195,10 +185,10 @@ let "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-ee0a041b1760e6a53d2a39c8c34115adc2af2c79"; + name = "guzzlehttp-guzzle-1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79"; - sha256 = "0wa63kw5fr5jhy2cv1g28qy9rsgwhn902447mzmgz17qjx72lzrb"; + url = https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82; + sha256 = "0a8491bb72y61r3ghqn32kabsj8rxhj9pddnkkr14x3wbc10zfr4"; }; }; }; @@ -207,7 +197,7 @@ let src = composerEnv.buildZipPackage { name = "guzzlehttp-promises-fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; + url = https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da; sha256 = "09ivi77y49bpc2sy3xhvgq22rfh2fhv921mn8402dv0a8bdprf56"; }; }; @@ -215,90 +205,90 @@ let "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-089edd38f5b8abba6cb01567c2a8aaa47cec4c72"; + name = "guzzlehttp-psr7-13388f00956b1503577598873fffb5ae994b5737"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72"; - sha256 = "1k29gax82rf82sbw2cbcp4qn3s3096csvmw9848l94q6ryc4j2rb"; + url = https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737; + sha256 = "05vc1q903nxfg11y9mcnlg253lm5d81jjg6wv76hjiwx8m47lbac"; }; }; }; "intervention/image" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "intervention-image-9a8cc99d30415ec0b3f7649e1647d03a55698545"; + name = "intervention-image-04be355f8d6734c826045d02a1079ad658322dad"; src = fetchurl { - url = "https://api.github.com/repos/Intervention/image/zipball/9a8cc99d30415ec0b3f7649e1647d03a55698545"; - sha256 = "1fvfhxr8jyh6jjg3imacgvddgn222g822fq5p9yz8lqlw2ymcfnz"; + url = https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad; + sha256 = "1cbg43hm2jgwb7gm1r9xcr4cpx8ng1zr93zx6shk9xhjlssnv0bx"; }; }; }; "knplabs/knp-snappy" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "knplabs-knp-snappy-349c2e872bbeb15dff825a17dd92ea9c6ae4120e"; + name = "knplabs-knp-snappy-5126fb5b335ec929a226314d40cd8dad497c3d67"; src = fetchurl { - url = "https://api.github.com/repos/KnpLabs/snappy/zipball/349c2e872bbeb15dff825a17dd92ea9c6ae4120e"; - sha256 = "12fsslr3k1zn7rw9xnma3pvlmm4qvrapizhn4il4zqcmw51lgnl7"; + url = https://api.github.com/repos/KnpLabs/snappy/zipball/5126fb5b335ec929a226314d40cd8dad497c3d67; + sha256 = "1j5bdj3sbww43nfgk7pasmyciwqdi92vj6pykw8f2xaq9c3i75p9"; }; }; }; "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-83fe447ae964dc5f1f829d25fa2f6042d9099834"; + name = "laravel-framework-2cf142cd5100b02da248acad3988bdaba5635e16"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/83fe447ae964dc5f1f829d25fa2f6042d9099834"; - sha256 = "0843j6am2fmnyvgydd9fkc7fnjbj63ii25mnrbi6xnzqniq2lrrz"; + url = https://api.github.com/repos/laravel/framework/zipball/2cf142cd5100b02da248acad3988bdaba5635e16; + sha256 = "19n6ynj4cbpxx1h4y1np61i7mdahfbzfajly95w4zqss5bm67j73"; }; }; }; "laravel/serializable-closure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-25de3be1bca1b17d52ff0dc02b646c667ac7266c"; + name = "laravel-serializable-closure-09f0e9fb61829f628205b7c94906c28740ff9540"; src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/25de3be1bca1b17d52ff0dc02b646c667ac7266c"; - sha256 = "1fk4zbvlc3qcw50pbs1qw5hgc8a3xgv4hn185ghq5kmmxm3q84p6"; + url = https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540; + sha256 = "1b0kdx0cs43ci4pyhhv874k5i0k42iiizz1mz0f6wk8lpzhk0r6r"; }; }; }; "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-b5c67f187ddcf15529ff7217fa735b132620dfac"; + name = "laravel-socialite-68afb03259b82d898c68196cbcacd48596a9dd72"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/b5c67f187ddcf15529ff7217fa735b132620dfac"; - sha256 = "0sryq8a6sr7n1b1cajdnd4xkwhfygkb6a7s4b176vvh64lps3nn9"; + url = https://api.github.com/repos/laravel/socialite/zipball/68afb03259b82d898c68196cbcacd48596a9dd72; + sha256 = "0pp8wqbjvsdsh4x8nvafp0fz42iwaqbm4l7qf91q0c1jqqfqqx6r"; }; }; }; "laravel/tinker" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-tinker-a9ddee4761ec8453c584e393b393caff189a3e42"; + name = "laravel-tinker-dff39b661e827dae6e092412f976658df82dbac5"; src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/a9ddee4761ec8453c584e393b393caff189a3e42"; - sha256 = "1kzwwkxx1lzx6x85z29dd8a35jz3qw416p797s203vidayynn731"; + url = https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5; + sha256 = "0az4n99pfrhrnr7diwi656f8y9qbynxzdw25md29ji8bw0isbc6d"; }; }; }; "laravel/ui" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-ui-b3e804559bf3973ecca160a4ae1068e6c7c167c6"; + name = "laravel-ui-65ec5c03f7fee2c8ecae785795b829a15be48c2c"; src = fetchurl { - url = "https://api.github.com/repos/laravel/ui/zipball/b3e804559bf3973ecca160a4ae1068e6c7c167c6"; - sha256 = "1mf6f7508b3943bsb75x6myh62ry6r5n2iqicdiw3kv5f87c1c5a"; + url = https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c; + sha256 = "0hr8kkbxvxxidnw86r1i92938wajhskv68zjn1627h1i16b10ysm"; }; }; }; "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-c4228d11e30d7493c6836d20872f9582d8ba6dcf"; + name = "league-commonmark-2b8185c13bc9578367a5bf901881d1c1b5bbd09b"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/c4228d11e30d7493c6836d20872f9582d8ba6dcf"; - sha256 = "0x18k1qmvskd5x1b3jkkmig6l734sxffj5xyfb82yrzgpw9lrld5"; + url = https://api.github.com/repos/thephpleague/commonmark/zipball/2b8185c13bc9578367a5bf901881d1c1b5bbd09b; + sha256 = "14hp7vmqag9jh89rcq1mi3hyw01rkmypdbw2p3zsnjq2p8wwh4r5"; }; }; }; @@ -307,7 +297,7 @@ let src = composerEnv.buildZipPackage { name = "league-flysystem-094defdb4a7001845300334e7c1ee2335925ef99"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99"; + url = https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99; sha256 = "0dn71b1pwikbwz1cmmz9k1fc8k1fsmah3gy8sqxbz7czhqn5qiva"; }; }; @@ -317,7 +307,7 @@ let src = composerEnv.buildZipPackage { name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972"; + url = https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972; sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab"; }; }; @@ -325,50 +315,50 @@ let "league/html-to-markdown" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-html-to-markdown-4d0394e120dc14b0d5c52fd1755fd48656da2ec9"; + name = "league-html-to-markdown-e0fc8cf07bdabbcd3765341ecb50c34c271d64e1"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/4d0394e120dc14b0d5c52fd1755fd48656da2ec9"; - sha256 = "0my5k4cf5m3qb6bgq07dyq3347xm64sd1f83nr14ny3w31vb43cm"; + url = https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e0fc8cf07bdabbcd3765341ecb50c34c271d64e1; + sha256 = "1a7ab0xafjwd5hmkmixc3ijwrrncb2qncy9b52jbnzspv1vjav1h"; }; }; }; "league/mime-type-detection" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-mime-type-detection-aa70e813a6ad3d1558fc927863d47309b4c23e69"; + name = "league-mime-type-detection-ff6248ea87a9f116e78edd6002e39e5128a0d4dd"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/aa70e813a6ad3d1558fc927863d47309b4c23e69"; - sha256 = "0k2kccf1v0002bb083p1ncmm8fbyflnkjx45808sxlkrxggzqcy3"; + url = https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd; + sha256 = "1a63nvqd6cz3vck3y8vjswn6c3cfwh13p0cn0ci5pqdf0bgjvvfz"; }; }; }; "league/oauth1-client" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-oauth1-client-88dd16b0cff68eb9167bfc849707d2c40ad91ddc"; + name = "league-oauth1-client-d6365b901b5c287dd41f143033315e2f777e1167"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/oauth1-client/zipball/88dd16b0cff68eb9167bfc849707d2c40ad91ddc"; - sha256 = "1b0zza3qxqgn57105wbfw2fzphj3l3f7iqh7v3w98pdvaiapaf5d"; + url = https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167; + sha256 = "0hkh8l7884g8ssja1biwfb59x0jj951lwk6kmiacjqvyvzs07qmx"; }; }; }; "league/oauth2-client" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-oauth2-client-badb01e62383430706433191b82506b6df24ad98"; + name = "league-oauth2-client-2334c249907190c132364f5dae0287ab8666aa19"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/oauth2-client/zipball/badb01e62383430706433191b82506b6df24ad98"; - sha256 = "1j2bmvy39k8wafisxdc0xn58gga5w9jpwp5hqjy51sk1s2ssws8i"; + url = https://api.github.com/repos/thephpleague/oauth2-client/zipball/2334c249907190c132364f5dae0287ab8666aa19; + sha256 = "12a3mpv3x5jy1nnpzx25z80chzhjxk8sgvn5x02pzk5dlw8kbzhz"; }; }; }; "monolog/monolog" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "monolog-monolog-fd4380d6fc37626e2f799f29d91195040137eba9"; + name = "monolog-monolog-5579edf28aee1190a798bfa5be8bc16c563bd524"; src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9"; - sha256 = "1k56si01sjl93mxq1pk599yqqqhldqz34qi73y5jaga0m9iq07wk"; + url = https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524; + sha256 = "014sys8bv57jbpag7xlc7vplc1qy4h5jppy258hpr0xfbh27cg3w"; }; }; }; @@ -377,7 +367,7 @@ let src = composerEnv.buildZipPackage { name = "mtdowling-jmespath.php-9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; src = fetchurl { - url = "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; + url = https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb; sha256 = "1ig3gi6f8gisagcn876598ps48s86s6m0c82diyksylarg3yn0yd"; }; }; @@ -385,50 +375,50 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-8c2a18ce3e67c34efc1b29f64fe61304368259a2"; + name = "nesbot-carbon-97a34af22bde8d0ac20ab34b29d7bfe360902055"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/8c2a18ce3e67c34efc1b29f64fe61304368259a2"; - sha256 = "0ld6pm7sj7myqs1xa9c2bh9l0v2qcr7lcv590sy0mqn0fcx2gqr5"; + url = https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055; + sha256 = "0dagm5dr9pbyvxhmspdwmpwgnxf65mjk24a32cw8h5wqfn0p99i8"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-210577fe3cf7badcc5814d99455df46564f3c077"; + name = "nikic-php-parser-34bea19b6e03d8153165d8f30bba4c3be86184c1"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077"; - sha256 = "191ijb7bybqnl1jayx6bipqh91dc9acg9zsbh89fk4h1ff87b1qp"; + url = https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1; + sha256 = "1yj97j9cdx48566qwjl5q8hkjkrd1xl59aczb1scspxay37l9w72"; }; }; }; "onelogin/php-saml" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "onelogin-php-saml-f30f5062f3653c4d2082892d207f4dc3e577d979"; + name = "onelogin-php-saml-247a45c079e65a78185d5489bdda0f95826c014d"; src = fetchurl { - url = "https://api.github.com/repos/onelogin/php-saml/zipball/f30f5062f3653c4d2082892d207f4dc3e577d979"; - sha256 = "0nl431rx1gngc2g92w4hjf2y26vjvscgbrwhq0m6kzm9kq043qzh"; + url = https://api.github.com/repos/onelogin/php-saml/zipball/247a45c079e65a78185d5489bdda0f95826c014d; + sha256 = "1hmv63ba9164khnwmrrl0m8n0zjl729afp5nsvl8nz7frharilb4"; }; }; }; "opis/closure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "opis-closure-06e2ebd25f2869e54a306dda991f7db58066f7f6"; + name = "opis-closure-3d81e4309d2a927abbe66df935f4bb60082805ad"; src = fetchurl { - url = "https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6"; - sha256 = "0fpa1w0rmwywj67jgaldmw563p7gycahs8gpkpjvrra9zhhj4yyc"; + url = https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad; + sha256 = "0hqs6rdkkcggswrgjlispkby2yg4hwn63bl2ma62lnmpfbpwn0sd"; }; }; }; "paragonie/constant_time_encoding" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "paragonie-constant_time_encoding-f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"; + name = "paragonie-constant_time_encoding-58c3f47f650c94ec05a151692652a868995d2938"; src = fetchurl { - url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"; - sha256 = "1r1xj3j7s5mskw5gh3ars4dfhvcn7d252gdqgpif80026kj5fvrp"; + url = https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938; + sha256 = "0i9km0lzvc7df9758fm1p3y0679pzvr5m9x3mrz0d2hxlppsm764"; }; }; }; @@ -437,7 +427,7 @@ let src = composerEnv.buildZipPackage { name = "paragonie-random_compat-996434e5492cb4c3edcb9168db6fbb1359ef965a"; src = fetchurl { - url = "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a"; + url = https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a; sha256 = "0ky7lal59dihf969r1k3pb96ql8zzdc5062jdbg69j6rj0scgkyx"; }; }; @@ -445,20 +435,20 @@ let "phenx/php-font-lib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phenx-php-font-lib-ca6ad461f032145fff5971b5985e5af9e7fa88d8"; + name = "phenx-php-font-lib-dd448ad1ce34c63d09baccd05415e361300c35b4"; src = fetchurl { - url = "https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8"; - sha256 = "0kl9lks1kpniby8dn8racjcjp6xjnhl3065y7ivarbl6ni6hyyxw"; + url = https://api.github.com/repos/dompdf/php-font-lib/zipball/dd448ad1ce34c63d09baccd05415e361300c35b4; + sha256 = "0l20inbvipjdg9fdd32v8b7agjyvcs0rpqswcylld64vbm2sf3il"; }; }; }; "phenx/php-svg-lib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phenx-php-svg-lib-5fa61b65e612ce1ae15f69b3d223cb14ecc60e32"; + name = "phenx-php-svg-lib-4498b5df7b08e8469f0f8279651ea5de9626ed02"; src = fetchurl { - url = "https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32"; - sha256 = "1ppi3hs2r4cbd6b2xwf4znci6hpbs8469kqxk3msf7vi6vfnybbj"; + url = https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02; + sha256 = "01w65haq96sfyjl8ahm9nb95wasgl66ymv5lycx1cbagy653xdin"; }; }; }; @@ -467,7 +457,7 @@ let src = composerEnv.buildZipPackage { name = "phpoption-phpoption-eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; src = fetchurl { - url = "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; + url = https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15; sha256 = "1lk50y8jj2mzbwc2mxfm2xdasxf4axya72nv8wfc1vyz9y5ys3li"; }; }; @@ -475,30 +465,30 @@ let "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb"; + name = "phpseclib-phpseclib-2f0b7af658cbea265cbb4a791d6c29a6613f98ef"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb"; - sha256 = "1ahr00g5bpvgjw36ps32aadyvnrsar94p06kar4pxvls4cmixldl"; + url = https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef; + sha256 = "08azglzhm6j821p5w3nb61ny7gz4lgj5kdmr1f1h723f8sjjwmfs"; }; }; }; "pragmarx/google2fa" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "pragmarx-google2fa-26c4c5cf30a2844ba121760fd7301f8ad240100b"; + name = "pragmarx-google2fa-80c3d801b31fe165f8fe99ea085e0a37834e1be3"; src = fetchurl { - url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b"; - sha256 = "1jmc7s3hbczvb0h4kfmya67l969nfww3lmc4slvzsz0zd769434h"; + url = https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3; + sha256 = "0qfjgkl02ifc0zicv3d5d6zs8mwpq68bg211jy3psgghnqpxyhlm"; }; }; }; "predis/predis" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "predis-predis-c50c3393bb9f47fa012d0cdfb727a266b0818259"; + name = "predis-predis-a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e"; src = fetchurl { - url = "https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259"; - sha256 = "09riabf99jmxydrqn8cm6nsw3fbp307fqcpc9iw4ag2qfhwm2v73"; + url = https://api.github.com/repos/predis/predis/zipball/a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e; + sha256 = "109j0chyqmr0rzfn25843yacfnm438z94rpxlx1hvhcigfspjhvf"; }; }; }; @@ -507,7 +497,7 @@ let src = composerEnv.buildZipPackage { name = "psr-cache-d11b50ad223250cf17b86e38383413f5a6764bf8"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8"; + url = https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8; sha256 = "06i2k3dx3b4lgn9a4v1dlgv8l9wcl4kl7vzhh63lbji0q96hv8qz"; }; }; @@ -515,10 +505,10 @@ let "psr/container" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-container-8622567409010282b7aeebe4bb841fe98b58dcaf"; + name = "psr-container-513e0666f7216c7459170d56df27dfcefe1689ea"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf"; - sha256 = "0qfvyfp3mli776kb9zda5cpc8cazj3prk0bg0gm254kwxyfkfrwn"; + url = https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea; + sha256 = "00yvj3b5ls2l1d0sk38g065raw837rw65dx1sicggjnkr85vmfzz"; }; }; }; @@ -527,7 +517,7 @@ let src = composerEnv.buildZipPackage { name = "psr-event-dispatcher-dbefd12671e8a14ec7f180cab83036ed26714bb0"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0"; + url = https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0; sha256 = "05nicsd9lwl467bsv4sn44fjnnvqvzj1xqw2mmz9bac9zm66fsjd"; }; }; @@ -537,7 +527,7 @@ let src = composerEnv.buildZipPackage { name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; + url = https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621; sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v"; }; }; @@ -547,7 +537,7 @@ let src = composerEnv.buildZipPackage { name = "psr-http-factory-12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; + url = https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be; sha256 = "0inbnqpc5bfhbbda9dwazsrw9xscfnc8rdx82q1qm3r446mc1vds"; }; }; @@ -557,7 +547,7 @@ let src = composerEnv.buildZipPackage { name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363"; + url = https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363; sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45"; }; }; @@ -567,7 +557,7 @@ let src = composerEnv.buildZipPackage { name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11"; + url = https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11; sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln"; }; }; @@ -577,7 +567,7 @@ let src = composerEnv.buildZipPackage { name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; + url = https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b; sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw"; }; }; @@ -585,10 +575,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-a0d9981aa07ecfcbea28e4bfa868031cca121e7d"; + name = "psy-psysh-c23686f9c48ca202710dbb967df8385a952a2daf"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d"; - sha256 = "1gsmnqshrc97phlinhiina9465lw0ir3xcfl4lbn4f9lm7nxzzs2"; + url = https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf; + sha256 = "1qjqb3x1sgqz9m6ckzgsymdgwqkd9kf8zv6wy5xiwhaxvqv4f0i7"; }; }; }; @@ -597,7 +587,7 @@ let src = composerEnv.buildZipPackage { name = "ralouphie-getallheaders-120b605dfeb996808c31b6477290a714d356e822"; src = fetchurl { - url = "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822"; + url = https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822; sha256 = "1bv7ndkkankrqlr2b4kw7qp3fl0dxi6bp26bnim6dnlhavd6a0gg"; }; }; @@ -607,7 +597,7 @@ let src = composerEnv.buildZipPackage { name = "ramsey-collection-cccc74ee5e328031b15640b51056ee8d3bb66c0a"; src = fetchurl { - url = "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a"; + url = https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a; sha256 = "1i2ga25aj80cci3di58qm17l588lzgank8wqhdbq0dcb3cg6cgr6"; }; }; @@ -617,7 +607,7 @@ let src = composerEnv.buildZipPackage { name = "ramsey-uuid-fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; src = fetchurl { - url = "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; + url = https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df; sha256 = "1fhjsyidsj95x5dd42z3hi5qhzii0hhhxa7xvc5jj7spqjdbqln4"; }; }; @@ -627,7 +617,7 @@ let src = composerEnv.buildZipPackage { name = "robrichards-xmlseclibs-f8f19e58f26cdb42c54b214ff8a820760292f8df"; src = fetchurl { - url = "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df"; + url = https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df; sha256 = "01zlpm36rrdj310cfmiz2fnabszxd3fq80fa8x8j3f9ki7dvhh5y"; }; }; @@ -637,7 +627,7 @@ let src = composerEnv.buildZipPackage { name = "sabberworm-php-css-parser-e41d2140031d533348b2192a83f02d8dd8a71d30"; src = fetchurl { - url = "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30"; + url = https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30; sha256 = "0slqh0ra9cwk1pm4q7bqhndynir0yxypzrxb2vrfzfkmnh0rm02c"; }; }; @@ -647,7 +637,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-discord-c6eddeb07ace7473e82d02d4db852dfacf5ef574"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574"; + url = https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574; sha256 = "1w8m7jmlsdk94cqckgd75mwblh3jj6j16w3g4hzysyms25g091xc"; }; }; @@ -657,7 +647,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-gitlab-a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/GitLab/zipball/a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d"; + url = https://api.github.com/repos/SocialiteProviders/GitLab/zipball/a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d; sha256 = "1blv2h69dmm0r0djz3h0l0cxkxmzd1fzgg13r3npxx7c80xjpw3a"; }; }; @@ -665,30 +655,30 @@ let "socialiteproviders/manager" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-manager-0f5e82af0404df0080bdc5c105cef936c1711524"; + name = "socialiteproviders-manager-4e63afbd26dc45ff263591de2a0970436a6a0bf9"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/0f5e82af0404df0080bdc5c105cef936c1711524"; - sha256 = "0ppmln72khli94ylnsjarnhzkqzpkc32pn3zf3ljahm1yghccczx"; + url = https://api.github.com/repos/SocialiteProviders/Manager/zipball/4e63afbd26dc45ff263591de2a0970436a6a0bf9; + sha256 = "1056ilack76b0zsqv7i1znidg5nyd9iznvznh5x7vsryspjvx358"; }; }; }; "socialiteproviders/microsoft-azure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-microsoft-azure-9b23e02ff711de42e513aa55f768a4f1c67c0e41"; + name = "socialiteproviders-microsoft-azure-7522b27cd8518706b50e03b40a396fb0a6891feb"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/9b23e02ff711de42e513aa55f768a4f1c67c0e41"; - sha256 = "01i53v1pcr3nfpydpy0ka5jrdyygpi4vc5w24022913nfjqg3bqm"; + url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/7522b27cd8518706b50e03b40a396fb0a6891feb; + sha256 = "0nlxyvcn3vc273rq9cp2yhm72mqfj31csnla5bqsaqdshzfk8pna"; }; }; }; "socialiteproviders/okta" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-okta-e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8"; + name = "socialiteproviders-okta-7c0b7522423943131f680e74123b71ccd3989541"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Okta/zipball/e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8"; - sha256 = "1a3anw5di5nqiabvqpmsjv5x0jasmsn4y876qsv77gazxja880ng"; + url = https://api.github.com/repos/SocialiteProviders/Okta/zipball/7c0b7522423943131f680e74123b71ccd3989541; + sha256 = "1hly2f06k6jxjxz36swa3b0g285ni556k3wz089f3lxyrnhwnkdf"; }; }; }; @@ -697,7 +687,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-slack-2b781c95daf06ec87a8f3deba2ab613d6bea5e8d"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Slack/zipball/2b781c95daf06ec87a8f3deba2ab613d6bea5e8d"; + url = https://api.github.com/repos/SocialiteProviders/Slack/zipball/2b781c95daf06ec87a8f3deba2ab613d6bea5e8d; sha256 = "1xilg7l1wc1vgwyakhfl8dpvgkjqx90g4khvzi411j9xa2wvpprh"; }; }; @@ -707,7 +697,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-twitch-7accf30ae7a3139b757b4ca8f34989c09a3dbee7"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7"; + url = https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7; sha256 = "089i4fwxb32zmbxib0544jfs48wzjyp7bsqss2bf2xx89dsrx4ah"; }; }; @@ -715,10 +705,10 @@ let "ssddanbrown/htmldiff" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "ssddanbrown-htmldiff-f60d5cc278b60305ab980a6665f46117c5b589c0"; + name = "ssddanbrown-htmldiff-58f81857c02b50b199273edb4cc339876b5a4038"; src = fetchurl { - url = "https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/f60d5cc278b60305ab980a6665f46117c5b589c0"; - sha256 = "12h3swr8rjf5w78kfgwzkf0zb59b4a8mjwf65fgcgvjg115wha9x"; + url = https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/58f81857c02b50b199273edb4cc339876b5a4038; + sha256 = "0ixsi2s1igvciwnal1v2w654n4idbfs8ipyiixch7k5nzxl4g7wm"; }; }; }; @@ -727,7 +717,7 @@ let src = composerEnv.buildZipPackage { name = "swiftmailer-swiftmailer-8a5d5072dca8f48460fce2f4131fcc495eec654c"; src = fetchurl { - url = "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c"; + url = https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c; sha256 = "1p9m4fw9y9md9a7msbmnc0hpdrky8dwrllnyg1qf1cdyp9d70x1d"; }; }; @@ -735,270 +725,270 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4"; + name = "symfony-console-829d5d1bf60b2efeb0887b7436873becc71a45eb"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4"; - sha256 = "19b1457cnn8ijbwd4mha6nxhvcsd4kh7dn72klixykj2kvqh0hvg"; + url = https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb; + sha256 = "1mvlkvs7xq6l1lb6cgwy8j3avfhgx6aiz70ln6i6vaap7yhr3zh5"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-44b933f98bb4b5220d10bed9ce5662f8c2d13dcc"; + name = "symfony-css-selector-b0a190285cd95cb019237851205b8140ef6e368e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/css-selector/zipball/44b933f98bb4b5220d10bed9ce5662f8c2d13dcc"; - sha256 = "0h05a4jfv64vgbw40r7f0ndz617hmml5kn7wck38fb31mmrprbak"; + url = https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e; + sha256 = "1wpxfb7xcn7sjpcgz45582wxymq9d089a71mz80kmwrlblcvxq99"; }; }; }; "symfony/deprecation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-deprecation-contracts-6f981ee24cf69ee7ce9736146d1c57c2780598a8"; + name = "symfony-deprecation-contracts-e8b495ea28c1d97b5e0c121748d6f9b53d075c66"; src = fetchurl { - url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8"; - sha256 = "05jws1g4kcs297bwf5d72z47m2263i2jqpivi3yv8kf50kdjjzba"; + url = https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66; + sha256 = "09k869asjb7cd3xh8i5ps824k5y6v510sbpzfalndwy3knig9fig"; }; }; }; "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-1e3cb3565af49cd5f93e5787500134500a29f0d9"; + name = "symfony-error-handler-c116cda1f51c678782768dce89a45f13c949455d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/1e3cb3565af49cd5f93e5787500134500a29f0d9"; - sha256 = "1qqgn6ksg7bimcvf5f821zmfhp9zd5x9c9bibvg3qzfzd22zmk11"; + url = https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d; + sha256 = "16bvys7dkhja7bjf42k7rxd7d96fbsp1aj3n50a6b6fj3q2jkxwm"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-27d39ae126352b9fa3be5e196ccf4617897be3eb"; + name = "symfony-event-dispatcher-8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb"; - sha256 = "01gl3av34p4jk71xjw6bjfsycb0fh02ll1bn3h3jdknzgkg2lsg4"; + url = https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc; + sha256 = "10vdzpy7gvmy0w4lpr4h4xj2gr224k5llc7f356x1jzbijxg8ckh"; }; }; }; "symfony/event-dispatcher-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-contracts-66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"; + name = "symfony-event-dispatcher-contracts-f98b54df6ad059855739db6fcbc2d36995283fe1"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"; - sha256 = "03bx5j7xh5bv1v17nlaw9wnbad66bzwp5w7npg8w2b01my49phfy"; + url = https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1; + sha256 = "114zpsd8vac016a0ppf5ag5lmgllrha7nwln8vvhq9282r79xhsl"; }; }; }; "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-d2f29dac98e96a98be467627bd49c2efb1bc2590"; + name = "symfony-finder-9b630f3427f3ebe7cd346c277a1408b00249dad9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/d2f29dac98e96a98be467627bd49c2efb1bc2590"; - sha256 = "10ham5wrdsmxp8mrzwmxc87dw33fpacrbcaynm5w4v0z1sbvwkpb"; + url = https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9; + sha256 = "0b2rdx4080jav1ixqxrl4mabn91amf81xsj533b067vdfq4rcfv4"; }; }; }; "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-5dad3780023a707f4c24beac7d57aead85c1ce3c"; + name = "symfony-http-foundation-6b0d0e4aca38d57605dcd11e2416994b38774522"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/5dad3780023a707f4c24beac7d57aead85c1ce3c"; - sha256 = "0szcq1x9zil11axgjlhcnw3vw48md5k02k3h01sxd8ywlzkjyaz0"; + url = https://api.github.com/repos/symfony/http-foundation/zipball/6b0d0e4aca38d57605dcd11e2416994b38774522; + sha256 = "0633r4dx8xrbllqxfxl9fhfr32qak5wx8p2zysb3g9yqp0saf4gb"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-2bdace75c9d6a6eec7e318801b7dc87a72375052"; + name = "symfony-http-kernel-34b121ad3dc761f35fe1346d2f15618f8cbf77f8"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/2bdace75c9d6a6eec7e318801b7dc87a72375052"; - sha256 = "1gwpzi97ih9gzddlw8ihyndkyi137r3hyycyb55l01yfq1wl7la1"; + url = https://api.github.com/repos/symfony/http-kernel/zipball/34b121ad3dc761f35fe1346d2f15618f8cbf77f8; + sha256 = "02x5ym8p9mjn7j69a85nkg50685m9kq6xwhnzpydbn28w3rwksdv"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-d4365000217b67c01acff407573906ff91bcfb34"; + name = "symfony-mime-2b3802a24e48d0cfccf885173d2aac91e73df92e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/d4365000217b67c01acff407573906ff91bcfb34"; - sha256 = "12q2b5xbc0pyhfn0wyfnjf5sklnsrkafy2yg7d4fb3d8vliv4zzf"; + url = https://api.github.com/repos/symfony/mime/zipball/2b3802a24e48d0cfccf885173d2aac91e73df92e; + sha256 = "0qsfkx1md5xkvq5cxkj3qggmk5ykcsdm6i9553p9r14iqpxhnkqg"; }; }; }; "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-46cd95797e9df938fdd2b03693b5fca5e64b01ce"; + name = "symfony-polyfill-ctype-6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce"; - sha256 = "0z4iiznxxs4r72xs4irqqb6c0wnwpwf0hklwn2imls67haq330zn"; + url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4; + sha256 = "18235xiqpjx9nzx3pzylm5yzqr6n1j8wnnrzgab1hpbvixfrbqba"; }; }; }; "symfony/polyfill-iconv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-iconv-63b5bb7db83e5673936d6e3b8b3e022ff6474933"; + name = "symfony-polyfill-iconv-143f1881e655bebca1312722af8068de235ae5dc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933"; - sha256 = "1jyjsjprsgb3r6cbc4x1wg1q1zqakqm8a62ah5lppxnjgq1sgjc5"; + url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc; + sha256 = "19v4r40vx62a181l6zfs7n40w9f7npy7jw5x6dssg40hl4a0i3p2"; }; }; }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-16880ba9c5ebe3642d1995ab866db29270b36535"; + name = "symfony-polyfill-intl-grapheme-433d05519ce6990bf3530fba6957499d327395c2"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535"; - sha256 = "0pb57756kvdxksqy2nndf8q7c91p2dzhysa52x2rbhba869760fv"; + url = https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2; + sha256 = "11169jh39mhr591b61iara8hvq4pnfzgkynlqg90iv510c74d1cg"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-65bd267525e82759e7d8c4e8ceea44f398838e65"; + name = "symfony-polyfill-intl-idn-59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65"; - sha256 = "1cx2cjx0vzni297l7avd3cb1q4c8d2hylkvdqcjlpxjqdimn4jkn"; + url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8; + sha256 = "1bcdl48ji0dmswwvw2b66qxdxxawbx8bgicc02la92gacps08n5v"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-8590a5f561694770bdcd3f9b5c69dde6945028e8"; + name = "symfony-polyfill-intl-normalizer-219aa369ceff116e673852dce47c3a41794c14bd"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8"; - sha256 = "1c60xin00q0d2gbyaiglxppn5hqwki616v5chzwyhlhf6aplwsh3"; + url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd; + sha256 = "1cwckrazq4p4i9ysjh8wjqw8qfnp0rx48pkwysch6z7vkgcif22w"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-9174a3d80210dca8daa7f31fec659150bbeabfc6"; + name = "symfony-polyfill-mbstring-9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6"; - sha256 = "17bhba3093di6xgi8f0cnf3cdd7fnbyp9l76d9y33cym6213ayx1"; + url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e; + sha256 = "0y289x91c9lgr8vlixj5blayf9lsgi4nn2gyn3a99brvn2jnh6q8"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-9a142215a36a3888e30d0a9eeea9766764e96976"; + name = "symfony-polyfill-php72-bf44a9fd41feaac72b074de600314a93e2ae78e2"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976"; - sha256 = "06ipbcvrxjzgvraf2z9fwgy0bzvzjvs5z1j67grg1gb15x3d428b"; + url = https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2; + sha256 = "11knb688wcf8yvrprgp4z02z3nb6s5xj3wrv77n2qjkc7nc8q7l7"; }; }; }; "symfony/polyfill-php73" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php73-fba8933c384d6476ab14fb7b8526e5287ca7e010"; + name = "symfony-polyfill-php73-e440d35fa0286f77fb45b79a03fedbeda9307e85"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010"; - sha256 = "0fc1d60iw8iar2zcvkzwdvx0whkbw8p6ll0cry39nbkklzw85n1h"; + url = https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85; + sha256 = "1c7w7j375a1fxq5m4ldy72jg5x4dpijs8q9ryqxvd6gmj1lvncqy"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-1100343ed1a92e3a38f9ae122fc0eb21602547be"; + name = "symfony-polyfill-php80-cfa0ae98841b9e461207c13ab093d76b0fa7bace"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be"; - sha256 = "0kwk2qgwswsmbfp1qx31ahw3lisgyivwhw5dycshr5v2iwwx3rhi"; + url = https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace; + sha256 = "1kbh4j01kxxc39ls9kzkg7dj13cdlzwy599b96harisysn47jw2n"; }; }; }; "symfony/polyfill-php81" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php81-e66119f3de95efc359483f810c4c3e6436279436"; + name = "symfony-polyfill-php81-13f6d1271c663dc5ae9fb843a8f16521db7687a1"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436"; - sha256 = "0hg340da7m0yipj2bj5hxhd3mqidz767ivg7w85r8vwz3mr9k1p3"; + url = https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1; + sha256 = "01dqzkdppaw7kh1vkckkzn54aql4iw6m9vyg99ahhzmqc2krs91x"; }; }; }; "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-5be20b3830f726e019162b26223110c8f47cf274"; + name = "symfony-process-597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"; src = fetchurl { - url = "https://api.github.com/repos/symfony/process/zipball/5be20b3830f726e019162b26223110c8f47cf274"; - sha256 = "03pwf12al7mg2sz3waiqxnqliyzszwiyvzb1f51c1hl57zbj9zz4"; + url = https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3; + sha256 = "1vv2xwk3cvr144yxjj6k4afhkv50v2b957lscncs6m3rvi2zs1nk"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-9eeae93c32ca86746e5d38f3679e9569981038b1"; + name = "symfony-routing-e07817bb6244ea33ef5ad31abc4a9288bef3f2f7"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/9eeae93c32ca86746e5d38f3679e9569981038b1"; - sha256 = "193vj08r1v3ghvid6jggqy62ip3n56mbwzpai3ldjhm8v8qdc9bs"; + url = https://api.github.com/repos/symfony/routing/zipball/e07817bb6244ea33ef5ad31abc4a9288bef3f2f7; + sha256 = "1lk7dbcxvfwmyx65hm0v78ma79f67jnq2xnzg6k0wz52161rk6cl"; }; }; }; "symfony/service-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-service-contracts-1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"; + name = "symfony-service-contracts-24d9dc654b83e91aa59f9d167b131bc3b5bea24c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"; - sha256 = "0c1vq6jv2jc37i9m1ndpbv7g75blgvf1s44vk65nb1jdk3hrbrd1"; + url = https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c; + sha256 = "1flrnq7dw7rg8b901fbi7gv6k25hqbhffpd15w751fmzsrpzaphl"; }; }; }; "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d"; + name = "symfony-string-985e6a9703ef5ce32ba617c9c7d97873bb7b2a99"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d"; - sha256 = "1ml6zra6bynqgi0rqfkz65lgmp0wiay93simx7882wxrcxfkljqf"; + url = https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99; + sha256 = "0hjkz8bb95ibp2am8i84b7ijh48llip613l0cc8i5fg5q12b20sn"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-8c82cd35ed861236138d5ae1c78c0c7ebcd62107"; + name = "symfony-translation-1639abc1177d26bcd4320e535e664cef067ab0ca"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/8c82cd35ed861236138d5ae1c78c0c7ebcd62107"; - sha256 = "0yh933f222v98bmvni0rxmvhqlhb1pa6ncwrvf06gly36sl6zkij"; + url = https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca; + sha256 = "0q7f4hfv8n7px5fhh0f8ii6lbfj9xp7fas5ls7yazm4980c06a1x"; }; }; }; "symfony/translation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-contracts-d28150f0f44ce854e942b671fc2620a98aae1b1e"; + name = "symfony-translation-contracts-1211df0afa701e45a04253110e959d4af4ef0f07"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e"; - sha256 = "0gwqxhrzb9dzsqvqr9lc3whzl8wwlfhwskr0wdwqri4pq5mspb2w"; + url = https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07; + sha256 = "09d057ycwa7l34ph32agkcbam8jwpxh6fr1ay17xf9haczlgs1ad"; }; }; }; "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-2366ac8d8abe0c077844613c1a4f0c0a9f522dcc"; + name = "symfony-var-dumper-af52239a330fafd192c773795520dc2dd62b5657"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/2366ac8d8abe0c077844613c1a4f0c0a9f522dcc"; - sha256 = "0ii4p4rkvrshvdix855p0jwb1snll275286swy95l59m6i76wzy1"; + url = https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657; + sha256 = "1dxmwyg3wxq313zfrjwywkfsi38lq6i3prq69f47vbiqajfs55jn"; }; }; }; @@ -1007,7 +997,7 @@ let src = composerEnv.buildZipPackage { name = "tijsverkoyen-css-to-inline-styles-da444caae6aca7a19c0c140f68c6182e337d5b1c"; src = fetchurl { - url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c"; + url = https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c; sha256 = "13lzhf1kswg626b8zd23z4pa7sg679si368wcg6pklqvijnn0any"; }; }; @@ -1017,7 +1007,7 @@ let src = composerEnv.buildZipPackage { name = "vlucas-phpdotenv-264dce589e7ce37a7ba99cb901eed8249fbec92f"; src = fetchurl { - url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f"; + url = https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f; sha256 = "0z2q376k3rww8qb9jdywm3fj386pqmcx7rg6msd3zdrjxfbqcqnl"; }; }; @@ -1025,20 +1015,20 @@ let "voku/portable-ascii" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "voku-portable-ascii-80953678b19901e5165c56752d087fc11526017c"; + name = "voku-portable-ascii-87337c91b9dfacee02452244ee14ab3c43bc485a"; src = fetchurl { - url = "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c"; - sha256 = "112sz1jl55l3qm3041ijyzxy7qbv0sa6535hx6sp7nk2c76wjq0d"; + url = https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a; + sha256 = "1j2xpbv7xiwxwb6gfc3h6imc6xcbyb2jw3h8wgfnpvjl5yfbi4xb"; }; }; }; "webmozart/assert" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "webmozart-assert-6964c76c7804814a842473e0c8fd15bab0f18e25"; + name = "webmozart-assert-11cb2199493b2f8a3b53e7f19068fc6aac760991"; src = fetchurl { - url = "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25"; - sha256 = "17xqhb2wkwr7cgbl4xdjf7g1vkal17y79rpp6xjpf1xgl5vypc64"; + url = https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991; + sha256 = "18qiza1ynwxpi6731jx1w5qsgw98prld1lgvfk54z92b1nc7psix"; }; }; }; From a16bc44532bbfe8ae0b6c4c9098fb9619ad4599c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 09:02:24 +0000 Subject: [PATCH 033/120] python310Packages.pglast: 3.12 -> 3.13 --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index b45b2139e712..b3c5d1284897 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.12"; + version = "3.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9lPyillQyCTXiHCCLq1DKG6YbKWSYu9h8AGijO3xN/M="; + hash = "sha256-H1IVoXBanNlmjUMhBHRbnBsbeK9LuruqXJaVgSgCFPo="; }; propagatedBuildInputs = [ From bad5dfb4f6fec988116c49f6059f0dbefec16ced Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 30 Jun 2022 05:48:27 -0500 Subject: [PATCH 034/120] pulumi-bin: 3.34.1 -> 3.35.2 --- pkgs/tools/admin/pulumi/data.nix | 258 +++++++++++++++--------------- pkgs/tools/admin/pulumi/update.sh | 2 +- 2 files changed, 130 insertions(+), 130 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 69b1c584313b..cecb05b06fdc 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.34.1"; + version = "3.35.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.34.1-linux-x64.tar.gz"; - sha256 = "04gavrv62m32nbw34mifm4vjwdrwwicnvhsln27m7jv0b67w5zpi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-linux-x64.tar.gz"; + sha256 = "0139r4l80i9mww7bjqk2j04lll0hl9xkc0irqq4ly65py6g3hh60"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.2-linux-amd64.tar.gz"; - sha256 = "18hkna4vr1m6gh93952wzz3nlal8q39m0gzc9fmy8lgaw3h7n2y7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-linux-amd64.tar.gz"; + sha256 = "0slbk34mx8bkvadlddi32j7pml3576gx0y8rjrsbgpy6xd6a4v5j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-linux-amd64.tar.gz"; sha256 = "1xsrskiw91izjvj1xqfhaf4728vl28wcq4dsinh232g7gfm862r3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.21.0-linux-amd64.tar.gz"; - sha256 = "10cj7d0lf8jj3wmz7l67s8ibs3znw2b07vr6k3yj3xg42dd5a4fr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-linux-amd64.tar.gz"; + sha256 = "0vxcc3hh3vqhfn6gx8fwarxiyah3yk86hza88p04qhymwfay0fry"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-linux-amd64.tar.gz"; @@ -29,24 +29,24 @@ sha256 = "01sgghfnd6wgvx2h4i69asbjshscbw9g4yl15ar5w178dp17p44n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.8.0-linux-amd64.tar.gz"; - sha256 = "0448vga6w9073lnsjj3d02cbxnb9rsfz0vhr6fzkznkxpg51lw3w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-linux-amd64.tar.gz"; + sha256 = "0zwqyhhkhblg1bf7ywsy0r6z85wf07vsdw4za19x7pwgjyairg2w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.24.0-linux-amd64.tar.gz"; - sha256 = "06x03vbdgg93lzmyf5cjzjmhb2nk724ml28h2bj230iip64gqj9x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-linux-amd64.tar.gz"; + sha256 = "1zjkgdx03zf55w9akw7ddscvk3agzhdsdjpkiq0irhjyf8ycf43q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-amd64.tar.gz"; sha256 = "1z8f287mm2mqfa76021fp5a1bj9045iwxcy8xs1ygh48b1890j49"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.10.0-linux-amd64.tar.gz"; - sha256 = "1v4cpdl97mgcq0s7lbdl8hncxrbx5pqscawjjywh4qnvq1qzrzb2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-linux-amd64.tar.gz"; + sha256 = "0lz9nv12a3ppazs9hlvn4pfpbh4lhbrq81wmghx12brd6pv5l22g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.7.0-linux-amd64.tar.gz"; - sha256 = "1g2qzmbzb7bs2shzxnhkml1hxrbryyms3zviziqv787dn0p85p08"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.8.0-linux-amd64.tar.gz"; + sha256 = "1pvczhjhwabfr00nab0x7liyciwbgg7lgb90z9jf3g2pxrlnf6z0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "1gypzjjdadw4cpzxz77h06l2fjq9arddh22m1ibp9bwy8ql9k0kq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.13.0-linux-amd64.tar.gz"; - sha256 = "041gi7yhgmksxnvx3v0w7nsnf8zkj3zx916kkiv0jijmdszvs1rj"; + 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-docker-v3.2.0-linux-amd64.tar.gz"; @@ -73,12 +73,12 @@ sha256 = "0qi0gz3dylmcm4wj5ld79ris9lvq00fx54vds36q8wwikawyil00"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.27.0-linux-amd64.tar.gz"; - sha256 = "10pl9cx6nh4384sq9ssv1vd98k91cnlqwlx15h2rjsh5nn0c3yjk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-linux-amd64.tar.gz"; + sha256 = "18zljx3fhkaai04h49j10vyczgl1wpzjai7qs6xk3vx1zpmmddlm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.12.0-linux-amd64.tar.gz"; - sha256 = "0p770idxdxn4nydgf1q56m0lf3x9fz66m2pydp09ba07kqnk9xvn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-linux-amd64.tar.gz"; + sha256 = "0iy324r7l1xca8mpidbhbsqlpxfsl50hmbxxs3bbbf8k3xxcamlm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-linux-amd64.tar.gz"; @@ -93,12 +93,12 @@ sha256 = "1gfiiwgb51ylwns3mqgnbgm2knrdzvy9r9v23yx0z03ba189d3m9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.3-linux-amd64.tar.gz"; - sha256 = "087k66789jrd26mygfbg25z4qrkfkp95240jsk2mrrzmmnyp8h4h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-linux-amd64.tar.gz"; + sha256 = "1d355rsp56npfgdkyzmpr8702lgdnc92f2k7r2ajfqp26ga1hmhk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.8.0-linux-amd64.tar.gz"; - sha256 = "0c7zvk5l1v789hj2xnqkbjmd4a10xwq7hnw8why7dbbmlwqypvnb"; + 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-mailgun-v3.4.0-linux-amd64.tar.gz"; @@ -121,20 +121,20 @@ sha256 = "0h3a9nywj0a3ib425274nf19xb9bmk012w1kjv240hnhcnrgg1kp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.9.0-linux-amd64.tar.gz"; - sha256 = "0gcay22abws4nxk8lpk0asw67y3immw2669y2hs9mfbqinvj58cv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-linux-amd64.tar.gz"; + sha256 = "1i32f640iwzmqmvwyzb9grbdypcgi4m7jj23w8yb4m0cyryf221q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.20.0-linux-amd64.tar.gz"; - sha256 = "1pn1q398y50rw2r306pfqqsv8wvplz7a1z8hf8x2g1z2bfcip0nd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-linux-amd64.tar.gz"; + sha256 = "1q7dqly6cz4vdsjlq522i2dgyb4nl1321jrx5jqxpcrsix5m83wz"; } { 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-tailscale-v0.9.0-linux-amd64.tar.gz"; - sha256 = "1rayjf72ryxy1ss9d049jsibl7rqhn78r1qiwm7yyfnna1f02x4z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-linux-amd64.tar.gz"; + sha256 = "1bmvxcwqgc2861zkrkfdasxr03ppbh7ffavh1agw53c8vy0f2shk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-linux-amd64.tar.gz"; @@ -149,8 +149,8 @@ sha256 = "1l3iplqqndvx98bcil1z2vhnmaldvrgyggbs2f15jyz4iv2k822k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.2.0-linux-amd64.tar.gz"; - sha256 = "1yg18l0dhljy841gi47k63wq7qxg51zds2w59hw0x3i8lgaz0m2f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-linux-amd64.tar.gz"; + sha256 = "1rkn9l16mfr97h9hi5i0kfm4lh6xm5wwxj4mwz8rwwiwfr963zw9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.1-linux-amd64.tar.gz"; @@ -163,20 +163,20 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.34.1-darwin-x64.tar.gz"; - sha256 = "1wg9s0ngk26icvv7cyg8parh74f0ls5ixpdrjqvzib4k2mifnh54"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-darwin-x64.tar.gz"; + sha256 = "1qcqc0lsb1wdgn203kj4z86blqwkcxfx7wijznfvvpjd4rg4k0wx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.2-darwin-amd64.tar.gz"; - sha256 = "1mph89ghx4agvip8iqkwlqxwk506xh9a0jlf9aw64xagvag8ady8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-darwin-amd64.tar.gz"; + sha256 = "1dhbqwy991h5h6w5zj3m0wbf99gvk8q4ykzc7ws0cbfk6szy052w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-darwin-amd64.tar.gz"; sha256 = "0xnlj48lgjhb3cf0yp958j7js5akxygd6034r4fa26kzhqq6rnl6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.21.0-darwin-amd64.tar.gz"; - sha256 = "1ssi3w7rzgi9781r04lbpsfbcprsk7a7l6wmadjp4i7gbzii55q2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-darwin-amd64.tar.gz"; + sha256 = "1dnr6b8md6chip5smhzx3i8b3av3n1qlvv8jdas2yxlsynj3vf3s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-darwin-amd64.tar.gz"; @@ -187,24 +187,24 @@ sha256 = "0fxr55qdll5bxx5hz80na2zhcfds231kycbpd7ahsxf3yfvwppm9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.8.0-darwin-amd64.tar.gz"; - sha256 = "1j090zl24sdyw28p2vj5d382cmamabvg0pg33dsfqhw9smzkc6c0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-darwin-amd64.tar.gz"; + sha256 = "1m2nyxq0cvj7rzy46nd9arg6rj0p7palpg6yj0730p73cpszmpwm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.24.0-darwin-amd64.tar.gz"; - sha256 = "1nivhnyv7750vw0bsw8bp2il3a57r572pskfbd9njr2kvmlic7wf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-darwin-amd64.tar.gz"; + sha256 = "1np3hq3hmdxgbz86mp2cihyyp2b1ax8d9wv994q1ahvkv74bapdz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-amd64.tar.gz"; sha256 = "1shc7m4xlsmcjnrlbi2jyvmnvf9bg1cs6knfkl82jfs65ya5iidf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.10.0-darwin-amd64.tar.gz"; - sha256 = "0himardpabg8wiqd6557pgnpj5p6i45fy2j4yyixi7jqaiashig7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-darwin-amd64.tar.gz"; + sha256 = "1r71n40wif8rb4gzfy2k7bzafpsfl9vabfvj4s08d0k1pqbv9pz9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.7.0-darwin-amd64.tar.gz"; - sha256 = "1p1ba58ifz2vl1zi15kny6jlijzjgd9cdbsvkh11m4am2fi18qsa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.8.0-darwin-amd64.tar.gz"; + sha256 = "19mj3bfiadlmfd606pa98n4wk02816n0l5klp08hdl7nzhq4s46z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "00gnqfbmqa731n0g6qzvhkq240x7pbfqh6hppprrzxcxr4i25qkh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.13.0-darwin-amd64.tar.gz"; - sha256 = "0241frab4w2xfyml9vbzvmrjxsbpyvl14z1y3f3cqzp655srpmi9"; + 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-docker-v3.2.0-darwin-amd64.tar.gz"; @@ -231,12 +231,12 @@ sha256 = "0zjap38frc6d5r2y7a4k5arvdc9fhh4bnr0swzqm5k9vxza3vfq8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.27.0-darwin-amd64.tar.gz"; - sha256 = "0p9mk3h8943cpd7slwmj6swx0jmb1mrkmkq70lmcx9633zzf91v6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-darwin-amd64.tar.gz"; + sha256 = "0aq09v80rbha7qzrl0kh7wmqf8g8pfvgy4id28gbd9ln40xs6dnv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.12.0-darwin-amd64.tar.gz"; - sha256 = "1vg68hfx568cqqvdwybsx580r1jgic6g71nrh5587hi8lbkcxvx7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-darwin-amd64.tar.gz"; + sha256 = "057q1cxcs0iwrmxps8x87zvjbp2ms56pwmfjl0kz12gr2rzzavab"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-darwin-amd64.tar.gz"; @@ -251,12 +251,12 @@ sha256 = "11r73jfqkc0wgdf66zp6pmgq5packlm4dkjp12a00z6l2s4f0w4h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.3-darwin-amd64.tar.gz"; - sha256 = "1i4waql9mcj48xzsb6i54cf1b7gpw5dqdlj2m4fjr3kfagw7xfqb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-darwin-amd64.tar.gz"; + sha256 = "16rd9v0raxskv6hk5dn9lr3b2vcy9k6f87dda0vsbwx4ssc018yd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.8.0-darwin-amd64.tar.gz"; - sha256 = "10y87y3llb7y5mf15681c4l7nnmq3i63wm4hphcc7y1pfald86cr"; + 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-mailgun-v3.4.0-darwin-amd64.tar.gz"; @@ -279,20 +279,20 @@ sha256 = "043zi2khq6bdp19njw7nz1rkx5ddxx5w51qac7lym7pdfx1pvd4i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.9.0-darwin-amd64.tar.gz"; - sha256 = "0r3wm8a9fzlhpapr7xmfdk5pmanz2phzbpplnh0irzl4nikwx80h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-darwin-amd64.tar.gz"; + sha256 = "0zk63fijhkafwhm5qrwn6n3qq0jvz9vqxg0zy8dq96kp141inp0v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.20.0-darwin-amd64.tar.gz"; - sha256 = "1g1fmsb3414xdw77al6pbps16pa07x09pli8bvgfmyysvgm1wb4l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-darwin-amd64.tar.gz"; + sha256 = "0izydcxyk30qrxnbvfqs2y6znyxz64njfalkghqwv8j7fzc5pv5s"; } { 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-tailscale-v0.9.0-darwin-amd64.tar.gz"; - sha256 = "0pjikivf87p7s9m162j7dxrxxs99lf25sjkfaixzldf3l5dqddfm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-darwin-amd64.tar.gz"; + sha256 = "1f2danvjdfqdivw6kjj2jj3qgx5jfjxwc21ziqy8kyzgvqfykxvj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-darwin-amd64.tar.gz"; @@ -307,8 +307,8 @@ sha256 = "1gxk3gcyqk688m9dv2p4flbm1dw0z9478xip6jqaiw4awkrzbnns"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "06sws30nxmhkcgg6ag01b32l4vi4c6sr9rdwdc3sy27abqhsmhgn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "0bmdfvdh2smwpdmz8jhkn4cl4zrn7jqw8nmf7y7zkpwpiw8647ir"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.1-darwin-amd64.tar.gz"; @@ -321,20 +321,20 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.34.1-linux-arm64.tar.gz"; - sha256 = "0nnl0qkd5xblvbhgzy2ikhs1xyjsmzfz4fda8kfgmcn9lh3hwjlz"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-linux-arm64.tar.gz"; + sha256 = "19pc892kkgccsddnlq4n1cgvfsqciqnba05ypkn4gvxr8rm2xia0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.2-linux-arm64.tar.gz"; - sha256 = "1a264gf1kwvq8x0qdccnfj8d5h0z1mw86lcv9qpawym98zms7jq7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-linux-arm64.tar.gz"; + sha256 = "0y5p6bgs8ngz1fh9695rnz3rciqixkaivqh5j9j0fcklfmr6i6dc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-linux-arm64.tar.gz"; sha256 = "0vn6rdqfl79p666v2h72dsqgwqfag5k3hh4abb7hdz2kzqrl7l9k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.21.0-linux-arm64.tar.gz"; - sha256 = "1h55nmzlaba249iy5lkd6zk7a2zz97n5jkfy1a2yy5xa9v4kv8ab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-linux-arm64.tar.gz"; + sha256 = "0a4daij35nwpqqkn7nr8993x02awas36jrazfqjc5pnir3nwdp3b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-linux-arm64.tar.gz"; @@ -345,24 +345,24 @@ sha256 = "126hqi44avcw21q8niyagb86p191ci78089sfig56irzkykc7gsy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.8.0-linux-arm64.tar.gz"; - sha256 = "0i89v1wm17wj7nb63ywydmvgzz3klm884m8di8qmg03mmlr2h6p3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-linux-arm64.tar.gz"; + sha256 = "0dag8fnzd0bzc1jakqxr3r3mdhj7196hxmh39wyfkh2wnpxcschd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.24.0-linux-arm64.tar.gz"; - sha256 = "076g4h58hv8g062r9swp4gfcqb7bmkfn8a63p2069v7k8c594rgq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-linux-arm64.tar.gz"; + sha256 = "1isysrvqc6lh5ikmp3snvny0jldykp0ir7yd5fr7vwn5lmk7a8cw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-arm64.tar.gz"; sha256 = "0w55pk3ham08lrg3vq0hg3p23qipz21ln01g61xd0cpl79aysbq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.10.0-linux-arm64.tar.gz"; - sha256 = "0rkgx3xb6p8r40yjbwg49irqxyc7lb5ksiifb93dz9650za4bs4v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-linux-arm64.tar.gz"; + sha256 = "11v3zggzkpvs8iscd45ng3s0x3959i00rlpfn17sxpvdmcjhs6nr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.7.0-linux-arm64.tar.gz"; - sha256 = "00ja951rzxkq01yzygp27wrq1s34j2fzs2lv2njxskqwmhqd77xw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.8.0-linux-arm64.tar.gz"; + sha256 = "0xnz9mvvm44msk33zqwxzybgglqnn4gggxcfclg4dqr9vgb6wk7v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "01hf8ycb6w3ny3ccfimxj1l96m0jzjp7f1r0xm9an8i59d3wslx8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.13.0-linux-arm64.tar.gz"; - sha256 = "03x8mwzwnkjw1pj8rv3mkzj3jrw921xq8izf1qnr32aglskmqvjn"; + 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-docker-v3.2.0-linux-arm64.tar.gz"; @@ -389,12 +389,12 @@ sha256 = "1w03vj5an0mkb9cawkz94xxj9d2yp2zvr67nnwvmdgaj6kwb9by8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.27.0-linux-arm64.tar.gz"; - sha256 = "18cb2ka8yvjxnhhhf5zmhy79rmz3zacyz4i2mm9rvx3nljkxmm4a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-linux-arm64.tar.gz"; + sha256 = "1if44ng79r16j906hpniwh007ngixm3j7li318xdpshm28hkjiqx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.12.0-linux-arm64.tar.gz"; - sha256 = "1zs7skijbrs496545qz7gjkmqvax43wb0p0pna3bm034sd7zcl6z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-linux-arm64.tar.gz"; + sha256 = "0sg8wfvh91144h8k4k97zfb63xadvj44qvp4lq823kcr8c37f0bj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-linux-arm64.tar.gz"; @@ -409,12 +409,12 @@ sha256 = "1vrz3pm14i5zdmk3yibny2sghxk8kzwb2qi77mjbiyfhbvciy97q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.3-linux-arm64.tar.gz"; - sha256 = "17qm3sbfxi5i24rdcicr7pairxvlh8bi48fldazccpwfsbmgd83c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-linux-arm64.tar.gz"; + sha256 = "1kqyvzd6h8ymwv3j08lcirv9dpnvyj1l7vfxgmxd2yny50jh7vfp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.8.0-linux-arm64.tar.gz"; - sha256 = "0dqjyyh4jarzr385qqa4dwlpi5nribc8l22jxhdjgj52av6hc9pv"; + 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-mailgun-v3.4.0-linux-arm64.tar.gz"; @@ -437,20 +437,20 @@ sha256 = "13i481a9xj9aw1mi8j3sw4m69kfcaqdl1cj9w4silqwyqk4gzmyd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.9.0-linux-arm64.tar.gz"; - sha256 = "0f3sp3zl4zikwa7rswnqgy09pwv8r8rn08n3zyk3vmqzsyrldbgy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-linux-arm64.tar.gz"; + sha256 = "0pbjmj6hbwgfcjlc9pvhljvwm5cs2a24gmp4rl30wg7lxrcjgyl3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.20.0-linux-arm64.tar.gz"; - sha256 = "1rv2k5kqjsg01qdqvb1yhkbh1sc7jszh8wgm42q223zdyplqlid2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-linux-arm64.tar.gz"; + sha256 = "1y99pryvp2jg26s7zivmmpkpw88lxc2r905yv7ffhzb6mfq79zvr"; } { 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-tailscale-v0.9.0-linux-arm64.tar.gz"; - sha256 = "1g9z3nv18mwklvbqrz07pxcar3373f19jmbdn1m6z5v871qg97r8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-linux-arm64.tar.gz"; + sha256 = "170k5xchwm53r7k3483rmv0hbf4nxk31yq7fxz6qfp05yk05d74a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-linux-arm64.tar.gz"; @@ -465,8 +465,8 @@ sha256 = "1ivbdpls45zjzw4v2hi7g3zfhy0nlnnh026bkzzfnfan1isnpp87"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.2.0-linux-arm64.tar.gz"; - sha256 = "1wbx83fc5v4n57rjn5xn4y7iiv8z4fdx1inj9w1ibqlij5hf0xra"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-linux-arm64.tar.gz"; + sha256 = "065bcvm1p6fbhnhq4r0l5km7z7srd6yfpj05qd070lp5iaz90mp7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.1-linux-arm64.tar.gz"; @@ -479,20 +479,20 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.34.1-darwin-arm64.tar.gz"; - sha256 = "1g5sy9z3vg2s7g589q7247a7i2j3lpc0mla4z1nhmalfk4yh4qf4"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-darwin-arm64.tar.gz"; + sha256 = "1y4irj8jijm1wpynzihpg4sg6qwiznb4j89cmcfcw8prfzhsxcmh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.2-darwin-arm64.tar.gz"; - sha256 = "0m99mp7b1vcw2yb79yhms35mlz6f3b6xijyv5x1pdakays4bn16q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-darwin-arm64.tar.gz"; + sha256 = "1g4m9hrdgzczikrzz6b2irx9945k97ckwmg1m5b4ikgi6hxaycx1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-darwin-arm64.tar.gz"; sha256 = "14qf3y7nz4dd6qf9fq49f90415dn5hcjymm86rmcgyw1w1dkjpqi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.21.0-darwin-arm64.tar.gz"; - sha256 = "06pia0q1ajmlbfzgj3p30zw611drq5vbp2maj21jhdkcxfbjsbw6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-darwin-arm64.tar.gz"; + sha256 = "1xiiavc4c6lbgrabfypw1yhmksq0azfwl699yd0pn6vs3daav0n7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-darwin-arm64.tar.gz"; @@ -503,24 +503,24 @@ sha256 = "12dx70f5fiy2qvd4cmkxk2ph2dq19sc2a9rxhfxqn1bjjs8ifh2j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.8.0-darwin-arm64.tar.gz"; - sha256 = "01l9bl8wjkh8cfm7d7xky2zliwnfx2kgzlwd7bph7zkngwjg86b9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-darwin-arm64.tar.gz"; + sha256 = "0wa2w12xaxpmnbf6gc01kj0dnwdc5bhg9295yskfvwq701g77n3k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.24.0-darwin-arm64.tar.gz"; - sha256 = "17yxlxqa0jjraz19y3x164hhdn1w8rhfxn2m3nkl9gqh6bjx0pvr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-darwin-arm64.tar.gz"; + sha256 = "12nbwv4y44w8phf2nf30fhn0mgcq8vyw7gj8riaq1ris794mns95"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-arm64.tar.gz"; sha256 = "0ivwpfhknhyidpafm2347g1pair7vk055ajhhyg631vizx53hrr9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.10.0-darwin-arm64.tar.gz"; - sha256 = "10c0jsp2kcyw2vrx495jlqyiljgz5701a9dlzqb37ys67qixmfnj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-darwin-arm64.tar.gz"; + sha256 = "1hacxf3w4jlddvgqxgqi72dj4qwh00xx6kl073kjnyxhvnx9qpnd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.7.0-darwin-arm64.tar.gz"; - sha256 = "0f4fylipawslcal2267q7vih0l4j7yq0pkkw1vaqww2xgvpy2ds4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.8.0-darwin-arm64.tar.gz"; + sha256 = "0vhc7ww2phca0b2bn79xjqddp217c38zir6vdhgsg41nxxs081a5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "0p1zvwi53gxsl13cw3n7iiy9ndcd5v0w8y7i4kshlnjrsxc10x42"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.13.0-darwin-arm64.tar.gz"; - sha256 = "1wkhifv4ag4w2plvh63ii8rhc72724zyg49i7xc3kgm5jg3cadn6"; + 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-docker-v3.2.0-darwin-arm64.tar.gz"; @@ -547,12 +547,12 @@ sha256 = "06m4cn4v6hcqlk7pq50zd8dg5bg4zjh28r3466k532d3jvl99vr9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.27.0-darwin-arm64.tar.gz"; - sha256 = "09nh1vdislil9ip7v96bxxivplrlz0yzz1v6d5rvp872m9qknpij"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-darwin-arm64.tar.gz"; + sha256 = "08gna75da1pz7da6kkq9mwm2w549sxini4102fwabyq5ky2kjwnb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.12.0-darwin-arm64.tar.gz"; - sha256 = "0hpjrvvqr8lnfy0gwi534l3dnp1c5az35y6g45w1hx0ix9n4kvip"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-darwin-arm64.tar.gz"; + sha256 = "0y37z57bfjw2kkv4m6az3kf6pbsppgha4hskklhhcgfxac7ymc9m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-darwin-arm64.tar.gz"; @@ -567,12 +567,12 @@ sha256 = "058f1j40ar4xh860c3qrm0qaagm69fdmbw14avvrhsmw245cyyzc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.3-darwin-arm64.tar.gz"; - sha256 = "0218n86hz0lds4k1x2nq4and7cikl6nv65sh7k7p8hv4fpgbnsfd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-darwin-arm64.tar.gz"; + sha256 = "17g9y1riss0ibyxwcxk89q3hi5wszaizwarg77cqajycz9887g37"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.8.0-darwin-arm64.tar.gz"; - sha256 = "040fx2a8sgs1rpzz2bnlsrlrha07b1klh3vq21zjr77apg7l9kya"; + 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-mailgun-v3.4.0-darwin-arm64.tar.gz"; @@ -595,20 +595,20 @@ sha256 = "1hgqybvag1mlj3hikjgx9pn2hr4r3bag0lv3l9qnjdzkmdcy248j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.9.0-darwin-arm64.tar.gz"; - sha256 = "1y6ikzk7npajc5y0b8q6r3ks7ipwlyymjb1gh06604iylgd708nw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-darwin-arm64.tar.gz"; + sha256 = "05ng5n0lqkc2f8i9vnlm20d2m6hw8in2r3nshmg58hscfzx70iiq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.20.0-darwin-arm64.tar.gz"; - sha256 = "0jlci2ba7vkizzjd2rw35fbl0qib3dvfalypa13a8lgqcjmyn9p7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-darwin-arm64.tar.gz"; + sha256 = "08cf7265rh8h9qcgdh1agqxqx78fw59kz6081rl81iv4p9bjw1yy"; } { 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-tailscale-v0.9.0-darwin-arm64.tar.gz"; - sha256 = "16p0qsp8gi28xj7p7zi4yl2w9kadv9n8z97f4s28agg62b3fh5x5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-darwin-arm64.tar.gz"; + sha256 = "1fwhq1rv5a79zcbkzbgkwn5f2vdqn8fx344j7v03znx0n36qpnl6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-darwin-arm64.tar.gz"; @@ -623,8 +623,8 @@ sha256 = "1iabwi9cf0pvfhhhxbhp8283bzhd58rwwfcrhgh1wh9kgr0icqlx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "0r399sqs15knbq1h1p9qixzm3836whskpk9i91ag5h7kg5xjvnin"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-darwin-arm64.tar.gz"; + sha256 = "02739v2jq70s9vxvibffd9xnhfpy0zp3724n79pdcjygj5xw32g9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 0c8a3b38294d..8de0f40c1e14 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.34.1" +VERSION="3.35.2" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. From baa6fca638c98cbec386c4c0ff4b397e2515f1df Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 30 Jun 2022 12:51:05 +0200 Subject: [PATCH 035/120] nix-du: 0.5.1 -> 0.6.0 https://github.com/symphorien/nix-du/releases/tag/v0.6.0 --- pkgs/tools/package-management/nix-du/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 20652557ce63..a2ab8a08bfb1 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-du"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; rev = "v${version}"; - sha256 = "sha256-LOs+geYOiAigxwc4VD0FiZQjAnIrcV9ncyPuwGhS92E="; + sha256 = "sha256-2OODk0Z6UpUOHrGOrMa0XZnG/CPP4yfP8kvsE9Mn3DU="; }; - cargoSha256 = "sha256-aEm+SQgE63ZWpb2kXavyoiq2rVkaebFw8kqWPMr2aMA="; + cargoSha256 = "sha256-LB2XJSANQOKHlbifPMd8hH26bRO06Vp+qjWomvrU8Dc="; doCheck = true; checkInputs = [ nix graphviz ]; From 6ed6ef2ea1b60edbf2f47932494b62c3486a7973 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 30 Jun 2022 14:58:30 +0300 Subject: [PATCH 036/120] linux: 5.10.126 -> 5.10.127 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 87ac3427f7a3..34fce5c16d5d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.126"; + version = "5.10.127"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0qsg5mxvq11xdbssz3qsmd794c8nydq297jwmgfwbzwkx1ll61ci"; + sha256 = "100m4b6w1kbc1lc3gwlmkp8xl42xai0v5wdbx0mxrq8y1gp374j1"; }; } // (args.argsOverride or {})) From 5a52c81969a9c8d6b32753adb0c2fe41e1379775 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 30 Jun 2022 14:58:33 +0300 Subject: [PATCH 037/120] linux: 5.15.50 -> 5.15.51 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 1fb189b1ef9f..9a9950a301cd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.50"; + version = "5.15.51"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "03yp3gz45059gkzqbijbg503rxx4wihjg4c3ikz10f526xym0kam"; + sha256 = "1229m4r4n61n5l8anp2pcqdhajkwmavhr1z00n8gvx3yn9w4ifhz"; }; } // (args.argsOverride or { })) From 7c4567e0d4bb5a54c3827ca95d1222ac5b5b39df Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 30 Jun 2022 14:58:35 +0300 Subject: [PATCH 038/120] linux: 5.18.7 -> 5.18.8 --- pkgs/os-specific/linux/kernel/linux-5.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.18.nix b/pkgs/os-specific/linux/kernel/linux-5.18.nix index ae2406b03723..43505e9d5d10 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.18.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.18.7"; + version = "5.18.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0nsj44p1wn7ysckhv4a99ncj0a9xxhvi54v63w1047sspxjd18m1"; + sha256 = "0dhaj1zcsr5sfg62byzvvkhm9j419px6v9v04ngcy0d0vc2yn8q8"; }; } // (args.argsOverride or { })) From 7b061f8eb6de460c9622ad473f9ee4cc6efca8ee Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 30 Jun 2022 14:58:36 +0300 Subject: [PATCH 039/120] linux: 5.4.201 -> 5.4.202 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index cd79e9680b11..6c0011b4471a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.201"; + version = "5.4.202"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0qbfqfca4ism7k7y8grjqsxby3j50ach576szrljxxy140qxfgc1"; + sha256 = "0gak58h5l2d8rmbmjw48460bgqi73yf1m7swsbbhfsmbkvhvr8aw"; }; } // (args.argsOverride or {})) From 02281899164fd848736c8ad278e25c98e76df85e Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 30 Jun 2022 14:59:10 +0300 Subject: [PATCH 040/120] linux/hardened/patches/5.10: 5.10.125-hardened1 -> 5.10.127-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 079ea453bbf4..42fd2c123922 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.125-hardened1.patch", - "sha256": "04hdgzx7yqv26i74k6yzdh3k4dzyvcmxn9y93whdw0jyal34nj5w", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.125-hardened1/linux-hardened-5.10.125-hardened1.patch" + "name": "linux-hardened-5.10.127-hardened1.patch", + "sha256": "0lmsmmj1f0zqm5plb3c4sfqkq70msa24l1hcsrynavmzys8hndmq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.127-hardened1/linux-hardened-5.10.127-hardened1.patch" }, - "sha256": "0q4garkqdkr2280ygz44053cbmzv59yfd0lsn7q67h1j4nh6wddr", - "version": "5.10.125" + "sha256": "100m4b6w1kbc1lc3gwlmkp8xl42xai0v5wdbx0mxrq8y1gp374j1", + "version": "5.10.127" }, "5.15": { "patch": { From 362d5a564f3c2b8cf93ea33381ab86a9126cb8fa Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 30 Jun 2022 14:59:13 +0300 Subject: [PATCH 041/120] linux/hardened/patches/5.15: 5.15.50-hardened1 -> 5.15.51-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 42fd2c123922..675b2005ff15 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.50-hardened1.patch", - "sha256": "0vridxhn9s21d3r877ndnm7zg5iyqpm9lm319ccw47fwyydwwh4y", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.50-hardened1/linux-hardened-5.15.50-hardened1.patch" + "name": "linux-hardened-5.15.51-hardened1.patch", + "sha256": "0rfj0ypag0wn0ja77c920ppbqbik07i9yfrlhjanrz66vdip0z1r", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.51-hardened1/linux-hardened-5.15.51-hardened1.patch" }, - "sha256": "03yp3gz45059gkzqbijbg503rxx4wihjg4c3ikz10f526xym0kam", - "version": "5.15.50" + "sha256": "1229m4r4n61n5l8anp2pcqdhajkwmavhr1z00n8gvx3yn9w4ifhz", + "version": "5.15.51" }, "5.18": { "patch": { From 87f3f3ab17074e6e969ce0aa4425e792d076e311 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 30 Jun 2022 14:59:17 +0300 Subject: [PATCH 042/120] linux/hardened/patches/5.18: 5.18.7-hardened1 -> 5.18.8-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 675b2005ff15..c4f5c25dcf78 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.18": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.18.7-hardened1.patch", - "sha256": "085skg598k5q0kgk5zb2ns6m0a6j5bpdi0aa5r8iidln1pqw2894", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.7-hardened1/linux-hardened-5.18.7-hardened1.patch" + "name": "linux-hardened-5.18.8-hardened1.patch", + "sha256": "1i0y11flb4alxaqf2inms8x2yzar20zg6vc9s9gs507z97yh24v2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.8-hardened1/linux-hardened-5.18.8-hardened1.patch" }, - "sha256": "0nsj44p1wn7ysckhv4a99ncj0a9xxhvi54v63w1047sspxjd18m1", - "version": "5.18.7" + "sha256": "0dhaj1zcsr5sfg62byzvvkhm9j419px6v9v04ngcy0d0vc2yn8q8", + "version": "5.18.8" }, "5.4": { "patch": { From f8b452f1278baa0530d354facfbcd7ead5a9f773 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 30 Jun 2022 14:59:20 +0300 Subject: [PATCH 043/120] linux/hardened/patches/5.4: 5.4.201-hardened1 -> 5.4.202-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c4f5c25dcf78..e60cfeaec7fb 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.201-hardened1.patch", - "sha256": "1l0qgkwsp12wn2k78m04bpb88qknckbwn6610xj9jxvhq0n0qg4l", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.201-hardened1/linux-hardened-5.4.201-hardened1.patch" + "name": "linux-hardened-5.4.202-hardened1.patch", + "sha256": "1gkgipw7ic0l3gh6haylcyss46wbph7zhx91fdp4na20jy4dxrzv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.202-hardened1/linux-hardened-5.4.202-hardened1.patch" }, - "sha256": "0qbfqfca4ism7k7y8grjqsxby3j50ach576szrljxxy140qxfgc1", - "version": "5.4.201" + "sha256": "0gak58h5l2d8rmbmjw48460bgqi73yf1m7swsbbhfsmbkvhvr8aw", + "version": "5.4.202" } } From 37b1b4ec6a48d17807e06e054a9d70b5b5449045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 15:10:33 +0200 Subject: [PATCH 044/120] gosca: drop --- pkgs/development/tools/gosca/default.nix | 34 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/development/tools/gosca/default.nix diff --git a/pkgs/development/tools/gosca/default.nix b/pkgs/development/tools/gosca/default.nix deleted file mode 100644 index 18459ec94322..000000000000 --- a/pkgs/development/tools/gosca/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, gosca -, testers -}: - -buildGoModule rec { - pname = "gosca"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "TARI0510"; - repo = pname; - rev = "v${version}"; - hash = "sha256-mjQSYkcLl9X3IPv0liX26hvystsQOSVXvovKp4VekAY="; - }; - - vendorSha256 = "sha256-0EqMW4aNYPZEuk+mxmLTuenGdam56YneEad8lodVeBo="; - - passthru.tests.version = testers.testVersion { - package = gosca; - command = "gosca -v"; - version = "GoSCA_v${version}"; - }; - - meta = with lib; { - description = "Golang dependence security checker"; - homepage = "https://github.com/TARI0510/gosca"; - changelog = "https://github.com/TARI0510/gosca/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1e59dbddefc5..85c4f7e42058 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -530,6 +530,7 @@ mapAliases ({ google-gflags = gflags; # Added 2019-07-25 google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + gosca = throw "gosca has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-30 gotags = throw "gotags has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16 go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2d5472383b0..7859f54a692b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2576,8 +2576,6 @@ with pkgs; buildGoModule = buildGo118Module; }; - gosca = callPackage ../development/tools/gosca { }; - gosh = callPackage ../tools/security/gosh { }; gospider = callPackage ../tools/security/gospider { }; From f6fb8628f8ed4d0832dbbfc5fe2f7bcd90f86318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 15:13:55 +0200 Subject: [PATCH 045/120] go-langserver: drop --- .../tools/go-langserver/default.nix | 24 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/tools/go-langserver/default.nix diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix deleted file mode 100644 index ac6034dffa42..000000000000 --- a/pkgs/development/tools/go-langserver/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "go-langserver"; - version = "2.0.0"; - - goPackagePath = "github.com/sourcegraph/go-langserver"; - subPackages = [ "." ]; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "sourcegraph"; - repo = "go-langserver"; - sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp"; - }; - - meta = with lib; { - description = "A Go language server protocol server"; - homepage = "https://github.com/sourcegraph/go-langserver"; - license = licenses.mit; - maintainers = with maintainers; [ johnchildren ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85c4f7e42058..a9c0377ba5bc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -533,6 +533,7 @@ mapAliases ({ gosca = throw "gosca has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-30 gotags = throw "gotags has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16 + go-langserver = throw "go-langserver has been replaced by gopls"; # Added 2022-06-30 go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7859f54a692b..34d8988d2057 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23886,8 +23886,6 @@ with pkgs; gomodifytags = callPackage ../development/tools/gomodifytags { }; - go-langserver = callPackage ../development/tools/go-langserver { }; - gopls = callPackage ../development/tools/gopls { buildGoModule = buildGo118Module; }; From 2b9ed9cf28ab5c533993029b1f374174d46609f5 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Thu, 23 Jun 2022 03:02:02 +0200 Subject: [PATCH 046/120] mynewt-newt: 1.7.0 -> 1.10.0 --- .../mynewt-newt/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index dd5c36019f20..9d97a472a160 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,31 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib +, buildGoModule +, fetchFromGitHub +, stdenv +}: buildGoModule rec { pname = "mynewt-newt"; - version = "1.7.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "apache"; repo = "mynewt-newt"; rev = "mynewt_${builtins.replaceStrings ["."] ["_"] version}_tag"; - sha256 = "0rwn4ghh7kal8csxlh0w1p29b5m1nam9lkrxla5wdfhnzbsg8hfa"; + sha256 = "sha256-HWZDs4kYWveEqzPRNGNbghc1Yg6hy/Pq3eU5jW8WdHc="; }; - patches = [ - (fetchpatch { - url = "https://github.com/apache/mynewt-newt/commit/6a51e35565323ebe8feb8d1aa6e00960b6ce662e.patch"; - sha256 = "186yha60jzcjq8r04w12rqqh3cin2w974l77hz2ixhmjzyr56wqv"; - }) - (fetchpatch { - url = "https://github.com/apache/mynewt-newt/commit/7d4ef3fe65a9a83cc58e7bd973654ad235cc68bc.patch"; - sha256 = "01scmq58bfr4c9icqzm79q7a55izflsb3mlx9xn0dv92m3mbprx7"; - }) - ]; - - vendorSha256 = "1sh9mx3lc28fzvc1yrhz58rlbaac7aq1dqyvxwj98vld3kigpv1z"; + vendorSha256 = "sha256-/LK+NSs7YZkw6TRvBQcn6/SszIwAfXN0rt2AKSBV7CE="; doCheck = false; + # CGO_ENABLED=0 required for mac - "error: 'TARGET_OS_MAC' is not defined, evaluates to 0" + # https://github.com/shirou/gopsutil/issues/976 + CGO_ENABLED = if stdenv.isLinux then 1 else 0; + meta = with lib; { homepage = "https://mynewt.apache.org/"; description = "Build and package management tool for embedded development"; From 64eb5ec86305e6547d5a7a37efda936584fbbafc Mon Sep 17 00:00:00 2001 From: 2gn <101851090+2gn@users.noreply.github.com> Date: Thu, 30 Jun 2022 22:34:17 +0900 Subject: [PATCH 047/120] maintainer: add myself --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8a177be26d7c..c780d0e9dfd4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -97,6 +97,12 @@ github = "1000teslas"; githubId = 47207223; }; + _2gn = { + name = "Hiram Tanner"; + email = "101851090+2gn@users.noreply.github.com"; + github = "2gn"; + githubId = 101851090; + }; _3699n = { email = "nicholas@nvk.pm"; github = "3699n"; From 47d35130e118eb160e967b505db9c3586e2be0cb Mon Sep 17 00:00:00 2001 From: 2gn <101851090+2gn@users.noreply.github.com> Date: Thu, 30 Jun 2022 22:34:58 +0900 Subject: [PATCH 048/120] pngloss: init at unstable-2020-11-25 --- pkgs/tools/graphics/pngloss/default.nix | 35 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/graphics/pngloss/default.nix diff --git a/pkgs/tools/graphics/pngloss/default.nix b/pkgs/tools/graphics/pngloss/default.nix new file mode 100644 index 000000000000..eafd77054e40 --- /dev/null +++ b/pkgs/tools/graphics/pngloss/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, libpng, zlib }: + +stdenv.mkDerivation rec { + pname = "pngloss"; + version = "unstable-2020-11-25"; + + src = fetchFromGitHub { + owner = "foobaz"; + repo = pname; + rev = "559f09437e1c797a1eaf08dfdcddd9b082f0e09c"; + sha256 = "sha256-dqrrzbLu4znyWOlTDIf56O3efxszetiP+CdFiy2PBd4="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libpng + zlib + ]; + + installPhase = '' + runHook preInstall + + install -D ./src/pngloss $out/bin/pngloss + + runHook postInstall + ''; + + meta = with lib; { + description = "Lossy compression of PNG images"; + homepage = "https://github.com/foobaz/pngloss"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ _2gn ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ed604e43d89..4ecebe7f5717 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9370,6 +9370,8 @@ with pkgs; p0f = callPackage ../tools/security/p0f { }; + pngloss = callPackage ../tools/graphics/pngloss { }; + pngout = callPackage ../tools/graphics/pngout { }; patch = gnupatch; From 461bdf0a7abde1521d9a8ed5c19f57bd3d412126 Mon Sep 17 00:00:00 2001 From: wyndon Date: Tue, 31 May 2022 07:54:25 +0200 Subject: [PATCH 049/120] lokinet: init at 0.9.9 --- .../networking/p2p/lokinet/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/networking/p2p/lokinet/default.nix diff --git a/pkgs/applications/networking/p2p/lokinet/default.nix b/pkgs/applications/networking/p2p/lokinet/default.nix new file mode 100644 index 000000000000..e3e2c8e58831 --- /dev/null +++ b/pkgs/applications/networking/p2p/lokinet/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libevent +, libsodium +, libuv +, nlohmann_json +, pkg-config +, sqlite +, systemd +, unbound +, zeromq +}: + +stdenv.mkDerivation rec { + pname = "lokinet"; + version = "0.9.9"; + + src = fetchFromGitHub { + owner = "oxen-io"; + repo = "lokinet"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-AaGsRg9S9Cng9emI/mN09QSOIRbE+x3916clWAwLnRs="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libevent + libuv + libsodium + nlohmann_json + sqlite + systemd + unbound + zeromq + ]; + + cmakeFlags = [ + "-DGIT_VERSION=v${version}" + "-DWITH_BOOTSTRAP=OFF" # we provide bootstrap files manually + "-DWITH_SETCAP=OFF" + ]; + + # copy bootstrap files + # see https://github.com/oxen-io/lokinet/issues/1765#issuecomment-938208774 + postInstall = '' + mkdir -p $out/share/testnet + cp $src/contrib/bootstrap/mainnet.signed $out/share/bootstrap.signed + cp $src/contrib/bootstrap/testnet.signed $out/share/testnet/bootstrap.signed + ''; + + meta = with lib; { + description = "Anonymous, decentralized and IP based overlay network for the internet"; + homepage = "https://lokinet.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wyndon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b396cf56189..6ff981e99b1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28105,6 +28105,8 @@ with pkgs; portaudio = null; }; + lokinet = callPackage ../applications/networking/p2p/lokinet { }; + losslesscut-bin = callPackage ../applications/video/losslesscut-bin { }; loxodo = callPackage ../applications/misc/loxodo { }; From 69e1e00ebbdf40c1a1b2cc622f7e58aa927b4044 Mon Sep 17 00:00:00 2001 From: wyndon Date: Tue, 31 May 2022 07:54:41 +0200 Subject: [PATCH 050/120] nixos/lokinet: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/lokinet.nix | 157 ++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 nixos/modules/services/networking/lokinet.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b757e05edce3..c8e1216813e4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -825,6 +825,7 @@ ./services/networking/libreswan.nix ./services/networking/lldpd.nix ./services/networking/logmein-hamachi.nix + ./services/networking/lokinet.nix ./services/networking/lxd-image-server.nix ./services/networking/magic-wormhole-mailbox-server.nix ./services/networking/matterbridge.nix diff --git a/nixos/modules/services/networking/lokinet.nix b/nixos/modules/services/networking/lokinet.nix new file mode 100644 index 000000000000..cf091341c839 --- /dev/null +++ b/nixos/modules/services/networking/lokinet.nix @@ -0,0 +1,157 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.lokinet; + dataDir = "/var/lib/lokinet"; + settingsFormat = pkgs.formats.ini { listsAsDuplicateKeys = true; }; + configFile = settingsFormat.generate "lokinet.ini" (lib.filterAttrsRecursive (n: v: v != null) cfg.settings); +in with lib; { + options.services.lokinet = { + enable = mkEnableOption "Lokinet daemon"; + + package = mkOption { + type = types.package; + default = pkgs.lokinet; + defaultText = literalExpression "pkgs.lokinet"; + description = "Lokinet package to use."; + }; + + useLocally = mkOption { + type = types.bool; + default = false; + example = true; + description = "Whether to use Lokinet locally."; + }; + + settings = mkOption { + type = with types; + submodule { + freeformType = settingsFormat.type; + + options = { + dns = { + bind = mkOption { + type = str; + default = "127.3.2.1"; + description = "Address to bind to for handling DNS requests."; + }; + + upstream = mkOption { + type = listOf str; + default = [ "9.9.9.10" ]; + example = [ "1.1.1.1" "8.8.8.8" ]; + description = '' + Upstream resolver(s) to use as fallback for non-loki addresses. + Multiple values accepted. + ''; + }; + }; + + network = { + exit = mkOption { + type = bool; + default = false; + description = '' + Whether to act as an exit node. Beware that this + increases demand on the server and may pose liability concerns. + Enable at your own risk. + ''; + }; + + exit-node = mkOption { + type = nullOr (listOf str); + default = null; + example = '' + exit-node = [ "example.loki" ]; # maps all exit traffic to example.loki + exit-node = [ "example.loki:100.0.0.0/24" ]; # maps 100.0.0.0/24 to example.loki + ''; + description = '' + Specify a `.loki` address and an optional ip range to use as an exit broker. + See for + a list of exit nodes. + ''; + }; + + keyfile = mkOption { + type = nullOr str; + default = null; + example = "snappkey.private"; + description = '' + The private key to persist address with. If not specified the address will be ephemeral. + This keyfile is generated automatically if the specified file doesn't exist. + ''; + }; + }; + }; + }; + default = { }; + example = literalExpression '' + { + dns = { + bind = "127.3.2.1"; + upstream = [ "1.1.1.1" "8.8.8.8" ]; + }; + + network.exit-node = [ "example.loki" "example2.loki" ]; + } + ''; + description = '' + Configuration for Lokinet. + Currently, the best way to view the available settings is by + generating a config file using `lokinet -g`. + ''; + }; + }; + + config = mkIf cfg.enable { + networking.resolvconf.extraConfig = mkIf cfg.useLocally '' + name_servers="${cfg.settings.dns.bind}" + ''; + + systemd.services.lokinet = { + description = "Lokinet"; + after = [ "network-online.target" "network.target" ]; + wants = [ "network-online.target" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + ln -sf ${cfg.package}/share/bootstrap.signed ${dataDir} + ${pkgs.coreutils}/bin/install -m 600 ${configFile} ${dataDir}/lokinet.ini + + ${optionalString (cfg.settings.network.keyfile != null) '' + ${pkgs.crudini}/bin/crudini --set ${dataDir}/lokinet.ini network keyfile "${dataDir}/${cfg.settings.network.keyfile}" + ''} + ''; + + serviceConfig = { + DynamicUser = true; + StateDirectory = "lokinet"; + AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_BIND_SERVICE" ]; + ExecStart = "${cfg.package}/bin/lokinet ${dataDir}/lokinet.ini"; + Restart = "always"; + RestartSec = "5s"; + + # hardening + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateTmp = true; + PrivateMounts = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + ReadWritePaths = "/dev/net/tun"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + }; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} From c856c35fe9cc736ebab69027f2c2191d7dc2720d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 16:31:52 +0000 Subject: [PATCH 051/120] python310Packages.hcloud: 1.16.0 -> 1.17.0 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 3183560ba00c..6c79629919da 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.16.0"; + version = "1.17.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c8b94557d93bcfe437f20a8176693ea4f54358b74986cc19d94ebc23f48e40cc"; + sha256 = "sha256-+BQuBDi+J3xvod3uE67NXaFStIxt7H/Ulw3vG13CGeI="; }; propagatedBuildInputs = [ future requests python-dateutil ]; From 0ccd98cae581613816aacdc0bb8ea3845cf9ca61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Jun 2022 17:26:48 +0000 Subject: [PATCH 052/120] python310Packages.onetimepad: init at 1.4 --- .../python-modules/onetimepad/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/onetimepad/default.nix diff --git a/pkgs/development/python-modules/onetimepad/default.nix b/pkgs/development/python-modules/onetimepad/default.nix new file mode 100644 index 000000000000..cca4a06d6027 --- /dev/null +++ b/pkgs/development/python-modules/onetimepad/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "onetimepad"; + version = "1.4"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1eaade76d8036e1cb79e944b75874bfe5ee4046a571c0724564e1721565c73fd"; + }; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "onetimepad" ]; + + meta = { + description = "A hacky implementation of one-time pad"; + homepage = "https://jailuthra.in/onetimepad"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3eb09abe3e4e..4235bba33074 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6466,6 +6466,8 @@ in { netmap = callPackage ../development/python-modules/netmap { }; + onetimepad = callPackage ../development/python-modules/onetimepad { }; + openai = callPackage ../development/python-modules/openai { }; openapi-core = callPackage ../development/python-modules/openapi-core { }; From 3ac24f48357076ef5c823d550bf5c9118c03b969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Jun 2022 17:23:13 +0000 Subject: [PATCH 053/120] python310Packages.pysqlitecipher: init at 0.22 --- .../python-modules/pysqlitecipher/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pysqlitecipher/default.nix diff --git a/pkgs/development/python-modules/pysqlitecipher/default.nix b/pkgs/development/python-modules/pysqlitecipher/default.nix new file mode 100644 index 000000000000..6eaa1d13eb7d --- /dev/null +++ b/pkgs/development/python-modules/pysqlitecipher/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, cryptography +, onetimepad +}: + +buildPythonPackage rec { + pname = "pysqlitecipher"; + version = "0.22"; + + disabled = pythonOlder "3.6"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "daff63ca2719fbd698aa10f64493c4b31fb67877a8e8dbb8090e9c03a1b1a9e4"; + }; + + propagatedBuildInputs = [ + cryptography + onetimepad + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "pysqlitecipher" ]; + + meta = { + description = "Lightweight and easy to use sqlite wrapper with built-in encryption system"; + homepage = "Ghttps://github.com/harshnative/pysqlitecipher"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4235bba33074..72fa774af619 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6657,6 +6657,8 @@ in { pysolcast = callPackage ../development/python-modules/pysolcast { }; + pysqlitecipher = callPackage ../development/python-modules/pysqlitecipher { }; + pysyncthru = callPackage ../development/python-modules/pysyncthru { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; From 649c644ba84193f8ef2ee12291a61296901cf457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Jun 2022 17:12:36 +0000 Subject: [PATCH 054/120] banking: 0.4.0 -> 0.5.1 --- pkgs/applications/office/banking/default.nix | 24 ++++---------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index 07ce23a215e8..7e397bdb76b8 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -17,34 +17,17 @@ python3.pkgs.buildPythonApplication rec { pname = "banking"; - version = "0.4.0"; + version = "0.5.1"; format = "other"; src = fetchFromGitLab { owner = "tabos"; repo = "banking"; rev = version; - sha256 = "sha256-VGNCSirQslRfLIFeo375BNlHujoNXm+s55Ty+hB+ZRI="; + sha256 = "sha256-tZlBpDcwQ/aWroP2sFQBZcvmBD26PiY7q/8xFA8GnVc="; }; - patches = [ - # Fix build with meson 0.61 - # https://gitlab.com/tabos/banking/-/merge_requests/90 - (fetchpatch { - url = "https://gitlab.com/tabos/banking/-/commit/c3cc9afc380fe666ae6e331aa8a97659c60397a4.patch"; - sha256 = "r9n9l47XU4Tg4U5sfiFdGkbG8QB7O4ol9CB1ya06yOc="; - }) - # fix build with libadwaita 1.0.0 - (fetchpatch { - url = "https://gitlab.com/tabos/banking/-/commit/27ac4a89ba6047005d43de71a469ef30d1fda8b5.patch"; - hash = "sha256-dpDjdYf3gDsyFMTfGes+x27yUxKEnKjLulJxX2encG0="; - }) - ]; - postPatch = '' - substituteInPlace meson_post_install.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - patchShebangs meson_post_conf.py meson_post_install.py ''; @@ -70,12 +53,15 @@ python3.pkgs.buildPythonApplication rec { fints mt-940 pygobject3 + pysqlitecipher + schwifty ]; meta = with lib; { description = "Banking application for small screens"; homepage = "https://tabos.gitlab.io/projects/banking/"; license = licenses.gpl3Plus; + mainProgram = "org.tabos.banking"; maintainers = with maintainers; [ dotlambda ]; }; } From ece1a9fe66e849dae0a081b38d08b9111acf0cd6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 30 Jun 2022 21:07:39 +0100 Subject: [PATCH 055/120] arandr: refactor derivation --- pkgs/tools/X11/arandr/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 4e4146a55994..0d8303c0df46 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,22 +1,26 @@ -{ lib, fetchurl, python3Packages -, gobject-introspection, gsettings-desktop-schemas, gtk3 -, wrapGAppsHook, xrandr +{ lib +, fetchurl +, python3Packages +, gobject-introspection +, gsettings-desktop-schemas +, gtk3 +, wrapGAppsHook +, xrandr }: let inherit (python3Packages) buildPythonApplication docutils pygobject3; +in +buildPythonApplication rec { pname = "arandr"; version = "0.1.10"; - name = "${pname}-${version}"; -in buildPythonApplication rec { - inherit pname version; src = fetchurl { - url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; + url = "https://christian.amsuess.com/tools/arandr/files/${pname}-${version}.tar.gz"; sha256 = "135q0llvm077jil2fr92ssw3p095m4r8jfj0lc5rr3m71n4srj6v"; }; - patchPhase = '' + preBuild = '' rm -rf data/po/* ''; From 4387a86646d5414c1172e3075a51561ccc7d35ea Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 30 Jun 2022 10:47:23 -0700 Subject: [PATCH 056/120] libpg_query: not just for x86_64! --- pkgs/development/libraries/libpg_query/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index 1319a8eedf87..7c654c07f03a 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "C library for accessing the PostgreSQL parser outside of the server environment"; changelog = "https://github.com/pganalyze/libpg_query/raw/${version}/CHANGELOG.md"; license = licenses.bsd3; - platforms = platforms.x86_64; + platforms = platforms.unix; maintainers = [ maintainers.marsam ]; }; } From b360ddc88c87951161cb25e4d6f1fc9aa5da61fc Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 30 Jun 2022 18:08:54 -0400 Subject: [PATCH 057/120] nushell: 0.63.0 -> 0.64.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 7c3c586ae129..625634467a7c 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -21,16 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.63.0"; + version = "0.64.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-4thvUSOSvH/bv0aW7hGGQMvtXdS+yDfZzPRLZmPZQMQ="; + sha256 = "sha256-mDKoZVen3g8GujWF8WILEqdlHFDx2BxGyBJJFmK9Mdw="; }; - cargoSha256 = "sha256-Vd8R9EsO52q840HqRzc37PirZZyTZr+Bnow5qHEacJ0="; + cargoSha256 = "sha256-A2RJoU2hHcN6DfBQ+cPECtoVnrxlEHHlOV9bLqQE8VU="; # Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and # `parquet`, for dataframe support), which by default has an impure build # (git submodule for the `zstd` C library). The `pkg-config` feature flag From 40b11c149bb4f2ffd6cba9ebb4fe5f96459fad1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 30 Jun 2022 19:18:12 -0300 Subject: [PATCH 058/120] vopono: 0.9.1 -> 0.9.2 --- pkgs/tools/networking/vopono/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index af496cdab50c..dbbdbda7bcfd 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.9.1"; + version = "0.9.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-6fK4A7/Ezi6MZxDec565g2LnDkTyGgQhiqzZznwG3s8="; + sha256 = "sha256-Z9eAbGq4ePbLyp6SWSbgLy4ogo2EFMps2HT8JUQFuR4="; }; - cargoHash = "sha256-lNBmX8UyGPQARjxYF9ECzVfgDtqXdHyB4GvjCgXoiLo="; + cargoHash = "sha256-aeukVOn6uBZlsPl35erJNlKxp929czuFCzllswYOWhM="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; From 9fcfdda1accdcafa6b65ccc3637741adcc8f6cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Jun 2022 00:53:00 +0000 Subject: [PATCH 059/120] python310Packages.zope-cachedescriptors: init at 4.3.1 --- .../zope-cachedescriptors/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/zope-cachedescriptors/default.nix diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix new file mode 100644 index 000000000000..4cbf9386b6cb --- /dev/null +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zope-cachedescriptors"; + version = "4.3.1"; + + format = "setuptools"; + + src = fetchPypi { + pname = "zope.cachedescriptors"; + inherit version; + sha256 = "1f4d1a702f2ea3d177a1ffb404235551bb85560100ec88e6c98691734b1d194a"; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/zope/cachedescriptors/tests.py" + ]; + + pythonImportsCheck = [ "zope.cachedescriptors" ]; + + meta = { + description = "Method and property caching decorators"; + homepage = "https://github.com/zopefoundation/zope.cachedescriptors"; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 767e69eb54ba..024f9c5dd5c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11633,6 +11633,8 @@ in { zope_broken = callPackage ../development/python-modules/zope_broken { }; + zope-cachedescriptors = callPackage ../development/python-modules/zope-cachedescriptors { }; + zope_component = callPackage ../development/python-modules/zope_component { }; zope_configuration = callPackage ../development/python-modules/zope_configuration { }; From eb92ef3a74d17ec23ca86affdfd90c2dafae246e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Jun 2022 00:56:56 +0000 Subject: [PATCH 060/120] python310Packages.zope-testbrowser: init at 5.6.1 --- .../zope-testbrowser/default.nix | 75 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/zope-testbrowser/default.nix diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix new file mode 100644 index 000000000000..31de6e28f2ee --- /dev/null +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, zope_interface +, zope_schema +, zope-cachedescriptors +, pytz +, webtest +, beautifulsoup4 +, soupsieve +, wsgiproxy2 +, six +, mock +, zope_testing +, zope_testrunner +, python +}: + +buildPythonPackage rec { + pname = "zope-testbrowser"; + version = "5.6.1"; + + format = "setuptools"; + + src = fetchPypi { + pname = "zope.testbrowser"; + inherit version; + sha256 = "035bf63d9f7244e885786c3327448a7d9fff521dba596429698b8474961b05e7"; + }; + + postPatch = '' + # remove test that requires network access + substituteInPlace src/zope/testbrowser/tests/test_doctests.py \ + --replace "suite.addTests(wire)" "" + ''; + + propagatedBuildInputs = [ + setuptools + zope_interface + zope_schema + zope-cachedescriptors + pytz + webtest + beautifulsoup4 + soupsieve + wsgiproxy2 + six + ]; + + checkInputs = [ + mock + zope_testing + zope_testrunner + ]; + + checkPhase = '' + ${python.interpreter} -m zope.testrunner --test-path=src + ''; + + pythonImportsCheck = [ + "zope.testbrowser" + "zope.testbrowser.browser" + "zope.testbrowser.interfaces" + "zope.testbrowser.testing" + "zope.testbrowser.wsgi" + ]; + + meta = { + description = "Programmable browser for functional black-box tests"; + homepage = "https://github.com/zopefoundation/zope.testbrowser"; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 024f9c5dd5c5..78167b9bb949 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11671,6 +11671,8 @@ in { zope_size = callPackage ../development/python-modules/zope_size { }; + zope-testbrowser = callPackage ../development/python-modules/zope-testbrowser { }; + zope_testing = callPackage ../development/python-modules/zope_testing { }; zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; From 3b953b5a6973d3762b60f3f91ba7c233bfa4490c Mon Sep 17 00:00:00 2001 From: Anna Kudriavtsev Date: Thu, 30 Jun 2022 16:20:26 -0700 Subject: [PATCH 061/120] ruby-packages: update --- pkgs/top-level/ruby-packages.nix | 426 ++++++++++++++----------------- 1 file changed, 195 insertions(+), 231 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 4933478950ee..44508b8d1551 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05abj034rvyc1hgywp1gvj8bkxgp151aryxgmivxzk6sd29saq9q"; + sha256 = "0sv92v1hr9a0j3s8g26nda3b5i1ldd8a5fln2f7w6lr77bwbng2d"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ryx9y27m6bp6mwkk0v6sq48kpvq9i15pwhfvq2gvkph1d41vx1k"; + sha256 = "06xx9w2lzx02zq696rq6v96w19daw29svxm2vq9ik271718mc4j3"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qsns7caqymk0zm5nn5dylqzgjvdjs96fp8l0ycadi5j2q93klxg"; + sha256 = "1n4dyz7cjbx60vn6ppfps5qlx9s91pkbp5ybksnvv56xvxkcgprc"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yb36akfg61zq210sc9y1l3a0jz10m61a81iqxiczknsfh9d76rb"; + sha256 = "15bycvv1r0xx896dn76mdyb4bpqybi2h4g9rys9agbdrf5b1b08q"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bky0ixc4b1si0zhywm8cds73bvxprga86yap3z8p95irarziybq"; + sha256 = "00gvz5cxxlpmazdks33aadfggqxn8cl0zp2m6b97czbwppwg9g1m"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nldiqlj9jlnfvqblhk6c4md77nqri24ln10ajhfbgrx9b6h140h"; + sha256 = "0xsgawdv0v7y34zqv3wrjlrif4lkjma2106q5g2w5cdnq6axflz1"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12ycizvhxcp7mz99g6ap9y67z5n2wy0bbbm8s5il765xsfizi76k"; + sha256 = "1i5gh9qpdiv7wp1fz9j5112wfx3pfyjbyvxmkzc6cvl959vxk00k"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r2657xaa6zfvp3y04nrl4hnjpvd9m9sl7hs83q4nbnclkgzhb4w"; + sha256 = "1m09wr6f3vs25gw29y1bnjjkjfkx177sydd6r8ydwiv18b4nqmgi"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104jdjghliw33zmivlmvq70l40dyyz6gh1qsb0z82n9wyp861s18"; + sha256 = "01yk9pc59yvn9d5lvdx4vclk728k4zkcvl0pzvq0h8gr6xqnrc3k"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "143bfqq9m1mvmvm4s7qvgqzfl8fqa46a45kz5f4v0zfbflqx6f6v"; + sha256 = "0mal3s5541flic7z5fx9bzv6rhy4a62z6ywvyvsy8js5lg1kr3wa"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8"; + sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; addressable = { groups = ["default"]; @@ -447,10 +447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "161sjpyxipnbhwcr5kyfbcdbzs9zq20sigsazjm782cn3s466p0z"; + sha256 = "0jgipkiah3z6qb9ax6qac3b2m1idavd5adc319k5rjsfddpfgszh"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.3"; }; cocoapods-expert-difficulty = { groups = ["default"]; @@ -684,10 +684,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; crass = { groups = ["default"]; @@ -704,10 +704,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06k7iybv6shvf8ypw28q9pbks129v2k34sn4f293650000ybdman"; + sha256 = "1195gisqv1kn4lpshn6frlnjgx5r9a0gnpkzjxzsi6wfmfys1mwy"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; curses = { groups = ["default"]; @@ -878,10 +878,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yff4s5b8wcrk9ldils2k84l46m9nxr0my0wxchzdmgjbjdfsvww"; + sha256 = "1rv2hq29lx2337214a1p2qy70fi77ch6p0p77nw9h6x84q028qr0"; type = "gem"; }; - version = "0.92.0"; + version = "0.92.3"; }; execjs = { groups = ["default"]; @@ -894,116 +894,25 @@ version = "2.8.1"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; + dependencies = ["faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + sha256 = "1rvxs99wvrcw65v8ykppih323kw1qr5pnzgw3daxch1sfj828f2k"; type = "gem"; }; - version = "1.10.0"; - }; - faraday-em_http = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-excon = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday-httpclient = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; - type = "gem"; - }; - version = "1.0.1"; - }; - faraday-multipart = { - dependencies = ["multipart-post"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; - type = "gem"; - }; - version = "1.0.3"; + version = "2.3.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "1mbgcnjikbqa5d0pyn6cv30f33p2vaj3rgzkx45gwxw2gmx4wlb6"; type = "gem"; }; - version = "1.0.1"; - }; - faraday-net_http_persistent = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; - type = "gem"; - }; - version = "1.2.0"; - }; - faraday-patron = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-rack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-retry = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; - type = "gem"; - }; - version = "1.0.3"; + version = "2.0.3"; }; ffi = { groups = ["default"]; @@ -1219,6 +1128,17 @@ }; version = "3.4.3"; }; + haml = { + dependencies = ["temple" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf"; + type = "gem"; + }; + version = "5.2.2"; + }; hashie = { groups = ["default"]; platforms = []; @@ -1275,10 +1195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "080sn9z1a64gv04p318jz10y6lv6qd3avip08rrcmq9k4ihai0f1"; + sha256 = "0w14wk9j375dcvh7cr833jqqsd8974x51ds30m26cr1pwxy8xgbh"; type = "gem"; }; - version = "2.14.0"; + version = "2.14.2"; }; http-accept = { groups = ["default"]; @@ -1296,10 +1216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; + sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; httpclient = { groups = ["default"]; @@ -1342,16 +1262,6 @@ }; version = "0.1.4"; }; - io-wait = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10jj6xz15qaw8gkck5wv3a3xg1zdfsarrandkglfbf75x4xmkrfz"; - type = "gem"; - }; - version = "0.2.1"; - }; jaro_winkler = { groups = ["default"]; platforms = []; @@ -1528,20 +1438,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; + sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; type = "gem"; }; - version = "2.6.1"; + version = "2.6.2"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838"; + sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; kramdown = { groups = ["default"]; @@ -1579,10 +1489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kr51hg192mfn5ixngs41f1z8iyik5r6b52chcy8ilfs006fdkgi"; + sha256 = "0rsgvdyh828k6bz95b4391ydv6710d4dsdrrfr684glks7599ldf"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.3"; }; liquid = { groups = ["default"]; @@ -1611,10 +1521,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23"; + sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; type = "gem"; }; - version = "2.15.0"; + version = "2.18.0"; }; mab = { groups = ["default"]; @@ -1765,10 +1675,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "08z6rgs1jgbc032843mwg3fayvzn4hihz8bl2gp87pf7z02kw5f3"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.1"; }; molinillo = { groups = ["default"]; @@ -1785,10 +1695,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125"; + sha256 = "1hpj9mm31a5aw5qys2kglfl8jv74bkwkc5pfrpp3als89hgkznqy"; type = "gem"; }; - version = "1.4.5"; + version = "1.5.2"; }; multi_json = { groups = ["default"]; @@ -1800,16 +1710,6 @@ }; version = "1.15.0"; }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; - type = "gem"; - }; - version = "2.1.1"; - }; mustermann = { dependencies = ["ruby2_keywords"]; groups = ["default"]; @@ -1826,10 +1726,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw"; + sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1"; type = "gem"; }; - version = "0.5.3"; + version = "0.5.4"; }; nanaimo = { groups = ["default"]; @@ -1856,10 +1756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pcpqw8vjxf2cs97bzzxcz5bh72x6bkayj0vzsilidw90kvrv2ds"; + sha256 = "1p0fbbw548kj1mb8kimmchrfbhqi4cla2wnh0gr571l01s4m6fi7"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.4"; }; ncursesw = { groups = ["default"]; @@ -1904,15 +1804,15 @@ version = "0.1.1"; }; net-protocol = { - dependencies = ["io-wait" "timeout"]; + dependencies = ["timeout"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rrzdar609d8c96ikpw2yif44pp5k3n3cpjld31ia0rgmz9z59gv"; + sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; net-scp = { dependencies = ["net-ssh"]; @@ -1920,10 +1820,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4h3ip8d1gkrc0znnw54hbxillk73mdnaf5pz330lmrcl1wiilg"; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; type = "gem"; }; - version = "3.0.0"; + version = "1.2.1"; }; net-smtp = { dependencies = ["digest" "net-protocol" "timeout"]; @@ -1941,10 +1841,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; + sha256 = "1qp3i8bi7ji1np0530bp2p9zrrn6galvmbsivxwpkjdpjdyn19sr"; type = "gem"; }; - version = "6.1.0"; + version = "7.0.1"; }; netrc = { groups = ["default"]; @@ -1972,10 +1872,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.6"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -1983,10 +1883,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj"; + sha256 = "0yqs5cn07lwh7nhc6zh92rymk0aran90zfjgcbvpgsr2mjsyq8rc"; type = "gem"; }; - version = "4.22.0"; + version = "4.25.0"; }; optimist = { groups = ["default"]; @@ -2058,10 +1958,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.21.0"; + version = "1.22.1"; }; parser = { dependencies = ["ast"]; @@ -2109,10 +2009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb"; + sha256 = "11q4zw8n0lmff5k514ip30yizr38jb2x5nh3m7fy3k13sbxbysrq"; type = "gem"; }; - version = "1.3.4"; + version = "1.4.1"; }; pkg-config = { groups = ["default"]; @@ -2135,14 +2035,25 @@ version = "0.3.5"; }; prettier = { + dependencies = ["syntax_tree" "syntax_tree-haml" "syntax_tree-rbs"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vi8yzllqgjnmx0lcqrcyqw5lah06w4qln0mg8nczvgp8finflcb"; + sha256 = "1rp6vh4vlmcy5p0j92y2hmdbwr5i0mqhisk1y5b3qryk0sgk1pcz"; type = "gem"; }; - version = "2.0.0"; + version = "3.1.2"; + }; + prettier_print = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "080469yh9k1va9v6ws2y0bwg9k1mnfs4rl7871q8aak74x6mrv9p"; + type = "gem"; + }; + version = "0.1.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2193,10 +2104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; + sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; type = "gem"; }; - version = "5.6.2"; + version = "5.6.4"; }; racc = { groups = ["default"]; @@ -2213,10 +2124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.4"; }; rack-protection = { dependencies = ["rack"]; @@ -2235,10 +2146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; @@ -2246,10 +2157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10x2vb9rd3zpnp6f9vv60kmv9hlrcg4dxk9z5vhcdpkjbh3j8kpf"; + sha256 = "07dfhbzvhskazck9mayya6jgcwlz22szvrypwr5fy7jmjwd3w33y"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -2268,10 +2179,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; + sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; @@ -2279,10 +2190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jxqfalhac6q3v0rasm5r5c406knngrgdblhl41m753gn9hrzx4"; + sha256 = "1a6q818d2c0lrpm1kzgwj91dirhsy0vs2z5d0c5cvl7hn1qq59x9"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; rainbow = { groups = ["default"]; @@ -2346,6 +2257,16 @@ }; version = "7.1.1"; }; + rbs = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mp264klwbzh80xwdf8spnicjmq7072bsf38l4jm0j0jha6hh7dx"; + type = "gem"; + }; + version = "2.6.0"; + }; re2 = { groups = ["default"]; platforms = []; @@ -2382,10 +2303,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lhdfkl4r6dnhlr8jpz4a21ca6c76jfy7fj7gf4j2qpbh8ld8qyb"; + sha256 = "1w5j8666zz2cdg342g16cyr9rbm0ljgs2adygl8bnf22zq3fvir4"; type = "gem"; }; - version = "4.6.0"; + version = "4.7.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -2414,10 +2335,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; type = "gem"; }; - version = "2.2.1"; + version = "2.5.0"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -2456,10 +2377,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zxljscsg2sp49s2f80n2rdpbazkf97v3jd2fydm3kgaplcyrh96"; + sha256 = "1ms0dn1jk08zjrm31m0qfk0pva1n8b1yhmwq4fxlncm8m4ngckpr"; type = "gem"; }; - version = "4.2.4"; + version = "4.2.5"; }; rouge = { groups = ["default"]; @@ -2520,10 +2441,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3"; + sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rspec-support = { groups = ["default"]; @@ -2646,10 +2567,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mn175vcdm8d1a96j4lzq3dqclcml6cvv8xhnklx5vbzdfw9qmfl"; + sha256 = "1zq24qvkqzjsrcwyz9lp3pm602kqw08cp3g1acf3zy0nc7npvx9p"; type = "gem"; }; - version = "3.12.5"; + version = "3.12.6"; }; rubyzip = { groups = ["default"]; @@ -2666,10 +2587,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m94p1fdgn6m16vnw4qs3ja2xd8kiz1z67glyp0c56g0bfghbx3q"; + sha256 = "0l02a46cg4xsk2cmg6bxqjq561qnsk2jc2zxpwybc018s391xn62"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; safe_yaml = { groups = ["default"]; @@ -2720,10 +2641,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.2"; }; scrypt = { dependencies = ["ffi-compiler"]; @@ -2741,20 +2662,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s98gvp8fzxyz57lvnmb44vn93d4cyipw4qwk1ykikgml289zqwy"; + sha256 = "0va9770p8qbr3sizjl1kpcr3pw9727nh70hplafay3gcalyk5x9z"; type = "gem"; }; - version = "0.11.9"; + version = "0.13.0"; }; sequel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wzb16vyslr7bpy7g5k2m35yz90bpf12f3pzj5w6icf1vldnc3nf"; + sha256 = "000nddwcpgahbv7zyhl0br4nxcxg310ijpaghlwq8qm7c6795ajx"; type = "gem"; }; - version = "5.54.0"; + version = "5.57.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2825,10 +2746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "067bvjmjdjs19bvy138hkqqvw8li3732radcd4x5f5dbf30yk3a9"; + sha256 = "1dgj8bjbfblk0lpwbz51sp1p98caxk420rcpz2kpijgk96kzmp2y"; type = "gem"; }; - version = "4.9.1"; + version = "4.9.2"; }; snappy = { groups = ["default"]; @@ -2866,30 +2787,73 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + sha256 = "1z1wa639c278bsipczn6kv8b13fj85pi8gk7x462chqx6k0wm0ax"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.4"; }; strscan = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05bzfzfwvs5ngl14yf303nvrg5wjx3srgbjqkki7x65cm66w948p"; + sha256 = "1k9c9dhjac57qsyigbbw6whynz3nm75vk3z937xn6lnz8hl1qc2g"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.3"; + }; + syntax_tree = { + dependencies = ["prettier_print"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kamfywhkwv37xi8bds1yvix43fh811jjbzh2c8k54h71q8hi2rp"; + type = "gem"; + }; + version = "2.8.0"; + }; + syntax_tree-haml = { + dependencies = ["haml" "prettier_print" "syntax_tree"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cbax3y4jr6n83zh54146ynl2aznda3yixvy2zsi9p1b1x5sins7"; + type = "gem"; + }; + version = "1.2.0"; + }; + syntax_tree-rbs = { + dependencies = ["prettier_print" "rbs" "syntax_tree"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l5clqjp6xc5y0m5hvb756bx672f9zm3mcgspzqf2zyq9657wp4i"; + type = "gem"; + }; + version = "0.4.0"; }; taglib-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nkwmlx0ja35gs4lkh7hmshlwsqk5wm1wqrc2p45icnjmrh0x5cw"; + sha256 = "0zf6cavsmj87lszy0b5mzw6mdg0dbsb7f52xy2fx06y9abv78xxw"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.2"; + }; + temple = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; + type = "gem"; + }; + version = "0.8.2"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -2937,10 +2901,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10bx1hcyrjqgq6a848fc1i0cgrvx42gcy8hk4vp90y6zc7k8xzbk"; + sha256 = "00cy93b6803j3aw5nail4l0zdrj54i5n2dlk6j9z998swcjbv3b2"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; }; tiny_tds = { groups = ["default"]; @@ -3001,10 +2965,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; type = "gem"; }; - version = "0.0.8.1"; + version = "0.0.8.2"; }; unicode-display_width = { groups = ["default"]; @@ -3073,10 +3037,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; + sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi"; type = "gem"; }; - version = "1.21.0"; + version = "1.22.0"; }; xctasks = { groups = ["default"]; @@ -3094,20 +3058,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d08gkis1imlvppyh8dbslk89hwj5af2fmlzvmwahgx2bm48d9sn"; + sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk"; type = "gem"; }; - version = "0.9.27"; + version = "0.9.28"; }; zeitwerk = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; + sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; type = "gem"; }; - version = "2.5.4"; + version = "2.6.0"; }; ZenTest = { groups = ["default"]; From 9a578a2c083bf21a8688088c3ef787f6faae892a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Jun 2022 00:15:01 +0000 Subject: [PATCH 062/120] python310Packages.splinter: 0.17.0 -> 0.18.0 https://github.com/cobrateam/splinter/releases/tag/0.18.0 --- .../python-modules/splinter/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index a368d1a81131..2b4cef2e30f8 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -1,20 +1,29 @@ { lib , buildPythonPackage +, isPy27 , fetchFromGitHub , selenium +, cssselect +, django , flask +, lxml , pytestCheckHook +, zope-testbrowser }: buildPythonPackage rec { pname = "splinter"; - version = "0.17.0"; + version = "0.18.0"; + + disabled = isPy27; + + format = "setuptools"; src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; rev = version; - hash = "sha256-7QhFz/qBh2ECyeyvjCyqOYy/YrUK7KVX13VC/gem5BQ="; + hash = "sha256-kJ5S/fBesaxTbxCQ0yBR30+CfCV6U5jgbfDZA7eF6ac="; }; propagatedBuildInputs = [ @@ -22,27 +31,35 @@ buildPythonPackage rec { ]; checkInputs = [ + cssselect + django flask + lxml pytestCheckHook + zope-testbrowser ]; disabledTests = [ # driver is present and fails with a different error during loading + "test_browser_local_driver_not_present" "test_local_driver_not_present" ]; disabledTestPaths = [ "samples" - # TODO: requires optional dependencies which should be defined in passthru.optional-dependencies.$name - "tests/test_djangoclient.py" - "tests/test_flaskclient.py" + # We run neither Chromium nor Firefox nor ... + "tests/test_async_finder.py" + "tests/test_html_snapshot.py" + "tests/test_iframes.py" + "tests/test_mouse_interaction.py" "tests/test_popups.py" + "tests/test_screenshot.py" + "tests/test_shadow_root.py" "tests/test_webdriver.py" "tests/test_webdriver_chrome.py" "tests/test_webdriver_edge_chromium.py" "tests/test_webdriver_firefox.py" "tests/test_webdriver_remote.py" - "tests/test_zopetestbrowser.py" ]; pythonImportsCheck = [ "splinter" ]; From d54b22f9ac6271e3e2b158ed80770ad8a7f552b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 00:50:50 +0000 Subject: [PATCH 063/120] python310Packages.qiskit-finance: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/qiskit-finance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index ad80eb3698fa..45764b4983ef 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-finance"; - version = "0.3.2"; + version = "0.3.3"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-ZmK4nYuv3DBJ0Ah819zGAh7inGVBWDnzJvl0FABJ6KU="; + sha256 = "sha256-1XM4gBuMsvjwU4GSdQJobMyyDFZOOTbwvnUPG0nXFoc="; }; postPatch = '' From 959efb4705741f193ece980bbc331b10ece725c7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 28 Jun 2022 15:47:13 +0800 Subject: [PATCH 064/120] geoip: pass through the dataDir so consumers know where to look --- pkgs/development/libraries/geoip/default.nix | 27 ++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 8747433047c6..4b12871e5567 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,24 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook , drvName ? "geoip" -# in geoipDatabase, you can insert a package defining -# "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy + # in geoipDatabase, you can insert a package defining + # "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy , geoipDatabase ? "/var/lib/geoip-databases" }: let - dataDir = if lib.isDerivation geoipDatabase + dataDir = + if lib.isDerivation geoipDatabase then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; + in stdenv.mkDerivation rec { pname = drvName; version = "1.6.12"; src = fetchFromGitHub { - owner = "maxmind"; - repo = "geoip-api-c"; - rev = "v${version}"; + owner = "maxmind"; + repo = "geoip-api-c"; + rev = "v${version}"; sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv"; }; @@ -35,11 +40,13 @@ stdenv.mkDerivation rec { find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; + passthru = { inherit dataDir; }; + meta = with lib; { description = "An API for GeoIP/Geolocation databases"; maintainers = with maintainers; [ thoughtpolice raskin ]; - license = licenses.lgpl21; - platforms = platforms.unix; - homepage = "https://www.maxmind.com"; + license = licenses.lgpl21; + platforms = platforms.unix; + homepage = "https://www.maxmind.com"; }; } From 1e698a79791b81a2da341009fd0ecc15271b2557 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 28 Jun 2022 15:47:23 +0800 Subject: [PATCH 065/120] ipcalc: add geoip support --- pkgs/tools/networking/ipcalc/default.nix | 38 +++++++++++++++++------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 2237c739ec14..a29c426b2893 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -1,14 +1,18 @@ { lib , stdenv , fetchFromGitLab -, glib , meson , ninja -, libmaxminddb , pkg-config , ronn +, withGeo ? true +, geoip }: +# In order for the geoip part to work, you need to set up a link from +# geoip.dataDir to a directory containing the data files This would typically be +# /var/lib/geoip-databases pointing to geoip-legacy/share/GeoIP + stdenv.mkDerivation rec { pname = "ipcalc"; version = "1.0.1"; @@ -17,22 +21,34 @@ stdenv.mkDerivation rec { owner = "ipcalc"; repo = "ipcalc"; rev = version; - sha256 = "0qg516jv94dlk0qj0bj5y1dd0i31ziqcjd6m00w8xp5wl97bj2ji"; + hash = "sha256-UQq5TqK83I44ANU0yXD8YUTQWvBFLiAxmLSRtKUJ5WE="; }; - nativeBuildInputs = [ - glib - meson - ninja - pkg-config - libmaxminddb - ronn + # technically not needed as we do not support the paid maxmind databases, but + # keep it around if someone wants to add support and /usr/share/GeoIP is + # broken anyway + postPatch = '' + substituteInPlace ipcalc-maxmind.c \ + --replace /usr/share/GeoIP /var/lib/GeoIP + ''; + + nativeBuildInputs = [ meson ninja pkg-config ronn ]; + + buildInputs = [ geoip ]; + + mesonFlags = [ + "-Duse_geoip=${if withGeo then "en" else "dis"}abled" + "-Duse_maxminddb=disabled" + # runtime linking doesn't work on NixOS anyway + "-Duse_runtime_linking=disabled" ]; + doCheck = true; + meta = with lib; { description = "Simple IP network calculator"; homepage = "https://gitlab.com/ipcalc/ipcalc"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ peterhoeg ]; }; } From 808b08df16b7745809a87df423dd67b68f22b393 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 29 Jun 2022 07:55:14 +0200 Subject: [PATCH 066/120] mu: 1.8.1 -> 1.8.2 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 98dd7d1a8789..1a1a8d3c673d 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = "v${version}"; - sha256 = "dFYITyO9znocf9fv3eh2h83NM3RDYcpDV/uxOISChZo="; + sha256 = "wpyolNXm5JloKMJarYzSbs2yMcrkl73vOw6951Ol8Rs="; }; postPatch = '' From 22f96886cfb31111f35f91761eadf60c22df0460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Jun 2022 22:20:00 +0000 Subject: [PATCH 067/120] netcdf: 4.8.1 -> 4.9.0 https://github.com/Unidata/netcdf-c/releases/tag/v4.9.0 --- pkgs/development/libraries/netcdf/default.nix | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index da2ad9c3f9ba..76478bc80c65 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchurl, unzip , hdf5 +, libxml2 , m4 , curl # for DAP , removeReferencesTo @@ -10,11 +11,11 @@ let inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; - version = "4.8.1"; + version = "4.9.0"; src = fetchurl { url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz"; - sha256 = "1cbjwjmp9691clacw5v88hmpz46ngxs3bfpkf2xy1j7cvlkc72l0"; + hash = "sha256-TJVgIrecCOXhTu6N9RsTwo5hIcK35/qtwhs3WUlAC0k="; }; postPatch = '' @@ -27,7 +28,13 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ m4 removeReferencesTo ]; - buildInputs = [ hdf5 curl mpi ]; + + buildInputs = [ + curl + hdf5 + libxml2 + mpi + ]; passthru = { inherit mpiSupport mpi; @@ -50,12 +57,15 @@ in stdenv.mkDerivation rec { doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64)); checkInputs = [ unzip ]; + preCheck = '' + export HOME=$TEMP + ''; + meta = { - description = "Libraries for the Unidata network Common Data Format"; - platforms = lib.platforms.unix; - homepage = "https://www.unidata.ucar.edu/software/netcdf/"; - license = { - url = "https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html"; - }; + description = "Libraries for the Unidata network Common Data Format"; + platforms = lib.platforms.unix; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; + changelog = "https://docs.unidata.ucar.edu/netcdf-c/${version}/RELEASE_NOTES.html"; + license = lib.licenses.bsd3; }; } From 8d1a4469dd9000bf9d3d445f59531ff9673271e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 10:04:19 +0000 Subject: [PATCH 068/120] python310Packages.netcdf4: 1.5.8 -> 1.6.0 --- pkgs/development/python-modules/netcdf4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 23f2b88a8591..4908e1eb8aee 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.8"; + version = "1.6.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "ca3d468f4812c0999df86e3f428851fb0c17ac34ce0827115c246b0b690e4e84"; + sha256 = "sha256-le+jc9mj4c0N9xk+duZoDZ7KKOYAl8qBOa/qikNGumM="; }; checkInputs = [ pytest ]; From 6806e4e8b78eae240cb9e657b168c13dd58f9a3f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 24 Jun 2022 06:26:47 +0200 Subject: [PATCH 069/120] =?UTF-8?q?ocamlPackages.shared-memory-ring:=203.1?= =?UTF-8?q?.0=20=E2=86=92=203.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/shared-memory-ring/default.nix | 8 +++----- pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 17dd6183c0da..baeda2d1b152 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -10,13 +10,11 @@ buildDunePackage rec { pname = "shared-memory-ring"; - version = "3.1.0"; - - useDune2 = true; + version = "3.1.1"; src = fetchurl { - url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-v${version}.tbz"; - sha256 = "06350ph3rdfvybi0cgs3h3rdkmjspk3c4375rxvbdg0kza1w22x1"; + url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-${version}.tbz"; + sha256 = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix index 8f41253bab8e..e3ae1ef2e3dc 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix @@ -12,7 +12,7 @@ buildDunePackage { pname = "shared-memory-ring-lwt"; - inherit (shared-memory-ring) version src useDune2; + inherit (shared-memory-ring) version src; buildInputs = [ ppx_cstruct From a046e6c8f31a4766d8374c5269ebb492f623072a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Jul 2022 08:50:39 +0200 Subject: [PATCH 070/120] python310Packages.hcloud: enable all tests - add pythonImportsCheck - remove lint inputs - disable on older Python releases - add format - update description --- .../python-modules/hcloud/default.nix | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 6c79629919da..ad8e79b63fd1 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -2,39 +2,44 @@ , buildPythonPackage , fetchPypi , future -, requests -, python-dateutil -, flake8 -, isort , mock -, pytest -, isPy27 +, pytestCheckHook +, python-dateutil +, pythonOlder +, requests }: buildPythonPackage rec { pname = "hcloud"; version = "1.17.0"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+BQuBDi+J3xvod3uE67NXaFStIxt7H/Ulw3vG13CGeI="; + hash = "sha256-+BQuBDi+J3xvod3uE67NXaFStIxt7H/Ulw3vG13CGeI="; }; - propagatedBuildInputs = [ future requests python-dateutil ]; + propagatedBuildInputs = [ + future + requests + python-dateutil + ]; - checkInputs = [ flake8 isort mock pytest ]; + checkInputs = [ + mock + pytestCheckHook + ]; - # Skip integration tests since they require a separate external fake API endpoint. - checkPhase = '' - pytest --ignore=tests/integration - ''; + pythonImportsCheck = [ + "hcloud" + ]; meta = with lib; { - description = "Official Hetzner Cloud python library"; + description = "Library for the Hetzner Cloud API"; homepage = "https://github.com/hetznercloud/hcloud-python"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ liff ]; }; } From d20dd119683e1b9b2f8ca557e3ca8414424bb9c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 07:47:54 +0000 Subject: [PATCH 071/120] pantheon.wingpanel-indicator-network: 2.3.2 -> 2.3.3 --- .../pantheon/desktop/wingpanel-indicators/network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index fdb6481f7e7f..013884cb3490 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-4Fg8/Gm9mUqaL3wEc8h+/pMvOfD75ILjo7LhLz6LQmo="; + sha256 = "sha256-fcR8gcexxIzSvR27SUyDhyCOlev+0r7YPPJlCNydCYM="; }; nativeBuildInputs = [ From 283d9754bba49eda627c146ad745d1635a08d550 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 08:55:55 +0000 Subject: [PATCH 072/120] python310Packages.tempest: 31.0.0 -> 31.1.0 --- pkgs/development/python-modules/tempest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 0ca5f4accbb9..9eae17b3e178 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -28,11 +28,11 @@ buildPythonApplication rec { pname = "tempest"; - version = "31.0.0"; + version = "31.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g/fpVDGa2TFAzMVvC/370bStPJvhWSZ2tkbmP54nzc4="; + sha256 = "sha256-EaDFnIxaAGBDViAVzMjZev3jXmb3NIlMlcg4BiwoAq4="; }; propagatedBuildInputs = [ From aa6d3e68171d35e68d6aa7f9987f8aa651bf8d66 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 30 Jun 2022 08:48:25 +0000 Subject: [PATCH 073/120] top-level/linux-kernels.nix: add vendor kernels note This codifies existing practice of avoiding adding new vendor kernels to Nixpkgs. Hopefully I've put this comment at the place in the file somebody hoping to add a new vendor kernel would be most likely to look. --- pkgs/top-level/linux-kernels.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 0d2d7cc835c0..a7376042a6e5 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -57,6 +57,10 @@ in { kernels = recurseIntoAttrs (lib.makeExtensible (self: with self; let callPackage = newScope self; in { + # NOTE: PLEASE DO NOT ADD NEW VENDOR KERNELS TO NIXPKGS. + # New vendor kernels should go to nixos-hardware instead. + # e.g. https://github.com/NixOS/nixos-hardware/tree/master/microsoft/surface/kernel + linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { kernelPatches = linux_4_19.kernelPatches; }; From 5932186344b312cbb3fa9b0b0be7a90b688843ae Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 27 Jun 2022 01:40:31 +0200 Subject: [PATCH 074/120] signal-desktop: fix missing tray icon Fixes: #178892 --- .../networking/instant-messengers/signal-desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 7d18a8d29252..53b7f8417cae 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -82,6 +82,7 @@ in stdenv.mkDerivation rec { runtimeDependencies = [ (lib.getLib systemd) + libappindicator-gtk3 libnotify libdbusmenu xdg-utils From 12ae5d953db66bcb18bdbee0b3afee179f88680c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 10:05:36 +0000 Subject: [PATCH 075/120] python310Packages.asana: 0.10.9 -> 1.0.0 --- pkgs/development/python-modules/asana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index d179f3f94902..09ff95885441 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asana"; - version = "0.10.9"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asana"; repo = "python-asana"; - rev = "v${version}"; - sha256 = "sha256-9gOkCMY15ChdhiFdzS0TjvWpVTKKEGt7XIcK6EhkSK8="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-SbYTLGBCfKbjhyzM5OnVX6kxEMnofwPIyzwuJvYORhw="; }; propagatedBuildInputs = [ From 84a29ac208037849c25a355cc141c7d7b9b378b1 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Fri, 1 Jul 2022 13:27:52 +0200 Subject: [PATCH 076/120] jprofiler: init at 13.0.2 --- .../tools/java/jprofiler/default.nix | 99 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 103 insertions(+) create mode 100644 pkgs/development/tools/java/jprofiler/default.nix diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix new file mode 100644 index 000000000000..e6f0232fe681 --- /dev/null +++ b/pkgs/development/tools/java/jprofiler/default.nix @@ -0,0 +1,99 @@ +{ stdenv +, lib +, fetchurl +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, undmg +, jdk +}: + +let + inherit (stdenv.hostPlatform) system; + pname = "jprofiler"; + + # 11.1.4 is the last version which can be unpacked by undmg + # See: https://github.com/matthewbauer/undmg/issues/9 + version = if stdenv.isLinux then "13.0.2" else "11.1.4"; + nameApp = "JProfiler"; + + meta = with lib; { + description = "JProfiler's intuitive UI helps you resolve performance bottlenecks"; + longDescription = '' + JProfiler's intuitive UI helps you resolve performance bottlenecks, + pin down memory leaks and understand threading issues. + ''; + homepage = "https://www.ej-technologies.com/products/jprofiler/overview.html"; + license = licenses.unfree; + maintainers = with maintainers; [ catap ]; + }; + + src = if stdenv.isLinux then fetchurl { + url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; + sha256 = "sha256-x9I7l2ctquCqUymtlQpFXE6+u0Yg773qE6MvAxvCaEE="; + } else fetchurl { + url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${lib.replaceStrings ["."] ["_"] version}.dmg"; + sha256 = "sha256-WDMGrDsMdY1//WMHgr+/YKSxHWt6A1dD1Pd/MuDOaz8="; + }; + + srcIcon = fetchurl { + url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png"; + sha256 = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE="; + }; + + desktopItems = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = meta.description; + desktopName = nameApp; + genericName = "Java Profiler Tool"; + categories = [ "Development" ]; + }; + + linux = stdenv.mkDerivation { + inherit pname version src desktopItems; + + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + + installPhase = '' + runHook preInstall + cp -r . $out + + rm -f $out/bin/updater + rm -rf $out/bin/linux-ppc* + rm -rf $out/bin/linux-armhf + rm -rf $out/bin/linux-musl* + + for f in $(find $out/bin -type f -executable); do + wrapProgram $f --set JAVA_HOME "${jdk.home}" + done + + install -Dm644 "${srcIcon}" \ + "$out/share/icons/hicolor/scalable/apps/jprofiler.png" + runHook postInstall + ''; + + meta = meta // { platforms = lib.platforms.linux; }; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src; + + # Archive extraction via undmg fails for this particular version. + nativeBuildInputs = [ makeWrapper undmg ]; + + sourceRoot = "${nameApp}.app"; + + installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/${nameApp}.app,bin} + cp -R . $out/Applications/${nameApp}.app + makeWrapper $out/Applications/${nameApp}.app/Contents/MacOS/JavaApplicationStub $out/bin/${pname} + runHook postInstall + ''; + + meta = meta // { platforms = lib.platforms.darwin; }; + }; +in +if stdenv.isDarwin then darwin else linux diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1381c472d22f..c8752d11c3de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16670,6 +16670,10 @@ with pkgs; java-language-server = callPackage ../development/tools/java/java-language-server { }; + jprofiler = callPackage ../development/tools/java/jprofiler { + jdk = jdk11; + }; + jhiccup = callPackage ../development/tools/java/jhiccup { }; valgrind = callPackage ../development/tools/analysis/valgrind { From 28385978bc9c827d642091e5e39aa1ff1c478eb7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 1 Jul 2022 14:26:13 +0200 Subject: [PATCH 077/120] bitcoin: fix broken build on aarch64-darwin by disabling stackprotector which kills the tests --- pkgs/applications/blockchains/bitcoin/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 5ecbf4fc9790..cb7355aac17a 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -74,6 +74,10 @@ stdenv.mkDerivation rec { "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; + # fix "Killed: 9 test/test_bitcoin" + # https://github.com/NixOS/nixpkgs/issues/179474 + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + checkInputs = [ python3 ]; doCheck = true; From 987400b848773e4f274c96d33630273ea7d7d02f Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Fri, 1 Jul 2022 16:10:14 +0400 Subject: [PATCH 078/120] nixos/desktop-manager: Use literal newline to fix shell syntax Running `nixos/tests/keepassxc.nix` shows: ``` machine # [ 18.705390] xsession[985]: /nix/store/2g2jx5c6x3p152wbiijr0rmky7byqivc-xsession: line 13: nn: command not found ``` This garbled bash script runs without `set -o errexit` and thus skips "\n\n" as invalid command: ``` $ cat -n /nix/store/2g2jx5c6x3p152wbiijr0rmky7byqivc-xsession ... \n\n if [ -e $HOME/.background-image ]; then /nix/store/wq1d1ph8wj4alpx78akvpbd0a0m9qkd1-feh-3.8/bin/feh --bg-scale $HOME/.background-image fi ... ``` KeePassXC uses it through `nixos/modules/services/x11/display-managers/default.nix`: ``` ... # Script responsible for starting the window manager and the desktop manager. xsession = dm: wm: pkgs.writeScript "xsession" '' #! ${pkgs.bash}/bin/bash # Legacy session script used to construct .desktop files from # `services.xserver.displayManager.session` entries. Called from # `sessionWrapper`. # Start the window manager. ${wm.start} # Start the desktop manager. ${dm.start} ... ''; ... ``` The bogus line was introduced in PR #160752: ``` commit 0bc0dc8090e6609838816f43dc7799e32c674434 Author: Shaw Vrana Date: Fri Feb 18 11:27:42 2022 -0800 desktop manager script: start properly Adds a missing line feed when X is enabled to the start script name and the appended if check. Resolves #160735 ``` I have not tried to reproduce the original issue and thus don't know why "\n\n" apparently gets interpreted fine in one place but remains literal the `xsession` case. However, using a literal newline must be valid for all cases and certainly fixes the warning seen in KeePassXC tests. Furthermore, starting the nix string (`''`) with a newline as usual also fixes its overall indentation. --- nixos/modules/services/x11/desktop-managers/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 2c2f2cae4b74..ffdf7e9a86eb 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -72,7 +72,9 @@ in apply = map (d: d // { manage = "desktop"; start = d.start - + optionalString (needBGCond d) ''\n\n + # literal newline to ensure d.start's last line is not appended to + + optionalString (needBGCond d) '' + if [ -e $HOME/.background-image ]; then ${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image fi From 2439ddbd9b7781e5316fa16bce66dac4f171b7d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 03:26:11 +0000 Subject: [PATCH 079/120] gnome.gnome-control-center: 42.2 -> 42.3 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index b8cf3765714c..f0db2b984922 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "42.2"; + version = "42.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-eLolewn73cBYh5F00Tg3p5zVnpWoSQEX5Myi5SLJ6wA="; + sha256 = "sha256-zgrjZQ3ir368sKfh/JkS7dtu/40lfz/lD/iynBk0HH4="; }; patches = [ From 991aa3f49ac22b71996515ba184feeb800d99ee4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 04:10:21 +0000 Subject: [PATCH 080/120] gnome.gnome-software: 42.2 -> 42.3 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index aa45ce2f5517..8fdc16ca74e3 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "42.2"; + version = "42.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6ENJYyp/XQhmzlwMVi5f6oQRoF8ickRBzZqCQgRiMiQ="; + sha256 = "OM9whWmj12TU0NLt7KqG9Og57CK5ZvQf2tVleKDdM8A="; }; patches = [ From 4c35729086139bae51d0575e47687e845f180eb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 03:31:00 +0000 Subject: [PATCH 081/120] glib-networking: 2.72.0 -> 2.72.1 --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index fce73f74660e..edd54516853f 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.72.0"; + version = "2.72.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EAquuzaShQQd5S2kIra3FnidXk11SaOnG6WHuTLggjs="; + sha256 = "b8G+3IBiSE3IoCBJZZle8jZ8PbXJNAWP8WB+WiTZWnQ="; }; patches = [ From a034fd5235f4cb7d61e4e2ff1e00b9f2af9a053c Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 1 Jul 2022 08:14:19 -0500 Subject: [PATCH 082/120] duckdb: add patch to fix list type inference (#178886) --- pkgs/development/libraries/duckdb/default.nix | 5 +++++ pkgs/development/python-modules/duckdb/default.nix | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 059c79bfcbb5..d4d45713de25 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { url = "https://github.com/duckdb/duckdb/commit/82e13a4bb9f0683af6c52468af2fb903cce4286d.patch"; sha256 = "sha256-m0Bs0DOJQtkadbKZKk88NHyBFJkjxXUsiWYciuRIJLU="; }) + (fetchpatch { + name = "fix-list-type-metadata.patch"; + url = "https://github.com/duckdb/duckdb/commit/26d123fdc57273903573c72b1ddafc52f365e378.patch"; + sha256 = "sha256-ttqs5EjeSLhZQOXc43Y5/N5IYSESQTD1FZWV1uJ15Fo="; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index dd7ad8737975..d7878bd6a44d 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , duckdb , google-cloud-storage , mypy @@ -13,10 +14,12 @@ buildPythonPackage rec { pname = "duckdb"; - inherit (duckdb) version src; + inherit (duckdb) version src patches; format = "setuptools"; - sourceRoot = "source/tools/pythonpkg"; + preConfigure = '' + cd tools/pythonpkg + ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -45,6 +48,6 @@ buildPythonPackage rec { description = "Python binding for DuckDB"; homepage = "https://duckdb.org/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ costrouc cpcloud ]; }; } From 09ef743e10fd7923fe8a417956a1a462c74c8fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 1 Jul 2022 15:28:42 +0200 Subject: [PATCH 083/120] act: 0.2.28 -> 0.2.29 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 934f417b0745..0bc4d9a9b6d5 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.28"; + version = "0.2.29"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wHBdmNFi//0nAgqRjTJYE3H+06HrW9l+xLVB97/XrnY="; + sha256 = "sha256-n5IUhx5nZ6+bbYc3Z0d3stBSvr2Ht2XUwtDorQTcOhs="; }; - vendorSha256 = "sha256-bWNDBoLGiV/eSUW/AE/yzvJN7NYCnT1GjzP3VmDVAg8="; + vendorSha256 = "sha256-rMM1BcL4FGFXs0DHoLV9kt+BxnreVTL7kwCd9li1i6g="; doCheck = false; From e94f1b45efd69a6ad89b28dd4944a2bc6e825007 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Fri, 1 Jul 2022 15:31:42 +0200 Subject: [PATCH 084/120] lesspipe: 1.85 -> 2.05 (#178581) Co-authored-by: Sandro --- pkgs/tools/misc/lesspipe/default.nix | 47 ++++++++++--------- pkgs/tools/misc/lesspipe/fix-paths.patch | 22 --------- .../lesspipe/override-shell-detection.patch | 12 ----- 3 files changed, 25 insertions(+), 56 deletions(-) delete mode 100644 pkgs/tools/misc/lesspipe/fix-paths.patch delete mode 100644 pkgs/tools/misc/lesspipe/override-shell-detection.patch diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index 8977f9013959..0f2d4e4fe11c 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -1,34 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses, bash }: +{ lib, stdenv, fetchFromGitHub, substituteAll, makeWrapper, perl, procps, file, gnused, bash }: stdenv.mkDerivation rec { pname = "lesspipe"; - version = "1.85"; - - nativeBuildInputs = [ perl ]; - buildInputs = [ perl bash ]; - strictDeps = true; - preConfigure = '' - patchShebangs --build configure - ''; - configureFlags = [ "--shell=${bash}/bin/bash" "--yes" ]; - configurePlatforms = []; - dontBuild = true; + version = "2.05"; src = fetchFromGitHub { owner = "wofr06"; repo = "lesspipe"; - rev = version; - sha256 = "1v1jdkdq1phc93gdr6mjlk98gipxrkkq4bj8kks0kfdvjgdwkdaa"; + rev = "v${version}"; + sha256 = "sha256-mRgOndoDpyMnlj/BIoqwpZzuth4eA6yoB2VFZOigRw4="; }; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - file = "${file}/bin/file"; - tput = "${ncurses}/bin/tput"; - }) - ./override-shell-detection.patch - ]; + nativeBuildInputs = [ perl makeWrapper ]; + buildInputs = [ perl bash ]; + strictDeps = true; + + postPatch = '' + patchShebangs --build configure + substituteInPlace configure --replace '/etc/bash_completion.d' '/share/bash-completion/completions' + ''; + + configureFlags = [ "--shell=${bash}/bin/bash" "--prefix=/" ]; + configurePlatforms = [ ]; + + dontBuild = true; + + installFlags = [ "DESTDIR=$(out)" ]; + + postInstall = '' + for f in lesspipe.sh lesscomplete; do + wrapProgram "$out/bin/$f" --prefix-each PATH : "${lib.makeBinPath [ file gnused procps ]}" + done + ''; meta = with lib; { description = "A preprocessor for less"; diff --git a/pkgs/tools/misc/lesspipe/fix-paths.patch b/pkgs/tools/misc/lesspipe/fix-paths.patch deleted file mode 100644 index 1bffcf53c827..000000000000 --- a/pkgs/tools/misc/lesspipe/fix-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/lesspipe.sh.in -+++ b/lesspipe.sh.in -@@ -48,8 +48,8 @@ if [[ "$LESS_ADVANCED_PREPROCESSOR" = '' ]]; then - fi - - filecmd() { -- file -L -s "$@" -- file -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z -+ @file@ -L -s "$@" -+ @file@ -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z - } - - sep=: # file name separator -@@ -546,7 +546,7 @@ isfinal() { - - # color requires -r or -R when calling less - typeset COLOR -- if [[ $(tput colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then -+ if [[ $(@tput@ colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then - COLOR="--color=always" - fi - diff --git a/pkgs/tools/misc/lesspipe/override-shell-detection.patch b/pkgs/tools/misc/lesspipe/override-shell-detection.patch deleted file mode 100644 index 08ef7e07b7cd..000000000000 --- a/pkgs/tools/misc/lesspipe/override-shell-detection.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/configure -+++ b/configure -@@ -101,7 +101,8 @@ - open OUT, ">lesspipe.sh.tmp"; - my $in = 1; - my $anyin; --my $shell = check_shell_vers(); -+my $shell = $opt_shell; -+print OUT "#!$shell\n"; - # ask if syntax highlighting should be included - $ifsyntax = ''; - if ($opt_yes) { From 2f37856d4afd90aebd193db888b70b5c876f5de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Jun 2022 21:32:40 +0000 Subject: [PATCH 085/120] python310Packages.ua-parser: 0.10.0 -> 0.15.0 --- pkgs/development/python-modules/ua-parser/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index ec55add71d69..c97c2c5e7e9a 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ua-parser"; - version = "0.10.0"; + version = "0.15.0"; format = "setuptools"; @@ -16,13 +16,18 @@ buildPythonPackage rec { repo = "uap-python"; rev = version; fetchSubmodules = true; - hash = "sha256-kaTAfUtHj2vH7i7eIU61efuB4/XVHoc/z6o3ny+sgrQ="; + hash = "sha256-CwwVaToy5se5dZ4m1EHn8qgvprK82/Sgpos4lHedIUc="; }; patches = [ ./dont-fetch-submodule.patch ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyyaml ~= 5.4.0" pyyaml + ''; + nativeBuildInputs = [ pyyaml ]; From e03a83380d2aa2901d094c3418d92f0e15babc2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Jun 2022 05:36:25 +0000 Subject: [PATCH 086/120] ytfzf: 2.3 -> 2.4.0 https://github.com/pystardust/ytfzf/releases/tag/v2.4.0 --- pkgs/tools/misc/ytfzf/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 9bcc0712c354..1dddd4b64ce4 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , makeWrapper -, chafa , coreutils , curl , dmenu @@ -16,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-zfoICi1VChmrRHZ3dSHGTcXkVf/zirQTycFz98xj+QY="; + hash = "sha256-IQ6YIHcFriqLAGoB8QhvWiYkI7Aq4RL12TL3c/N+YqE="; }; nativeBuildInputs = [ makeWrapper ]; @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/ytfzf" \ --prefix PATH : ${lib.makeBinPath [ - chafa coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp + coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp ]} \ --set YTFZF_SYSTEM_ADDON_DIR "$out/share/ytfzf/addons" ''; From 638a2fbbee9e4a6dcccd18fdfcd3469c95710dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Jun 2022 21:07:44 +0000 Subject: [PATCH 087/120] python310Packages.jarowinkler: 1.0.4 -> 1.0.5 https://github.com/maxbachmann/JaroWinkler/releases/tag/v1.0.5 --- pkgs/development/python-modules/jarowinkler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index de20ac26550e..48b1385401d4 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jarowinkler"; - version = "1.0.4"; + version = "1.0.5"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "v${version}"; - hash = "sha256-2bhKl7l3ByfrtkXnXifQd/AhWVFGSMzULkzJftd1mVE="; + hash = "sha256-5LWJeNfQ0d8wiqjIha+CCcmBf+GU36VTYFqRlg4+6qA="; }; nativeBuildInputs = [ From 78958dd5fefe96687d5968d8fca8f8e758bede57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Jun 2022 21:08:41 +0000 Subject: [PATCH 088/120] rapidfuzz-cpp: 1.0.3 -> 1.0.4 https://github.com/maxbachmann/rapidfuzz-cpp/releases/tag/v1.0.4 --- pkgs/development/libraries/rapidfuzz-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 0831539dd570..36b6c5b9bae4 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-8SJU+ERFRGkbGBmGJa5Ypetc3LPeytg5pR4S29RkvR8="; + hash = "sha256-ocR88dgRo7dF7scATv8kPYmcK3R6a8DcoJfNHq1hZnM="; }; patches = [ From b6b5216a70a0aab0e8f4aa9f02d088b195a52420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Jun 2022 21:09:44 +0000 Subject: [PATCH 089/120] python310Packages.rapidfuzz: 2.0.15 -> 2.1.0 https://github.com/maxbachmann/RapidFuzz/releases/tag/v2.1.0 --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index f3c4b77a7095..5d718aadd6f0 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.0.15"; + version = "2.1.0"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "v${version}"; - hash = "sha256-wn77gA6UCgsdDf3FZgjrA5gSWpWJg3YoUhx88X7aVcM="; + hash = "sha256-bvuT31qxYj/agEtPIJf/6YAOe6CGpEmaKpfNocw4wYQ="; }; nativeBuildInputs = [ From fc8b57d850b83a964a2c81c32f9f29d3c5bbf964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Jun 2022 03:25:39 +0000 Subject: [PATCH 090/120] libdeltachat: 1.86.0 -> 1.87.0 https://github.com/deltachat/deltachat-core-rust/blob/1.87.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index db7db4cce626..4900c15d10eb 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.86.0"; + version = "1.87.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0="; + hash = "sha256-iRGLNMGs5WawzcqQb5AQTuD4NCJoBUSHfFUXXvm5+jE="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; + hash = "sha256-bmtm+cvjBIlZVRq/vjHd5Sl4FXJHP3cPp4+bWY5SKus="; }; nativeBuildInputs = [ From 415492eb719197cf436909ad01e4ac02f71f166e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jun 2022 00:17:35 +0000 Subject: [PATCH 091/120] amtk: 5.4.1 -> 5.5.1 --- pkgs/development/libraries/amtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 30a16cb48df0..ab8cbf617412 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.4.1"; + version = "5.5.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "frq8QpsO67KzI2DJv9vjaOSJs1w83AhqhWz8mzpGanI="; + sha256 = "7Ilt0BfiwUNoUuXmCXD80IML0SFI1XzBvcDZOCa925w="; }; nativeBuildInputs = [ From 1321d086fa38d8cee4a458fbfb9bb9be4ecd13b9 Mon Sep 17 00:00:00 2001 From: Maas Lalani Date: Tue, 7 Jun 2022 17:41:37 -0400 Subject: [PATCH 092/120] revive: init at 1.2.1 --- pkgs/development/tools/revive/default.nix | 53 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/tools/revive/default.nix diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix new file mode 100644 index 000000000000..56ef62ce1346 --- /dev/null +++ b/pkgs/development/tools/revive/default.nix @@ -0,0 +1,53 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "revive"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "mgechev"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-xZakVuw+QKzFh6wsnZbltLEEwyb9WcMvVWEzKnS9aWc="; + # 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; + postFetch = '' + date -u -d "@$(git -C $out log -1 --pretty=%ct)" "+%Y-%m-%d %H:%M UTC" > $out/DATE + git -C $out rev-parse HEAD > $out/COMMIT + rm -rf $out/.git + ''; + }; + vendorSha256 = "sha256-Fpl5i+qMvJ/CDh8X0gps9C/BxF7/Uvln+3DpVOXE0WQ="; + + ldflags = [ + "-s" + "-w" + "-X github.com/mgechev/revive/cli.version=${version}" + "-X github.com/mgechev/revive/cli.builtBy=nix" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X github.com/mgechev/revive/cli.commit=$(cat COMMIT)" + ldflags+=" -X 'github.com/mgechev/revive/cli.date=$(cat DATE)'" + ''; + + # The following tests fail when built by nix: + # + # $ nix log /nix/store/build-revive.1.2.1.drv | grep FAIL + # + # --- FAIL: TestAll (0.01s) + # --- FAIL: TestTimeEqual (0.00s) + # --- FAIL: TestTimeNaming (0.00s) + # --- FAIL: TestUnhandledError (0.00s) + # --- FAIL: TestUnhandledErrorWithBlacklist (0.00s) + doCheck = false; + + meta = with lib; { + description = "Fast, configurable, extensible, flexible, and beautiful linter for Go"; + homepage = "https://revive.run"; + license = licenses.mit; + maintainers = with maintainers; [ maaslalani ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 233ae5c9a2bd..d63cbdc145d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16295,6 +16295,10 @@ with pkgs; reviewdog = callPackage ../development/tools/misc/reviewdog { }; + revive = callPackage ../development/tools/revive { + buildGoModule = buildGo118Module; + }; + rman = callPackage ../development/tools/misc/rman { }; rnix-lsp = callPackage ../development/tools/rnix-lsp { }; From b0997ca8989ca2d04bba728f0040cf072273bece Mon Sep 17 00:00:00 2001 From: sudosubin Date: Fri, 1 Jul 2022 23:32:54 +0900 Subject: [PATCH 093/120] pretendard: 1.3.0 -> 1.3.3 --- pkgs/data/fonts/pretendard/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/data/fonts/pretendard/default.nix b/pkgs/data/fonts/pretendard/default.nix index ea2ccfecbc27..40175dc54056 100644 --- a/pkgs/data/fonts/pretendard/default.nix +++ b/pkgs/data/fonts/pretendard/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.3.0"; + version = "1.3.3"; mkPretendard = { pname, typeface, sha256 }: fetchzip { @@ -10,9 +10,12 @@ let url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip"; inherit sha256; + stripRoot = false; + postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile "*.otf" -d $out/share/fonts/opentype + mkdir -p $out/share/fonts/ + install -Dm644 $out/public/static/*.otf -t $out/share/fonts/opentype + rm -rf $out/{public,web,LICENSE.txt} ''; meta = with lib; { @@ -29,18 +32,18 @@ in pretendard = mkPretendard { pname = "pretendard"; typeface = "Pretendard"; - sha256 = "sha256-4DM8PZjxW93sgQChs+qu5Svo+iGlFnpglu6acYMCkSQ="; + sha256 = "sha256-lRHRdCAg3i3+3Y6j0dCXUgwLdeS/VeI6KNkbDKchNEY="; }; pretendard-jp = mkPretendard { pname = "pretendard-jp"; typeface = "PretendardJP"; - sha256 = "sha256-3OOUUDiurCpIGNIVjrr2KW0CB3fCXt11P+13teK5kOQ="; + sha256 = "sha256-VgGt/WoaaJJDAzw+gUQVgTQ+q34bdAaKUB4cA9eU0dQ="; }; pretendard-std = mkPretendard { pname = "pretendard-std"; typeface = "PretendardStd"; - sha256 = "sha256-iVAPdA6qAiE7pseaB0NKPJBPNGdw/nT6PzXIsLajJH4="; + sha256 = "sha256-FOlZrr6CHPfUm9Q+Yoi0HLQUI7cAhQYq6P6sJGXBIWg="; }; } From f73860882de91393fd29219288cbab67841c2dfa Mon Sep 17 00:00:00 2001 From: sudosubin Date: Fri, 1 Jul 2022 23:40:59 +0900 Subject: [PATCH 094/120] lefthook: 1.0.0 -> 1.0.4 --- .../version-management/git-and-tools/lefthook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index f745f399f39e..75bf008d1ec7 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.0.0"; + version = "1.0.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-UpMzqp4NVvj/Y3OdtI5nGhJHgPIfSlopmyv7jDDpWdM="; + sha256 = "sha256-uaIZrxfzV2WPvnAPm6Q67yKx1EVmSMcChSxZG/Huw48="; }; vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI="; From 9c544193df8a1e7f083a7d3261f78e71f588f3e7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 1 Jul 2022 18:21:36 +0300 Subject: [PATCH 095/120] ocrfeeder: Fix launch with patch (#179675) --- pkgs/applications/graphics/ocrfeeder/default.nix | 7 +++++-- .../applications/graphics/ocrfeeder/fix-launch.diff | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/graphics/ocrfeeder/fix-launch.diff diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 2cd3299c6175..9e516f211069 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { pygobject3 ])) ]; + patches = [ + # Compiles, but doesn't launch without this, see: + # https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83 + ./fix-launch.diff + ]; enginesPath = lib.makeBinPath ([ tesseract4 @@ -64,7 +69,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; license = licenses.gpl3Plus; platforms = platforms.linux; - # Compiles, but doesn't launch, see: https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83 - broken = true; }; } diff --git a/pkgs/applications/graphics/ocrfeeder/fix-launch.diff b/pkgs/applications/graphics/ocrfeeder/fix-launch.diff new file mode 100644 index 000000000000..c6f10c2b1101 --- /dev/null +++ b/pkgs/applications/graphics/ocrfeeder/fix-launch.diff @@ -0,0 +1,13 @@ +diff --git i/src/ocrfeeder/studio/studioBuilder.py w/src/ocrfeeder/studio/studioBuilder.py +index 7a2ccdc..7af19d9 100644 +--- i/src/ocrfeeder/studio/studioBuilder.py ++++ w/src/ocrfeeder/studio/studioBuilder.py +@@ -144,7 +144,7 @@ class Studio: + if not self.ocr_engines: + engines = self.configuration_manager.getEnginesInSystem() + if engines: +- add_engines_dialog = widgetPresenter.SystemEnginesDialog(engines) ++ add_engines_dialog = widgetPresenter.SystemEnginesDialog(self.main_window, engines) + response = add_engines_dialog.run() + if response == Gtk.ResponseType.ACCEPT: + for engine in add_engines_dialog.getChosenEngines(): From 420f7d191ca25d7fd99c11bbede4875015c2f208 Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 12 Jun 2022 23:04:43 +0800 Subject: [PATCH 096/120] blueprint-compiler: 2022-05-27 -> 0.2.0 remove wrapPython --- pkgs/development/compilers/blueprint/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 9aa1893effe7..8b595fc9c0ac 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "blueprint-compiler"; - version = "unstable-2022-05-27"; + version = "0.2.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; repo = pname; - rev = "cebd9ecadc53790cd547392899589dd5de0ac552"; - sha256 = "sha256-mNR0ooJSRBIXy2E4avXYEdO1aSST+j41TsVg8+kitwo="; + rev = "v${version}"; + sha256 = "sha256-LXZ6n1oCbPa0taVbUZf52mGECrzXIcF8EaMVJ30rMtc="; }; # Requires pythonfuzz, which I've found difficult to package @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - python3.pkgs.wrapPython ]; buildInputs = [ @@ -37,10 +36,6 @@ stdenv.mkDerivation rec { gobject-introspection ]; - postFixup = '' - wrapPythonPrograms - ''; - meta = with lib; { description = "A markup language for GTK user interface files"; homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler"; From dd3a47ef86bc25570c4419529eef37cf1305fc62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 30 Jun 2022 14:02:39 +0200 Subject: [PATCH 097/120] neovide: 0.8 -> 0.9 --- pkgs/applications/editors/neovim/neovide/default.nix | 10 +++++----- .../editors/neovim/neovide/skia-externals.json | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 9cb786989efb..346647838e95 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; rev = version; - sha256 = "sha256-pbniOWjEw1Z+PoXqbbFOUkW5Ii1UDOMoZpAvVF1uNEg="; + sha256 = "sha256-2fN05o8Zo1MGdIYUcsCgkiW/kG6DkY8uTnpw2XrKxrI="; }; - cargoSha256 = "sha256-7o7uJXH68pvfuiG1eSNmbPx8OO8QJjCe+oEFl38bFm4="; + cargoSha256 = "sha256-eATUyczkcwHI8Y7Gl2ts4dRgiFUAL8yrWDNe4JzserE="; SKIA_SOURCE_DIR = let @@ -42,8 +42,8 @@ rustPlatform.buildRustPackage rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m93-0.42.0"; - sha256 = "sha256-F1DWLm7bdKnuCu5tMMekxSyaGq8gPRNtZwcRVXJxjZQ="; + rev = "m100-0.48.7"; + sha256 = "sha256-roZUv5YoLolRi0iWAB+5WlCFV+8GdzNzS+JINnEHaMs="; }; # The externals for skia are taken from skia/DEPS externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json); diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json index d0553830a6be..80280c217ffc 100644 --- a/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -6,8 +6,8 @@ }, "libjpeg-turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "24e310554f07c0fdb8ee52e3e708e4f3e9eb6e20", - "sha256": "sha256-bhbUnA36rKYLJSLpElmXJqccXQDjjbMcNMsVM4Eekrs=" + "rev": "02959c3ee17abacfd1339ec22ea93301292ffd56", + "sha256": "sha256-gs8JUT8AoKL+9vlmz3evq61+h2QxNcWqOHN4elb2Grc=" }, "icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", @@ -21,8 +21,8 @@ }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "3a74ee528255cc027d84b204a87b5c25e47bff79", - "sha256": "sha256-/4UdoUj0bxj6+EfNE8ofjtWOn2VkseEfvdFah5rwwBM=" + "rev": "a8b7f1880412c7f0c9ecdada0a4935011816c7dc", + "sha256": "sha256-TQdgg0G8Dk10tg2MLv405nG8DAaPm7JiZjiZ6tOSGW4=" }, "libpng": { "url": "https://skia.googlesource.com/third_party/libpng.git", From 1a4ec9ef7f79f84c84078abb3f6ddf04a5e8bedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yuri=20A=2E=20Martinez=20Falc=C3=A3o?= Date: Fri, 1 Jul 2022 16:36:34 +0000 Subject: [PATCH 098/120] zoom-us: 5.10.{4,6} -> 5.11.1 (#178587) --- .../zoom-us/arm64-darwin-sha.nix | 1 + .../zoom-us/arm64-darwin-version.nix | 1 + .../instant-messengers/zoom-us/default.nix | 16 +++++----- .../instant-messengers/zoom-us/update.sh | 30 +++++++++++++++---- .../zoom-us/x86_64-darwin-sha.nix | 1 + .../zoom-us/x86_64-darwin-version.nix | 1 + .../zoom-us/x86_64-linux-sha.nix | 1 + .../zoom-us/x86_64-linux-version.nix | 1 + 8 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix create mode 100644 pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix create mode 100644 pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix create mode 100644 pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix create mode 100644 pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix create mode 100644 pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix new file mode 100644 index 000000000000..9b4a21cb7d28 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix @@ -0,0 +1 @@ +"0cwplzza8vv4nzxf35i2p4gfnna4dpgp0ddqbpdxl8cxrikq5rji" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix new file mode 100644 index 000000000000..4fd4c471b3cf --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix @@ -0,0 +1 @@ +"5.11.1.8356" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 37f3c9925106..f85fa1e28f6c 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, pipewire , makeWrapper , xar , cpio @@ -44,23 +45,23 @@ let # Zoom versions are released at different times for each platform version = { - aarch64-darwin = "5.10.4.6592"; - x86_64-darwin = "5.10.4.6592"; - x86_64-linux = "5.10.6.3192"; + aarch64-darwin =import ./arm64-darwin-version.nix; + x86_64-darwin = import ./x86_64-darwin-version.nix; + x86_64-linux = import ./x86_64-linux-version.nix; }.${system} or throwSystem; srcs = { aarch64-darwin = fetchurl { - url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64"; - sha256 = "0jg5f9hvb67hhfnifpx5fzz65fcijldy1znlia6pqflxwci3m5rq"; + url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64"; + sha256 = import ./arm64-darwin-sha.nix; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${version}/Zoom.pkg"; - sha256 = "1p83691bid8kz5mw09x6l9zvjglfszi5vbhfmbbpiqhiqcxlfz83"; + sha256 = import ./x86_64-darwin-sha.nix; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "8QIkF5+875VFoGK6T0CROsqML6bJDG934c1gkuz8Klk="; + sha256 = import ./x86_64-linux-sha.nix; }; }; @@ -76,6 +77,7 @@ let expat libdrm libGL + pipewire fontconfig freetype gtk3 diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index 3ec1cccd0d64..6d9b50252d12 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -1,10 +1,30 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl pup common-updater-scripts +#!nix-shell -i bash -p curl pup set -eu -o pipefail -version="$(curl -Ls https://zoom.us/download\?os\=linux | \ - pup '.linux-ver-text text{}' | \ - awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')" +dirname="$(dirname "$0")" -update-source-version zoom-us "$version" +uname="$(uname)" + +if [[ "$uname" == "Linux" ]]; then + version="$(curl -Ls https://zoom.us/download\?os\=linux | \ + pup '.linux-ver-text text{}' | \ + awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')" + printf '"%s"\n' ${version} > $dirname/x86_64-linux-version.nix + printf '"%s"\n' \ + $(nix-prefetch-url https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz) > \ + $dirname/x86_64-linux-sha.nix +elif [[ $uname == "Darwin" ]]; then + # The 1st line might be empty + # 2nd line is the version of the conference room application + version="$(curl -Ls https://zoom.us/download\?os\=mac | \ + pup '.ver text{}' | \ + sed '/^$/d' |\ + head -1 | \ + awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')" + printf '"%s"\n' ${version} > "$dirname/$(uname -m)-darwin-version.nix" + printf '"%s"\n' \ + $(nix-prefetch-url "https://zoom.us/client/${version}/Zoom.pkg?archType=$(uname -m)") > \ + "$dirname/$(uname -m)-darwin-sha.nix" +fi diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix new file mode 100644 index 000000000000..a5ef33d28b56 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix @@ -0,0 +1 @@ +"12s4z80n1qk1vcp5vppabj6fxanm4q7pjj7mggalmjbj6984fsza" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix new file mode 100644 index 000000000000..4fd4c471b3cf --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix @@ -0,0 +1 @@ +"5.11.1.8356" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix new file mode 100644 index 000000000000..c50424c7a5b0 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix @@ -0,0 +1 @@ +"1ir5akl4vrzb0b5s37s2viqisvf4sylw8rfnfj434h1q0gqz79sc" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix new file mode 100644 index 000000000000..e776017ccb04 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix @@ -0,0 +1 @@ +"5.11.1.3595" From 268a0c5a62045f4a2f996feec308ddbbf0366e61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 12:22:15 +0000 Subject: [PATCH 099/120] python310Packages.env-canada: 0.5.23 -> 0.5.24 --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 216168b51131..77ed6401f65c 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.23"; + version = "0.5.24"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ksQQ3jujfu2XR0ZaR5fc8GNYDL8Tos+8U4OHS1mMyRY="; + sha256 = "sha256-R6X4TY0yrfSj30FXHmHHK6QBHAT3pb+UXjjZ3SW1SP8="; }; propagatedBuildInputs = [ From 62ebe4176a4f513daf2aceb9a20f2505292b01cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 14:02:08 +0000 Subject: [PATCH 100/120] python310Packages.stripe: 3.4.0 -> 3.5.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 2d99b497eac6..0488a4ea950f 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XcN979nWXgUwItq8tlnnNisFinr3QEfuWFGKKQenYfI="; + hash = "sha256-CPdMrmYZ1KfXj4Fi/3K8PpyRP1PsluzV3cfYI8Lnnd0="; }; propagatedBuildInputs = [ From 6593cea2596952bd27f1a786d86d99229346e354 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 12:32:18 +0000 Subject: [PATCH 101/120] python310Packages.boxx: 0.10.4 -> 0.10.5 --- pkgs/development/python-modules/boxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 81f19b0a55ee..f8ab26fae171 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.4"; + version = "0.10.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HnEXvge1R2GAcrP+2yEecwIlT95/oKrWiK+TB9+CRxs="; + hash = "sha256-6qO/aPegHk+1PAu8qzIkC3fULh2WjgJcqNui+XEaLQw="; }; propagatedBuildInputs = [ From a2dfde58bc28cde00d96bc6a8e9fc5c61078e820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 1 Jul 2022 19:41:35 +0200 Subject: [PATCH 102/120] Revert "sage: link doc in jupyter kernel" This reverts commit 9a409fc5028fa1fc3e448383c08a375b8cb35d66. --- pkgs/applications/science/math/sage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index e0f77e1b7be4..eced57706d27 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -9,7 +9,7 @@ # is always preferred, see `sage-src.nix` for that. let - inherit (pkgs) symlinkJoin callPackage nodePackages lib; + inherit (pkgs) symlinkJoin callPackage nodePackages; python3 = pkgs.python3.override { packageOverrides = self: super: { @@ -46,7 +46,7 @@ let # just one 16x16 logo is available logo32 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; logo64 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; - } // lib.optionalAttrs withDoc { extraPaths = { "doc" = "${sagedoc}/share/doc/sage/html/en"; }; }; + }; jupyter-kernel-specs = pkgs.jupyter-kernel.create { definitions = pkgs.jupyter-kernel.default // { From c1a59f40e04b4703a8983510e74eeda595fb0470 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Fri, 1 Jul 2022 19:49:54 +0200 Subject: [PATCH 103/120] xonotic: 0.8.2 -> 0.8.5 --- pkgs/games/xonotic/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 525beb5f98ce..8865e8f992de 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchzip, makeWrapper, runCommand, makeDesktopItem +{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem , xonotic-data, copyDesktopItems , # required for both unzip, libjpeg, zlib, libvorbis, curl @@ -16,7 +16,7 @@ let pname = "xonotic"; - version = "0.8.2"; + version = "0.8.5"; name = "${pname}-${version}"; variant = if withSDL && withGLX then @@ -61,18 +61,9 @@ let src = fetchurl { url = "https://dl.xonotic.org/xonotic-${version}-source.zip"; - sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"; + sha256 = "sha256-oagbpVqxUb8JdY5/WWFLLlFQ6EIkdT53lQvNB6KC6l0="; }; - patches = [ - # Fix to make darkplaces compile under GCC 11 - (fetchpatch { - name = "fix-darkplaces-gcc11"; - url = "https://gitlab.com/xonotic/darkplaces/-/commit/5e9e998c1759bc0085c3273fc39f9ea6f72a7dc8.patch"; - sha256 = "sha256-s0JettSg0AYr8V2mXKJ2QU125bBcX1BAu/yDciTWC5o="; - }) - ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg zlib libvorbis curl gmp ] ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] @@ -146,7 +137,7 @@ in rec { xonotic-data = fetchzip { name = "xonotic-data"; url = "https://dl.xonotic.org/xonotic-${version}.zip"; - sha256 = "15caj11v9hhr7w55w3rs1rspblzr9lg1crqivbn9pyyq0rif8cpl"; + sha256 = "sha256-/malKGbDdUnqG+bJOJ2f3zHb7hAGiNZdprczr2Fgb5E="; postFetch = '' cd $out rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") From 7446edab41042812a25b54c9209377d3876cba4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Jul 2022 09:02:55 +0200 Subject: [PATCH 104/120] python310Packages.lsassy: 3.1.1 -> 3.1.2 --- pkgs/development/python-modules/lsassy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 421c1f481e8a..e19edfd67eaa 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "Hackndo"; repo = pname; rev = "v${version}"; - sha256 = "0jd0kmp0mc8jn5qmgrspdx05vy6nyq773cj4yid1qyr8dmyx6a7n"; + sha256 = "sha256-FnqWDPcWgRQpX1k/Sf2NQKpuu6srh6xWdNKtHzXZTtk="; }; propagatedBuildInputs = [ From 84f7babbca50075ddb5ab4454e5bc7ffa684fd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Jun 2022 22:09:35 +0000 Subject: [PATCH 105/120] python310Packages.pikepdf: 5.1.5.post1 -> 5.2.0 https://github.com/pikepdf/pikepdf/blob/v5.2.0/docs/releasenotes/version5.rst --- pkgs/development/python-modules/pikepdf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 466a39fb2924..ec95bd24fc88 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -6,6 +6,7 @@ , pythonOlder , importlib-metadata , jbig2dec +, deprecation , lxml , mupdf , packaging @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "5.1.5.post1"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-CGhkfQgsKUxiZzs1i2B2SlM++7G6Yrd9ruFh4sSJPbI="; + hash = "sha256-el7gnqnk8Mp5rpn8Q3WKOTAuB11j4ByCq2Gf60LBBEI="; }; patches = [ @@ -78,6 +79,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + deprecation lxml packaging pillow From 0669fd6f204262354c2c10f00e4829097d1b4118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Jul 2022 03:24:30 +0000 Subject: [PATCH 106/120] python310Packages.wandb: 0.12.19 -> 0.12.20 --- pkgs/development/python-modules/wandb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 747f60bc21f8..5bfade16e5c5 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.19"; + version = "0.12.20"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = pname; repo = "client"; rev = "refs/tags/v${version}"; - hash = "sha256-eH65vk3Pnm6d4vDiaWbs1tXD0lCRkfOB2hqD9MGxuXY="; + hash = "sha256-zS3DA06uLfUApe0kDAbqPA+2is70bnb9EifgFWqcuRg="; }; patches = [ From 12218a56e0b541f1d97d5797fa771f47dd419957 Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 1 Jul 2022 14:42:10 +0200 Subject: [PATCH 107/120] wireless-regdb: 2022.02.18 -> 2022.06.06 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 9479f5bdce5e..2c92896b5a1c 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wireless-regdb"; - version = "2022.02.18"; + version = "2022.06.06"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iCjCWk7iUCAEQAT1c3S7nerIUoCfrXD409AXcL+ayX8="; + sha256 = "sha256-rAD5fv7M5QRu0GnR2T8zZf35lMfHhUqPxQgx6VlTcjA="; }; dontBuild = true; From 977a9b915e15514e009e36f14e18590243635daf Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Sat, 25 Jun 2022 11:02:37 -0700 Subject: [PATCH 108/120] prometheus-blackbox-exporter: 0.21.0 -> 0.21.1 --- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 1e2f0a472d32..f6cd44ca7b25 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "blackbox_exporter"; - version = "0.21.0"; + version = "0.21.1"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "sha256-u7MCZnzzEoPSk/SVlFRSc47YikQJ0lIxE4wchSN+aec="; + sha256 = "sha256-57+bNoLUfB98WqDUe8ysRdoG87RhKXttmkA//ucSqbQ="; }; vendorSha256 = "sha256-7V5WEEy/Rz1QjscPD2Kz+viGkKQsWjs+8QN/3W7D+Ik="; From c6e76ab7c91d16bd627095e6a55848bc97ea31df Mon Sep 17 00:00:00 2001 From: James Hannah Date: Thu, 30 Jun 2022 19:35:53 +0100 Subject: [PATCH 109/120] nixos/radvd: add package option Allow package users to override the package for radvd. --- nixos/modules/services/networking/radvd.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 6e8db55bbf0d..fb3eb71a8ce1 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -16,9 +16,9 @@ in ###### interface - options = { + options.services.radvd = { - services.radvd.enable = mkOption { + enable = mkOption { type = types.bool; default = false; description = @@ -32,7 +32,16 @@ in ''; }; - services.radvd.config = mkOption { + package = mkOption { + type = types.package; + default = pkgs.radvd; + defaultText = literalExpression "pkgs.radvd"; + description = '' + The RADVD package to use for the RADVD service. + ''; + }; + + config = mkOption { type = types.lines; example = '' @@ -67,7 +76,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = - { ExecStart = "@${pkgs.radvd}/bin/radvd radvd -n -u radvd -C ${confFile}"; + { ExecStart = "@${cfg.package}/bin/radvd radvd -n -u radvd -C ${confFile}"; Restart = "always"; }; }; From 782b85a9c24fb137a710840954f489614599249e Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Fri, 1 Jul 2022 12:09:16 -0500 Subject: [PATCH 110/120] lxqt.lximage-qt: add qtimageformats plugin Adds the qtimageformats plugin to provide viewing support for some additional formats, including TIFF and WEBP. Closure size increases by 650KiB to 530MiB. --- pkgs/desktops/lxqt/lximage-qt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 22f253ad9738..b83289056d90 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -7,6 +7,7 @@ , qttools , qtx11extras , qtsvg +, qtimageformats , xorg , lxqt-build-tools , libfm-qt @@ -36,6 +37,7 @@ mkDerivation rec { qttools qtx11extras qtsvg + qtimageformats # add-on module to support more image file formats libfm-qt xorg.libpthreadstubs xorg.libXdmcp From 4e9369f65e5babf442ded90dcf0f4ebe919df869 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Fri, 1 Jul 2022 12:19:29 -0500 Subject: [PATCH 111/120] lxqt.pcmanfm-qt: add qtimageformats plugin Adds the qtimageformats plugin to provide thumbnailing support for some additional formats, including TIFF and WEBP. Closure size increases by 650KiB to 530MiB. --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index ad74d0fca704..e5f3246b06bb 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -7,6 +7,7 @@ , qtbase , qttools , qtx11extras +, qtimageformats , libfm-qt , menu-cache , lxmenu-data @@ -34,6 +35,7 @@ mkDerivation rec { qtbase qttools qtx11extras + qtimageformats # add-on module to support more image file formats libfm-qt libfm-qt menu-cache From 339665a9b0ce43c916c482a93a481d7377c60dbf Mon Sep 17 00:00:00 2001 From: Michael Weinrich Date: Mon, 20 Jun 2022 22:21:19 -0700 Subject: [PATCH 112/120] libvirt: add zfs to PATH when enabled libvirtd requires zpool to access zfs type pools. --- pkgs/development/libraries/libvirt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 60f6888d11f1..8b1613c844f6 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -97,6 +97,8 @@ let ] ++ optionals enableIscsi [ libiscsi openiscsi + ] ++ optionals enableZfs [ + zfs ]); in From 28915606ba138a7016a0030c97ce95613c63c7ac Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Fri, 3 Jun 2022 13:59:26 +0200 Subject: [PATCH 113/120] prometheus: add flag for dns plugin, enable by default --- pkgs/servers/monitoring/prometheus/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 84415e52ed89..34f51f607193 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -10,6 +10,7 @@ , enableAzure ? true , enableConsul ? true , enableDigitalOcean ? true +, enableDNS ? true , enableEureka ? true , enableGCE ? true , enableHetzner ? true @@ -66,6 +67,8 @@ buildGoModule rec { "echo - github.com/prometheus/prometheus/discovery/consul"} ${lib.optionalString (enableDigitalOcean) "echo - github.com/prometheus/prometheus/discovery/digitalocean"} + ${lib.optionalString (enableDNS) + "echo - github.com/prometheus/prometheus/discovery/dns"} ${lib.optionalString (enableEureka) "echo - github.com/prometheus/prometheus/discovery/eureka"} ${lib.optionalString (enableGCE) From 28a328a1246669a534898054cda351d37fce8ce4 Mon Sep 17 00:00:00 2001 From: Karanjot Singh Date: Wed, 18 May 2022 00:09:36 +0530 Subject: [PATCH 114/120] zulu: build for aarch64-darwin zulu: build for aarch64-darwin fixed indentation and spaces minor changes and formatting --- pkgs/development/compilers/zulu/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 1b961c3f9e40..a3731a97045e 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -25,12 +25,14 @@ let version = "11.52.13"; openjdk = "11.0.13"; - sha256_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f"; - sha256_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e"; + sha256_x64_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f"; + sha256_x64_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e"; + sha256_aarch64_darwin = "dmzfergSUVz39T30PT/6ZtT8JNqv5lzdX7zUsXsFGJg="; platform = if stdenv.isDarwin then "macosx" else "linux"; - hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; + hash = if stdenv.isAarch64 && stdenv.isDarwin then sha256_aarch64_darwin else if stdenv.isDarwin then sha256_x64_darwin else sha256_x64_linux; extension = if stdenv.isDarwin then "zip" else "tar.gz"; + architecture = if stdenv.isAarch64 then "aarch64" else "x64"; runtimeDependencies = [ cups @@ -45,7 +47,7 @@ in stdenv.mkDerivation { pname = "zulu"; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${version}-ca-jdk${openjdk}-${platform}_x64.${extension}"; + url = "https://cdn.azul.com/zulu/bin/zulu${version}-ca-jdk${openjdk}-${platform}_${architecture}.${extension}"; sha256 = hash; }; @@ -116,7 +118,7 @@ in stdenv.mkDerivation { operating systems, containers, hypervisors and Cloud platforms. ''; maintainers = with maintainers; [ fpletz ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "java"; }; } From 627579b71a4243f833445fb96c312d283b198651 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 1 Jul 2022 23:16:22 +0300 Subject: [PATCH 115/120] mattermost: Don't restrict system types --- pkgs/servers/mattermost/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index db01a48b61a3..c8b8d4ffb060 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -46,6 +46,5 @@ buildGo118Module rec { homepage = "https://www.mattermost.org"; license = with licenses; [ agpl3 asl20 ]; maintainers = with maintainers; [ fpletz ryantm numinit kranzes ]; - platforms = [ "x86_64-linux" ]; }; } From 8b00147f1d20a3d3c4b7dc2a88cdc6c2d648abaf Mon Sep 17 00:00:00 2001 From: Yuka Date: Fri, 1 Jul 2022 22:18:59 +0200 Subject: [PATCH 116/120] ratman: 0.3.1 -> 0.4.0 (#179814) --- pkgs/tools/networking/ratman/default.nix | 64 +++++++++++++++++++++--- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/tools/networking/ratman/default.nix index e2b2966f78b0..5ddab7850fae 100644 --- a/pkgs/tools/networking/ratman/default.nix +++ b/pkgs/tools/networking/ratman/default.nix @@ -1,22 +1,30 @@ { lib -, fetchurl +, fetchFromGitLab , installShellFiles , libsodium , pkg-config , protobuf , rustPlatform +, fetchYarnDeps +, fixup_yarn_lock +, stdenv +, yarn +, nodejs }: rustPlatform.buildRustPackage rec { pname = "ratman"; - version = "0.3.1"; + version = "0.4.0"; - src = fetchurl { - url = "https://git.irde.st/we/irdest/-/archive/${pname}-${version}/irdest-${pname}-${version}.tar.gz"; - sha256 = "0x1wvhsmf7m55j9hmirkz75qivsg33xab1sil6nbv8fby428fpq6"; + src = fetchFromGitLab { + domain = "git.irde.st"; + owner = "we"; + repo = "irdest"; + rev = "${pname}-${version}"; + sha256 = "sha256-ZZ7idZ67xvQFmQJqIFU/l77YU+yDQOqNthX5NR/l4k8="; }; - cargoSha256 = "1dkfyy1z34qaavyd3f20hrrrb3kjsdfkyzd535xlds9wivgchmd0"; + cargoSha256 = "Nsux0QblBtzlhLEgfKYvkQrOz8+oVd2pqT3CL8TnQEc="; nativeBuildInputs = [ protobuf pkg-config installShellFiles ]; @@ -31,6 +39,50 @@ rustPlatform.buildRustPackage rec { SODIUM_USE_PKG_CONFIG = 1; + dashboard = stdenv.mkDerivation rec { + pname = "ratman-dashboard"; + inherit version src; + sourceRoot = "source/ratman/dashboard"; + + yarnDeps = fetchYarnDeps { + yarnLock = src + "/ratman/dashboard/yarn.lock"; + sha256 = "sha256-pWjKL41r/bTvWv+5qCgCFVL9+o64BiV2/ISdLeKEOqE="; + }; + + nativeBuildInputs = [ yarn nodejs ]; + + outputs = [ "out" "dist" ]; + + buildPhase = '' + # Yarn writes temporary files to $HOME. Copied from mkYarnModules. + export HOME=$NIX_BUILD_TOP/yarn_home + + # Make yarn install packages from our offline cache, not the registry + yarn config --offline set yarn-offline-mirror ${yarnDeps} + + # Fixup "resolved"-entries in yarn.lock to match our offline cache + ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive + + patchShebangs node_modules/ + + # Build into `./dist/`, suppress formatting. + yarn --offline build | cat + ''; + + installPhase = '' + cp -R . $out + + mv $out/dist $dist + ln -s $dist $out/dist + ''; + }; + + prePatch = '' + cp -r ${dashboard.dist} ratman/dashboard/dist + ''; + meta = with lib; { description = "A modular decentralised peer-to-peer packet router and associated tools"; homepage = "https://git.irde.st/we/irdest"; From a8c71a477fa3337c5cde8e5ac8b862c807c0385d Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 1 Jul 2022 22:19:41 +0200 Subject: [PATCH 117/120] gitlab: 15.1.0 -> 15.1.1 (#179810) https://about.gitlab.com/releases/2022/06/30/critical-security-release-gitlab-15-1-1-released/ Fixes CVE-2022-2185 CVE-2022-2235 CVE-2022-2230 CVE-2022-2229 CVE-2022-1983 CVE-2022-1963 CVE-2022-2228 CVE-2022-1981 CVE-2022-2243 CVE-2022-2244 CVE-2022-1954 CVE-2022-2270 CVE-2022-2250 CVE-2022-1999 CVE-2022-2281 CVE-2022-2227 --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 3cfdc2a11c77..c9d03868bfde 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.1.0", - "repo_hash": "sha256-vOPI9kxdJlQNmI/DZueFcbvZPy2/0d+2CYM/RBAkIcU=", + "version": "15.1.1", + "repo_hash": "sha256-wCO0Ksi5c8kgerpK/O3IkI6CJARQbQj9nWmnxBVhBIM=", "yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.1.0-ee", + "rev": "v15.1.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.1.0", + "GITALY_SERVER_VERSION": "15.1.1", "GITLAB_PAGES_VERSION": "1.59.0", "GITLAB_SHELL_VERSION": "14.7.4", - "GITLAB_WORKHORSE_VERSION": "15.1.0" + "GITLAB_WORKHORSE_VERSION": "15.1.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index b8c1ecf6704e..22cbc267c6bb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.1.0"; + version = "15.1.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; in @@ -24,7 +24,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-rhMQRskum4c5bQL1sE7O4gMxIGX7q3bntuV1HkttA8M="; + sha256 = "sha256-JMKB6lrmQBbBgXSKinL2shlXRXhZrf4QwoJrm+VpKdE="; }; vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b59909dd041a..99860d3fc36f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.1.0"; + version = "15.1.1"; src = fetchFromGitLab { owner = data.owner; From 86481006e78633eccd6b849b88697c7f4d70f04d Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 1 Jul 2022 17:59:04 +0100 Subject: [PATCH 118/120] deno: 1.23.1 -> 1.23.2 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index c433e2dfa671..6c01bd969988 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z9dZrhH+zlYNuhFs+aicuepnUTSOfIHdLaz9sJp0LCA="; + sha256 = "sha256-rygBiDIZ8W51GIu36+g6zFOnIvmGe+HLGZg7x/pRFJ0="; }; - cargoSha256 = "sha256-VIpy5vRZinFvFhyyKQwi5ThrBNwqGy1TVg5tAoxxJyQ="; + cargoSha256 = "sha256-q7yZZXws58QuEfC0J+fZo8QyYUWx6sOKfphmIurxVkU="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 793bc9cb1949..0e7cbf510e7e 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.44.2"; + version = "0.44.3"; shas = { - x86_64-linux = "sha256-I1ad9a9FtJGGGW7Odc8HfysQyCEAb8xoEYmYti0pEkE="; - aarch64-linux = "sha256-KHjVMI9qiJ6q3D6t6iUKxbp1qthHSSl+2AfvL3Hvk6I="; - x86_64-darwin = "sha256-UO1NRpbCA5MtqeRLTGM3FIWdX/ECDW/JG52U756FIv8="; - aarch64-darwin = "sha256-FqakcG050m52/F6nWlS7VeW0r+77CCIzG1qvBP3Naik="; + x86_64-linux = "sha256-0l05QWfWICFTStB0AVGMAzB28MFOe4kH7Y5mT6CxvGc="; + aarch64-linux = "sha256-G2yZPD1lXHZvEX3CwnijoFyWF2dv6fM07+xK0oYKMVU="; + x86_64-darwin = "sha256-f0lBrayYNo7ivCqeJcYF5EMEnmrgH+qHLofMzbUJ+Os="; + aarch64-darwin = "sha256-3DG8IIMeniYLk+GyK0znFpx/f3URxFy5SFMusEPzykU="; }; } From e953e73b6f303ab97dcd0c6843e5114a8c57556d Mon Sep 17 00:00:00 2001 From: Akhil Indurti Date: Fri, 1 Jul 2022 17:51:48 -0400 Subject: [PATCH 119/120] go-tools: 2021.1.2 -> 2022.1.2 (#179827) * go-tools: 2021.1.2 -> 2022.1.2 * Update pkgs/development/tools/go-tools/default.nix Co-authored-by: Sandro --- pkgs/development/tools/go-tools/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 0812c949e37e..3890133256ed 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,18 @@ buildGoModule rec { pname = "go-tools"; - version = "2021.1.2"; + version = "2022.1.2"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "sha256-C6ekgrc+zvm8ZLvw1uYR3ZiMLCNSUw1ANEuM4bT4C/o="; + sha256 = "sha256-pfZv/GZxb7weD+JFGCOknhRCsx8g5puQfpY9lZ4v6Rs="; }; - vendorSha256 = "sha256-EjCOMdeJ0whp2pHZvm4VV2K78UNKzl98Z/cQvGhWSyY="; + vendorSha256 = "sha256-19uLCtKuuZoVwC4SUKvYGWi2ryqAQbcKXY1iNjIqyn8="; + + excludedPackages = [ "website" ]; doCheck = false; @@ -22,6 +24,6 @@ buildGoModule rec { description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; homepage = "https://staticcheck.io"; license = licenses.mit; - maintainers = with maintainers; [ rvolosatovs kalbasit ]; + maintainers = with maintainers; [ rvolosatovs kalbasit smasher164 ]; }; } From 78abe603afefa3f644000b0fe6bdc6eec11e37f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Fri, 1 Jul 2022 18:55:49 -0300 Subject: [PATCH 120/120] openasar: add unzip; remove autoupdater; unstable-2022-06-10 -> unstable-2022-06-27 --- .../instant-messengers/discord/darwin.nix | 4 +-- .../instant-messengers/discord/default.nix | 9 +++++-- .../instant-messengers/discord/linux.nix | 4 +-- .../instant-messengers/discord/openasar.nix | 26 ++++++++++++++++--- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index 494a7e6a4428..368b4572aa67 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg }: +{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, withOpenASAR }: stdenv.mkDerivation { inherit pname version src meta; @@ -16,7 +16,7 @@ stdenv.mkDerivation { runHook postInstall ''; - postInstall = lib.strings.optionalString (openasar != null) '' + postInstall = lib.strings.optionalString withOpenASAR '' cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar ''; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 71606f2dcadd..f6e291ab7f3e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -62,10 +62,15 @@ let }; package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; - openasar = if withOpenASAR then callPackage ./openasar.nix { } else null; + openasar = callPackage ./openasar.nix { }; packages = (builtins.mapAttrs - (_: value: callPackage package (value // { inherit src version openasar; meta = meta // { mainProgram = value.binaryName; }; })) + (_: value: callPackage package + (value // { + inherit src version openasar withOpenASAR; + meta = meta // { mainProgram = value.binaryName; }; + }) + ) { stable = rec { pname = "discord"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 28c1d353ff61..a68414978b02 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -5,7 +5,7 @@ , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript -, common-updater-scripts }: +, common-updater-scripts, withOpenASAR }: stdenv.mkDerivation rec { inherit pname version src meta; @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postInstall = lib.strings.optionalString (openasar != null) '' + postInstall = lib.strings.optionalString withOpenASAR '' cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar ''; diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index e378f490c0f4..ba4b5f0ffd4e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -1,16 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages }: +{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages, unzip }: +let + # OpenAsar fails with default unzip, throwing "lchmod (file attributes) error: Operation not supported" + unzipFix = + if stdenv.isLinux then + unzip.overrideAttrs (oldAttrs: { + buildFlags = oldAttrs.buildFlags ++ [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; + }) + else + unzip; +in stdenv.mkDerivation rec { - version = "unstable-2022-06-10"; pname = "openasar"; + version = "unstable-2022-06-27"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "c6f2f5eb7827fea14cb4c54345af8ff6858c633a"; - sha256 = "m6e/WKGgkR8vjKcHSNdWE25MmDQM1Z3kgB24OJgbw/w="; + rev = "6f7505fb91a07035d3661a3a7bf68b3018ddfd82"; + sha256 = "2tb6OgYOnpryiyk7UH39sgzwtGJf9hNOpy74YqLI+Uk="; }; + postPatch = '' + # Hardcode unzip path + substituteInPlace ./src/updater/moduleUpdater.js \ + --replace \'unzip\' \'${unzipFix}/bin/unzip\' + # Remove auto-update feature + echo "module.exports = async () => log('AsarUpdate', 'Removed');" > ./src/asarUpdate.js + ''; + buildPhase = '' runHook preBuild