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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-16 18:32:41 +00:00 committed by GitHub
parent 684991c696 805825cc52
commit 8c6d819143
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 156 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View File

@ -1394,12 +1394,6 @@
githubId = 302429; githubId = 302429;
name = "Marton Boros"; name = "Marton Boros";
}; };
branwright1 = {
email = "branwright@protonmail.com";
github = "branwright1";
githubId = 71175207;
name = "Brandon Wright";
};
bramd = { bramd = {
email = "bram@bramd.nl"; email = "bram@bramd.nl";
github = "bramd"; github = "bramd";
@ -4765,12 +4759,6 @@
githubId = 1102396; githubId = 1102396;
name = "Jussi Maki"; name = "Jussi Maki";
}; };
joaquinito2051 = {
email = "joaquinito2051@gmail.com";
github = "heroku-miraheze";
githubId = 61781343;
name = "Joaquín Rufo Gutierrez";
};
jobojeha = { jobojeha = {
email = "jobojeha@jeppener.de"; email = "jobojeha@jeppener.de";
github = "jobojeha"; github = "jobojeha";

2
pkgs/applications/gis/qgis/unwrapped.nix
View File

@ -19,7 +19,7 @@ let
urllib3 urllib3
pygments pygments
pyqt5 pyqt5
sip sip_4
owslib owslib
six six
]; ];

3
pkgs/applications/graphics/jpeg-archive/default.nix
View File

@ -22,9 +22,10 @@ stdenv.mkDerivation {
''; '';
makeFlags = [ makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"PREFIX=$(out)" "PREFIX=$(out)"
"MOZJPEG_PREFIX=${mozjpeg}" "MOZJPEG_PREFIX=${mozjpeg}"
"LIBJPEG=${mozjpeg}/lib/libjpeg.so" "LIBJPEG=${mozjpeg}/lib/libjpeg${stdenv.hostPlatform.extensions.sharedLibrary}"
]; ];
postInstall = '' postInstall = ''

2
pkgs/applications/graphics/krita/default.nix
View File

@ -17,7 +17,7 @@ mkDerivation rec {
sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl"; sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
buildInputs = [ buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons

4
pkgs/applications/misc/calibre/default.nix
View File

@ -45,7 +45,7 @@ mkDerivation rec {
prePatch = '' prePatch = ''
sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \ sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \
setup/build.py setup/build.py
sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip_5.platform_tag}\"]/g" \ sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \
setup/build.py setup/build.py
# Remove unneeded files and libs # Remove unneeded files and libs
@ -95,7 +95,7 @@ mkDerivation rec {
pyqtwebengine pyqtwebengine
python python
regex regex
sip_5 sip
zeroconf zeroconf
# the following are distributed with calibre, but we use upstream instead # the following are distributed with calibre, but we use upstream instead
odfpy odfpy

4
pkgs/applications/misc/cura/lulzbot/default.nix
View File

@ -10,10 +10,10 @@ let
}; };
libarcusLulzbot = callPackage ./libarcus.nix { libarcusLulzbot = callPackage ./libarcus.nix {
inherit (python3.pkgs) buildPythonPackage sip pythonOlder; inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
}; };
libsavitarLulzbot = callPackage ./libsavitar.nix { libsavitarLulzbot = callPackage ./libsavitar.nix {
inherit (python3.pkgs) buildPythonPackage sip pythonOlder; inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
}; };
inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder; inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;

4
pkgs/applications/misc/cura/lulzbot/libarcus.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: { lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip_4, protobuf, pythonOlder }:
buildPythonPackage { buildPythonPackage {
pname = "libarcus"; pname = "libarcus";
@ -13,7 +13,7 @@ buildPythonPackage {
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ]; buildInputs = [ protobuf ];

4
pkgs/applications/misc/cura/lulzbot/libsavitar.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: { lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip_4 }:
buildPythonPackage { buildPythonPackage {
pname = "libsavitar-lulzbot"; pname = "libsavitar-lulzbot";
@ -19,7 +19,7 @@ buildPythonPackage {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";

4
pkgs/applications/misc/openlp/lib.nix
View File

@ -5,7 +5,7 @@
# python deps # python deps
, python, buildPythonPackage , python, buildPythonPackage
, alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant , alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant
, pyqt5_with_qtwebkit, pyxdg, sip, sqlalchemy, sqlalchemy_migrate , pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy_migrate
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -41,7 +41,7 @@ buildPythonPackage rec {
pyenchant pyenchant
pyqt5_with_qtwebkit pyqt5_with_qtwebkit
pyxdg pyxdg
sip sip_4
sqlalchemy sqlalchemy
sqlalchemy_migrate sqlalchemy_migrate
]; ];

2
pkgs/applications/networking/gns3/gui.nix
View File

@ -24,7 +24,7 @@ in python.pkgs.buildPythonPackage rec {
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python.pkgs; [
sentry-sdk psutil jsonschema # tox for check sentry-sdk psutil jsonschema # tox for check
# Runtime dependencies # Runtime dependencies
sip (pyqt5.override { withWebSockets = true; }) distro setuptools sip_4 (pyqt5.override { withWebSockets = true; }) distro setuptools
]; ];
doCheck = false; # Failing doCheck = false; # Failing

2
pkgs/applications/science/machine-learning/labelimg/default.nix
View File

@ -15,7 +15,7 @@
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
pyqt5 pyqt5
lxml lxml
sip sip_4
]; ];
preBuild = '' preBuild = ''
make qt5py3 make qt5py3

5
pkgs/applications/science/math/eukleides/default.nix
View File

@ -9,6 +9,9 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
}; };
# use $CC instead of hardcoded gcc
patches = [ ./use-CC.patch ];
nativeBuildInputs = [ bison flex texinfo makeWrapper ]; nativeBuildInputs = [ bison flex texinfo makeWrapper ];
buildInputs = [ readline texLive ]; buildInputs = [ readline texLive ];
@ -59,7 +62,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
circles and conics. circles and conics.
''; '';
platforms = lib.platforms.linux; platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.peti ]; maintainers = [ lib.maintainers.peti ];
}; };
}) })

11
pkgs/applications/science/math/eukleides/use-CC.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/build/Makefile
+++ b/build/Makefile
@@ -11,7 +11,7 @@ LEX = flex
LFLAGS = -8
YACC = bison
YFLAGS = -d
-CC = gcc
+CC ?= gcc
IFLAGS = -I$(COMMON_DIR) -I$(MAIN_DIR) -I$(BUILD_DIR)
ifneq ($(strip $(LOCALES)),)
MOFLAGS = -DMO_DIR=\"$(MO_DIR)\"

4
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: { lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }:
let let
inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify; inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify;
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "git-cola"; pname = "git-cola";
@ -15,7 +15,7 @@ in buildPythonApplication rec {
}; };
buildInputs = [ git gettext ]; buildInputs = [ git gettext ];
propagatedBuildInputs = [ pyqt5 sip pyinotify ]; propagatedBuildInputs = [ pyqt5 sip_4 pyinotify ];
nativeBuildInputs = [ qt5.wrapQtAppsHook ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ];
doCheck = false; doCheck = false;

2
pkgs/applications/video/openshot-qt/default.nix
View File

@ -18,7 +18,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
buildInputs = [ gtk3 ]; buildInputs = [ gtk3 ];
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ]; propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip_4 httplib2 pyzmq ];
dontWrapGApps = true; dontWrapGApps = true;
dontWrapQtApps = true; dontWrapQtApps = true;

8
pkgs/applications/video/vdr/default.nix
View File

@ -5,12 +5,12 @@
}: stdenv.mkDerivation rec { }: stdenv.mkDerivation rec {
pname = "vdr"; pname = "vdr";
version = "2.4.6"; version = "2.4.7";
src = fetchgit { src = fetchgit {
url = "git://git.tvdr.de/vdr.git"; url = "git://git.tvdr.de/vdr.git";
rev = "V20406"; rev = version;
sha256 = "sha256-te9lMmnWpesv+np2gJUDL17pI0WyVxhUnoBsFSRtOco="; sha256 = "sha256-hDJ/DemWuLddDvXGqxkSTIqATlWUjolcP7ojjhK2CDk=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -51,6 +51,6 @@
description = "Video Disc Recorder"; description = "Video Disc Recorder";
maintainers = [ maintainers.ck3d ]; maintainers = [ maintainers.ck3d ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl2; license = licenses.gpl2Plus;
}; };
} }

2
pkgs/applications/window-managers/river/default.nix
View File

@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
description = "A dynamic tiling wayland compositor"; description = "A dynamic tiling wayland compositor";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ branwright1 ]; maintainers = with maintainers; [ ];
}; };
} }

4
pkgs/development/python-modules/enaml/default.nix
View File

@ -5,7 +5,7 @@
, ply , ply
, kiwisolver , kiwisolver
, qtpy , qtpy
, sip , sip_4
, cppy , cppy
, bytecode , bytecode
}: }:
@ -44,7 +44,7 @@ buildPythonPackage rec {
ply ply
kiwisolver kiwisolver
qtpy qtpy
sip sip_4
cppy cppy
bytecode bytecode
]; ];

4
pkgs/development/python-modules/libarcus/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, python, fetchFromGitHub { lib, buildPythonPackage, python, fetchFromGitHub
, cmake, sip, protobuf, pythonOlder }: , cmake, sip_4, protobuf, pythonOlder }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "libarcus"; pname = "libarcus";
@ -15,7 +15,7 @@ buildPythonPackage rec {
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ]; buildInputs = [ protobuf ];

4
pkgs/development/python-modules/libsavitar/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: { lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip_4 }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "libsavitar"; pname = "libsavitar";
@ -18,7 +18,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";

6
pkgs/development/python-modules/poppler-qt5/default.nix
View File

@ -4,7 +4,7 @@
, isPy3k , isPy3k
, fetchPypi , fetchPypi
, pythonPackages , pythonPackages
, sip_5 , sip
, qtbase , qtbase
, qmake , qmake
, pyqt5 , pyqt5
@ -34,7 +34,7 @@ buildPythonPackage rec {
]; ];
buildInputs = [ qtbase.dev poppler pyqt-builder ]; buildInputs = [ qtbase.dev poppler pyqt-builder ];
nativeBuildInputs = [ pkg-config qmake sip_5 ]; nativeBuildInputs = [ pkg-config qmake sip ];
propagatedBuildInputs = [ pyqt5.dev ]; propagatedBuildInputs = [ pyqt5.dev ];
format = "pyproject"; format = "pyproject";
@ -46,7 +46,7 @@ buildPythonPackage rec {
[tool.sip.bindings.Poppler-Qt5] [tool.sip.bindings.Poppler-Qt5]
include-dirs = ["${poppler.dev}/include/poppler"] include-dirs = ["${poppler.dev}/include/poppler"]
tags = ["${sip_5.platform_tag}"] tags = ["${sip.platform_tag}"]
EOF EOF
''; '';

4
pkgs/development/python-modules/pykdl/default.nix
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 { toPythonModule (stdenv.mkDerivation {
pname = "pykdl"; pname = "pykdl";
@ -18,7 +18,7 @@ toPythonModule (stdenv.mkDerivation {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ orocos-kdl ]; buildInputs = [ orocos-kdl ];
propagatedBuildInputs = [ python sip ]; propagatedBuildInputs = [ python sip_4 ];
meta = with lib; { meta = with lib; {
description = "Kinematics and Dynamics Library (Python bindings)"; description = "Kinematics and Dynamics Library (Python bindings)";

4
pkgs/development/python-modules/pynest2d/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake { lib, buildPythonPackage, fetchFromGitHub, python3, cmake
, pythonOlder, libnest2d, sip, clipper }: , pythonOlder, libnest2d, sip_4, clipper }:
buildPythonPackage rec { buildPythonPackage rec {
version = "4.8.0"; version = "4.8.0";
@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp"; sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp";
}; };
propagatedBuildInputs = [ libnest2d sip clipper ]; propagatedBuildInputs = [ libnest2d sip_4 clipper ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
CLIPPER_PATH = "${clipper.out}"; CLIPPER_PATH = "${clipper.out}";

4
pkgs/development/python-modules/pyqt-builder/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, packaging, sip_5 }: { lib, fetchPypi, buildPythonPackage, packaging, sip }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyqt-builder"; pname = "pyqt-builder";
@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v"; sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v";
}; };
propagatedBuildInputs = [ packaging sip_5 ]; propagatedBuildInputs = [ packaging sip ];
pythonImportsCheck = [ "pyqtbuild" ]; pythonImportsCheck = [ "pyqtbuild" ];

8
pkgs/development/python-modules/pyqt/4.x.nix
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 { buildPythonPackage rec {
pname = "PyQt-x11-gpl"; pname = "PyQt-x11-gpl";
version = "4.12"; version = "4.12.3";
format = "other"; format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz"; url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz";
sha256 = "1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w"; sha256 = "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0";
}; };
postPatch = '' postPatch = ''
@ -45,7 +45,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ]; nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ];
buildInputs = [ qt4 dbus ]; buildInputs = [ qt4 dbus ];
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
postInstall = '' postInstall = ''
for i in $out/bin/*; do for i in $out/bin/*; do

4
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -16,9 +16,9 @@ let
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34; inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
sip = if isPy3k then sip = if isPy3k then
pythonPackages.sip_5 pythonPackages.sip
else 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 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. # if we want to be able to import it with Python 2.
# Python 3 could rely on it being an implicit namespace package, however, # Python 3 could rely on it being an implicit namespace package, however,

4
pkgs/development/python-modules/qscintilla-qt5/default.nix
View File

@ -10,7 +10,7 @@ buildPythonPackage {
src = qscintilla.src; src = qscintilla.src;
format = "other"; format = "other";
nativeBuildInputs = [ sip qtbase ]; nativeBuildInputs = [ sip_4 qtbase ];
buildInputs = [ qscintilla ]; buildInputs = [ qscintilla ];
propagatedBuildInputs = [ pyqt5 ]; propagatedBuildInputs = [ pyqt5 ];
@ -40,7 +40,7 @@ buildPythonPackage {
--qsci-libdir=${qscintilla}/lib \ --qsci-libdir=${qscintilla}/lib \
--pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \ --pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \
--qsci-sipdir=$out/share/sip/PyQt5 \ --qsci-sipdir=$out/share/sip/PyQt5 \
--sip-incdir=${sip}/include --sip-incdir=${sip_4}/include
''; '';
meta = with lib; { meta = with lib; {

44
pkgs/development/python-modules/sip/4.x.nix Normal file
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;
};
}

40
pkgs/development/python-modules/sip/5.x.nix
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 ];
};
}

56
pkgs/development/python-modules/sip/default.nix
View File

@ -1,44 +1,40 @@
{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }: { lib, stdenv, fetchPypi, buildPythonPackage, packaging, toml }:
buildPythonPackage rec { buildPythonPackage rec {
pname = sip-module; pname = "sip";
version = "4.19.24"; version = "5.5.0";
format = "other";
disabled = isPyPy; src = fetchPypi {
pname = "sip";
src = fetchurl { inherit version;
url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx";
sha256 = "1ra15vb5i9gkg2vdvh16cq9x2mmzw1yi3xphxs8q34q1pf83gkgd";
}; };
configurePhase = '' propagatedBuildInputs = [ packaging toml ];
${python.executable} ./configure.py \
--sip-module ${sip-module} \
-d $out/${python.sitePackages} \
-b $out/bin -e $out/include
'';
enableParallelBuilding = true; # There aren't tests
doCheck = false;
installCheckPhase = let pythonImportsCheck = [ "sipbuild" ];
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; # 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; { meta = with lib; {
description = "Creates C++ bindings for Python modules"; description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/"; homepage = "http://www.riverbankcomputing.co.uk/";
license = licenses.gpl2Plus; license = licenses.gpl3Only;
maintainers = with maintainers; [ lovek323 sander ]; maintainers = with maintainers; [ eduardosm ];
platforms = platforms.all;
}; };
} }

4
pkgs/development/tools/luaformatter/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "luaformatter"; pname = "luaformatter";
version = "1.3.4"; version = "1.3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koihik"; owner = "koihik";
repo = "luaformatter"; repo = "luaformatter";
rev = version; rev = version;
sha256 = "163190g37r6npg5k5mhdwckdhv9nwy2gnfp5jjk8p0s6cyvydqjw"; sha256 = "sha256-TMo6zRfhVAXVh0tIC0PecaJCKr0ev45jOKm2+reTtS4=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

2
pkgs/misc/drivers/hplip/3.18.5.nix
View File

@ -75,7 +75,7 @@ python2Packages.buildPythonApplication {
pygobject2 pygobject2
reportlab reportlab
usbutils usbutils
sip sip_4
] ++ lib.optionals withQt5 [ ] ++ lib.optionals withQt5 [
pyqt5 pyqt5
]; ];

2
pkgs/misc/drivers/hplip/default.nix
View File

@ -79,7 +79,7 @@ python3Packages.buildPythonApplication {
pygobject3 pygobject3
reportlab reportlab
usbutils usbutils
sip sip_4
dbus-python dbus-python
] ++ lib.optionals withQt5 [ ] ++ lib.optionals withQt5 [
pyqt5 pyqt5

2
pkgs/misc/frescobaldi/default.nix
View File

@ -12,7 +12,7 @@ buildPythonApplication rec {
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
lilypond pygame python-ly sip lilypond pygame python-ly sip_4
pyqt5 poppler-qt5 pyqt5 poppler-qt5
pyqtwebengine pyqtwebengine
]; ];

12
pkgs/misc/vim-plugins/generated.nix
View File

@ -2458,6 +2458,18 @@ let
meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/";
}; };
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
version = "2021-05-07";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
rev = "de68e0754019f7ff5822f3180b067d89f014943b";
sha256 = "009lih2s5x9nccx2i2xqb377jkclpxbw25vmznngdq47qr89ws1r";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
lspkind-nvim = buildVimPluginFrom2Nix { lspkind-nvim = buildVimPluginFrom2Nix {
pname = "lspkind-nvim"; pname = "lspkind-nvim";
version = "2021-02-06"; version = "2021-02-06";

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -522,6 +522,7 @@ raghur/vim-ghost
Raimondi/delimitMate Raimondi/delimitMate
rakr/vim-one rakr/vim-one
ray-x/aurora ray-x/aurora
ray-x/lsp_signature.nvim
rbgrouleff/bclose.vim rbgrouleff/bclose.vim
rbong/vim-flog rbong/vim-flog
rhysd/committia.vim rhysd/committia.vim

2
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

@ -105,7 +105,7 @@ while [ "$#" -gt 0 ]; do
;; ;;
--flake) --flake)
flake="$1" flake="$1"
flakeFlags=(--experimental-features 'nix-command flakes') flakeFlags=(--extra-experimental-features 'nix-command flakes')
shift 1 shift 1
;; ;;
--recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file)

3
pkgs/servers/gonic/default.nix
View File

@ -1,5 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub { lib, buildGoModule, fetchFromGitHub
, pkg-config, taglib, alsaLib , pkg-config, taglib, alsaLib
, zlib
# Disable on-the-fly transcoding, # Disable on-the-fly transcoding,
# removing the dependency on ffmpeg. # removing the dependency on ffmpeg.
@ -20,7 +21,7 @@ buildGoModule rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ taglib alsaLib ]; buildInputs = [ taglib alsaLib zlib ];
vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
# TODO(Profpatsch): write a test for transcoding support, # TODO(Profpatsch): write a test for transcoding support,

2
pkgs/servers/http/trafficserver/default.nix
View File

@ -201,7 +201,7 @@ stdenv.mkDerivation rec {
large intranets by maximizing existing and available bandwidth. large intranets by maximizing existing and available bandwidth.
''; '';
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ midchildan joaquinito2051 ]; maintainers = with maintainers; [ midchildan ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

4
pkgs/top-level/python-packages.nix
View File

@ -7564,9 +7564,9 @@ in {
signify = callPackage ../development/python-modules/signify { }; signify = callPackage ../development/python-modules/signify { };
sip = callPackage ../development/python-modules/sip { }; sip = callPackage ../development/python-modules/sip/default.nix { };
sip_5 = callPackage ../development/python-modules/sip/5.x.nix { }; sip_4 = callPackage ../development/python-modules/sip/4.x.nix { };
six = callPackage ../development/python-modules/six { }; six = callPackage ../development/python-modules/six { };