Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-11-03 00:02:24 +00:00 committed by GitHub
commit 0c72496088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 178 additions and 52 deletions

View File

@ -34,11 +34,11 @@ let
in
stdenv.mkDerivation rec {
pname = "bisq-desktop";
version = "1.9.5";
version = "1.9.6";
src = fetchurl {
url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb";
sha256 = "1jmhngxyn2yf7k1dn98yr9d20jlvkmskbpzz5kbzci36v2wfmjrp";
sha256 = "02j6n693lhfn9x8kaz253xm76zzsdz8h10rkyxnlqiwwbn1wnmsa";
};
nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ];

View File

@ -4558,6 +4558,18 @@ final: prev:
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
};
material-vim = buildVimPluginFrom2Nix {
pname = "material.vim";
version = "2022-09-14";
src = fetchFromGitHub {
owner = "kaicataldo";
repo = "material.vim";
rev = "81d5d0bb30677b0846a2721a600f2f45db6d10a7";
sha256 = "1j23wi0hh5h0pc0rk5dxvsc60k484h5haa2gfxzahjqd7kzil4y8";
};
meta.homepage = "https://github.com/kaicataldo/material.vim/";
};
mayansmoke = buildVimPluginFrom2Nix {
pname = "mayansmoke";
version = "2010-10-18";
@ -5086,6 +5098,18 @@ final: prev:
meta.homepage = "https://github.com/kassio/neoterm/";
};
neotest = buildVimPluginFrom2Nix {
pname = "neotest";
version = "2022-10-27";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest";
rev = "0be9899e859da147ad28c23a30a1df2081c16741";
sha256 = "08f7d8w82jk5jd2w4wrh8x4gyw0msv7m82cpzd1ahijg917818pd";
};
meta.homepage = "https://github.com/nvim-neotest/neotest/";
};
neotest-haskell = buildVimPluginFrom2Nix {
pname = "neotest-haskell";
version = "2022-10-29";
@ -5830,6 +5854,18 @@ final: prev:
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
};
nvim-luadev = buildVimPluginFrom2Nix {
pname = "nvim-luadev";
version = "2022-01-26";
src = fetchFromGitHub {
owner = "bfredl";
repo = "nvim-luadev";
rev = "2a2c242bd751c289cfc1bc27f357925f68eba098";
sha256 = "0prwzxgg6fqkfmqqs41c1c81lch2x4qrs7287l5b104rz3alcinn";
};
meta.homepage = "https://github.com/bfredl/nvim-luadev/";
};
nvim-luapad = buildVimPluginFrom2Nix {
pname = "nvim-luapad";
version = "2022-10-26";
@ -7877,6 +7913,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
telescope_hoogle = buildVimPluginFrom2Nix {
pname = "telescope_hoogle";
version = "2022-10-27";
src = fetchFromGitHub {
owner = "luc-tielen";
repo = "telescope_hoogle";
rev = "6322f74655a2773974377a8fc8d170c00f24938f";
sha256 = "1pjq5bwnrxb3qhvvqd9v996hqfkbg5ah7qmbzrq1287h13m5jy2n";
};
meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/";
};
template-string-nvim = buildVimPluginFrom2Nix {
pname = "template-string.nvim";
version = "2022-08-18";

View File

@ -381,6 +381,7 @@ https://github.com/iamcco/markdown-preview.nvim/,,
https://github.com/chentoast/marks.nvim/,,
https://github.com/vim-scripts/matchit.zip/,,
https://github.com/marko-cerovac/material.nvim/,,
https://github.com/kaicataldo/material.vim/,HEAD,
https://github.com/vim-scripts/mayansmoke/,,
https://github.com/echasnovski/mini.nvim/,,
https://github.com/wfxr/minimap.vim/,,
@ -426,6 +427,7 @@ https://github.com/karb94/neoscroll.nvim/,,
https://github.com/Shougo/neosnippet-snippets/,,
https://github.com/Shougo/neosnippet.vim/,,
https://github.com/kassio/neoterm/,,
https://github.com/nvim-neotest/neotest/,HEAD,
https://github.com/MrcJkb/neotest-haskell/,HEAD,
https://github.com/rose-pine/neovim/,main,rose-pine
https://github.com/Shatur/neovim-ayu/,,
@ -490,6 +492,7 @@ https://github.com/mfussenegger/nvim-lint/,,
https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
https://github.com/neovim/nvim-lspconfig/,,
https://github.com/RishabhRD/nvim-lsputils/,,
https://github.com/bfredl/nvim-luadev/,HEAD,
https://github.com/rafcamlet/nvim-luapad/,,
https://github.com/scalameta/nvim-metals/,,
https://github.com/gpanders/nvim-moonwalk/,,
@ -660,6 +663,7 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
https://github.com/nvim-telescope/telescope-z.nvim/,,
https://github.com/jvgrootveld/telescope-zoxide/,,
https://github.com/nvim-telescope/telescope.nvim/,,
https://github.com/luc-tielen/telescope_hoogle/,HEAD,
https://github.com/axelvc/template-string.nvim/,HEAD,
https://github.com/jacoborus/tender.vim/,,
https://github.com/wincent/terminus/,,

View File

@ -9,10 +9,10 @@
let
# Keep these separate so the update script can regex them
rpcs3GitVersion = "14337-5210df688";
rpcs3Version = "0.0.24-14337-5210df688";
rpcs3Revision = "5210df688262ec7fd8c21230d30e568d98724c8f";
rpcs3Sha256 = "1m0j53xl6g01s27bi2p9j23m724gq7a3hss7kqhc239a5m9akqdg";
rpcs3GitVersion = "14358-a00f9e421";
rpcs3Version = "0.0.25-14358-a00f9e421";
rpcs3Revision = "a00f9e42115527aa9654870f194cf2c64329f2ef";
rpcs3Sha256 = "0avajihbs02nbfqs4kzgckl0v2z4z8h8fgcjs5m4zxvkgj5701nv";
ittapi = fetchFromGitHub {
owner = "intel";

View File

@ -3,15 +3,15 @@
}:
let
pname = "josm";
version = "18570";
version = "18583";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-EAEh/n7M56rzjtkIs8ZteDvOLuHxNsMyT7VGFyPre6s=";
hash = "sha256-6S6E7ngTCBXb0epPfYxIswLvfm9r2Ql0wgOs/PxpmIM=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
hash = "sha256-2xsHsaDxm/wjiCyS5tmD8uUlLrBdd3sS8JLal3pX3pA=";
hash = "sha256-3XEoSCXEpeqZj1y4nns5+0JR1SINYE1rsmQ4fMflxRQ=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

View File

@ -168,9 +168,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.3.3";
sha256 = "sha256-Oqswfw/ZkBJKldRd916Jfaugz66C3wE8VU44kAkGmUA=";
vendorSha256 = "sha256-mXCtgB1MdMP2XlJBagaDtZURw5o0JudAB2koHmfM0f8=";
version = "1.3.4";
sha256 = "sha256-UaMZTBmaLHbW1mNjDrMQSPMLKRIADlVvyP2qwuAv2Zo=";
vendorSha256 = "sha256-Wwf2EcqtlNqcGijR8WWcdSsayJrbZO68JEBPKWHXHuw=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "element";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = pname;
rev = "v${version}";
sha256 = "gjdcNvYNnxb6hOE/MQjTezZeYGBWTr4E8/Pt8YQv3lY=";
sha256 = "sha256-06RDZnie0Lv7i95AwnBGl6PPucuj8pIT6DHW3e3mu1o=";
};
vendorSha256 = "A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg=";
vendorSha256 = "sha256-A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg=";
meta = with lib; {
description = "The periodic table on the command line";

View File

@ -1,15 +1,15 @@
{
"version": "15.4.2",
"repo_hash": "sha256-KGVZrfrzfIn2ZQJ42FisLvjIGg0+QOnzfjCR6mQHjlM=",
"version": "15.4.4",
"repo_hash": "sha256-iIgN1j02Lr/RtNeopqs6ndFqw8YIU2F6c49RGWvpmgc=",
"yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.4.2-ee",
"rev": "v15.4.4-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.4.2",
"GITALY_SERVER_VERSION": "15.4.4",
"GITLAB_PAGES_VERSION": "1.62.0",
"GITLAB_SHELL_VERSION": "14.10.0",
"GITLAB_WORKHORSE_VERSION": "15.4.2"
"GITLAB_WORKHORSE_VERSION": "15.4.4"
},
"vendored_gems": [
"bundler-checksum",

View File

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.4.2";
version = "15.4.4";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-DBAQ1dJLQ+Xno4e/n1jvgKiHAol/uTMjx6RtZIBwM3w=";
sha256 = "sha256-b8ChQYaj+7snlrLP4P9FIUSIq/SNMh9hFlFajOPcBEU=";
};
vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM=";

View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.4.2";
version = "15.4.4";
src = fetchFromGitLab {
owner = data.owner;

View File

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
version = "1.0.164";
version = "1.0.165";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-ckC6QL8pCnenSWYCBKwEx0JrwOnmWAaQhFvw6qQFCv4=";
sha256 = "sha256-sFLJVNyx0IFfPjxbYzSthRdF77sRHeNGFXHzKH22HfY=";
};
executable = "bb";

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = "ngtcp2";
rev = "v${version}";
sha256 = "sha256-nfXEX1GxtmOcb0reRyO0OyQkSHeUWtQW+SZ8thxor+s=";
sha256 = "sha256-zDiJlwcDTLCU+WpJ6Jz6tve4oV+XMRYOtppC2fj/HgU=";
};
outputs = [ "out" "dev" ];

View File

@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
"shared" # "shared" builds both shared and static libraries
"--libdir=lib"
"--openssldir=etc/ssl"
"enable-ktls"
] ++ lib.optionals withCryptodev [
"-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS"

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "11.4.1";
version = "11.4.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-2vECQFeHvCjU0Fxd/H5M+C5c5lxYE5Tg5u+01EchNO0=";
hash = "sha256-dYogEs9cU+h6oPu9PImHTLvyaJ3kNAOgKNdN44HeqWY=";
};
postPatch = ''

View File

@ -18,6 +18,9 @@ buildPythonPackage rec {
hash = "sha256-d+aEok/uF7o+SHypgtAlntF7rhr2gAb0zyhLI7og6iw=";
};
# sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495
doCheck = postgresql.doCheck;
checkInputs = [
uvloop
postgresql

View File

@ -0,0 +1,59 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, niapy
, numpy
, pandas
, poetry-core
, scikit-learn
, toml-adapt
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "niaaml";
version = "1.1.11";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "lukapecnik";
repo = "NiaAML";
rev = version;
sha256 = "sha256-B87pI1EpZj1xECrgTmzN5S35Cy1nPowBRyu1IDb5zCE=";
};
nativeBuildInputs = [
poetry-core
toml-adapt
];
propagatedBuildInputs = [
niapy
numpy
pandas
scikit-learn
];
# create scikit-learn dep version consistent
preBuild = ''
toml-adapt -path pyproject.toml -a change -dep scikit-learn -ver X
'';
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"niaaml"
];
meta = with lib; {
description = "Python automated machine learning framework";
homepage = "https://github.com/lukapecnik/NiaAML";
license = licenses.mit;
maintainers = with maintainers; [ firefly-cpp ];
};
}

View File

@ -46,7 +46,7 @@ let
in
stdenv.mkDerivation rec {
pname = "github-runner";
version = "2.298.2";
version = "2.299.0";
inherit sdkSource;
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-ejYNuaijUOG3czW+7i4UmR+ysDnZwXXmS3V8INqeeTg=";
hash = "sha256-/grYaWhpd6jZx/gkWC3L+BoZcB6WKVMZzMGfwDhBRr0=";
};
nativeBuildInputs = [

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
version = "0.22.1";
version = "0.22.2";
src = fetchFromGitHub {
owner = "crate-ci";
repo = "cargo-release";
rev = "v${version}";
sha256 = "sha256-GKjEp0KX/YcEWo2ci6CwTpouPYHTymDx4hk3zO5pEcU=";
sha256 = "sha256-G235QKwwOFnHsfU26hc7d0mD/nwGyJRPs6BCctEqxJ8=";
};
cargoSha256 = "sha256-1iRHpEZ+FlZbc5SgovCYf5X1NTt4q+gigcX0sBwKM3s=";
cargoSha256 = "sha256-A3tzgLW+/GO4/kHRJH7Y7vtFUzI2Ow0nyfMfIuI5Sl4=";
nativeBuildInputs = [ pkg-config ];

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "yamlpath";
version = "3.6.7";
version = "3.6.8";
format = "setuptools";
src = fetchFromGitHub {
owner = "wwkimball";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lz8n3c+NohZnkbAoF/9rHsGzXW5PWPOsJKUFqqenIRg=";
rev = "refs/tags/v${version}";
sha256 = "sha256-g4Pw0IWLY/9nG2eqbiknWCZjJNGbmV42KEviIENXYYA=";
};
propagatedBuildInputs = with python3.pkgs; [

View File

@ -118,7 +118,7 @@ let
timer = {
# Enable Full Dynticks System.
NO_HZ_FULL = yes;
NO_HZ_FULL = mkIf stdenv.is64bit yes; # TODO: more precise condition?
};
# Enable NUMA.

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.2.1";
version = "3.2.2";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "51efa36f92679b25d43dbf8ba543e9f26138559f0fa1ba5fae172f5400659c8f";
sha256 = "cea9c1988cdce7752f88fbe37378f65e83c4e54048978b94fb21a9c92f88788f";
};
outputs = [ "bin" "out" "dev" ];

View File

@ -1,13 +1,13 @@
{ lib, stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }:
stdenv.mkDerivation rec {
pname = "dehydrated";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "lukas2511";
repo = "dehydrated";
rev = "v${version}";
sha256 = "09jhmkjvnj98zbf92qwdr5rr7pc6v63xzyk2fbi177r7szb2yg09";
sha256 = "sha256-K08eeruyT5vKzK3PzfCkubZiHbf9Yq7wzD1z69MeDtY=";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fd";
version = "8.5.0";
version = "8.5.1";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${version}";
sha256 = "sha256-FWnuV55xWL59lbLfs2IUi4QPolFGgsJDQdZCXx4PaKE=";
sha256 = "sha256-zS0AEGd+4YmwId6zJ08q3xYzXF+9K0XL8XWeXGaEJxA=";
};
cargoSha256 = "sha256-SD0olex4wDfdGHuuiNGQwjEV7AwmDIucLJbY+7E8hZg=";
cargoSha256 = "sha256-upI/cDtqe+P7PxoWZZddPqaic2pWclpTC/ATjR7sXx8=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "panoply";
version = "5.2.1";
version = "5.2.2";
src = fetchurl {
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
sha256 = "sha256-ukIH6hiWg8GMq28chfxIb2uHZaaymL9x/BhbFnIzw0Y=";
sha256 = "sha256-RIjdNfX4jsMwpgbE1aTzT6bysIFGUi33o5m030fF6mg=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -146,6 +146,17 @@ buildPythonPackage rec {
# Expects `git commit` to fail when `pre-commit` is not in the `$PATH`,
# but we use an absolute path so it's not an issue.
"test_environment_not_sourced"
# broken with Git 2.38.1, upstream issue filed at https://github.com/pre-commit/pre-commit/issues/2579
"test_golang_with_recursive_submodule"
"test_install_in_submodule_and_run"
"test_is_in_merge_conflict_submodule"
"test_get_conflicted_files_in_submodule"
"test_sub_nothing_unstaged"
"test_sub_something_unstaged"
"test_sub_staged"
"test_submodule_does_not_discard_changes"
"test_submodule_does_not_discard_changes_recurse"
];
pythonImportsCheck = [

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.16.4";
version = "3.16.5";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-DXqHJCzRYRiFgDa/OTBxWoWzz8uAZAwE1xCwIm30VDM=";
hash = "sha256-53TFXrzeyEcd8WV7hdb+2VXlN2Iogw3bdCiejRIs8Yw=";
};
vendorSha256 = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E=";

View File

@ -15,13 +15,13 @@
let
pname = "zerotierone";
version = "1.10.1";
version = "1.10.2";
src = fetchFromGitHub {
owner = "zerotier";
repo = "ZeroTierOne";
rev = version;
sha256 = "sha256-Y0klfE7ANQl1uYMkRg+AaIiJYSVPT6zME7tDMg2xbOk=";
sha256 = "sha256-p900bw+BGzyMwH91W9NRfYS1ZUW74YaALwr1Gv9BlvQ=";
};
in stdenv.mkDerivation {
inherit pname version src;

View File

@ -6111,6 +6111,8 @@ self: super: with self; {
enablePython = true; # ... and its Python bindings
})).python;
niaaml = callPackage ../development/python-modules/niaaml { };
niaarm = callPackage ../development/python-modules/niaarm { };
niapy = callPackage ../development/python-modules/niapy { };