Merge staging-next into staging
This commit is contained in:
commit
bb8ff383c5
|
@ -10677,6 +10677,12 @@
|
||||||
githubId = 1142322;
|
githubId = 1142322;
|
||||||
name = "Martin Lavoie";
|
name = "Martin Lavoie";
|
||||||
};
|
};
|
||||||
|
regadas = {
|
||||||
|
email = "oss@regadas.email";
|
||||||
|
name = "Filipe Regadas";
|
||||||
|
github = "regadas";
|
||||||
|
githubId = 163899;
|
||||||
|
};
|
||||||
regnat = {
|
regnat = {
|
||||||
email = "regnat@regnat.ovh";
|
email = "regnat@regnat.ovh";
|
||||||
github = "regnat";
|
github = "regnat";
|
||||||
|
|
|
@ -6516,6 +6516,18 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/vmware-archive/salt-vim/";
|
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 {
|
scrollbar-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "scrollbar.nvim";
|
pname = "scrollbar.nvim";
|
||||||
version = "2022-06-16";
|
version = "2022-06-16";
|
||||||
|
|
|
@ -547,6 +547,7 @@ https://github.com/simrat39/rust-tools.nvim/,,
|
||||||
https://github.com/rust-lang/rust.vim/,,
|
https://github.com/rust-lang/rust.vim/,,
|
||||||
https://github.com/hauleth/sad.vim/,,
|
https://github.com/hauleth/sad.vim/,,
|
||||||
https://github.com/vmware-archive/salt-vim/,,
|
https://github.com/vmware-archive/salt-vim/,,
|
||||||
|
https://github.com/lewis6991/satellite.nvim/,HEAD,
|
||||||
https://github.com/Xuyuanp/scrollbar.nvim/,,
|
https://github.com/Xuyuanp/scrollbar.nvim/,,
|
||||||
https://github.com/cakebaker/scss-syntax.vim/,,
|
https://github.com/cakebaker/scss-syntax.vim/,,
|
||||||
https://github.com/RobertAudi/securemodelines/,,
|
https://github.com/RobertAudi/securemodelines/,,
|
||||||
|
|
|
@ -30,6 +30,18 @@ let
|
||||||
#
|
#
|
||||||
baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs)
|
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 {
|
_4ops.terraform = buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
publisher = "4ops";
|
publisher = "4ops";
|
||||||
|
@ -269,8 +281,8 @@ let
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "vscode-neovim";
|
name = "vscode-neovim";
|
||||||
publisher = "asvetliakov";
|
publisher = "asvetliakov";
|
||||||
version = "0.0.83";
|
version = "0.0.86";
|
||||||
sha256 = "1giybf12p0h0fm950w9bwvzdk77771zfkylrqs9h0lhbdzr92qbl";
|
sha256 = "sha256-XZd2xTcTqT6LytVwN+CybaFT71nwdobgZQQddMFdjU4=";
|
||||||
};
|
};
|
||||||
meta = {
|
meta = {
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
|
@ -443,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 {
|
bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "vscode-tailwindcss";
|
name = "vscode-tailwindcss";
|
||||||
|
|
|
@ -26,12 +26,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnucash";
|
pname = "gnucash";
|
||||||
version = "4.10";
|
version = "4.11";
|
||||||
|
|
||||||
# raw source code doesn't work out of box; fetchFromGitHub not usable
|
# raw source code doesn't work out of box; fetchFromGitHub not usable
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2";
|
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||||
hash = "sha256-f9S7kZ9uOTiKtHv6Ea9vo/Wem5vWlcfU6SCK+Fy5yTs=";
|
hash = "sha256-+BTt4w174N7Ar7KujQNii5rjTISLaDEuTFre2UwQKxk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
From 4d8a88c134df634ba610ff8db1eb8478ac5fd345 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Xi Ruoyao <xry111@xry111.site>
|
||||||
|
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 <xry111@xry111.site>
|
||||||
|
|
||||||
|
Reviewed-by: Tomas Mraz <tomas@openssl.org>
|
||||||
|
Reviewed-by: Paul Dale <pauli@openssl.org>
|
||||||
|
(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);
|
||||||
|
|
|
@ -210,6 +210,10 @@ in {
|
||||||
# This patch disables build-time detection.
|
# This patch disables build-time detection.
|
||||||
./3.0/openssl-disable-kernel-detection.patch
|
./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
|
(if stdenv.hostPlatform.isDarwin
|
||||||
then ./use-etc-ssl-certs-darwin.patch
|
then ./use-etc-ssl-certs-darwin.patch
|
||||||
else ./use-etc-ssl-certs.patch)
|
else ./use-etc-ssl-certs.patch)
|
||||||
|
|
|
@ -8,14 +8,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "cachelib";
|
pname = "cachelib";
|
||||||
version = "0.8.0";
|
version = "0.9.0";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pallets";
|
owner = "pallets";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "sha256-MtfBiis0oXF4sxCUI/uneZM/OFzmTy+pj8ddTxamKrs=";
|
sha256 = "sha256-LO1VdirKWXIAy3U8oRtnFI58qO+yn6Vm5bZdCjdgKwo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "mkdocs-material";
|
pname = "mkdocs-material";
|
||||||
version = "8.3.6";
|
version = "8.3.7";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -22,7 +22,7 @@ buildPythonApplication rec {
|
||||||
owner = "squidfunk";
|
owner = "squidfunk";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-hPDzA1QybLx47ZEAwKZJRqiI48vF0R4DOR3w7EiCpvU=";
|
hash = "sha256-LOsgWRjKFZ+ZkJkQzDStNNBUh+AwlI8zZcUBz7L/Ook=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -19,14 +19,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pywlroots";
|
pname = "pywlroots";
|
||||||
version = "0.15.17";
|
version = "0.15.18";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "mDD2PLlq1rVlgYrLIN88MwAEVE/hU/K0mrTszpXQ30g=";
|
sha256 = "ZKWA0pRrh/nP1D8wUHNhM+R53l5PCKO1tnqbMfMd2WE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
35
pkgs/development/tools/database/trino-cli/default.nix
Normal file
35
pkgs/development/tools/database/trino-cli/default.nix
Normal file
|
@ -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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -17,11 +17,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vintagestory";
|
pname = "vintagestory";
|
||||||
version = "1.16.4";
|
version = "1.16.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
|
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 ];
|
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||||
|
|
|
@ -14,13 +14,13 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "starship";
|
pname = "starship";
|
||||||
version = "1.8.0";
|
version = "1.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "starship";
|
owner = "starship";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-+LfQ7ce8j7LBopV9bo+WjYcZCnwntOToKUHctPMaGXw=";
|
sha256 = "sha256-IujaGyAGYlBb4efaRb13rsPSD2gWAg5UgG10iMp9iQE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||||
|
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cargoSha256 = "sha256-XPbirDdSDzIgsukkMYJrS/ghfF3VCplZ4BuOrzIRK0E=";
|
cargoSha256 = "sha256-HrSMNNrldwb6LMMuxdQ84iY+/o5L2qwe+Vz3ekQt1YQ=";
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
HOME=$TMPDIR
|
HOME=$TMPDIR
|
||||||
|
|
|
@ -24170,6 +24170,8 @@ with pkgs;
|
||||||
|
|
||||||
trinity = callPackage ../os-specific/linux/trinity { };
|
trinity = callPackage ../os-specific/linux/trinity { };
|
||||||
|
|
||||||
|
trino-cli = callPackage ../development/tools/database/trino-cli { };
|
||||||
|
|
||||||
trinsic-cli = callPackage ../tools/admin/trinsic-cli {
|
trinsic-cli = callPackage ../tools/admin/trinsic-cli {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue