From 192c0e2e1c540c195c596486075108001e4568b2 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 27 Jun 2022 09:29:42 +0200 Subject: [PATCH 01/13] gnucash: 4.10 -> 4.11 --- pkgs/applications/office/gnucash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 9024260459b..1c6fe68480d 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.10"; + version = "4.11"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-f9S7kZ9uOTiKtHv6Ea9vo/Wem5vWlcfU6SCK+Fy5yTs="; + hash = "sha256-+BTt4w174N7Ar7KujQNii5rjTISLaDEuTFre2UwQKxk="; }; nativeBuildInputs = [ From de90786542ac717bcb65dc2b40e8d52867fc5d9f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 27 Jun 2022 09:43:09 +0200 Subject: [PATCH 02/13] python3Packages.pywlroots: 0.15.17 -> 0.15.18 --- pkgs/development/python-modules/pywlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 83a4e876e34..0a75f623622 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.17"; + version = "0.15.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "mDD2PLlq1rVlgYrLIN88MwAEVE/hU/K0mrTszpXQ30g="; + sha256 = "ZKWA0pRrh/nP1D8wUHNhM+R53l5PCKO1tnqbMfMd2WE="; }; nativeBuildInputs = [ pkg-config ]; From c59d1ebd6eeb2c9a2889e22a2249ad5a1a341375 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 27 Jun 2022 12:29:30 +0000 Subject: [PATCH 03/13] openssl_3_0: fix apparent x86_64 AVX512 RCE Has been applied upstream. No CVE. --- ...lace-call-for-rsaz_mod_exp_avx512_x2.patch | 34 +++++++++++++++++++ .../development/libraries/openssl/default.nix | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch diff --git a/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch b/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch new file mode 100644 index 00000000000..e144a718889 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch @@ -0,0 +1,34 @@ +From 4d8a88c134df634ba610ff8db1eb8478ac5fd345 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Wed, 22 Jun 2022 18:07:05 +0800 +Subject: [PATCH] rsa: fix bn_reduce_once_in_place call for + rsaz_mod_exp_avx512_x2 + +bn_reduce_once_in_place expects the number of BN_ULONG, but factor_size +is moduli bit size. + +Fixes #18625. + +Signed-off-by: Xi Ruoyao + +Reviewed-by: Tomas Mraz +Reviewed-by: Paul Dale +(Merged from https://github.com/openssl/openssl/pull/18626) +--- + crypto/bn/rsaz_exp_x2.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/crypto/bn/rsaz_exp_x2.c b/crypto/bn/rsaz_exp_x2.c +index 6b04486e3f56..f979cebd6fb7 100644 +--- a/crypto/bn/rsaz_exp_x2.c ++++ b/crypto/bn/rsaz_exp_x2.c +@@ -257,6 +257,9 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1, + from_words52(res1, factor_size, rr1_red); + from_words52(res2, factor_size, rr2_red); + ++ /* bn_reduce_once_in_place expects number of BN_ULONG, not bit size */ ++ factor_size /= sizeof(BN_ULONG) * 8; ++ + bn_reduce_once_in_place(res1, /*carry=*/0, m1, storage, factor_size); + bn_reduce_once_in_place(res2, /*carry=*/0, m2, storage, factor_size); + diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 8f940b69256..d79f91a5783 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -210,6 +210,10 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch + # https://guidovranken.com/2022/06/27/notes-on-openssl-remote-memory-corruption/ + # https://github.com/openssl/openssl/commit/4d8a88c134df634ba610ff8db1eb8478ac5fd345.patch + 3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch + (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) From f66f16c103d74df95ccc484b23751ee8251407d8 Mon Sep 17 00:00:00 2001 From: regadas Date: Thu, 23 Jun 2022 16:39:58 +0100 Subject: [PATCH 04/13] trino-cli: init at 387 --- maintainers/maintainer-list.nix | 6 ++++ .../tools/database/trino-cli/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/development/tools/database/trino-cli/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cd5023ceda7..3690890c6a9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10645,6 +10645,12 @@ githubId = 1142322; name = "Martin Lavoie"; }; + regadas = { + email = "oss@regadas.email"; + name = "Filipe Regadas"; + github = "regadas"; + githubId = 163899; + }; regnat = { email = "regnat@regnat.ovh"; github = "regnat"; diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix new file mode 100644 index 00000000000..aeeebf484d8 --- /dev/null +++ b/pkgs/development/tools/database/trino-cli/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "trino-cli"; + version = "387"; + + jarfilename = "${pname}-${version}-executable.jar"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchurl { + url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; + sha256 = "sha256-26TYtfxKLP3dW2uOoxc6rRnGXxnmbKG99xR0X7ntXDY="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre}/bin/java $out/bin/trino \ + --add-flags "-jar $out/share/java/${jarfilename}" + + runHook postInstall + ''; + + meta = with lib; { + description = "The Trino CLI provides a terminal-based, interactive shell for running queries"; + homepage = "https://github.com/trinodb/trino"; + license = licenses.asl20; + maintainers = [ maintainers.regadas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daa41e5e4db..54bdb073bb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24049,6 +24049,8 @@ with pkgs; trinity = callPackage ../os-specific/linux/trinity { }; + trino-cli = callPackage ../development/tools/database/trino-cli { }; + trinsic-cli = callPackage ../tools/admin/trinsic-cli { inherit (darwin.apple_sdk.frameworks) Security; }; From 7b5ee88acbb96e8ad5a06d7823e9b2a1a5be4ee7 Mon Sep 17 00:00:00 2001 From: Sergei Shilovsky Date: Mon, 27 Jun 2022 21:17:07 +0300 Subject: [PATCH 05/13] vintagestory: 1.16.4 -> 1.16.5 --- pkgs/games/vintagestory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index e6e7d28e17b..4c94fa4f1ae 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.16.4"; + version = "1.16.5"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-wdwQ1Dv0872nEOYIB+rEzYtG5rnSw8DZgoSlSvCvtrI="; + sha256 = "sha256-qqrQ+cs/ujzeXAa0xX5Yee3l5bo9DaH+kS1pkCt/UoU="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; From 2e230d1d14cbff0fcfd73510800efcadd7b55b2f Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 27 Jun 2022 21:47:17 +0200 Subject: [PATCH 06/13] starship: 1.8.0 -> 1.9.1 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 9754c9f0c14..4f3603d6e6f 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+LfQ7ce8j7LBopV9bo+WjYcZCnwntOToKUHctPMaGXw="; + sha256 = "sha256-IujaGyAGYlBb4efaRb13rsPSD2gWAg5UgG10iMp9iQE="; }; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-XPbirDdSDzIgsukkMYJrS/ghfF3VCplZ4BuOrzIRK0E="; + cargoSha256 = "sha256-HrSMNNrldwb6LMMuxdQ84iY+/o5L2qwe+Vz3ekQt1YQ="; preCheck = '' HOME=$TMPDIR From 7b3018bbe2c33f1b51b9a42ee13c155288459bb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 01:58:49 +0000 Subject: [PATCH 07/13] python310Packages.mkdocs-material: 8.3.6 -> 8.3.7 --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 4f32dd745b0..d4d8f7875e0 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.3.6"; + version = "8.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonApplication rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hPDzA1QybLx47ZEAwKZJRqiI48vF0R4DOR3w7EiCpvU="; + hash = "sha256-LOsgWRjKFZ+ZkJkQzDStNNBUh+AwlI8zZcUBz7L/Ook="; }; propagatedBuildInputs = [ From fcfaac31aae133ce4c785048ed002393fa472ed8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jun 2022 03:29:24 +0000 Subject: [PATCH 08/13] python310Packages.cachelib: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/cachelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 6c0bb626f9b..9a873d24f56 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.8.0"; + version = "0.9.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pallets"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-MtfBiis0oXF4sxCUI/uneZM/OFzmTy+pj8ddTxamKrs="; + sha256 = "sha256-LO1VdirKWXIAy3U8oRtnFI58qO+yn6Vm5bZdCjdgKwo="; }; checkInputs = [ From 6111acd7e64c8ad248f296db9ca778918299d728 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 27 Jun 2022 15:39:57 +0200 Subject: [PATCH 09/13] vimPlugins.satellite-nvim: init at 2022-06-26 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f96dba825a6..06be5e03f7f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6516,6 +6516,18 @@ final: prev: meta.homepage = "https://github.com/vmware-archive/salt-vim/"; }; + satellite-nvim = buildVimPluginFrom2Nix { + pname = "satellite.nvim"; + version = "2022-06-26"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "satellite.nvim"; + rev = "320e3c54b507486e3ed0c9dacc656fdf54b40057"; + sha256 = "1qkx0mcrmqgvpx9gmncblkm7km4ap3hvkcp65dqc9nn2h4w63hvy"; + }; + meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; + }; + scrollbar-nvim = buildVimPluginFrom2Nix { pname = "scrollbar.nvim"; version = "2022-06-16"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index b540180d123..a79fb1848a3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -547,6 +547,7 @@ https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, +https://github.com/lewis6991/satellite.nvim/,HEAD, https://github.com/Xuyuanp/scrollbar.nvim/,, https://github.com/cakebaker/scss-syntax.vim/,, https://github.com/RobertAudi/securemodelines/,, From 886bed4ccc52a7cdfcac41c56b751d545f6fa1fa Mon Sep 17 00:00:00 2001 From: 2gn <101851090+2gn@users.noreply.github.com> Date: Thu, 23 Jun 2022 20:39:04 +0900 Subject: [PATCH 10/13] add 1password extension for vscode --- .../editors/vscode/extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2de4575d440..c8dc58a7d61 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -42,6 +42,18 @@ let maintainers = with lib.maintainers; [ kamadorueda ]; }; }; + + _1Password.op-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "1Password"; + name = "op-vscode"; + version = "1.0.0"; + sha256 = "sha256-ZeKTP3WKjyuR/ryBdJRHXJT+l2gbY4QnWNTsN9+4nOA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; a5huynh.vscode-ron = buildVscodeMarketplaceExtension { mktplcRef = { From 788fc876f99999ae0e96a64eb6371d892578cff4 Mon Sep 17 00:00:00 2001 From: 2gn <101851090+2gn@users.noreply.github.com> Date: Mon, 27 Jun 2022 22:30:09 +0900 Subject: [PATCH 11/13] sorted keys --- .../editors/vscode/extensions/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c8dc58a7d61..42d21d529da 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -30,6 +30,18 @@ let # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { + _1Password.op-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "1Password"; + name = "op-vscode"; + version = "1.0.0"; + sha256 = "sha256-ZeKTP3WKjyuR/ryBdJRHXJT+l2gbY4QnWNTsN9+4nOA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + _4ops.terraform = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "4ops"; @@ -42,18 +54,6 @@ let maintainers = with lib.maintainers; [ kamadorueda ]; }; }; - - _1Password.op-vscode = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "1Password"; - name = "op-vscode"; - version = "1.0.0"; - sha256 = "sha256-ZeKTP3WKjyuR/ryBdJRHXJT+l2gbY4QnWNTsN9+4nOA="; - }; - meta = { - license = lib.licenses.mit; - }; - }; a5huynh.vscode-ron = buildVscodeMarketplaceExtension { mktplcRef = { From e6ebe074d5843675c216ff9c629765d5e0c4e4e1 Mon Sep 17 00:00:00 2001 From: ners Date: Mon, 27 Jun 2022 12:02:03 +0200 Subject: [PATCH 12/13] vscode-extensions.markdown-mermaid: init at 1.14.2 --- .../editors/vscode/extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 42d21d529da..07dc2887b83 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -455,6 +455,18 @@ let }; }; + bierner.markdown-mermaid = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-mermaid"; + publisher = "bierner"; + version = "1.14.2"; + sha256 = "RZyAY2d3imnLhm1mLur+wTx/quxrNWYR9PCjC+co1FE="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; From 1b3082280540b1a06cf9adf9712a8b1e94d62116 Mon Sep 17 00:00:00 2001 From: ners Date: Mon, 27 Jun 2022 15:45:06 +0200 Subject: [PATCH 13/13] vscode-extensions.vscode-neovim: 0.0.83 -> 0.0.86 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 07dc2887b83..5a39c88ef34 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -281,8 +281,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "0.0.83"; - sha256 = "1giybf12p0h0fm950w9bwvzdk77771zfkylrqs9h0lhbdzr92qbl"; + version = "0.0.86"; + sha256 = "sha256-XZd2xTcTqT6LytVwN+CybaFT71nwdobgZQQddMFdjU4="; }; meta = { license = lib.licenses.mit;