public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-19 10:39:54 -07:00
parent 7000ae2b9a b73f621c25
commit c1f8a15dac
126 changed files with 2445 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/brother/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "brother";
version = "1.0.1";
version = "1.0.2";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
sha256 = "sha256-Cfut6Y4Hln32g4V13xbOo5JdjPv2cH6FCDqvRRyijIA=";
sha256 = "sha256-xs/GIsJUuKKbDotV1BeT/ng86UVkNsH48uHR4i3vqow=";
};
nativeBuildInputs = [
pkgs/development/python-modules/clickhouse-driver/default.nix
+31 -5
View File
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, setuptools
, pytz
, tzlocal
@@ -10,15 +10,20 @@
, freezegun
, mock
, nose
, pytestCheckHook
, pytest-xdist
}:
buildPythonPackage rec {
pname = "clickhouse-driver";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "62d37f93872d5a13eb6b0d52bab2b593ed0e14cf9200949aa2d02f9801064c0f";
# pypi source doesn't contain tests
src = fetchFromGitHub {
owner = "mymarilyn";
repo = "clickhouse-driver";
rev = "96b7ba448c63ca2670cc9aa70d4a0e08826fb650";
sha256 = "sha256-HFKUxJOlBCVlu7Ia8heGpwX6+HdKuwSy92s3v+GKGwE=";
};
propagatedBuildInputs = [
@@ -34,9 +39,30 @@ buildPythonPackage rec {
freezegun
mock
nose
pytest-xdist
pytestCheckHook
];
doCheck = true;
postPatch = ''
substituteInPlace setup.py \
--replace "lz4<=3.0.1" "lz4<=4"
'';
# remove source to prevent pytest testing source instead of the build artifacts
# (the source doesn't contain the extension modules)
preCheck = ''
rm -rf clickhouse_driver
'';
# some test in test_buffered_reader.py doesn't seem to return
disabledTestPaths = [ "tests/test_buffered_reader.py" ];
pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" ];
# most tests require `clickhouse`
# TODO: enable tests after `clickhouse` unbroken
doCheck = false;
pythonImportsCheck = [ "clickhouse_driver" ];
meta = with lib; {
pkgs/development/python-modules/flask-appbuilder/default.nix
+4 -4
View File
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, apispec
, colorama
, click
@@ -27,15 +26,16 @@
buildPythonPackage rec {
pname = "flask-appbuilder";
version = "3.2.3";
version = "3.3.0";
src = fetchPypi {
pname = "Flask-AppBuilder";
inherit version;
sha256 = "sha256-+ZYrn2LnVORyYsnZtsH3JX+4XbGgAZZ/Eh6O5gUP+y4=";
sha256 = "00dsfv1apl6483wy20aj91f9h5ak2casbx5vcajv2nd3i7c7v8gx";
};
patches = [
# https://github.com/dpgaspar/Flask-AppBuilder/pull/1610
(fetchpatch {
name = "flask_jwt_extended-and-pyjwt-patch";
url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch";
@@ -75,7 +75,7 @@ buildPythonPackage rec {
--replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy >=0.22.0, <0.25.0"
'';
# majority of tests require network access or mongo
# Majority of tests require network access or mongo
doCheck = false;
pythonImportsCheck = [ "flask_appbuilder" ];
pkgs/development/python-modules/karton-asciimagic/default.nix
+2 -7
View File
@@ -7,24 +7,19 @@
buildPythonPackage rec {
pname = "karton-asciimagic";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "0yvd0plpwy5qkd2jljpd6wm6dlj2g8csvj1q2md23vsgx7h7v2vm";
sha256 = "0d15fhb3y0jpwdfm4y11i6pmfa9szr943cm6slvf0ir31f9nznyz";
};
propagatedBuildInputs = [
karton-core
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "karton.core==4.0.5" "karton-core"
'';
checkPhase = ''
runHook preCheck
${python.interpreter} -m unittest discover
pkgs/development/python-modules/karton-classifier/default.nix
+2 -3
View File
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "karton-classifier";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "05pxv0smrzgmljykc6yx0rx8b85ck7fa09xjkjw0dd7lb6bb19a6";
sha256 = "0s09mzsw546klnvm59wzj9vdwd2hyzgxvapi20k86q3prs9ncds6";
};
propagatedBuildInputs = [
@@ -27,7 +27,6 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "chardet==3.0.4" "chardet" \
--replace "karton-core==4.0.4" "karton-core" \
--replace "python-magic==0.4.18" "python-magic"
'';
pkgs/development/python-modules/karton-config-extractor/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "karton-config-extractor";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vijyqki2x813H2xbmz2JIXlh87J5l6NFoZcOu8xi61o=";
sha256 = "1kq0gbfz9y0n0bcblyrmwv4la3lcf86lf80794sdvyvn49g0brny";
};
propagatedBuildInputs = [
pkgs/development/python-modules/karton-dashboard/default.nix
+3 -4
View File
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "karton-dashboard";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "101qmx6nmiim0vrz2ldk973ns498hnxla1xy7nys9kh9wijg4msk";
sha256 = "0qygv9lkd1jad5b4l0zz6hsi7m8q0fmpwaa6hpp7p9x6ql7gnyl8";
};
propagatedBuildInputs = [
@@ -27,8 +27,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "Flask==1.1.1" "Flask" \
--replace "karton-core==4.1.0" "karton-core"
--replace "Flask==1.1.1" "Flask"
'';
# Project has no tests. pythonImportsCheck requires MinIO configuration
pkgs/development/python-modules/karton-mwdb-reporter/default.nix
+3 -4
View File
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "karton-mwdb-reporter";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "0ks8jrc4v87q6zhwqg40w6xv2wfkzslmnfmsmmkfjj8mak8nk70f";
sha256 = "0jrn5c83nhcjny4bc879wrsgcr7mbazm51jzdkxmxyqf543cc841";
};
propagatedBuildInputs = [
@@ -23,8 +23,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "karton-core==4.0.4" "karton-core" \
--replace "mwdblib==3.3.1" "mwdblib"
--replace "mwdblib==3.4.0" "mwdblib"
'';
# Project has no tests
pkgs/development/python-modules/pyflume/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyflume";
version = "0.6.4";
version = "0.7.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ChrisMandich";
repo = "PyFlume";
rev = "v${version}";
sha256 = "1dm560hh6fl1waiwsq8m31apmvvwhc3y95bfdb7449bs8k96dmxq";
sha256 = "129sz33a270v120bzl9l98nmvdzn7ns4cf9w2v18lmzlldbyz2vn";
};
prePatch = ''
pkgs/development/python-modules/pysonos/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pysonos";
version = "0.0.46";
version = "0.0.49";
disabled = !isPy3k;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "amelchio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5vQBSKDgzwdWkyGduq2cWa7Eq5l01gbs236H2Syc/Dc=";
sha256 = "sha256-f8MBf2E7kHzvdt7oBwdJZ91jlU6I5np1FhOmxgxbqYw=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pythonnet/default.nix
+34 -28
View File
@@ -2,8 +2,7 @@
, fetchPypi
, fetchNuGet
, buildPythonPackage
, python
, pytest
, pytestCheckHook
, pycparser
, psutil
, pkg-config
@@ -15,29 +14,36 @@
let
UnmanagedExports127 = fetchNuGet {
baseName = "UnmanagedExports";
version = "1.2.7";
sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf";
outputFiles = [ "*" ];
};
NUnit371 = fetchNuGet {
baseName = "NUnit";
version = "3.7.1";
sha256 = "1yc6dwaam4w2ss1193v735nnl79id78yswmpvmjr1w4bgcbdza4l";
outputFiles = [ "*" ];
};
dotnetPkgs = [
(fetchNuGet {
baseName = "UnmanagedExports";
version = "1.2.7";
sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf";
outputFiles = [ "*" ];
})
(fetchNuGet {
baseName = "NUnit";
version = "3.12.0";
sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2";
outputFiles = [ "*" ];
})
(fetchNuGet {
baseName = "System.ValueTuple";
version = "4.5.0";
sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy";
outputFiles = [ "*" ];
})
];
in
buildPythonPackage rec {
pname = "pythonnet";
version = "2.4.0";
version = "2.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "1ach9jic7a9rd3vmc4bphkr9fq01a0qk81f8a7gr9npwzmkqx8x3";
sha256 = "1qzdc6jd7i9j7p6bcihnr98y005gv1358xqdr1plpbpnl6078a5p";
};
postPatch = ''
@@ -50,7 +56,6 @@ buildPythonPackage rec {
'';
nativeBuildInputs = [
pytest
pycparser
pkg-config
@@ -59,13 +64,15 @@ buildPythonPackage rec {
mono
NUnit371
UnmanagedExports127
];
] ++ dotnetPkgs;
buildInputs = [
glib
mono
];
checkInputs = [
pytestCheckHook
psutil # needed for memory leak tests
];
@@ -73,22 +80,21 @@ buildPythonPackage rec {
rm -rf packages
mkdir packages
ln -s ${NUnit371}/lib/dotnet/NUnit/ packages/NUnit.3.7.1
ln -s ${UnmanagedExports127}/lib/dotnet/NUnit/ packages/UnmanagedExports.1.2.7
${builtins.concatStringsSep "\n" (
builtins.map (
x: ''ln -s ${x}/lib/dotnet/${x.baseName} ./packages/${x.baseName}.${x.version}''
) dotnetPkgs)}
# Setting TERM=xterm fixes an issue with terminfo in mono: System.Exception: Magic number is wrong: 542
export TERM=xterm
'';
checkPhase = ''
${python.interpreter} -m pytest
'';
meta = with lib; {
description = ".Net and Mono integration for Python";
homepage = "https://pythonnet.github.io";
license = licenses.mit;
# <https://github.com/pythonnet/pythonnet/issues/898>
badPlatforms = [ "aarch64-linux" ];
maintainers = with maintainers; [ jraygauthier ];
broken = true;
};
}
pkgs/development/python-modules/requests-http-signature/default.nix
+20 -8
View File
@@ -1,28 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, cryptography
, python
, requests
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "requests-http-signature";
version = "0.1.0";
version = "0.2.0";
# .pem files for tests aren't present on PyPI
src = fetchFromGitHub {
owner = "pyauth";
repo = pname;
rev = "v${version}";
sha256 = "0y96wsbci296m1rcxx0ybx8r44rdvyb59p1jl27p7rgz7isr3kx1";
sha256 = "1jsplqrxadjsc86f0kb6dgpblgwplxrpi0ql1a714w8pbbz4z3h7";
};
propagatedBuildInputs = [ requests cryptography ];
propagatedBuildInputs = [
cryptography
requests
];
checkPhase = ''
${python.interpreter} test/test.py
'';
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "test/test.py" ];
disabledTests = [
# Test require network access
"test_readme_example"
];
pythonImportsCheck = [ "requests_http_signature" ];
meta = with lib; {
description = "A Requests auth module for HTTP Signature";
pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, sphinx
, actdiag
, blockdiag
}:
buildPythonPackage rec {
pname = "sphinxcontrib-actdiag";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-TtuFZOLkig4MULLndDQlrTTx8RiGw34MsjmXoPladMY=";
};
propagatedBuildInputs = [ sphinx actdiag blockdiag ];
pythonImportsCheck = [ "sphinxcontrib.actdiag" ];
meta = with lib; {
description = "Sphinx actdiag extension";
homepage = "https://github.com/blockdiag/sphinxcontrib-actdiag";
maintainers = with maintainers; [ davidtwco ];
license = licenses.bsd2;
};
}
pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, sphinx
, blockdiag
, nwdiag
}:
buildPythonPackage rec {
pname = "sphinxcontrib-nwdiag";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-bula1DutRv6NwfZRhciZfLHRZmXu42p+qvbeExN/+Fk=";
};
propagatedBuildInputs = [ sphinx blockdiag 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;
};
}
pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, sphinx
, blockdiag
, seqdiag
}:
buildPythonPackage rec {
pname = "sphinxcontrib-seqdiag";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-THJ1ra/W2X/lQaDjGbL27VMn0lWPJApwgKMrPhL0JY0=";
};
propagatedBuildInputs = [ sphinx blockdiag 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;
};
}
pkgs/development/python-modules/stem/default.nix
+2
View File
@@ -12,6 +12,8 @@ buildPythonPackage rec {
postPatch = ''
rm test/unit/installation.py
sed -i "/test.unit.installation/d" test/settings.cfg
# https://github.com/torproject/stem/issues/56
sed -i '/MOCK_VERSION/d' run_tests.py
'';
checkInputs = [ mock ];
pkgs/development/python-modules/zeroconf/default.nix
+2 -2
View File
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.30.0";
version = "0.31.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-elpjZq4FpI2wTf1ciILumKE/LQ4fxtCaXxvQo9HRCcc=";
sha256 = "sha256-U6GAJIRxxvgb0f/8vOA+2T19jq8QkFyRIaweqZbRmEQ=";
};
propagatedBuildInputs = [ ifaddr ];