diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e77a5bbde6d0..08758631a177 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1394,12 +1394,6 @@
githubId = 302429;
name = "Marton Boros";
};
- branwright1 = {
- email = "branwright@protonmail.com";
- github = "branwright1";
- githubId = 71175207;
- name = "Brandon Wright";
- };
bramd = {
email = "bram@bramd.nl";
github = "bramd";
@@ -4765,12 +4759,6 @@
githubId = 1102396;
name = "Jussi Maki";
};
- joaquinito2051 = {
- email = "joaquinito2051@gmail.com";
- github = "heroku-miraheze";
- githubId = 61781343;
- name = "Joaquín Rufo Gutierrez";
- };
jobojeha = {
email = "jobojeha@jeppener.de";
github = "jobojeha";
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index a8dd7787a521..3669cf0771b1 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -19,7 +19,7 @@ let
urllib3
pygments
pyqt5
- sip
+ sip_4
owslib
six
];
diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix
index cac930dae143..b974e271a675 100644
--- a/pkgs/applications/graphics/jpeg-archive/default.nix
+++ b/pkgs/applications/graphics/jpeg-archive/default.nix
@@ -22,9 +22,10 @@ stdenv.mkDerivation {
'';
makeFlags = [
+ "CC=${stdenv.cc.targetPrefix}cc"
"PREFIX=$(out)"
"MOZJPEG_PREFIX=${mozjpeg}"
- "LIBJPEG=${mozjpeg}/lib/libjpeg.so"
+ "LIBJPEG=${mozjpeg}/lib/libjpeg${stdenv.hostPlatform.extensions.sharedLibrary}"
];
postInstall = ''
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 282db23f4756..15d8096e5496 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";
};
- nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
+ nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index aff203cce618..f5c4acb1f997 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -45,7 +45,7 @@ mkDerivation rec {
prePatch = ''
sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \
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
# Remove unneeded files and libs
@@ -95,7 +95,7 @@ mkDerivation rec {
pyqtwebengine
python
regex
- sip_5
+ sip
zeroconf
# the following are distributed with calibre, but we use upstream instead
odfpy
diff --git a/pkgs/applications/misc/cura/lulzbot/default.nix b/pkgs/applications/misc/cura/lulzbot/default.nix
index 229966561c6d..360ef47ecf1d 100644
--- a/pkgs/applications/misc/cura/lulzbot/default.nix
+++ b/pkgs/applications/misc/cura/lulzbot/default.nix
@@ -10,10 +10,10 @@ let
};
libarcusLulzbot = callPackage ./libarcus.nix {
- inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
+ inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
};
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;
diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
index 7b1dbf4d85ef..15e221a8f743 100644
--- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
+{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip_4, protobuf, pythonOlder }:
buildPythonPackage {
pname = "libarcus";
@@ -13,7 +13,7 @@ buildPythonPackage {
disabled = pythonOlder "3.4.0";
- propagatedBuildInputs = [ sip ];
+ propagatedBuildInputs = [ sip_4 ];
nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ];
diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
index f12059e6317b..dd84173ffce1 100644
--- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
+{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip_4 }:
buildPythonPackage {
pname = "libsavitar-lulzbot";
@@ -19,7 +19,7 @@ buildPythonPackage {
nativeBuildInputs = [ cmake ];
- propagatedBuildInputs = [ sip ];
+ propagatedBuildInputs = [ sip_4 ];
disabled = pythonOlder "3.4.0";
diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix
index 6f0634b5c934..c044e76c597d 100644
--- a/pkgs/applications/misc/openlp/lib.nix
+++ b/pkgs/applications/misc/openlp/lib.nix
@@ -5,7 +5,7 @@
# python deps
, python, buildPythonPackage
, 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 {
@@ -41,7 +41,7 @@ buildPythonPackage rec {
pyenchant
pyqt5_with_qtwebkit
pyxdg
- sip
+ sip_4
sqlalchemy
sqlalchemy_migrate
];
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index f206c645ae21..5f5594c05374 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -24,7 +24,7 @@ in python.pkgs.buildPythonPackage rec {
propagatedBuildInputs = with python.pkgs; [
sentry-sdk psutil jsonschema # tox for check
# Runtime dependencies
- sip (pyqt5.override { withWebSockets = true; }) distro setuptools
+ sip_4 (pyqt5.override { withWebSockets = true; }) distro setuptools
];
doCheck = false; # Failing
diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix
index 50d0aa6f9d1d..620ccfb084ef 100644
--- a/pkgs/applications/science/machine-learning/labelimg/default.nix
+++ b/pkgs/applications/science/machine-learning/labelimg/default.nix
@@ -15,7 +15,7 @@
propagatedBuildInputs = with python3Packages; [
pyqt5
lxml
- sip
+ sip_4
];
preBuild = ''
make qt5py3
diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix
index fe498fdbd8a1..b5a9fc3fa86d 100644
--- a/pkgs/applications/science/math/eukleides/default.nix
+++ b/pkgs/applications/science/math/eukleides/default.nix
@@ -9,6 +9,9 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
};
+ # use $CC instead of hardcoded gcc
+ patches = [ ./use-CC.patch ];
+
nativeBuildInputs = [ bison flex texinfo makeWrapper ];
buildInputs = [ readline texLive ];
@@ -59,7 +62,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
circles and conics.
'';
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.peti ];
};
})
diff --git a/pkgs/applications/science/math/eukleides/use-CC.patch b/pkgs/applications/science/math/eukleides/use-CC.patch
new file mode 100644
index 000000000000..08bd71ec9dc5
--- /dev/null
+++ b/pkgs/applications/science/math/eukleides/use-CC.patch
@@ -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)\"
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 37c10bf2f982..707e0855d151 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }:
let
- inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify;
+ inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify;
in buildPythonApplication rec {
pname = "git-cola";
@@ -15,7 +15,7 @@ in buildPythonApplication rec {
};
buildInputs = [ git gettext ];
- propagatedBuildInputs = [ pyqt5 sip pyinotify ];
+ propagatedBuildInputs = [ pyqt5 sip_4 pyinotify ];
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
doCheck = false;
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 5951f4665e40..c25e53b657b6 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -18,7 +18,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
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;
dontWrapQtApps = true;
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
index eeb61624409f..265ef82528db 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/pkgs/applications/video/vdr/default.nix
@@ -5,12 +5,12 @@
}: stdenv.mkDerivation rec {
pname = "vdr";
- version = "2.4.6";
+ version = "2.4.7";
src = fetchgit {
url = "git://git.tvdr.de/vdr.git";
- rev = "V20406";
- sha256 = "sha256-te9lMmnWpesv+np2gJUDL17pI0WyVxhUnoBsFSRtOco=";
+ rev = version;
+ sha256 = "sha256-hDJ/DemWuLddDvXGqxkSTIqATlWUjolcP7ojjhK2CDk=";
};
enableParallelBuilding = true;
@@ -51,6 +51,6 @@
description = "Video Disc Recorder";
maintainers = [ maintainers.ck3d ];
platforms = [ "i686-linux" "x86_64-linux" ];
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
};
}
diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix
index e82f290169c7..a7331aa39af0 100644
--- a/pkgs/applications/window-managers/river/default.nix
+++ b/pkgs/applications/window-managers/river/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
description = "A dynamic tiling wayland compositor";
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ branwright1 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix
index 1102443884f7..8896c5c706a6 100644
--- a/pkgs/development/python-modules/enaml/default.nix
+++ b/pkgs/development/python-modules/enaml/default.nix
@@ -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
];
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index edea85876a84..a48d70c544c3 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -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 ];
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index f6aa1b378f58..7ecd09160fff 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -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";
diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix
index 94d86f7b7133..4a9fdfa42620 100644
--- a/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/pkgs/development/python-modules/poppler-qt5/default.nix
@@ -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
'';
diff --git a/pkgs/development/python-modules/pykdl/default.nix b/pkgs/development/python-modules/pykdl/default.nix
index 674a43f5f3e0..9a0431b2b859 100644
--- a/pkgs/development/python-modules/pykdl/default.nix
+++ b/pkgs/development/python-modules/pykdl/default.nix
@@ -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)";
diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix
index 7ca72293382d..f3b5b9ba6854 100644
--- a/pkgs/development/python-modules/pynest2d/default.nix
+++ b/pkgs/development/python-modules/pynest2d/default.nix
@@ -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}";
diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix
index d7f15d966b37..d371fd7bcee7 100644
--- a/pkgs/development/python-modules/pyqt-builder/default.nix
+++ b/pkgs/development/python-modules/pyqt-builder/default.nix
@@ -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" ];
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 3427438b8a26..2652b5eb00b3 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -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
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 6e4b4d37f289..2671b27a6307 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -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,
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index dcbe213966f9..05c12c1c62af 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -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; {
diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix
new file mode 100644
index 000000000000..5334d1196344
--- /dev/null
+++ b/pkgs/development/python-modules/sip/4.x.nix
@@ -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;
+ };
+}
diff --git a/pkgs/development/python-modules/sip/5.x.nix b/pkgs/development/python-modules/sip/5.x.nix
deleted file mode 100644
index c15589b77bc8..000000000000
--- a/pkgs/development/python-modules/sip/5.x.nix
+++ /dev/null
@@ -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 ];
- };
-}
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 0027c1c0ba5f..c15589b77bc8 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -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 ];
};
}
diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix
index 991f1a377170..ee34886a063e 100644
--- a/pkgs/development/tools/luaformatter/default.nix
+++ b/pkgs/development/tools/luaformatter/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "luaformatter";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchFromGitHub {
owner = "koihik";
repo = "luaformatter";
rev = version;
- sha256 = "163190g37r6npg5k5mhdwckdhv9nwy2gnfp5jjk8p0s6cyvydqjw";
+ sha256 = "sha256-TMo6zRfhVAXVh0tIC0PecaJCKr0ev45jOKm2+reTtS4=";
fetchSubmodules = true;
};
diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix
index c62161c96f80..3c2f8fa2a08f 100644
--- a/pkgs/misc/drivers/hplip/3.18.5.nix
+++ b/pkgs/misc/drivers/hplip/3.18.5.nix
@@ -75,7 +75,7 @@ python2Packages.buildPythonApplication {
pygobject2
reportlab
usbutils
- sip
+ sip_4
] ++ lib.optionals withQt5 [
pyqt5
];
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 6a7eb35ae52b..9fcdbd8c515e 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -79,7 +79,7 @@ python3Packages.buildPythonApplication {
pygobject3
reportlab
usbutils
- sip
+ sip_4
dbus-python
] ++ lib.optionals withQt5 [
pyqt5
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 070babc0cbc8..60fee5a6c861 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
};
propagatedBuildInputs = with python3Packages; [
- lilypond pygame python-ly sip
+ lilypond pygame python-ly sip_4
pyqt5 poppler-qt5
pyqtwebengine
];
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4ab0700e8a53..8d80f3e9b183 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2458,6 +2458,18 @@ let
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 {
pname = "lspkind-nvim";
version = "2021-02-06";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index ff4b066be248..ec322def0c0d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -522,6 +522,7 @@ raghur/vim-ghost
Raimondi/delimitMate
rakr/vim-one
ray-x/aurora
+ray-x/lsp_signature.nvim
rbgrouleff/bclose.vim
rbong/vim-flog
rhysd/committia.vim
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 01d0fa823b9b..afc0b8a32223 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -105,7 +105,7 @@ while [ "$#" -gt 0 ]; do
;;
--flake)
flake="$1"
- flakeFlags=(--experimental-features 'nix-command flakes')
+ flakeFlags=(--extra-experimental-features 'nix-command flakes')
shift 1
;;
--recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file)
diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix
index b807a1ff757d..4be2bdfb5b86 100644
--- a/pkgs/servers/gonic/default.nix
+++ b/pkgs/servers/gonic/default.nix
@@ -1,5 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub
, pkg-config, taglib, alsaLib
+, zlib
# Disable on-the-fly transcoding,
# removing the dependency on ffmpeg.
@@ -20,7 +21,7 @@ buildGoModule rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ taglib alsaLib ];
+ buildInputs = [ taglib alsaLib zlib ];
vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
# TODO(Profpatsch): write a test for transcoding support,
diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix
index 05eb9a17c8e8..4a7f9854d183 100644
--- a/pkgs/servers/http/trafficserver/default.nix
+++ b/pkgs/servers/http/trafficserver/default.nix
@@ -201,7 +201,7 @@ stdenv.mkDerivation rec {
large intranets by maximizing existing and available bandwidth.
'';
license = licenses.asl20;
- maintainers = with maintainers; [ midchildan joaquinito2051 ];
+ maintainers = with maintainers; [ midchildan ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 197bacc3b59d..9ca7815c3b80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7564,9 +7564,9 @@ in {
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 { };