Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-06-24 06:01:28 +00:00 committed by GitHub
commit bc9dd2e294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 143 additions and 76 deletions

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pluto";
version = "5.16.4";
version = "5.17.0";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "pluto";
rev = "v${version}";
sha256 = "sha256-X/ei4BXj2tuFeHt4QZQ4QI6m15emOMjSrK+GxAqRMFM=";
sha256 = "sha256-oJ9GWzgukwBEo0kMUSS+rxYPgjFwtchiAYOCy1SwWic=";
};
vendorHash = "sha256-okqDtxSKVLlmnm5JdCKSvRZkXTsghi/L5R9TX10WWjY=";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vcluster";
version = "0.15.1";
version = "0.15.2";
src = fetchFromGitHub {
owner = "loft-sh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RsaEeWK8jEDolHH0FNFKGrvRDPreAu2/rkXqqYIxH1s=";
sha256 = "sha256-xXeNWLhaCjOqKYJWshosStuAGy43Ur2Kp7xSY6KKcqw=";
};
vendorSha256 = null;
vendorHash = null;
subPackages = [ "cmd/vclusterctl" ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "llhttp";
version = "8.1.0";
version = "8.1.1";
src = fetchFromGitHub {
owner = "nodejs";
repo = "llhttp";
rev = "release/v${version}";
hash = "sha256-pBGjcT5MiCSJI12TiH1XH5eAzIeylCdP/82L3o38BJo=";
hash = "sha256-srAHKyYvdEGtjV7BwcKQArwAChRoZqTCfa/RefI/8wQ=";
};
nativeBuildInputs = [

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, glibcLocales
, pycodestyle
, pytestCheckHook
@ -11,7 +10,7 @@
buildPythonPackage rec {
pname = "autopep8";
version = "2.0.1";
version = "2.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,18 +19,9 @@ buildPythonPackage rec {
owner = "hhatto";
repo = "autopep8";
rev = "refs/tags/v${version}";
hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo=";
hash = "sha256-+EZgo7xtYKMgpcntU5FtPrfikDDpnvGHhorhtoqDsvE=";
};
patches = [
# Ignore DeprecationWarnings to fix tests on Python 3.11, https://github.com/hhatto/autopep8/pull/665
(fetchpatch {
name = "ignore-deprecation-warnings.patch";
url = "https://github.com/hhatto/autopep8/commit/75b444d7cf510307ef67dc2b757d384b8a241348.patch";
hash = "sha256-5hcJ2yAuscvGyI7zyo4Cl3NEFG/fZItQ8URstxhzwzE=";
})
];
propagatedBuildInputs = [
pycodestyle
] ++ lib.optionals (pythonOlder "3.11") [
@ -43,7 +33,7 @@ buildPythonPackage rec {
pytestCheckHook
];
LC_ALL = "en_US.UTF-8";
env.LC_ALL = "en_US.UTF-8";
meta = with lib; {
changelog = "https://github.com/hhatto/autopep8/releases/tag/v${version}";

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "browser-cookie3";
version = "0.19.0";
version = "0.19.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-CtVPtMhX6pBW4rM+Hq68lfM6EocJX6fgXuROEfYshL0=";
hash = "sha256-MDGtFLlrR+8eTIVF8vRj4QrYRO+DTc0Ova42HjHGEZo=";
};
propagatedBuildInputs = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "23.6.0";
version = "23.6.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-NWhDKcxA4lFOPLYH12FGqfsErIKp+Lsrjy0adFIKEWc=";
hash = "sha256-HBDijU5R1furmlP1ykmjbbBWXh/LSVE2zuuJ80D9Yng=";
};
nativeBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "schwifty";
version = "2023.3.0";
version = "2023.6.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Un9J1Yzt080vZ3rzoVURNpMcAObBS8Jsn5kEQKUVxf0=";
hash = "sha256-hDNAoITt2Ak5aVWmMgqg2oA9rDFsiuum5JXc7v7sspU=";
};
propagatedBuildInputs = [

View File

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "signalslot";
version = "0.1.2";
version = "0.2.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-Z26RPNau+4719e82jMhb2LyIR6EvsANI8r3+eKuw494=";
hash = "sha256-ZNodibNGfCOa8xd3myN+cRa28rY3/ynNUia1kwjTIOU=";
};
postPatch = ''

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "zdaemon";
version = "4.4";
version = "5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw=";
hash = "sha256-ml7GxRmigLvPqPfnP04Q2AjnuCcQq2COD0Sb88BtQ9U=";
};
propagatedBuildInputs = [
@ -32,7 +32,7 @@ buildPythonPackage rec {
description = "A daemon process control library and tools for Unix-based systems";
homepage = "https://pypi.python.org/pypi/zdaemon";
changelog = "https://github.com/zopefoundation/zdaemon/blob/${version}/CHANGES.rst";
license = licenses.zpl20;
license = licenses.zpl21;
maintainers = with maintainers; [ goibhniu ];
};
}

View File

@ -53,6 +53,11 @@ buildPythonPackage rec {
makeWrapperArgs = [
# prefer ruff from user's PATH, that's usually desired behavior
"--suffix PATH : ${lib.makeBinPath [ ruff ]}"
# Unset ambient PYTHONPATH in the wrapper, so ruff-lsp only ever runs with
# its own, isolated set of dependencies. This works because the correct
# PYTHONPATH is set in the Python script, which runs after the wrapper.
"--unset PYTHONPATH"
];
meta = with lib; {

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "runme";
version = "1.2.5";
version = "1.2.6";
src = fetchFromGitHub {
owner = "stateful";
repo = "runme";
rev = "v${version}";
hash = "sha256-1rtYp5LH+PBUV9CJIn7V69BmQOin3/RHQ0MDZMAJH1k=";
hash = "sha256-yiprpN2vKGX2g2ANoRgCze2cAccPigI7GAPBFIf7xxo=";
};
vendorHash = "sha256-el+gM3GRN5KU4RlSAx02rn+22xj28IZq3erZUzPbUUw=";

View File

@ -5,18 +5,18 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-insta";
version = "1.29.0";
version = "1.30.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "insta";
rev = "refs/tags/${version}";
hash = "sha256-3fN7otTIAdn7Bs96IaboxY0DG381AjCV/KsDzv8xng8=";
hash = "sha256-Gh0RdWCYIYhur+nuHx68B2LllInx5Lx+5GeooWkB4dc=";
};
sourceRoot = "source/cargo-insta";
cargoHash = "sha256-zxf70F3x8eydQuUrrdoQljvmmTzS6ytxVlbHOCepxFg=";
cargoHash = "sha256-bV8LzYIQuSDg8ZETzF28PTuonvI+2QsPn7uTF8kn4fA=";
meta = with lib; {
description = "A Cargo subcommand for snapshot testing";

View File

@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
version = "0.6.7";
version = "0.6.9";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
sha256 = "g3DuKv8K2+PtMkLb5wK4m85tMsB5z7KzgJwWsFJ9abg=";
sha256 = "19NWXqC6HNBP45IYeZYQQE8/cp0M5VTEspmg/Sf0GMU=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
sha256 = "P5dK+uWiZZ0F3hy40oiNKnFOQTcHHrl3QcIMIXKFp5I=";
sha256 = "qmjYq+UhYO4uYvygVtetTrGfbsRDuZDrViui+Dg4TU4=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
sha256 = "uOqUagzkvJ1vcxgDLkTdJanzFpSdOT9HqBa+0EMKy1U=";
sha256 = "TBpqRY+ZLdS33S/tYdyZCflZMRjLwMQknE+H22AsPJg=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
sha256 = "bX3gV3wR2ZJabP6LXT4Tg3T+061aghktXD2YOrQfmWo=";
sha256 = "rOoeiinBgzTuoVb+Bhdo+gHvT2RXCF1fROau6A4CzJk=";
};
};
updateScript = writeShellScript "update-bun" ''

View File

@ -19,17 +19,17 @@
buildGoModule rec {
pname = "aaaaxy";
version = "1.4.6";
version = "1.4.8";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-vl5xFGsajjrD/rUQzA7qae/nTGo99wjyElpHNMbd5fg=";
hash = "sha256-WiU4pTIsgwkotKLvqTL/P1CZdW20y6VQbBjoPyMCd4E=";
fetchSubmodules = true;
};
vendorHash = "sha256-A8pzwt7Rzn7jPuuApQoZpSFXk1Oepf5u13rk4atG9ww=";
vendorHash = "sha256-On2J/9qnUGTysCWKRoU79mE1bFz275RWjJSfHqjsAoI=";
buildInputs = [
alsa-lib

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "opensmtpd-filter-rspamd";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "poolpOrg";
repo = "filter-rspamd";
rev = "v${version}";
sha256 = "pcHj4utpf/AIUv8/7mE8BLbE8LYkzNKfc4T4hIHgGeI=";
sha256 = "sha256-Ud1irvEyYr9QDsm2PsnWoWkXoDH0WWeH73k/IbLrVf4=";
};
vendorSha256 = "sNF2c+22FMvKoROkA/3KtSnRdJh4YZLaIx35HD896HI=";
vendorHash = "sha256-sNF2c+22FMvKoROkA/3KtSnRdJh4YZLaIx35HD896HI=";
passthru.tests = {
opensmtpd-rspamd-integration = nixosTests.opensmtpd-rspamd;

View File

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }:
buildGoModule rec {
pname = "mimir";
version = "2.8.0";
version = "2.9.0";
src = fetchFromGitHub {
rev = "${pname}-${version}";
owner = "grafana";
repo = pname;
sha256 = "sha256-gVt334HTKOotRaO1ga774FaxpblADpgdTtucADOHsCE=";
sha256 = "sha256-6URhofT5zJZX2eFx7fNPrFOWF7Po3ChlmVHGTpvG24c=";
};
vendorSha256 = null;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fastly-exporter";
version = "7.5.0";
version = "7.5.1";
src = fetchFromGitHub {
owner = "peterbourgon";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Am8TqolPP0m+57plvG0pzh69KDD7rfabLU+E35LE6aI=";
sha256 = "sha256-eMmnPxjtEYpVHm4reJYBkJ3kkkqmAAhyZot020Stb4E=";
};
vendorHash = null;

View File

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "oxigraph";
version = "0.3.17";
version = "0.3.18";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-UsoNsGS2JWiI1EotUXjKwtR0WIk+z/5/a0AJySw4xnQ=";
sha256 = "sha256-0sAQ/jOnYO0P1EX+DY7rDJyzOkdAaO7hGQDFTgNJyQs=";
fetchSubmodules = true;
};
cargoHash = "sha256-lQVWpIhWTUQTcMaPJ1z8wJI7/EBU+YoFkC92JhLCxe8=";
cargoHash = "sha256-bRSv77fq+3f4X+NB75qtjXRHo50H61ytoRPTEjKp6W0=";
nativeBuildInputs = [
rustPlatform.bindgenHook

View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation (finalAttrs: {
version = "1.8.7";
version = "1.8.8";
pname = "antidote";
src = fetchFromGitHub {
owner = "mattmc3";
repo = "antidote";
rev = "v${finalAttrs.version}";
hash = "sha256-5ccGoxmaHV7w4w7qc61gjI12OppU1FjDUeYh8ELljWQ=";
hash = "sha256-UliND3WZkaXWIxWnSINPLylSK+iXyflhwf/JTjwp/wg=";
};
dontPatch = true;

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "fits-cloudctl";
version = "0.11.7";
version = "0.11.8";
src = fetchFromGitHub {
owner = "fi-ts";
repo = "cloudctl";
rev = "v${version}";
sha256 = "sha256-wsv1d7CdrZeAOgY0a0L1ZjSJVahtfDsOzKaz3Uu2RWM=";
sha256 = "sha256-LdJ8EwTLn5PnbYAe36424qptV5LT4A7/sa2H21kGLAY=";
};
vendorHash = "sha256-/lDhvmeeEiXP+mihrz6076Cm/29UeJ0QH9GW3hIHKB8=";
vendorHash = "sha256-O0E65+GtvoLwgc2RnQbogQg10v3DDHz4fhUaxNKhObM=";
meta = with lib; {
description = "Command-line client for FI-TS Finance Cloud Native services";

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "charasay";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "latipun7";
repo = pname;
rev = "v${version}";
hash = "sha256-99lMXgSHgxKc0GHnRRciMoZ+rQJyMAx+27fj6NkXxds=";
hash = "sha256-tAikSQCXpzH2BTnnT2YuXO4XSoagAaMynCV2iPlFFNw=";
};
cargoHash = "sha256-0la16XinseOXPH2mvdYD7ZquvF2dju4UPBwl5VrTEZA=";
cargoHash = "sha256-O4Qxf54c3i7OKzk/pS8xoyDjnYlYEu1HcQ1ONev8cEQ=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -0,0 +1,64 @@
{ lib
, stdenv
, fetchFromGitHub
, buildPythonApplication
, click
, pydantic
, toml
, watchdog
, pytestCheckHook
, rsync
}:
buildPythonApplication rec {
pname = "remote-exec";
version = "1.13.2";
src = fetchFromGitHub {
owner = "remote-cli";
repo = "remote";
rev = "refs/tags/v${version}";
hash = "sha256-xaxkN6XukV9HiLYehwVTBZB8bUyjgpfg+pPfAGrOkgo=";
};
# remove legacy endpoints, we use --multi now
postPatch = ''
substituteInPlace setup.py \
--replace '"mremote' '#"mremote'
'';
propagatedBuildInputs = [
click
pydantic
toml
watchdog
];
# disable pytest --cov
preCheck = ''
rm setup.cfg
'';
doCheck = true;
nativeCheckInputs = [
rsync
];
checkInputs = [
pytestCheckHook
];
disabledTestPaths = lib.optionals stdenv.isDarwin [
# `watchdog` dependency does not correctly detect fsevents on darwin.
# this only affects `remote --stream-changes`
"test/test_file_changes.py"
];
meta = with lib; {
description = "Work with remote hosts seamlessly via rsync and ssh";
homepage = "https://github.com/remote-cli/remote";
license = licenses.bsd2;
maintainers = with maintainers; [ pbsds ];
};
}

View File

@ -6,12 +6,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "shell_gpt";
version = "0.9.1";
version = "0.9.3";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-k57oPqUpBuqoJFJ2JU3O4d4ESqb1DqJam/L+lJgBWIQ=";
sha256 = "sha256-g7zQ9ii38jBMUT0n8SjkccnGlkpCO4817GZ2yidxpMU=";
};
nativeBuildInputs = with python3.pkgs; [

View File

@ -5,16 +5,21 @@
rustPlatform.buildRustPackage rec {
pname = "spacer";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "samwho";
repo = "spacer";
rev = "v${version}";
hash = "sha256-KSR3KfZcPHrjKxHtgNhGS3ISR8bn8tXw9ED7OevTOsU=";
hash = "sha256-eFXxcOhUqyo3eUws3RCO0w+0XGlxZAonKFTphnrhHs8=";
};
cargoHash = "sha256-Rjmy6l35pnaZTJmacoNRYvFLCRHkkJYZXLU9MVkVTfY=";
cargoHash = "sha256-z7igJc8HHqpiY2an4hFWoZElwgF5NUA+TFPqxuowC/w=";
# Cargo.lock is outdated
preConfigure = ''
cargo metadata --offline
'';
meta = with lib; {
description = "CLI tool to insert spacers when command output stops";

View File

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "cnspec";
version = "8.13.0";
version = "8.15.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-ZHC1GpPp3/IwK67b3XMahf9KX73zoImRunY+yE/CGXQ=";
hash = "sha256-kPTnbet/+iw0ZYxczyn9K5IzTmLwoZiEKSjTFfBHKow=";
};
proxyVendor = true;
vendorHash = "sha256-iM86sTyu/GvWFV+iqXUMafg0uxpDJA8YqfB2SkglK/A=";
vendorHash = "sha256-7FNZ/In8S3vpUEHLIzqPLSTY+ZW9kfNNT6EcSAZRgtI=";
subPackages = [
"apps/cnspec"

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubernetes-polaris";
version = "8.2.1";
version = "8.2.3";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "polaris";
rev = version;
sha256 = "sha256-K8iFoCUVfSQdPluEwsZlxww+llwwBP8qkFsFEkFZqlQ=";
sha256 = "sha256-UOFXd9QzywQMFlj/0HxOdQM30mYGqOI7gQzk7p2kvoY=";
};
vendorHash = "sha256-9hjJ7xyuviAsXHrgfzyqCnk6xh0fpQRP1KXi+CoskkI=";
vendorHash = "sha256-OOA6OfBJHBPD890m7orJmSvn3kHW2lk84Q4xml5tUA8=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -12070,6 +12070,8 @@ with pkgs;
remote-touchpad = callPackage ../tools/inputmethods/remote-touchpad { };
remote-exec = python3Packages.callPackage ../tools/misc/remote-exec { };
reposurgeon = callPackage ../applications/version-management/reposurgeon { };
reptyr = callPackage ../os-specific/linux/reptyr { };
@ -17874,6 +17876,8 @@ with pkgs;
rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { };
ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { };
svls = callPackage ../development/tools/language-servers/svls { };
typst-lsp = callPackage ../development/tools/language-servers/typst-lsp { };

View File

@ -291,6 +291,7 @@ mapAliases ({
ruamel_base = ruamel-base; # added 2021-11-01
ruamel_yaml = ruamel-yaml; # added 2021-11-01
ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
inherit (super.pkgs) ruff-lsp; # added 2023-06-23
runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03
sapi-python-client = kbcstorage; # added 2022-04-20
scikitimage = scikit-image; # added 2023-05-14

View File

@ -10857,8 +10857,6 @@ self: super: with self; {
rubymarshal = callPackage ../development/python-modules/rubymarshal { };
ruff-lsp = callPackage ../development/python-modules/ruff-lsp { };
ruffus = callPackage ../development/python-modules/ruffus { };
rules = callPackage ../development/python-modules/rules { };