From 19983c6cb5bec0c05e207027a4ada05d4244186c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 00:33:39 +0100 Subject: [PATCH 01/14] pythonPackages.clifford: Update patch hash, use disabledTests, disable failing test --- .../python-modules/clifford/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 68ac9e45bb4..85ed160413e 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -22,12 +22,15 @@ buildPythonPackage rec { inherit pname version; sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c"; }; - patches = [ (fetchpatch { - # Compatibility with h5py 3. - # Will be included in the next releasse after 1.3.1 - url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch"; - sha256 = "00m8ias58xycn5n78sy9wywf4wck1v0gb8gzmg40inzdiha93jyz"; - }) ]; + + patches = [ + (fetchpatch { + # Compatibility with h5py 3. + # Will be included in the next releasse after 1.3.1 + url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch"; + sha256 = "0pkpwnk0kfdxsbzsxqlqh8kgif17l5has0mg31g3kyp8lncj89b1"; + }) + ]; propagatedBuildInputs = [ future @@ -53,10 +56,11 @@ buildPythonPackage rec { cd clifford/test ''; - pytestFlagsArray = [ - "-m \"not veryslow\"" - "--ignore=test_algebra_initialisation.py" # fails without JIT - "--ignore=test_cga.py" + disabledTests = [ + "veryslow" + "test_algebra_initialisation" + "test_cga" + "test_estimate_rotor_sequential[random_sphere]" ]; meta = with lib; { From c256508542b3cc95d6718d89a0144ebd01b7f5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 13:54:35 +0100 Subject: [PATCH 02/14] anki: Disable tests on darwin --- pkgs/games/anki/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index af4e819eeda..14e9704a432 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -128,6 +128,9 @@ buildPythonApplication rec { # UTF-8 locale needed for testing LC_ALL = "en_US.UTF-8"; + # tests fail with to many open files + doCheck = !stdenv.isDarwin; + # - Anki writes some files to $HOME during tests # - Skip tests using network checkPhase = '' From 511c7203b04b76e477e55d799fda72eede9d097d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 13:54:45 +0100 Subject: [PATCH 03/14] urlwatch: Disable tests, name -> pname --- pkgs/tools/networking/urlwatch/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index e4b821be1f4..15734132da7 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "urlwatch-${version}"; + pname = "urlwatch"; version = "2.21"; src = fetchFromGitHub { @@ -23,6 +23,9 @@ python3Packages.buildPythonApplication rec { pyppeteer ]; + # no tests + doCheck = false; + meta = with stdenv.lib; { description = "A tool for monitoring webpages for updates"; homepage = "https://thp.io/2008/urlwatch/"; From 075da3928b5eee0c672c60e9e5ba81d3a3c90766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 20:51:35 +0100 Subject: [PATCH 04/14] pythonPackages.python-engineio: Disable tests on darwin --- pkgs/development/python-modules/python-engineio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index ecbdb73abc0..37d1e362ac1 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { pytestCheckHook ]; + doCheck = !stdenv.isDarwin; + preCheck = stdenv.lib.optionalString stdenv.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ From 7923272cd537c0cc6805d11e1732f93a27a3a73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 21:01:19 +0100 Subject: [PATCH 05/14] pythonPackages.nixpkgs: Disable tests --- pkgs/development/python-modules/nixpkgs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 7df6d72c55c..b43c5ab192c 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { buildInputs = [ pbr ]; propagatedBuildInputs = [ pythonix ]; + # does not have any tests + doCheck = false; + pythonImportsCheck = [ "nixpkgs" ]; + meta = with stdenv.lib; { description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; homepage = "https://github.com/t184256/nixpkgs-python-importer"; From 87a169824713cb95f513fa9affd91a7e652b03c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jan 2021 11:40:18 +0100 Subject: [PATCH 06/14] dockbarx: Disable tests --- pkgs/applications/misc/dockbarx/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 463f7db6b0c..13d837aceec 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -28,6 +28,9 @@ pythonPackages.buildPythonApplication rec { ++ (with gnome2; [ gnome_python gnome_python_desktop ]) ++ [ keybinder ]; + # no tests + doCheck = false; + meta = with stdenv.lib; { homepage = "https://launchpad.net/dockbar/"; description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; From ecbf33092c96794692b598449d3a9e685d710676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jan 2021 11:40:32 +0100 Subject: [PATCH 07/14] raiseorlaunch: Disable tests --- pkgs/applications/misc/raiseorlaunch/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 6bbbc671bf8..e43cf7b95b9 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -10,9 +10,12 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ python3Packages.setuptools_scm ]; - checkInputs = [ python3Packages.pytest ]; pythonPath = with python3Packages; [ i3ipc ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "raiseorlaunch" ]; + meta = with lib; { maintainers = with maintainers; [ winpat ]; description = "A run-or-raise-application-launcher for i3 window manager"; From 2ce71085bc97d69012c041ef897368ff9802b36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jan 2021 11:40:43 +0100 Subject: [PATCH 08/14] remarkable-mouse: Disable tests --- .../applications/misc/remarkable/remarkable-mouse/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 8d668f7a38d..c07fe631f44 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -11,6 +11,10 @@ buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "remarkable_mouse" ]; + meta = with stdenv.lib; { description = "A program to use a reMarkable as a graphics tablet"; homepage = "https://github.com/evidlo/remarkable_mouse"; From 55a9cbedcadbc6df6705e0428a37743f67750df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jan 2021 11:41:12 +0100 Subject: [PATCH 09/14] i3altlayout: Disable tests --- pkgs/applications/window-managers/i3/altlayout.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/window-managers/i3/altlayout.nix b/pkgs/applications/window-managers/i3/altlayout.nix index 973dee3eeed..d66ae357236 100644 --- a/pkgs/applications/window-managers/i3/altlayout.nix +++ b/pkgs/applications/window-managers/i3/altlayout.nix @@ -11,6 +11,10 @@ python3Packages.buildPythonApplication rec { pythonPath = with python3Packages; [ enum-compat i3ipc docopt ]; + doCheck = false; + + pythonImportsCheck = [ "i3altlayout" ]; + meta = with lib; { maintainers = with maintainers; [ magnetophon ]; description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side"; From 74a19259727eb46b589eda368f643c160b14a8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jan 2021 20:11:46 +0100 Subject: [PATCH 10/14] libgda: Remove removed flag --- pkgs/development/libraries/libgda/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index f0b430c91d8..e518a07cc2b 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee +{ stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee , overrideCC, gcc6 , mysqlSupport ? false, libmysqlclient ? null , postgresSupport ? false, postgresql ? null @@ -16,7 +16,6 @@ assert postgresSupport -> postgresql != null; sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; }; configureFlags = with stdenv.lib; [ - "--enable-gi-system-install=no" "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" @@ -32,7 +31,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala ]; buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] ++ optional (mysqlSupport) libmysqlclient ++ optional (postgresSupport) postgresql; From 445d1ee7862409dae404ce350af6a1272172b35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jan 2021 20:12:01 +0100 Subject: [PATCH 11/14] libgda: Fix compiling with mysql --- pkgs/development/libraries/libgda/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index e518a07cc2b..3f8e6f01b34 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee -, overrideCC, gcc6 +, overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools , mysqlSupport ? false, libmysqlclient ? null , postgresSupport ? false, postgresql ? null }: @@ -15,6 +15,15 @@ assert postgresSupport -> postgresql != null; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; }; + + patches = [ + # fix compile error with mysql + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff"; + sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv"; + }) + ]; + configureFlags = with stdenv.lib; [ "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" @@ -31,7 +40,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ]; buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] ++ optional (mysqlSupport) libmysqlclient ++ optional (postgresSupport) postgresql; From 96ba5c472c61d2b211d30dda57d3a14c0b592404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jan 2021 20:13:24 +0100 Subject: [PATCH 12/14] pythonPackages.asyncio-dgram: Disable tests on darwin --- pkgs/development/python-modules/asyncio-dgram/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index 9edc215abcf..14c800f568b 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -16,9 +17,12 @@ buildPythonPackage rec { sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm"; }; + # OSError: AF_UNIX path too long + doCheck = !stdenv.isDarwin; + checkInputs = [ pytestCheckHook - pytest-asyncio + pytest-asyncio ]; disabledTests = [ "test_protocol_pause_resume" ]; From ad8ec3b48bd13ace532a989657c18c422efb29d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jan 2021 18:47:37 +0100 Subject: [PATCH 13/14] pythonPackages.shiboken2: Mark broken on darwin --- pkgs/development/python-modules/shiboken2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 9b2062dbf6c..ec44a9a15e1 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,5 +1,5 @@ -{ buildPythonPackage, python, fetchurl, stdenv, pyside2, - cmake, qt5, llvmPackages }: +{ buildPythonPackage, python, fetchurl, stdenv, pyside2 +, cmake, qt5, llvmPackages }: stdenv.mkDerivation { pname = "shiboken2"; @@ -32,5 +32,6 @@ stdenv.mkDerivation { license = with licenses; [ gpl2 lgpl21 ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; + broken = stdenv.isDarwin; }; } From 694a3766d6ffcb6150b780ffc86d3c5343d08b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jan 2021 18:59:26 +0100 Subject: [PATCH 14/14] vtk_7, vtk_8: Fix building --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42b6c9d6026..7e0754a41a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16673,6 +16673,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix { + stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -16680,6 +16681,7 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { + stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration