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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-16 18:32:44 +00:00
committed by GitHub
parent 21541fc97c 8c6d819143
commit 6cdac75d25
77 changed files with 796 additions and 1799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/awkward/default.nix
+2 -2
View File
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "awkward";
version = "1.2.2";
version = "1.2.3";
src = fetchPypi {
inherit pname version;
sha256 = "89f126a072d3a6eee091e1afeed87e0b2ed3c34ed31a1814062174de3cab8d9b";
sha256 = "7d727542927a926f488fa62d04e2c5728c72660f17f822e627f349285f295063";
};
nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/enaml/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
, ply
, kiwisolver
, qtpy
, sip
, sip_4
, cppy
, bytecode
}:
@@ -44,7 +44,7 @@ buildPythonPackage rec {
ply
kiwisolver
qtpy
sip
sip_4
cppy
bytecode
];
pkgs/development/python-modules/flask-appbuilder/default.nix
+18 -10
View File
@@ -6,6 +6,7 @@
, colorama
, click
, email_validator
, fetchpatch
, flask
, flask-babel
, flask_login
@@ -20,21 +21,27 @@
, python-dateutil
, prison
, pyjwt
, pyyaml
, sqlalchemy-utils
}:
buildPythonPackage rec {
pname = "flask-appbuilder";
version = "3.1.1";
version = "3.2.3";
src = fetchPypi {
pname = "Flask-AppBuilder";
inherit version;
sha256 = "076b020b0ba125339a2e710e74eab52648cde2b18599f7cb0fa1eada9bbb648c";
sha256 = "sha256-+ZYrn2LnVORyYsnZtsH3JX+4XbGgAZZ/Eh6O5gUP+y4=";
};
checkInputs = [
nose
patches = [
(fetchpatch {
name = "flask_jwt_extended-and-pyjwt-patch";
url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch";
sha256 = "sha256-ZpY8+2Hoz3z01GVtw2OIbQcsmAwa7iwilFWzgcGhY1w=";
includes = [ "flask_appbuilder/security/manager.py" "setup.py" ];
})
];
propagatedBuildInputs = [
@@ -56,22 +63,23 @@ buildPythonPackage rec {
python-dateutil
prison
pyjwt
pyyaml
sqlalchemy-utils
];
postPatch = ''
substituteInPlace setup.py \
--replace "apispec[yaml]>=3.3, <4" "apispec" \
--replace "Flask-Login>=0.3, <0.5" "Flask-Login" \
--replace "Flask-Babel>=1, <2" "Flask-Babel" \
--replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \
--replace "prison>=0.1.3, <1.0.0" "prison"
--replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3, <5" \
--replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3, <0.6" \
--replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \
--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
doCheck = false;
pythonImportsCheck = [ "flask_appbuilder" ];
meta = with lib; {
description = "Simple and rapid application development framework, built on top of Flask";
homepage = "https://github.com/dpgaspar/flask-appbuilder/";
pkgs/development/python-modules/libarcus/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, python, fetchFromGitHub
, cmake, sip, protobuf, pythonOlder }:
, cmake, sip_4, protobuf, pythonOlder }:
buildPythonPackage rec {
pname = "libarcus";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
disabled = pythonOlder "3.4.0";
propagatedBuildInputs = [ sip ];
propagatedBuildInputs = [ sip_4 ];
nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ];
pkgs/development/python-modules/libsavitar/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }:
{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip_4 }:
buildPythonPackage rec {
pname = "libsavitar";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ sip ];
propagatedBuildInputs = [ sip_4 ];
disabled = pythonOlder "3.4.0";
pkgs/development/python-modules/poppler-qt5/default.nix
+3 -3
View File
@@ -4,7 +4,7 @@
, isPy3k
, fetchPypi
, pythonPackages
, sip_5
, sip
, qtbase
, qmake
, pyqt5
@@ -34,7 +34,7 @@ buildPythonPackage rec {
];
buildInputs = [ qtbase.dev poppler pyqt-builder ];
nativeBuildInputs = [ pkg-config qmake sip_5 ];
nativeBuildInputs = [ pkg-config qmake sip ];
propagatedBuildInputs = [ pyqt5.dev ];
format = "pyproject";
@@ -46,7 +46,7 @@ buildPythonPackage rec {
[tool.sip.bindings.Poppler-Qt5]
include-dirs = ["${poppler.dev}/include/poppler"]
tags = ["${sip_5.platform_tag}"]
tags = ["${sip.platform_tag}"]
EOF
'';
pkgs/development/python-modules/prison/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "prison";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "betodealmeida";
repo = "python-rison";
rev = version;
sha256 = "14vb468iznf9416z993bbqihywp9ibyslw5vp67wfr200zyxjwak";
sha256 = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pykdl/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip }:
{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip_4 }:
toPythonModule (stdenv.mkDerivation {
pname = "pykdl";
@@ -18,7 +18,7 @@ toPythonModule (stdenv.mkDerivation {
nativeBuildInputs = [ cmake ];
buildInputs = [ orocos-kdl ];
propagatedBuildInputs = [ python sip ];
propagatedBuildInputs = [ python sip_4 ];
meta = with lib; {
description = "Kinematics and Dynamics Library (Python bindings)";
pkgs/development/python-modules/pynest2d/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake
, pythonOlder, libnest2d, sip, clipper }:
, pythonOlder, libnest2d, sip_4, clipper }:
buildPythonPackage rec {
version = "4.8.0";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp";
};
propagatedBuildInputs = [ libnest2d sip clipper ];
propagatedBuildInputs = [ libnest2d sip_4 clipper ];
nativeBuildInputs = [ cmake ];
CLIPPER_PATH = "${clipper.out}";
pkgs/development/python-modules/pyqt-builder/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, packaging, sip_5 }:
{ lib, fetchPypi, buildPythonPackage, packaging, sip }:
buildPythonPackage rec {
pname = "pyqt-builder";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v";
};
propagatedBuildInputs = [ packaging sip_5 ];
propagatedBuildInputs = [ packaging sip ];
pythonImportsCheck = [ "pyqtbuild" ];
pkgs/development/python-modules/pyqt/4.x.nix
+4 -4
View File
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }:
{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip_4, qt4, pkg-config, lndir, dbus, makeWrapper }:
buildPythonPackage rec {
pname = "PyQt-x11-gpl";
version = "4.12";
version = "4.12.3";
format = "other";
src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz";
sha256 = "1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w";
sha256 = "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0";
};
postPatch = ''
@@ -45,7 +45,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ];
buildInputs = [ qt4 dbus ];
propagatedBuildInputs = [ sip ];
propagatedBuildInputs = [ sip_4 ];
postInstall = ''
for i in $out/bin/*; do
pkgs/development/python-modules/pyqt/5.x.nix
+2 -2
View File
@@ -16,9 +16,9 @@ let
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
sip = if isPy3k then
pythonPackages.sip_5
pythonPackages.sip
else
(pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
(pythonPackages.sip_4.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
# If we install sip in another folder, then we need to create a __init__.py as well
# if we want to be able to import it with Python 2.
# Python 3 could rely on it being an implicit namespace package, however,
pkgs/development/python-modules/python-engineio/3.nix
+2
View File
@@ -13,6 +13,7 @@
, websocket_client
, websockets
, pytestCheckHook
, pythonAtLeast
}:
buildPythonPackage rec {
@@ -63,5 +64,6 @@ buildPythonPackage rec {
homepage = "https://github.com/miguelgrinberg/python-engineio/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ graham33 ];
broken = stdenv.isDarwin && (pythonAtLeast "3.9"); # See https://github.com/miguelgrinberg/python-socketio/issues/567
};
}
pkgs/development/python-modules/qscintilla-qt5/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@ buildPythonPackage {
src = qscintilla.src;
format = "other";
nativeBuildInputs = [ sip qtbase ];
nativeBuildInputs = [ sip_4 qtbase ];
buildInputs = [ qscintilla ];
propagatedBuildInputs = [ pyqt5 ];
@@ -40,7 +40,7 @@ buildPythonPackage {
--qsci-libdir=${qscintilla}/lib \
--pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \
--qsci-sipdir=$out/share/sip/PyQt5 \
--sip-incdir=${sip}/include
--sip-incdir=${sip_4}/include
'';
meta = with lib; {
pkgs/development/python-modules/random2/default.nix
+9
View File
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, isPyPy
, fetchpatch
}:
buildPythonPackage rec {
@@ -15,6 +16,14 @@ buildPythonPackage rec {
sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007";
};
patches = [
# Patch test suite for python >= 3.9
(fetchpatch {
url = "https://github.com/strichter/random2/pull/3/commits/1bac6355d9c65de847cc445d782c466778b94fbd.patch";
sha256 = "064137pg1ilv3f9r10123lqbqz45070jca8pjjyp6gpfd0yk74pi";
})
];
meta = with lib; {
homepage = "http://pypi.python.org/pypi/random2";
description = "Python 3 compatible Python 2 `random` Module";
pkgs/development/python-modules/sip/4.x.nix
+44
View File
@@ -0,0 +1,44 @@
{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }:
buildPythonPackage rec {
pname = sip-module;
version = "4.19.25";
format = "other";
disabled = isPyPy;
src = fetchurl {
url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz";
sha256 = "04a23cgsnx150xq86w1z44b6vr2zyazysy9mqax0fy346zlr77dk";
};
configurePhase = ''
${python.executable} ./configure.py \
--sip-module ${sip-module} \
-d $out/${python.sitePackages} \
-b $out/bin -e $out/include
'';
enableParallelBuilding = true;
installCheckPhase = let
modules = [
sip-module
"sipconfig"
];
imports = lib.concatMapStrings (module: "import ${module};") modules;
in ''
echo "Checking whether modules can be imported..."
PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}"
'';
doCheck = true;
meta = with lib; {
description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lovek323 sander ];
platforms = platforms.all;
};
}
pkgs/development/python-modules/sip/5.x.nix
-40
View File
@@ -1,40 +0,0 @@
{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, toml }:
buildPythonPackage rec {
pname = "sip";
version = "5.5.0";
src = fetchPypi {
pname = "sip";
inherit version;
sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx";
};
propagatedBuildInputs = [ packaging toml ];
# There aren't tests
doCheck = false;
pythonImportsCheck = [ "sipbuild" ];
# FIXME: Why isn't this detected automatically?
# Needs to be specified in pyproject.toml, e.g.:
# [tool.sip.bindings.MODULE]
# tags = [PLATFORM_TAG]
platform_tag =
if stdenv.targetPlatform.isLinux then
"WS_X11"
else if stdenv.targetPlatform.isDarwin then
"WS_MACX"
else if stdenv.targetPlatform.isWindows then
"WS_WIN"
else
throw "unsupported platform";
meta = with lib; {
description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ eduardosm ];
};
}
pkgs/development/python-modules/sip/default.nix
+26 -30
View File
@@ -1,44 +1,40 @@
{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }:
{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, toml }:
buildPythonPackage rec {
pname = sip-module;
version = "4.19.24";
format = "other";
pname = "sip";
version = "5.5.0";
disabled = isPyPy;
src = fetchurl {
url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz";
sha256 = "1ra15vb5i9gkg2vdvh16cq9x2mmzw1yi3xphxs8q34q1pf83gkgd";
src = fetchPypi {
pname = "sip";
inherit version;
sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx";
};
configurePhase = ''
${python.executable} ./configure.py \
--sip-module ${sip-module} \
-d $out/${python.sitePackages} \
-b $out/bin -e $out/include
'';
propagatedBuildInputs = [ packaging toml ];
enableParallelBuilding = true;
# There aren't tests
doCheck = false;
installCheckPhase = let
modules = [
sip-module
"sipconfig"
];
imports = lib.concatMapStrings (module: "import ${module};") modules;
in ''
echo "Checking whether modules can be imported..."
PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}"
'';
pythonImportsCheck = [ "sipbuild" ];
doCheck = true;
# FIXME: Why isn't this detected automatically?
# Needs to be specified in pyproject.toml, e.g.:
# [tool.sip.bindings.MODULE]
# tags = [PLATFORM_TAG]
platform_tag =
if stdenv.targetPlatform.isLinux then
"WS_X11"
else if stdenv.targetPlatform.isDarwin then
"WS_MACX"
else if stdenv.targetPlatform.isWindows then
"WS_WIN"
else
throw "unsupported platform";
meta = with lib; {
description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lovek323 sander ];
platforms = platforms.all;
license = licenses.gpl3Only;
maintainers = with maintainers; [ eduardosm ];
};
}