Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt 2022-01-05 17:31:37 +01:00
commit 74a4683605
28 changed files with 252 additions and 119 deletions

View File

@ -2812,6 +2812,12 @@
email = "d4delta@outlook.fr";
name = "Delta";
};
deltadelta = {
email = "contact@libellules.eu";
name = "Dara Ly";
github = "tournemire";
githubId = 20159432;
};
deltaevo = {
email = "deltaduartedavid@gmail.com";
github = "DeltaEvo";

View File

@ -67,15 +67,11 @@ let
(t == "directory" -> baseNameOf n != "tests")
&& (t == "file" -> hasSuffix ".nix" n)
);
pull = dir:
if isStorePath pkgs.path
then "${builtins.storePath pkgs.path}/${dir}"
else filter "${toString pkgs.path}/${dir}";
in
pkgs.runCommand "lazy-options.json" {
libPath = pull "lib";
pkgsLibPath = pull "pkgs/pkgs-lib";
nixosPath = pull "nixos";
libPath = filter "${toString pkgs.path}/lib";
pkgsLibPath = filter "${toString pkgs.path}/pkgs/pkgs-lib";
nixosPath = filter "${toString pkgs.path}/nixos";
modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy;
} ''
export NIX_STORE_DIR=$TMPDIR/store

View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "bitcoinclassic";
repo = "bitcoinclassic";
rev = "v${version}";
sha256 = "sha256-V1cOB5FLotGS5jup/aVaiDiyr/v2KJ2SLcIu/Hrjuwk=";
sha256 = "sha256-fVmFD1B4kKoejd2cmPPF5TJJQTAA6AVsGlVY8IIUNK4=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

View File

@ -5,8 +5,8 @@ let
description = "PrusaSlicer fork with more features and faster development cycle";
versions = {
stable = { version = "2.3.57.8"; sha256 = "sha256-k1G9sFukYyCqVeJIbYgjJX9T8zqmFTmjmj9OXZ78+LY="; };
latest = { version = "2.3.57.8"; sha256 = "sha256-k1G9sFukYyCqVeJIbYgjJX9T8zqmFTmjmj9OXZ78+LY="; };
stable = { version = "2.3.57.9"; sha256 = "sha256-JWZ6PdzKwxdyp7StYuW69XGbTPoxaIJ2R4Ynmc65hvE="; };
latest = { version = "2.3.57.9"; sha256 = "sha256-JWZ6PdzKwxdyp7StYuW69XGbTPoxaIJ2R4Ynmc65hvE="; };
};
override = { version, sha256 }: super: {

View File

@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
version = "1.0.0-alpha.56";
version = "1.0.0-alpha.57";
src = fetchCrate {
inherit version pname;
sha256 = "zV4F4dbjJ58yGiupUwj5Z0HrKR78Mzch8Zs98YfxSTQ=";
sha256 = "sha256-HhGUoO8UHJkfQ5QQ/H+PT8mqvdPb8Ok4D3j7QArLBeA=";
};
cargoSha256 = "JQGBTCNu9U2Kq6tc7VT07LEbzLW+jdVWrK5e2qjzGRA=";
cargoSha256 = "sha256-SyyJqUC7bCUJf53/+GJ/7+huab8hycNABwAFaHHmJtY=";
doCheck = false;
nativeBuildInputs = [ pkg-config ];

View File

@ -6,7 +6,8 @@
, clojure
, git
, jdk
, callPackage
, obb
, fetchFromGitHub
, makeWrapper
, runCommand }:
@ -14,9 +15,11 @@ stdenv.mkDerivation rec {
pname = "obb";
version = "0.0.1";
src = fetchurl {
url = "https://github.com/babashka/${pname}/archive/refs/tags/v${version}.tar.gz";
sha256 = "sha256-ZVd3VCJ7vdQGQ7iY5v2b+gRX/Ni0/03hzqBElqpPvpI=";
src = fetchFromGitHub {
owner = "babashka";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WxQjBg6el6XMiHTurmSo1GgZnTdaJjRmcV3+3X4yohc=";
};
nativeBuildInputs = [ makeWrapper ];
@ -61,11 +64,12 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
doInstallCheck = true;
installCheckPhase = ''
[ $($out/bin/obb -e '(+ 1 2)') = '3' ]
'';
passthru.tests = {
simple = runCommand "${pname}-test" {} ''
[ $(${obb}/bin/obb -e '(+ 1 2)') = '3' ]
touch $out
'';
};
meta = with lib; {
description = "Ad-hoc ClojureScript scripting of Mac applications via Apple's Open Scripting Architecture";

View File

@ -0,0 +1,28 @@
{ lib, buildDunePackage, fetchFromGitHub, ppx_cstruct, rresult, cstruct-unix
, core_kernel }:
buildDunePackage rec {
pname = "dbf";
version = "0.1.1";
minimalOCamlVersion = "4.08";
useDune2 = true;
src = fetchFromGitHub {
owner = "pveber";
repo = "dbf";
rev = "${version}";
sha256 = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g=";
};
buildInputs = [ ppx_cstruct ];
propagatedBuildInputs = [ rresult cstruct-unix core_kernel ];
meta = with lib; {
description = "DBF format parsing";
homepage = "https://github.com/pveber/dbf";
license = licenses.isc;
maintainers = [ maintainers.deltadelta ];
};
}

View File

@ -1,30 +1,40 @@
{ lib
, buildPythonPackage
, fetchPypi
, psutil
, pexpect
, python-daemon
, pyyaml
, six
, stdenv
, ansible
, buildPythonPackage
, fetchPypi
, mock
, openssh
, pexpect
, psutil
, pytest-mock
, pytest-timeout
, pytest-xdist
, pytestCheckHook
, python-daemon
, pyyaml
, six
}:
buildPythonPackage rec {
pname = "ansible-runner";
version = "2.1.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "7684612f7543c5f07f3e8135667eeb22a9dbd98f625cc69901ba9924329ef24f";
hash = "sha256-doRhL3VDxfB/PoE1Zn7rIqnb2Y9iXMaZAbqZJDKe8k8=";
};
propagatedBuildInputs = [
ansible
psutil
pexpect
python-daemon
pyyaml
six
];
checkInputs = [
ansible # required to place ansible CLI onto the PATH in tests
pytestCheckHook
@ -35,44 +45,45 @@ buildPythonPackage rec {
openssh
];
propagatedBuildInputs = [
ansible
psutil
pexpect
python-daemon
pyyaml
six
];
preCheck = ''
export HOME=$(mktemp -d)
export PATH="$PATH:$out/bin";
'';
disabledTests = [
"test_callback_plugin_task_args_leak" # requires internet
# Requires network access
"test_callback_plugin_task_args_leak"
"test_env_accuracy"
"test_large_stdout_blob" # times out on slower hardware
]
# Times out on slower hardware
"test_large_stdout_blob"
# Failed: DID NOT RAISE <class 'RuntimeError'>
"test_validate_pattern"
] ++ lib.optional stdenv.isDarwin [
# test_process_isolation_settings is currently broken on Darwin Catalina
# https://github.com/ansible/ansible-runner/issues/413
++ lib.optional stdenv.isDarwin "process_isolation_settings";
"process_isolation_settings"
];
disabledTestPaths = [
# these tests unset PATH and then run executables like `bash` (see https://github.com/ansible/ansible-runner/pull/918)
# These tests unset PATH and then run executables like `bash` (see https://github.com/ansible/ansible-runner/pull/918)
"test/integration/test_runner.py"
"test/unit/test_runner.py"
]
++ lib.optionals stdenv.isDarwin [
# integration tests on Darwin are not regularly passing in ansible-runner's own CI
# Integration tests on Darwin are not regularly passing in ansible-runner's own CI
"test/integration"
# these tests write to `/tmp` which is not writable on Darwin
# These tests write to `/tmp` which is not writable on Darwin
"test/unit/config/test__base.py"
];
pythonImportsCheck = [
"ansible_runner"
];
meta = with lib; {
description = "Helps when interfacing with Ansible";
homepage = "https://github.com/ansible/ansible-runner";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "censys";
version = "2.0.9";
version = "2.1.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "censys";
repo = "censys-python";
rev = "v${version}";
sha256 = "sha256-qh3Z8Gza8J3OEM94GguJ+oEdVle01Gx1m/7+LCOErKY=";
sha256 = "sha256-zQoG7clqDAxwJIt0AQcj8kKGODL61ODc4inP2Ll+Jt8=";
};
nativeBuildInputs = [

View File

@ -3,24 +3,36 @@
, cffi
, fetchPypi
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "cmarkgfm";
version = "0.6.0";
version = "0.7.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "ec2bf8d5799c4b5bbfbae30a4a1dfcb06512f2e17e9ee60ba7e1d390318582fc";
sha256 = "sha256-plwVL52ov4JxTxnCh/4JaO6Of4mejZRQPXPQ/lcinBk=";
};
propagatedNativeBuildInputs = [ cffi ];
propagatedNativeBuildInputs = [
cffi
];
propagatedBuildInputs = [ cffi ];
propagatedBuildInputs = [
cffi
];
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "cmarkgfm" ];
pythonImportsCheck = [
"cmarkgfm"
];
meta = with lib; {
description = "Minimal bindings to GitHub's fork of cmark";

View File

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "deemix";
version = "3.6.4";
version = "3.6.5";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "268617b3ff9346ae51a063cbdb820c1f591cbadc1cf2fafd201dc671e721c1dd";
sha256 = "c56245b2a2142dafb0658d60919ccf34e04e5d87720d5909e0e030521349a65a";
};
propagatedBuildInputs = [

View File

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "ephem";
version = "4.1.2";
version = "4.1.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "d65bf7c85d96ca830de82729d9ce54ba854a9625916d8765c1954c1f29680b76";
sha256 = "sha256-f6GGhZgbpSjt1QQFKp1SEqCapb8VwRpzTtxqhuiotWo=";
};
checkInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
version = "0.27.36";
version = "0.27.40";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = version;
sha256 = "sha256-Q84hDb7YnYU5L2IyL3aZ/16yRxViGlt8VX4vlMcykDA=";
sha256 = "sha256-imfdLomMjeGAyVBSygx+TV0DA9OrMreeSlzzrJ2B9cc=";
};
propagatedBuildInputs = [

View File

@ -23,10 +23,10 @@ buildPythonPackage rec {
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "dask";
owner = "fsspec";
repo = pname;
rev = version;
sha256 = "sha256-BME40kyxZHx9+XrMCqWYp8+q6tjeYwAw/zISMNpQxDU=";
sha256 = "sha256-cpV+HKE39Yct1yu5xW9HZftx2Wy9ydFL2YLvPD3YM2M=";
};
propagatedBuildInputs = [
@ -58,7 +58,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Convenient Filesystem interface over GCS";
homepage = "https://github.com/dask/gcsfs";
homepage = "https://github.com/fsspec/gcsfs";
license = licenses.bsd3;
maintainers = with maintainers; [ nbren12 ];
};

View File

@ -1,8 +1,16 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytest }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "parsy";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
repo = "parsy";
@ -11,13 +19,13 @@ buildPythonPackage rec {
sha256 = "sha256-FislrLb+u4T5m/eEER7kazZHJKEwPHe+Vg/YDJp4PyM=";
};
checkInputs = [ pytest ];
checkInputs = [
pytestCheckHook
];
checkPhase = ''
py.test tests
'';
disabled = pythonOlder "3.4";
pythonImportsCheck = [
"parsy"
];
meta = with lib; {
homepage = "https://github.com/python-parsy/parsy";

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyatmo";
version = "6.2.0";
version = "6.2.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "jabesq";
repo = "pyatmo";
rev = "v${version}";
sha256 = "sha256-VBc2avJiIFQW1LYXQEvIZ/wZKMFJsCF9DDrxwL8dDnk=";
sha256 = "1cd6g5vix8k45ndx4aq4pvyyisqdp38gd2466jrlg8z9byandj0i";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -1,28 +1,55 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, matplotlib, numpy, pytestCheckHook, seaborn }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, matplotlib
, numpy
, pytestCheckHook
, pythonOlder
, seaborn
}:
buildPythonPackage rec {
pname = "pycm";
version = "3.3";
format = "setuptools";
disabled = !isPy3k;
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "sepandhaghighi";
repo = pname;
rev = "v${version}";
owner = "sepandhaghighi";
repo = pname;
rev = "v${version}";
sha256 = "0i3qpb20mnc22qny1ar3yvxb1dac7njwi8bvi5sy5kywz10c5dkw";
};
# remove a trivial dependency on the author's `art` Python ASCII art library
propagatedBuildInputs = [
matplotlib
numpy
seaborn
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
# Remove a trivial dependency on the author's `art` Python ASCII art library
rm pycm/__main__.py
rm Otherfiles/notebook_check.py # also depends on python3Packages.notebook
substituteInPlace setup.py --replace '=get_requires()' '=[]'
# Also depends on python3Packages.notebook
rm Otherfiles/notebook_check.py
substituteInPlace setup.py \
--replace '=get_requires()' '=[]'
'';
checkInputs = [ pytestCheckHook ];
disabledTests = [ "pycm.pycm_compare.Compare" ]; # output formatting error
propagatedBuildInputs = [ matplotlib numpy seaborn ];
disabledTests = [
# Output formatting error
"pycm.pycm_compare.Compare"
"plot_test"
];
pythonImportsCheck = [
"pycm"
];
meta = with lib; {
description = "Multiclass confusion matrix library";

View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pyebus";
version = "1.2.4";
version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "i+p40s9SXey1lfXWW+PiXsA1kUF4o6Rk7QLmQ2ljN6g=";
sha256 = "sha256-6ooOSJAIi8vYmCjDHnbMGQJfPqPmzA5thDSg+iM7T+8=";
};
nativeBuildInputs = [

View File

@ -12,13 +12,16 @@
}:
buildPythonPackage rec {
pname = "readme_renderer";
version = "30.0";
pname = "readme-renderer";
version = "32.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-gplwDXqRDDBAcqdgHq+tpnEqWwEaIBOUF+Gx6fBGRdg=";
pname = "readme_renderer";
inherit version;
sha256 = "sha256-tRK+r6Z5gmDH1a8+Gx8Jfli/zZpXXafE3dXgN0kKW4U=";
};
propagatedBuildInputs = [
@ -34,7 +37,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "readme_renderer" ];
pythonImportsCheck = [
"readme_renderer"
];
meta = with lib; {
description = "Python library for rendering readme descriptions";

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "rich";
version = "10.15.2";
version = "10.16.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "willmcgugan";
repo = pname;
rev = "v${version}";
sha256 = "0439fnzcqm2ixigica1fn5g6d3sdji9r699dsh3npwr4z44p2jkk";
sha256 = "sha256-smeRZTMIDbK9pZRRj42BGj8ifQw9bTTE90rGaV/Up/4=";
};
nativeBuildInputs = [ poetry-core ];

View File

@ -9,17 +9,35 @@
}:
buildPythonPackage rec {
pname = "SQLObject";
pname = "sqlobject";
version = "3.9.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
pname = "SQLObject";
inherit version;
sha256 = "45064184decf7f42d386704e5f47a70dee517d3e449b610506e174025f84d921";
};
propagatedBuildInputs = [ FormEncode pastedeploy paste pydispatcher ];
propagatedBuildInputs = [
FormEncode
paste
pastedeploy
pydispatcher
];
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
disabledTests = [
# https://github.com/sqlobject/sqlobject/issues/179
"test_fail"
];
pythonImportsCheck = [
"sqlobject"
];
meta = with lib; {
description = "Object Relational Manager for providing an object interface to your database";

View File

@ -1,4 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, h5py
, matplotlib
@ -15,10 +17,10 @@
buildPythonPackage rec {
pname = "sumo";
version = "2.2.5";
format = "setuptools";
disabled = pythonOlder "3.6";
# No tests in Pypi tarball
src = fetchFromGitHub {
owner = "SMTG-UCL";
repo = "sumo";
@ -38,7 +40,18 @@ buildPythonPackage rec {
castepxbin
];
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "castepxbin==0.1.0" "castepxbin>=0.1.0"
'';
pythonImportsCheck = [
"sumo"
];
meta = with lib; {
description = "Toolkit for plotting and analysis of ab initio solid-state calculation data";

View File

@ -75,7 +75,7 @@ let base = {
owner = "FirebirdSQL";
repo = "firebird";
rev = "v${version}";
sha256 = "sha256-a4ex19FMfiJsUEhWUYd2YXKgJ24Jnpoab2t6x9sUuyQ=";
sha256 = "sha256-Pc3hUAhXgpa6VOkjidfh/vS/60Gtjenid8nHnIH7s0E=";
};
buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ];

View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "zellij";
version = "0.23.0";
version = "0.24.0";
src = fetchFromGitHub {
owner = "zellij-org";
repo = "zellij";
rev = "v${version}";
sha256 = "sha256-DJ7FGtcsWGk4caS22aXo+8chCcvEdRlVrSRmIHsETD4=";
sha256 = "sha256-GYbRu2ZEFswyOBUbg6jdAZQRogIDT/YolEElZT8h744=";
};
cargoSha256 ="sha256-dWdFBSZwTEvxrPiXtTWcYLtC+4XFb5R7Wu4r1YpHQRk=";
cargoSha256 = "sha256-ogWFAO3xMH4vho9SRjyeHCDxRtAx6exGkMpNhz2VOLA";
nativeBuildInputs = [
installShellFiles

View File

@ -1,13 +1,12 @@
{ lib
, buildPythonApplication
, colorama
, fetchFromGitHub
, pytestCheckHook
, python3
}:
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "uddup";
version = "0.9.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "rotemreiss";
@ -16,15 +15,17 @@ buildPythonApplication rec {
sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg";
};
propagatedBuildInputs = [
propagatedBuildInputs = with python3.pkgs; [
colorama
];
checkInputs = [
checkInputs = with python3.pkgs; [
pytestCheckHook
];
pythonImportsCheck = [ "uddup" ];
pythonImportsCheck = [
"uddup"
];
meta = with lib; {
description = "Tool for de-duplication URLs";

View File

@ -1,13 +1,12 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
, pluginbase
, requests
, python3
}:
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "wafw00f";
version = "2.1.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "EnableSecurity";
@ -16,14 +15,17 @@ buildPythonApplication rec {
sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj";
};
propagatedBuildInputs = [
propagatedBuildInputs = with python3.pkgs; [
requests
pluginbase
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "wafw00f" ];
pythonImportsCheck = [
"wafw00f"
];
meta = with lib; {
description = "Tool to identify and fingerprint Web Application Firewalls (WAF)";

View File

@ -15598,7 +15598,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
uddup = python3Packages.callPackage ../tools/security/uddup { };
uddup = callPackage ../tools/security/uddup { };
udis86 = callPackage ../development/tools/udis86 { };
@ -29387,7 +29387,7 @@ with pkgs;
wad = callPackage ../tools/security/wad { };
wafw00f = python3Packages.callPackage ../tools/security/wafw00f { };
wafw00f = callPackage ../tools/security/wafw00f { };
whispers = callPackage ../tools/security/whispers { };

View File

@ -254,6 +254,8 @@ let
data-encoding = callPackage ../development/ocaml-modules/data-encoding { };
dbf = callPackage ../development/ocaml-modules/dbf { };
decompress = callPackage ../development/ocaml-modules/decompress { };
diet = callPackage ../development/ocaml-modules/diet { };