Merge pull request #108799 from SuperSandro2000/fix-collection

authored by Sandro and committed by GitHub f41dc353 fe0ee326

+65 -20
+3
pkgs/applications/misc/dockbarx/default.nix
··· 28 ++ (with gnome2; [ gnome_python gnome_python_desktop ]) 29 ++ [ keybinder ]; 30 31 meta = with stdenv.lib; { 32 homepage = "https://launchpad.net/dockbar/"; 33 description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
··· 28 ++ (with gnome2; [ gnome_python gnome_python_desktop ]) 29 ++ [ keybinder ]; 30 31 + # no tests 32 + doCheck = false; 33 + 34 meta = with stdenv.lib; { 35 homepage = "https://launchpad.net/dockbar/"; 36 description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
+4 -1
pkgs/applications/misc/raiseorlaunch/default.nix
··· 10 }; 11 12 nativeBuildInputs = [ python3Packages.setuptools_scm ]; 13 - checkInputs = [ python3Packages.pytest ]; 14 pythonPath = with python3Packages; [ i3ipc ]; 15 16 meta = with lib; { 17 maintainers = with maintainers; [ winpat ];
··· 10 }; 11 12 nativeBuildInputs = [ python3Packages.setuptools_scm ]; 13 pythonPath = with python3Packages; [ i3ipc ]; 14 + 15 + # no tests 16 + doCheck = false; 17 + pythonImportsCheck = [ "raiseorlaunch" ]; 18 19 meta = with lib; { 20 maintainers = with maintainers; [ winpat ];
+4
pkgs/applications/misc/remarkable/remarkable-mouse/default.nix
··· 11 12 propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; 13 14 meta = with stdenv.lib; { 15 description = "A program to use a reMarkable as a graphics tablet"; 16 homepage = "https://github.com/evidlo/remarkable_mouse";
··· 11 12 propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; 13 14 + # no tests 15 + doCheck = false; 16 + pythonImportsCheck = [ "remarkable_mouse" ]; 17 + 18 meta = with stdenv.lib; { 19 description = "A program to use a reMarkable as a graphics tablet"; 20 homepage = "https://github.com/evidlo/remarkable_mouse";
+4
pkgs/applications/window-managers/i3/altlayout.nix
··· 11 12 pythonPath = with python3Packages; [ enum-compat i3ipc docopt ]; 13 14 meta = with lib; { 15 maintainers = with maintainers; [ magnetophon ]; 16 description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side";
··· 11 12 pythonPath = with python3Packages; [ enum-compat i3ipc docopt ]; 13 14 + doCheck = false; 15 + 16 + pythonImportsCheck = [ "i3altlayout" ]; 17 + 18 meta = with lib; { 19 maintainers = with maintainers; [ magnetophon ]; 20 description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side";
+12 -4
pkgs/development/libraries/libgda/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee 2 - , overrideCC, gcc6 3 , mysqlSupport ? false, libmysqlclient ? null 4 , postgresSupport ? false, postgresql ? null 5 }: ··· 15 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 16 sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; 17 }; 18 configureFlags = with stdenv.lib; [ 19 - "--enable-gi-system-install=no" 20 "--with-mysql=${if mysqlSupport then "yes" else "no"}" 21 "--with-postgres=${if postgresSupport then "yes" else "no"}" 22 ··· 32 33 hardeningDisable = [ "format" ]; 34 35 - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; 36 buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] 37 ++ optional (mysqlSupport) libmysqlclient 38 ++ optional (postgresSupport) postgresql;
··· 1 + { stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee 2 + , overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools 3 , mysqlSupport ? false, libmysqlclient ? null 4 , postgresSupport ? false, postgresql ? null 5 }: ··· 15 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 16 sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; 17 }; 18 + 19 + patches = [ 20 + # fix compile error with mysql 21 + (fetchpatch { 22 + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff"; 23 + sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv"; 24 + }) 25 + ]; 26 + 27 configureFlags = with stdenv.lib; [ 28 "--with-mysql=${if mysqlSupport then "yes" else "no"}" 29 "--with-postgres=${if postgresSupport then "yes" else "no"}" 30 ··· 40 41 hardeningDisable = [ "format" ]; 42 43 + nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ]; 44 buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] 45 ++ optional (mysqlSupport) libmysqlclient 46 ++ optional (postgresSupport) postgresql;
+6 -2
pkgs/development/python-modules/asyncio-dgram/default.nix
··· 1 - { lib 2 , buildPythonPackage 3 , fetchFromGitHub 4 , pytestCheckHook ··· 16 sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm"; 17 }; 18 19 checkInputs = [ 20 pytestCheckHook 21 - pytest-asyncio 22 ]; 23 24 disabledTests = [ "test_protocol_pause_resume" ];
··· 1 + { stdenv 2 + , lib 3 , buildPythonPackage 4 , fetchFromGitHub 5 , pytestCheckHook ··· 17 sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm"; 18 }; 19 20 + # OSError: AF_UNIX path too long 21 + doCheck = !stdenv.isDarwin; 22 + 23 checkInputs = [ 24 pytestCheckHook 25 + pytest-asyncio 26 ]; 27 28 disabledTests = [ "test_protocol_pause_resume" ];
+14 -10
pkgs/development/python-modules/clifford/default.nix
··· 22 inherit pname version; 23 sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c"; 24 }; 25 - patches = [ (fetchpatch { 26 - # Compatibility with h5py 3. 27 - # Will be included in the next releasse after 1.3.1 28 - url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch"; 29 - sha256 = "00m8ias58xycn5n78sy9wywf4wck1v0gb8gzmg40inzdiha93jyz"; 30 - }) ]; 31 32 propagatedBuildInputs = [ 33 future ··· 53 cd clifford/test 54 ''; 55 56 - pytestFlagsArray = [ 57 - "-m \"not veryslow\"" 58 - "--ignore=test_algebra_initialisation.py" # fails without JIT 59 - "--ignore=test_cga.py" 60 ]; 61 62 meta = with lib; {
··· 22 inherit pname version; 23 sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c"; 24 }; 25 + 26 + patches = [ 27 + (fetchpatch { 28 + # Compatibility with h5py 3. 29 + # Will be included in the next releasse after 1.3.1 30 + url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch"; 31 + sha256 = "0pkpwnk0kfdxsbzsxqlqh8kgif17l5has0mg31g3kyp8lncj89b1"; 32 + }) 33 + ]; 34 35 propagatedBuildInputs = [ 36 future ··· 56 cd clifford/test 57 ''; 58 59 + disabledTests = [ 60 + "veryslow" 61 + "test_algebra_initialisation" 62 + "test_cga" 63 + "test_estimate_rotor_sequential[random_sphere]" 64 ]; 65 66 meta = with lib; {
+4
pkgs/development/python-modules/nixpkgs/default.nix
··· 19 buildInputs = [ pbr ]; 20 propagatedBuildInputs = [ pythonix ]; 21 22 meta = with stdenv.lib; { 23 description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; 24 homepage = "https://github.com/t184256/nixpkgs-python-importer";
··· 19 buildInputs = [ pbr ]; 20 propagatedBuildInputs = [ pythonix ]; 21 22 + # does not have any tests 23 + doCheck = false; 24 + pythonImportsCheck = [ "nixpkgs" ]; 25 + 26 meta = with stdenv.lib; { 27 description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; 28 homepage = "https://github.com/t184256/nixpkgs-python-importer";
+2
pkgs/development/python-modules/python-engineio/default.nix
··· 36 pytestCheckHook 37 ]; 38 39 preCheck = stdenv.lib.optionalString stdenv.isLinux '' 40 echo "nameserver 127.0.0.1" > resolv.conf 41 export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \
··· 36 pytestCheckHook 37 ]; 38 39 + doCheck = !stdenv.isDarwin; 40 + 41 preCheck = stdenv.lib.optionalString stdenv.isLinux '' 42 echo "nameserver 127.0.0.1" > resolv.conf 43 export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \
+3 -2
pkgs/development/python-modules/shiboken2/default.nix
··· 1 - { buildPythonPackage, python, fetchurl, stdenv, pyside2, 2 - cmake, qt5, llvmPackages }: 3 4 stdenv.mkDerivation { 5 pname = "shiboken2"; ··· 32 license = with licenses; [ gpl2 lgpl21 ]; 33 homepage = "https://wiki.qt.io/Qt_for_Python"; 34 maintainers = with maintainers; [ gebner ]; 35 }; 36 }
··· 1 + { buildPythonPackage, python, fetchurl, stdenv, pyside2 2 + , cmake, qt5, llvmPackages }: 3 4 stdenv.mkDerivation { 5 pname = "shiboken2"; ··· 32 license = with licenses; [ gpl2 lgpl21 ]; 33 homepage = "https://wiki.qt.io/Qt_for_Python"; 34 maintainers = with maintainers; [ gebner ]; 35 + broken = stdenv.isDarwin; 36 }; 37 }
+3
pkgs/games/anki/default.nix
··· 128 # UTF-8 locale needed for testing 129 LC_ALL = "en_US.UTF-8"; 130 131 # - Anki writes some files to $HOME during tests 132 # - Skip tests using network 133 checkPhase = ''
··· 128 # UTF-8 locale needed for testing 129 LC_ALL = "en_US.UTF-8"; 130 131 + # tests fail with to many open files 132 + doCheck = !stdenv.isDarwin; 133 + 134 # - Anki writes some files to $HOME during tests 135 # - Skip tests using network 136 checkPhase = ''
+4 -1
pkgs/tools/networking/urlwatch/default.nix
··· 1 { stdenv, fetchFromGitHub, python3Packages }: 2 3 python3Packages.buildPythonApplication rec { 4 - name = "urlwatch-${version}"; 5 version = "2.21"; 6 7 src = fetchFromGitHub { ··· 22 requests 23 pyppeteer 24 ]; 25 26 meta = with stdenv.lib; { 27 description = "A tool for monitoring webpages for updates";
··· 1 { stdenv, fetchFromGitHub, python3Packages }: 2 3 python3Packages.buildPythonApplication rec { 4 + pname = "urlwatch"; 5 version = "2.21"; 6 7 src = fetchFromGitHub { ··· 22 requests 23 pyppeteer 24 ]; 25 + 26 + # no tests 27 + doCheck = false; 28 29 meta = with stdenv.lib; { 30 description = "A tool for monitoring webpages for updates";
+2
pkgs/top-level/all-packages.nix
··· 16697 vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; 16698 16699 vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix { 16700 inherit (darwin) libobjc; 16701 inherit (darwin.apple_sdk.libs) xpc; 16702 inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration ··· 16704 CoreText IOSurface ImageIO OpenGL GLUT; 16705 }; 16706 vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { 16707 inherit (darwin) libobjc; 16708 inherit (darwin.apple_sdk.libs) xpc; 16709 inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
··· 16697 vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; 16698 16699 vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix { 16700 + stdenv = gcc9Stdenv; 16701 inherit (darwin) libobjc; 16702 inherit (darwin.apple_sdk.libs) xpc; 16703 inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration ··· 16705 CoreText IOSurface ImageIO OpenGL GLUT; 16706 }; 16707 vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { 16708 + stdenv = gcc9Stdenv; 16709 inherit (darwin) libobjc; 16710 inherit (darwin.apple_sdk.libs) xpc; 16711 inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration