Merge pull request #108799 from SuperSandro2000/fix-collection

This commit is contained in:
Sandro 2021-01-10 20:04:46 +01:00 committed by GitHub
commit f41dc35387
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 65 additions and 20 deletions

View File

@ -28,6 +28,9 @@ pythonPackages.buildPythonApplication rec {
++ (with gnome2; [ gnome_python gnome_python_desktop ]) ++ (with gnome2; [ gnome_python gnome_python_desktop ])
++ [ keybinder ]; ++ [ keybinder ];
# no tests
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://launchpad.net/dockbar/"; homepage = "https://launchpad.net/dockbar/";
description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";

View File

@ -10,9 +10,12 @@ python3Packages.buildPythonApplication rec {
}; };
nativeBuildInputs = [ python3Packages.setuptools_scm ]; nativeBuildInputs = [ python3Packages.setuptools_scm ];
checkInputs = [ python3Packages.pytest ];
pythonPath = with python3Packages; [ i3ipc ]; pythonPath = with python3Packages; [ i3ipc ];
# no tests
doCheck = false;
pythonImportsCheck = [ "raiseorlaunch" ];
meta = with lib; { meta = with lib; {
maintainers = with maintainers; [ winpat ]; maintainers = with maintainers; [ winpat ];
description = "A run-or-raise-application-launcher for i3 window manager"; description = "A run-or-raise-application-launcher for i3 window manager";

View File

@ -11,6 +11,10 @@ buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ];
# no tests
doCheck = false;
pythonImportsCheck = [ "remarkable_mouse" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A program to use a reMarkable as a graphics tablet"; description = "A program to use a reMarkable as a graphics tablet";
homepage = "https://github.com/evidlo/remarkable_mouse"; homepage = "https://github.com/evidlo/remarkable_mouse";

View File

@ -11,6 +11,10 @@ python3Packages.buildPythonApplication rec {
pythonPath = with python3Packages; [ enum-compat i3ipc docopt ]; pythonPath = with python3Packages; [ enum-compat i3ipc docopt ];
doCheck = false;
pythonImportsCheck = [ "i3altlayout" ];
meta = with lib; { meta = with lib; {
maintainers = with maintainers; [ magnetophon ]; maintainers = with maintainers; [ magnetophon ];
description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side"; description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side";

View File

@ -1,5 +1,5 @@
{ 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 , overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools
, mysqlSupport ? false, libmysqlclient ? null , mysqlSupport ? false, libmysqlclient ? null
, postgresSupport ? false, postgresql ? null , postgresSupport ? false, postgresql ? null
}: }:
@ -15,8 +15,16 @@ assert postgresSupport -> postgresql != null;
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; 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; [ configureFlags = with stdenv.lib; [
"--enable-gi-system-install=no"
"--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-mysql=${if mysqlSupport then "yes" else "no"}"
"--with-postgres=${if postgresSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}"
@ -32,7 +40,7 @@ assert postgresSupport -> postgresql != null;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig 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 ] buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
++ optional (mysqlSupport) libmysqlclient ++ optional (mysqlSupport) libmysqlclient
++ optional (postgresSupport) postgresql; ++ optional (postgresSupport) postgresql;

View File

@ -1,4 +1,5 @@
{ lib { stdenv
, lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pytestCheckHook , pytestCheckHook
@ -16,6 +17,9 @@ buildPythonPackage rec {
sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm"; sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm";
}; };
# OSError: AF_UNIX path too long
doCheck = !stdenv.isDarwin;
checkInputs = [ checkInputs = [
pytestCheckHook pytestCheckHook
pytest-asyncio pytest-asyncio

View File

@ -22,12 +22,15 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c"; sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c";
}; };
patches = [ (fetchpatch {
patches = [
(fetchpatch {
# Compatibility with h5py 3. # Compatibility with h5py 3.
# Will be included in the next releasse after 1.3.1 # Will be included in the next releasse after 1.3.1
url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch"; url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch";
sha256 = "00m8ias58xycn5n78sy9wywf4wck1v0gb8gzmg40inzdiha93jyz"; sha256 = "0pkpwnk0kfdxsbzsxqlqh8kgif17l5has0mg31g3kyp8lncj89b1";
}) ]; })
];
propagatedBuildInputs = [ propagatedBuildInputs = [
future future
@ -53,10 +56,11 @@ buildPythonPackage rec {
cd clifford/test cd clifford/test
''; '';
pytestFlagsArray = [ disabledTests = [
"-m \"not veryslow\"" "veryslow"
"--ignore=test_algebra_initialisation.py" # fails without JIT "test_algebra_initialisation"
"--ignore=test_cga.py" "test_cga"
"test_estimate_rotor_sequential[random_sphere]"
]; ];
meta = with lib; { meta = with lib; {

View File

@ -19,6 +19,10 @@ buildPythonPackage rec {
buildInputs = [ pbr ]; buildInputs = [ pbr ];
propagatedBuildInputs = [ pythonix ]; propagatedBuildInputs = [ pythonix ];
# does not have any tests
doCheck = false;
pythonImportsCheck = [ "nixpkgs" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; description = "Allows to `from nixpkgs import` stuff in interactive Python sessions";
homepage = "https://github.com/t184256/nixpkgs-python-importer"; homepage = "https://github.com/t184256/nixpkgs-python-importer";

View File

@ -36,6 +36,8 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
doCheck = !stdenv.isDarwin;
preCheck = stdenv.lib.optionalString stdenv.isLinux '' preCheck = stdenv.lib.optionalString stdenv.isLinux ''
echo "nameserver 127.0.0.1" > resolv.conf echo "nameserver 127.0.0.1" > resolv.conf
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \

View File

@ -1,5 +1,5 @@
{ buildPythonPackage, python, fetchurl, stdenv, pyside2, { buildPythonPackage, python, fetchurl, stdenv, pyside2
cmake, qt5, llvmPackages }: , cmake, qt5, llvmPackages }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "shiboken2"; pname = "shiboken2";
@ -32,5 +32,6 @@ stdenv.mkDerivation {
license = with licenses; [ gpl2 lgpl21 ]; license = with licenses; [ gpl2 lgpl21 ];
homepage = "https://wiki.qt.io/Qt_for_Python"; homepage = "https://wiki.qt.io/Qt_for_Python";
maintainers = with maintainers; [ gebner ]; maintainers = with maintainers; [ gebner ];
broken = stdenv.isDarwin;
}; };
} }

View File

@ -128,6 +128,9 @@ buildPythonApplication rec {
# UTF-8 locale needed for testing # UTF-8 locale needed for testing
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
# tests fail with to many open files
doCheck = !stdenv.isDarwin;
# - Anki writes some files to $HOME during tests # - Anki writes some files to $HOME during tests
# - Skip tests using network # - Skip tests using network
checkPhase = '' checkPhase = ''

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python3Packages }: { stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "urlwatch-${version}"; pname = "urlwatch";
version = "2.21"; version = "2.21";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -23,6 +23,9 @@ python3Packages.buildPythonApplication rec {
pyppeteer pyppeteer
]; ];
# no tests
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A tool for monitoring webpages for updates"; description = "A tool for monitoring webpages for updates";
homepage = "https://thp.io/2008/urlwatch/"; homepage = "https://thp.io/2008/urlwatch/";

View File

@ -16697,6 +16697,7 @@ in
vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix { vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix {
stdenv = gcc9Stdenv;
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
@ -16704,6 +16705,7 @@ in
CoreText IOSurface ImageIO OpenGL GLUT; CoreText IOSurface ImageIO OpenGL GLUT;
}; };
vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix {
stdenv = gcc9Stdenv;
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration