Merge branch 'master' into staging-next

Conflicts:
	pkgs/development/python-modules/fe25519/default.nix
	pkgs/development/python-modules/fountains/default.nix
	pkgs/development/python-modules/humanize/default.nix
This commit is contained in:
Dmitry Kalinkin 2021-12-28 18:49:09 -05:00
commit 3961a789eb
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
45 changed files with 475 additions and 182 deletions

View File

@ -3401,6 +3401,12 @@
githubId = 103082;
name = "Ed Brindley";
};
elliot = {
email = "hack00mind@gmail.com";
github = "Eliot00";
githubId = 18375468;
name = "Elliot Xu";
};
elliottvillars = {
email = "elliottvillars@gmail.com";
github = "elliottvillars";

View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2,
pango, gobject-introspection, wrapGAppsHook, gettext,
# Optional packages:
enableOSM ? true, osm-gps-map,
enableOSM ? true, osm-gps-map, glib-networking,
enableGraphviz ? true, graphviz,
enableGhostscript ? true, ghostscript
}:
@ -15,7 +15,7 @@ in buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook intltool gettext ];
buildInputs = [ gtk3 gobject-introspection pango gexiv2 ]
# Map support
++ lib.optional enableOSM osm-gps-map
++ lib.optionals enableOSM [ osm-gps-map glib-networking ]
# Graphviz support
++ lib.optional enableGraphviz graphviz
# Ghostscript support

View File

@ -0,0 +1,39 @@
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, openssl
, stdenv
, CoreServices
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "quake";
version = "0.3.0";
src = fetchFromGitHub {
owner = "phodal";
repo = pname;
rev = "v${version}";
sha256 = "1f7k68g18g3dpnrsmhgmz753bly1i3f4lmsljiyp9ap0c6w8ahgg";
};
cargoSha256 = "1yqj9rq770j116138bqn4ycggy13vvym1cz50myfddb9rjjzafrl";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
CoreServices
Security
];
meta = with lib; {
description = "A knowledge management meta-framework for geeks";
homepage = "https://github.com/phodal/quake";
license = licenses.mit;
maintainers = [ maintainers.elliot ];
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.25.12";
version = "0.25.18";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-S+roKkAtiGJmp/MHFeB+8mLQDL9okzLuJW6DMz3dQDk=";
sha256 = "sha256-iUhMPtFX7qFULegiyhlT4aG9q3deZ8aRqyEcbZ9jY/s=";
};
ldflags = [

View File

@ -0,0 +1,33 @@
{ buildGoModule, lib, fetchFromGitHub }:
buildGoModule rec {
pname = "kubergrunt";
version = "0.7.11";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = "kubergrunt";
rev = "v${version}";
sha256 = "1224ssqdz9ak0vylyfbr9c2w0yfdp4hw9jh99qmfi2j5nhw9kzcc";
};
vendorSha256 = "1hbb3hn8mzz9h9p1rl35izz3l6c2rqsg8aq6dgpbpsf5krp3zs3v";
# Disable tests since it requires network access and relies on the
# presence of certain AWS infrastructure
doCheck = false;
runVend = true;
postInstall = ''
# The binary is named kubergrunt
mv $out/bin/cmd $out/bin/kubergrunt
'';
meta = with lib; {
description = "Collection of commands to fill in the gaps between Terraform, Helm, and Kubectl";
homepage = "https://github.com/gruntwork-io/kubergrunt";
license = licenses.asl20;
maintainers = with maintainers; [ psibi ];
};
}

View File

@ -34,9 +34,6 @@ rustPlatform.buildRustPackage rec {
make prefix="$out"
'';
# TODO: Check if that's still needed
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -Wno-error=format-security";
# https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set
# these for all platforms, since upstream's gettext crate behavior might
# change in the future.

View File

@ -174,7 +174,7 @@ with python.pkgs; buildPythonApplication rec {
--subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}'
substituteInPlace setup.py \
--replace "zeroconf==0.28.*" "zeroconf"
--replace "zeroconf==0.37.*" "zeroconf"
'';
meta = with lib; {

View File

@ -572,7 +572,7 @@ buildLuarocksPackage {
propagatedBuildInputs = [ penlight markdown ];
meta = {
homepage = "http://stevedonovan.github.com/ldoc";
homepage = "https://github.com/lunarmodules/LDoc";
description = "A Lua Documentation Tool";
license.fullName = "MIT/X11";
};

View File

@ -1,18 +1,44 @@
{ lib, buildPythonPackage, fetchPypi
, nose, docutils, blockdiag, reportlab }:
{ lib
, blockdiag
, buildPythonPackage
, fetchFromGitHub
, nose
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "actdiag";
version = "2.0.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "0g51v9dmdq18z33v332f1f0cmb3hqgaga5minj0mc2sglark1s7h";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "blockdiag";
repo = pname;
rev = version;
sha256 = "sha256-pTWunoc6T1m+4SOe0ob0ac4ZwwXsYNZwkdwVtlMZrIo=";
};
propagatedBuildInputs = [ blockdiag docutils ];
propagatedBuildInputs = [
blockdiag
setuptools
];
checkInputs = [ nose reportlab ];
checkInputs = [
nose
pytestCheckHook
];
pytestFlagsArray = [
"src/actdiag/tests/"
];
pythonImportsCheck = [
"actdiag"
];
meta = with lib; {
description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";

View File

@ -1,11 +1,10 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, py
, mock
, glibcLocales
, fetchpatch
, iocapture
, mock
, pytestCheckHook
}:
buildPythonPackage rec {
@ -17,18 +16,27 @@ buildPythonPackage rec {
sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65";
};
checkInputs = [ pytest py mock glibcLocales iocapture ];
patches = [
# https://github.com/neithere/argh/issues/148
(fetchpatch {
name = "argh-0.26.2-fix-py3.9-msgs.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch?id=6f194f12a2e30aad7da347848f7b0187e188f983";
sha256 = "nBmhF2PXVeS7cBNujzip6Bb601LRHrjmhlGKFr/++Oo=";
})
];
checkPhase = ''
export LANG="en_US.UTF-8"
py.test
'';
checkInputs = [
iocapture
mock
pytestCheckHook
];
pythonImportsCheck = [ "argh" ];
meta = with lib; {
homepage = "https://github.com/neithere/argh/";
homepage = "https://github.com/neithere/argh";
description = "An unobtrusive argparse wrapper with natural syntax";
license = licenses.lgpl2;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ domenkozar ];
};
}

View File

@ -1,22 +1,60 @@
{ lib, buildPythonPackage, fetchFromGitHub
, setuptools, funcparserlib, pillow, webcolors, reportlab, docutils
{ lib
, buildPythonPackage
, docutils
, fetchFromGitHub
, funcparserlib
, nose
, pillow
, ephem
, pythonOlder
, pytestCheckHook
, reportlab
, setuptools
, webcolors
, python
}:
buildPythonPackage rec {
pname = "blockdiag";
version = "2.0.1";
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "blockdiag";
repo = "blockdiag";
rev = version;
sha256 = "1cvcl66kf4wdh2n4fdk37zk59lp58wd2fhf84n7pbn0lilyksk5x";
sha256 = "sha256-j8FoNUIJJOaahaol1MRPyY2jcPCEIlaAD4bmM2QKFFI=";
};
propagatedBuildInputs = [ setuptools funcparserlib pillow webcolors reportlab docutils ];
propagatedBuildInputs = [
setuptools
funcparserlib
pillow
webcolors
reportlab
docutils
];
# require network and fail
doCheck = false;
checkInputs = [
ephem
nose
pytestCheckHook
];
pytestFlagsArray = [
"src/blockdiag/tests/"
];
disabledTests = [
# Test require network access
"test_app_cleans_up_images"
];
pythonImportsCheck = [
"blockdiag"
];
meta = with lib; {
description = "Generate block-diagram image from spec-text file (similar to Graphviz)";

View File

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "fe25519";
version = "1.0.0";
version = "1.1.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-947DIkmg56mAegEgLKq8iqETWf2SCvtmeDZi5cxVSJA=";
sha256 = "sha256-3WFpbt4bA7zPlK+mp5DJXdgk44MBimCbpIMhRjZ5p0o=";
};
propagatedBuildInputs = [
@ -29,13 +29,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "fountains~=1.1.1" "fountains~=1.2" \
--replace "bitlist~=0.5.1" "bitlist>=0.5.1" \
--replace "parts~=1.1.2" "parts>=1.1.2"
'';
pythonImportsCheck = [
"fe25519"
];

View File

@ -7,6 +7,7 @@
buildPythonPackage rec {
pname = "fountains";
version = "1.2.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@ -17,15 +18,12 @@ buildPythonPackage rec {
bitlist
];
postPatch = ''
substituteInPlace setup.py \
--replace "bitlist~=0.5.1" "bitlist>=0.5.1"
'';
# Project has no test
# Module has no test
doCheck = false;
pythonImportsCheck = [ "fountains" ];
pythonImportsCheck = [
"fountains"
];
meta = with lib; {
description = "Python library for generating and embedding data for unit testing";

View File

@ -1,25 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, fetchpatch
, poetry-core
, python
, isPy3k
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "funcparserlib";
version = "0.3.6";
version = "1.0.0a0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "vlasovskikh";
repo = pname;
rev = version;
sha256 = "sha256-YfcboKjyc5ASzrp0duu2R6psf51MGZIeZ0owo5QNSnU=";
};
checkPhase = ''
${python.interpreter} -m unittest discover
'';
nativeBuildInputs = [
poetry-core
];
# Tests are Python 2.x only judging from SyntaxError
doCheck = !(isPy3k);
checkInputs = [
pytestCheckHook
];
patches = [
# Support for poetry-core, https://github.com/vlasovskikh/funcparserlib/pull/73
(fetchpatch {
name = "support-poetry-core.patch";
url = "https://github.com/vlasovskikh/funcparserlib/commit/61ed558fc146b7a30879919325dfa8aae77be556.patch";
sha256 = "sha256-tqdR3r4/t7RWBYZeAabaN7oYf6VxkVVz006XICX9rYI=";
})
];
pythonImportsCheck = [
"funcparserlib"
];
meta = with lib; {
description = "Recursive descent parsing library based on functional combinators";
@ -27,5 +49,4 @@ buildPythonPackage rec {
license = licenses.mit;
platforms = platforms.unix;
};
}

View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "ge25519";
version = "1.0.0";
version = "1.1.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-f7xvZ92zRO3GLSdfgEyhkWVwAFT2TvKHy6+iF+k43bI=";
sha256 = "sha256-0M9RF8tlEoLyduvY3RvltGAnsus3HF6FEy22b6w6aUs=";
};
propagatedBuildInputs = [
@ -31,12 +31,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "bitlist~=0.5.1" "bitlist>=0.5.1" \
--replace "parts~=1.1.2" "parts>=1.1.2"
'';
pythonImportsCheck = [
"ge25519"
];

View File

@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "0.0.17";
version = "0.6.1";
format = "setuptools";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-XUlg3zuLJwWJCi2qx1f8eBK3Li94QxXz82G0zEgUztc=";
sha256 = "sha256-s3XdbkngdHApV4uE/Qudrr9TFf6gUvNHJKM3RA4UeN0=";
};
propagatedBuildInputs = [
@ -27,7 +27,7 @@ buildPythonPackage rec {
voluptuous
];
# Project has no tests
# Module has no tests
doCheck = false;
pythonImportsCheck = [

View File

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, fetchFromGitHub
, pythonOlder
, setuptools-scm
, setuptools
, pytestCheckHook
@ -11,16 +11,31 @@
buildPythonPackage rec {
version = "3.13.1";
pname = "humanize";
disabled = isPy27; # setup.py no longer compatible
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "12f113f2e369dac7f35d3823f49262934f4a22a53a6d3d4c86b736f50db88c7b";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jmoiron";
repo = pname;
rev = version;
sha256 = "sha256-lgGBvYb3ciqETBOR31gxQVD7YyopTtmr++nCwvm63Zs=";
};
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ setuptools ];
checkInputs = [ pytestCheckHook freezegun ];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
setuptools
];
checkInputs = [
freezegun
pytestCheckHook
];
meta = with lib; {
description = "Python humanize utilities";

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.4.0";
version = "2.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0J3P3RawafVAfOUhK9qSz5K8y0goMqTjMh5PL60sqME=";
sha256 = "sha256-+kfIpmJ6Gnb33MZ7NZrE8oVSBbZLuRfIvfCbstxJFX0=";
};
checkInputs = [

View File

@ -5,6 +5,7 @@
, pytest
, pytest-cov
, nbval
, jupyter-packaging
, ipywidgets
, numpy
, six
@ -22,6 +23,12 @@ buildPythonPackage rec {
sha256 = "d0e4b58b59b508165e8562b8f5d1dbfcd739855847ec0477bd9185a5e9b7c5bc";
};
nativeBuildInputs = [
jupyter-packaging
];
setupPyBuildFlags = [ "--skip-npm" ];
propagatedBuildInputs = [
ipywidgets
numpy

View File

@ -1,22 +1,49 @@
{ lib, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
, blockdiag, setuptools
{ lib
, blockdiag
, fetchFromGitHub
, buildPythonPackage
, nose
, pytestCheckHook
, setuptools
, pythonOlder
}:
buildPythonPackage rec {
pname = "nwdiag";
version = "2.0.0";
format = "setuptools";
src = fetchurl {
url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz";
sha256 = "1qkl1lq7cblr6fra2rjw3zlcccragp8384hpm4n7dkc5c3yzmmsw";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "blockdiag";
repo = pname;
rev = version;
sha256 = "sha256-PWLFJhXQeuUQQpGkXN2pEJs/1WECpJpUqWbGH3150TI=";
};
buildInputs = [ pep8 nose unittest2 docutils ];
propagatedBuildInputs = [
blockdiag
setuptools
];
propagatedBuildInputs = [ blockdiag setuptools ];
checkInputs = [
nose
pytestCheckHook
];
# tests fail
doCheck = false;
pytestFlagsArray = [
"src/nwdiag/tests/"
];
disabledTests = [
# UnicodeEncodeError: 'latin-1' codec can't encode...
"test_setup_inline_svg_is_true_with_multibytes"
];
pythonImportsCheck = [
"nwdiag"
];
meta = with lib; {
description = "Generate network-diagram image from spec-text file (similar to Graphviz)";

View File

@ -11,13 +11,13 @@
let
pname = "pydicom";
version = "2.1.2";
version = "2.2.2";
src = fetchFromGitHub {
owner = "${pname}";
repo = "${pname}";
rev = "v${version}";
sha256 = "sha256-iExy+mUs1uqs/u9N6btlqyP6/TvoPVsuOuzs56zZAS8=";
sha256 = "sha256-p5hJAUsactv6UEvbVaF+zk4iapx98eYkC9Zo+lzFATA=";
};
# Pydicom needs pydicom-data to run some tests. If these files aren't downloaded
@ -34,9 +34,15 @@ buildPythonPackage {
inherit pname version src;
disabled = pythonOlder "3.6";
propagatedBuildInputs = [ numpy pillow setuptools ];
propagatedBuildInputs = [
numpy
pillow
setuptools
];
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
# Setting $HOME to prevent pytest to try to create a folder inside
# /homeless-shelter which is read-only.
@ -58,9 +64,13 @@ buildPythonPackage {
"test_time_check"
];
pythonImportsCheck = [
"pydicom"
];
meta = with lib; {
description = "Python package for working with DICOM files";
homepage = "https://pydicom.github.io";
description = "Pure-Python package for working with DICOM files";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};

View File

@ -6,17 +6,21 @@
, pyfakefs
, pytestCheckHook
, sqlalchemy
, pythonOlder
}:
buildPythonPackage rec {
pname = "pynetdicom";
version = "1.5.7";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pydicom";
repo = pname;
rev = "v${version}";
sha256 = "0wr6nh0xrhzwf05gnf3dwg5r3lhn9nfwch3l16zkbj6fli871brc";
sha256 = "sha256-Kfcfk76au2ymbX+nl0PhuuCd+t6dYRbTurGlW6msv3Y=";
};
propagatedBuildInputs = [
@ -33,6 +37,7 @@ buildPythonPackage rec {
# Some tests needs network capabilities
"test_str_types_empty"
"test_associate_reject"
"TestAEGoodAssociation"
"TestEchoSCP"
"TestEchoSCPCLI"
"TestFindSCP"
@ -50,7 +55,9 @@ buildPythonPackage rec {
"TestState"
];
pythonImportsCheck = [ "pynetdicom" ];
pythonImportsCheck = [
"pynetdicom"
];
meta = with lib; {
description = "Python implementation of the DICOM networking protocol";

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pytibber";
version = "0.21.0";
version = "0.21.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyTibber";
rev = version;
sha256 = "sha256-lUe79VHlK/2/1SZfC+Ha+27NUoIKoTlqn75XA/mPCNU=";
hash = "sha256-zgiUXGso3bQ3pCD7r+VYHGBIihPwSfHibS2OZvPUb3Q=";
};
propagatedBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "roombapy";
version = "1.6.4";
version = "1.6.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pschmitt";
repo = "roombapy";
rev = version;
sha256 = "sha256-EN+em+lULAUplXlhcU409ZVPk9BfMmD2oNwO0ETuqoA=";
sha256 = "sha256-Xjeh29U+FCzI5n/i5s6wC0B88Ktmb8pnNDdOzCiKWi4=";
};
nativeBuildInputs = [

View File

@ -1,25 +1,49 @@
{ lib, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils
{ lib
, blockdiag
, buildPythonPackage
, fetchFromGitHub
, nose
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "seqdiag";
version = "2.0.0";
disabled = isPy27;
version = "3.0.0";
format = "setuptools";
src = fetchurl {
url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz";
sha256 = "0k7j4f9j3d0325piwvbv90nfh0wzfk2n6s73s6h6nsxmqshcgswk";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "blockdiag";
repo = pname;
rev = version;
sha256 = "sha256-Dh9JMx50Nexi0q39rYr9MpkKmQRAfT7lzsNOXoTuphg=";
};
buildInputs = [ pep8 nose unittest2 docutils ];
propagatedBuildInputs = [
blockdiag
setuptools
];
propagatedBuildInputs = [ blockdiag ];
checkInputs = [
nose
pytestCheckHook
];
# Tests fail:
# ...
# ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/')
doCheck = false;
pytestFlagsArray = [
"src/seqdiag/tests/"
];
disabledTests = [
# UnicodeEncodeError: 'latin-1' codec can't encode...
"test_setup_inline_svg_is_true_with_multibytes"
];
pythonImportsCheck = [
"seqdiag"
];
meta = with lib; {
description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)";

View File

@ -4,25 +4,35 @@
, sphinx
, actdiag
, blockdiag
, pythonOlder
}:
buildPythonPackage rec {
pname = "sphinxcontrib-actdiag";
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-PFXUVP/Due/nwg8q2vAiGZuCVhLTLyAL6KSXqofg+B8=";
};
propagatedBuildInputs = [ sphinx actdiag blockdiag ];
propagatedBuildInputs = [
actdiag
blockdiag
sphinx
];
pythonImportsCheck = [ "sphinxcontrib.actdiag" ];
pythonImportsCheck = [
"sphinxcontrib.actdiag"
];
meta = with lib; {
description = "Sphinx actdiag extension";
homepage = "https://github.com/blockdiag/sphinxcontrib-actdiag";
maintainers = with maintainers; [ davidtwco ];
license = licenses.bsd2;
maintainers = with maintainers; [ davidtwco ];
};
}

View File

@ -1,28 +1,38 @@
{ lib
, blockdiag
, buildPythonPackage
, fetchPypi
, sphinx
, blockdiag
, nwdiag
, pythonOlder
, sphinx
}:
buildPythonPackage rec {
pname = "sphinxcontrib-nwdiag";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-bula1DutRv6NwfZRhciZfLHRZmXu42p+qvbeExN/+Fk=";
};
propagatedBuildInputs = [ sphinx blockdiag nwdiag ];
propagatedBuildInputs = [
blockdiag
nwdiag
sphinx
];
pythonImportsCheck = [ "sphinxcontrib.nwdiag" ];
pythonImportsCheck = [
"sphinxcontrib.nwdiag"
];
meta = with lib; {
description = "Sphinx nwdiag extension";
homepage = "https://github.com/blockdiag/sphinxcontrib-nwdiag";
maintainers = with maintainers; [ davidtwco ];
license = licenses.bsd2;
maintainers = with maintainers; [ davidtwco ];
};
}

View File

@ -1,28 +1,38 @@
{ lib
, blockdiag
, buildPythonPackage
, fetchPypi
, sphinx
, blockdiag
, pythonOlder
, seqdiag
, sphinx
}:
buildPythonPackage rec {
pname = "sphinxcontrib-seqdiag";
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-QH5IeXZz9x2Ujp/6BHFsrB2ZqeyPYW3jdk1C0DNBZXQ=";
};
propagatedBuildInputs = [ sphinx blockdiag seqdiag ];
propagatedBuildInputs = [
blockdiag
seqdiag
sphinx
];
pythonImportsCheck = [ "sphinxcontrib.seqdiag" ];
pythonImportsCheck = [
"sphinxcontrib.seqdiag"
];
meta = with lib; {
description = "Sphinx seqdiag extension";
homepage = "https://github.com/blockdiag/sphinxcontrib-seqdiag";
maintainers = with maintainers; [ davidtwco ];
license = licenses.bsd2;
maintainers = with maintainers; [ davidtwco ];
};
}

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "splinter";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "cobrateam";
repo = "splinter";
rev = version;
sha256 = "sha256-b6zncEAPtKgBPLFRsCSGeBqiD4A/mHEhjQaEIsefc28=";
hash = "sha256-7QhFz/qBh2ECyeyvjCyqOYy/YrUK7KVX13VC/gem5BQ=";
};
propagatedBuildInputs = [

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "teslajsonpy";
version = "1.4.1";
version = "1.4.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zabuldon";
repo = pname;
rev = "v${version}";
sha256 = "1hnlymdi27rjxaivn5csqrj9ahk86cwvbpvdl29v7qal0y2bc433";
sha256 = "sha256-oablQoumBiqDk7bz1BUpUWddxExoqOofrZzX7y618Hw=";
};
nativeBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "total-connect-client";
version = "2021.11.5";
version = "2021.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "craigjmidwinter";
repo = "total-connect-client";
rev = version;
sha256 = "sha256-6hyeU0jigQZsZtdb4E8/iD8YfQeNOKm6IK1CHBizZQs=";
hash = "sha256-cgs6wIMSO8t8CPn6aR35sNcgfDaXDyFBldNEBOr850s=";
};
propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "youless-api";
version = "0.15";
version = "0.16";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jongsoftdev";
repo = "youless-python-bridge";
rev = version;
sha256 = "sha256-77uQUAPDCFQiCpNAI0feOtHq82sE0n70IV1Njn/W29M=";
sha256 = "sha256-8pJeb3eWchMRrk8KLSI/EbHs1wQDqBoqlAQXm9ulyqs=";
};
propagatedBuildInputs = [

View File

@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.37.0";
version = "0.38.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
sha256 = "sha256-KdcRG1YKtvhcqq/FNiOVQeXlyYepvPjRL5EZJA8Axyk=";
sha256 = "sha256-8bJEH+m+83rkKdN5GjD4THs1CUy/wstoBFiXR7kHKtw=";
};
propagatedBuildInputs = [

View File

@ -8,21 +8,23 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-spellcheck";
version = "0.8.14";
version = "0.9.6";
src = fetchFromGitHub {
owner = "drahnr";
repo = pname;
rev = "v${version}";
sha256 = "11r4gzcsbqlflam2rdixc451qw69c46mkf7g0slq6f127is25fgz";
sha256 = "0brrpcnsphvl1qn8myrzan0k87ph629gcj6zd54ym9f67qg2nri1";
};
cargoSha256 = "1p4iirblk6idvfhn8954v8lbxlzj0gbd8fv4wq03hfrdqisjqcsn";
cargoSha256 = "0d0adpgf0j8xvw0dm3gcd6lnksn6p5rz3limc038fg8k84zf7cdb";
buildInputs = lib.optional stdenv.isDarwin Security;
LIBCLANG_PATH = "${libclang.lib}/lib";
preCheck = "HOME=$(mktemp -d)";
checkFlags = [
"--skip checker::hunspell::tests::hunspell_binding_is_sane"
];

View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "15.7";
version = "15.8";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
sha256 = "sha256-SrD2rwV/8RnE5HvYSN51fsjZ3lAJwmDiyr/ywDK1TT4=";
sha256 = "sha256-segJVGH5ngSEhk0EpLHPORTNck4tIDCxJh9Ri6sa2dE=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.12.5";
version = "2021.12.6";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

View File

@ -265,7 +265,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.12.5";
hassVersion = "2021.12.6";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -282,7 +282,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256:116qklmzvqh3hn3i6i7lvsnqydd2qclk612rwlxs3v56kzpks62n";
hash = "sha256:0n01cjbbyb1i63z8zxkjlwssqpv6y41jzs7b7jk78w3qnbg15bk3";
};
# leave this in, so users don't have to constantly update their downstream patch handling

View File

@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20211220.0";
version = "20211227.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-qhuTvHN0kjdPIIyfrtj+col1Ba3WSnypqVxGfia4dW4=";
sha256 = "sha256-HdjkquxQM3Vxl+avM0fGanUkCMoTlBHodXIfNhW2lC4=";
};
# there is nothing to strip in this package

View File

@ -20,7 +20,6 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
argcomplete
argh
azure-identity
azure-storage-blob
boto3

View File

@ -4,11 +4,11 @@ with python3Packages;
buildPythonApplication rec {
pname = "pirate-get";
version = "0.4.0";
version = "0.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "07s5ss9dxccx1mip7pyga1fagywkqchxmzz55ng47ac9053ffxkq";
sha256 = "0pr703fwinr2f4rba86zp57mpf5j2jgvp5n50rc5vy5g7yfwsddm";
};
propagatedBuildInputs = [ colorama veryprettytable pyperclip ];

View File

@ -1,27 +1,37 @@
{ lib, fetchFromGitHub, pythonPackages }:
{ lib
, python3
, fetchFromGitHub
}:
let
python3.pkgs.buildPythonApplication rec {
pname = "yrd";
version = "0.5.3";
sha256 = "1yx1hr8z4cvlb3yi24dwafs0nxq41k4q477jc9q24w61a0g662ps";
in pythonPackages.buildPythonApplication {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
inherit sha256;
sha256 = "1yx1hr8z4cvlb3yi24dwafs0nxq41k4q477jc9q24w61a0g662ps";
};
propagatedBuildInputs = with pythonPackages; [ argh ];
propagatedBuildInputs = with python3.pkgs; [
argh
requests
];
checkInputs = with python3.pkgs; [
nose
];
checkPhase = ''
nosetests -v yrd
'';
meta = with lib; {
description = "Cjdns swiss army knife";
maintainers = with maintainers; [ akru ];
platforms = platforms.linux;
license = licenses.gpl3;
license = licenses.gpl3Only;
homepage = "https://github.com/kpcyrd/yrd";
};
}

View File

@ -22,8 +22,6 @@ buildPythonApplication rec {
pname = "expliot";
version = "0.9.8";
disabled = python3.pythonOlder "3.7";
src = fetchFromGitLab {
owner = "expliot_framework";
repo = pname;
@ -50,10 +48,18 @@ buildPythonApplication rec {
zeroconf
];
postPatch = ''
# https://gitlab.com/expliot_framework/expliot/-/merge_requests/113
substituteInPlace setup.py \
--replace "pynetdicom>=1.5.1,<2" "pynetdicom>=2,<3"
'';
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "expliot" ];
pythonImportsCheck = [
"expliot"
];
meta = with lib; {
description = "IoT security testing and exploitation framework";

View File

@ -5,13 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "wapiti";
version = "3.0.7";
version = "3.0.9";
format = "setuptools";
src = fetchFromGitHub {
owner = "wapiti-scanner";
repo = pname;
rev = version;
sha256 = "0kya9a2zs1c518z4p34pfjx2sms6843gh3c9qc9zvk4lr4g7hw3x";
sha256 = "sha256-olqPM8EQ8LxQQM7kqcjbT9RMdBeYdhfn6Qp6BUu8K5Q=";
};
nativeBuildInputs = with python3.pkgs; [
@ -22,17 +23,20 @@ python3.pkgs.buildPythonApplication rec {
aiocache
aiosqlite
beautifulsoup4
brotli
browser-cookie3
cryptography
dnspython
httpx
httpx-ntlm
httpx-socks
humanize
loguru
Mako
markupsafe
pysocks
six
sslyze
sqlalchemy
tld
yaswfp
@ -49,16 +53,8 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
# Ignore pinned versions
substituteInPlace setup.py \
--replace "httpx-socks[asyncio] == 0.5.1" "httpx-socks[asyncio]" \
--replace "markupsafe==1.1.1" "markupsafe" \
--replace "importlib_metadata==3.7.2" "importlib_metadata" \
--replace "browser-cookie3==0.11.4" "browser-cookie3" \
--replace "cryptography==3.3.2" "cryptography" \
--replace "httpx[brotli]==0.20.0" "httpx" \
--replace "sqlalchemy>=1.4.26" "sqlalchemy" \
--replace "aiocache==0.11.1" "aiocache" \
--replace "aiosqlite==0.17.0" "aiosqlite" \
--replace "dnspython==2.1.0" "dnspython"
--replace "httpx-socks[asyncio] == 0.6.0" "httpx-socks[asyncio]"
sed -i -e "s/==[0-9.]*//" setup.py
substituteInPlace setup.cfg \
--replace " --cov --cov-report=xml" ""
'';
@ -103,6 +99,7 @@ python3.pkgs.buildPythonApplication rec {
"test_request_object"
"test_script"
"test_ssrf"
"test_merge_with_and_without_redirection"
"test_tag_name_escape"
"test_timeout"
"test_title_false_positive"
@ -121,7 +118,7 @@ python3.pkgs.buildPythonApplication rec {
# Requires a PHP installation
"test_timesql"
"test_cookies"
# E TypeError: Expected bytes or bytes-like object got: <class 'str'>
# TypeError: Expected bytes or bytes-like object got: <class 'str'>
"test_persister_upload"
];

View File

@ -1917,6 +1917,10 @@ with pkgs;
passExtensions = recurseIntoAttrs pass.extensions;
inherd-quake = callPackage ../applications/misc/inherd-quake {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
xjadeo = callPackage ../tools/video/xjadeo { };
asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { };
@ -6930,6 +6934,8 @@ with pkgs;
kubepug = callPackage ../development/tools/kubepug { };
kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { };
kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
peruse = libsForQt5.callPackage ../tools/misc/peruse { };

View File

@ -7845,7 +7845,7 @@ in {
python-manilaclient = callPackage ../development/python-modules/python-manilaclient { };
python-mapnik = let
boost = pkgs.boost.override {
boost = pkgs.boost175.override {
enablePython = true;
inherit python;
};