Merge pull request #115631 from SuperSandro2000/fix-collection26
This commit is contained in:
commit
6c1afc1b99
|
@ -16,12 +16,11 @@ mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ];
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
|
||||
buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Stand-alone YouTube video player";
|
||||
|
|
|
@ -37,6 +37,6 @@ mkDerivation rec {
|
|||
description = "Free and modular front-end framework for developing fast and compelling user experiences";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
broken = lib.versionOlder qtbase.version "5.14.0";
|
||||
broken = versionOlder qtbase.version "5.14.0";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,23 +4,20 @@
|
|||
, xorgproto, gst_all_1, setfile
|
||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, withMesa ? libGLSupported
|
||||
, libGLU ? null, libGL ? null
|
||||
, libGLU, libGL
|
||||
, compat24 ? false, compat26 ? true, unicode ? true
|
||||
, withGtk2 ? true
|
||||
, withWebKit ? false, webkitgtk ? null
|
||||
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
|
||||
, withWebKit ? false, webkitgtk
|
||||
, AGL, Carbon, Cocoa, Kernel, QTKit
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
assert withMesa -> libGLU != null && libGL != null;
|
||||
assert withWebKit -> webkitgtk != null;
|
||||
|
||||
assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2.";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.5";
|
||||
pname = "wxwidgets";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wxWidgets";
|
||||
|
@ -29,16 +26,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
|
||||
] ++ optionals withGtk2 [ gtk2 ]
|
||||
] ++ optional withGtk2 gtk2
|
||||
++ optional (!withGtk2) gtk3
|
||||
++ optional withMesa libGLU
|
||||
++ optional withWebKit webkitgtk
|
||||
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
propagatedBuildInputs = optional stdenv.isDarwin AGL;
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools_scm
|
||||
, pytest
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
, pytestcov
|
||||
, sqlalchemy
|
||||
, tornado
|
||||
|
@ -29,11 +29,11 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
buildInputs = [
|
||||
setuptools_scm
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
pytestcov
|
||||
sqlalchemy
|
||||
tornado
|
||||
|
@ -51,18 +51,11 @@ buildPythonPackage rec {
|
|||
setuptools
|
||||
] ++ lib.optional (!isPy3k) futures;
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "apscheduler" ];
|
||||
|
||||
# Somehow it cannot find pytestcov
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python library that lets you schedule your Python code to be executed";
|
||||
homepage = "https://pypi.python.org/pypi/APScheduler/";
|
||||
homepage = "https://github.com/agronholm/apscheduler";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -48,5 +48,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/spacetelescope/asdf";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
# many ValueError in tests
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w=";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest-runner ];
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
||||
propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
|
||||
|
||||
|
|
|
@ -54,6 +54,7 @@ buildPythonPackage rec {
|
|||
license = licenses.lgpl3;
|
||||
homepage = "https://scitools.org.uk/cartopy/docs/latest/";
|
||||
maintainers = with maintainers; [ mredaelli ];
|
||||
# following tests fail: test_eccentric_globe and test_ellipse_globe
|
||||
broken = true;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -63,5 +63,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://clifford.readthedocs.io";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
# many TypeError's in tests
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -29,5 +29,6 @@ buildPythonPackage rec {
|
|||
description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Stackdriver Monitoring API client library";
|
||||
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
|
||||
homepage = "https://github.com/googleapis/python-monitoring";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
, decorator
|
||||
, nose
|
||||
, krb5Full
|
||||
, darwin
|
||||
, GSS
|
||||
, parameterized
|
||||
, shouldbe
|
||||
, cython
|
||||
|
@ -44,7 +44,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.GSS
|
||||
GSS
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, hypothesis
|
||||
, doCheck ? true
|
||||
, dataclasses
|
||||
, hypothesmith
|
||||
, pytestCheckHook
|
||||
|
@ -29,12 +28,13 @@ buildPythonPackage rec {
|
|||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
propagatedBuildInputs = [ hypothesis typing-inspect pyyaml ]
|
||||
propagatedBuildInputs = [ hypothesis typing-extensions typing-inspect pyyaml ]
|
||||
++ lib.optional (pythonOlder "3.7") dataclasses;
|
||||
|
||||
checkInputs = [ black hypothesmith isort pytestCheckHook ];
|
||||
|
||||
inherit doCheck;
|
||||
# can't run tests due to circular dependency on hypothesmith -> licst
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
python -m libcst.codegen.generate visitors
|
||||
|
@ -44,8 +44,7 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "libcst" ];
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"A Concrete Syntax Tree (CST) parser and serializer library for Python.";
|
||||
description = "A Concrete Syntax Tree (CST) parser and serializer library for Python.";
|
||||
homepage = "https://github.com/Instagram/libcst";
|
||||
license = with licenses; [ mit asl20 psfl ];
|
||||
maintainers = with maintainers; [ ruuda SuperSandro2000 ];
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python,
|
||||
cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null,
|
||||
cudaSupport ? false, cudatoolkit, cudnn, nccl, magma,
|
||||
mklDnnSupport ? true, useSystemNccl ? true,
|
||||
MPISupport ? false, mpi,
|
||||
buildDocs ? false,
|
||||
|
@ -30,8 +30,6 @@
|
|||
isPy3k, pythonOlder }:
|
||||
|
||||
# assert that everything needed for cuda is present and that the correct cuda versions are used
|
||||
assert !cudaSupport || cudatoolkit != null;
|
||||
assert cudnn == null || cudatoolkit != null;
|
||||
assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
|
||||
in majorIs == "9" || majorIs == "10" || majorIs == "11");
|
||||
|
||||
|
@ -297,12 +295,13 @@ in buildPythonPackage rec {
|
|||
install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Open source, prototype-to-production deep learning platform";
|
||||
homepage = "https://pytorch.org/";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin;
|
||||
maintainers = with lib.maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
|
||||
license = licenses.bsd3;
|
||||
platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin;
|
||||
maintainers = with maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
|
||||
# error: use of undeclared identifier 'noU'; did you mean 'no'?
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -33,6 +33,12 @@ buildPythonPackage rec {
|
|||
sha256 = "ad62bfd31e677d39984449d9c68e233da2776b80894a988a2421aad412e4c44f";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \
|
||||
--replace 'pytz<2021.0' 'pytz'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-storage-blob
|
||||
asn1crypto
|
||||
|
@ -55,11 +61,6 @@ buildPythonPackage rec {
|
|||
urllib3
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL',"
|
||||
'';
|
||||
|
||||
# tests require encrypted secrets, see
|
||||
# https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters
|
||||
doCheck = false;
|
||||
|
|
|
@ -27,5 +27,6 @@ buildPythonPackage rec {
|
|||
description = "Snowflake SQLAlchemy Dialect";
|
||||
homepage = "https://www.snowflake.net/";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, argh
|
||||
, pathtools
|
||||
, pyyaml
|
||||
, pkgs
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, CoreServices
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -27,8 +28,7 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin
|
||||
[ pkgs.darwin.apple_sdk.frameworks.CoreServices ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
argh
|
||||
|
@ -48,6 +48,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/gorakhargosh/watchdog";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
# error: use of undeclared identifier 'kFSEventStreamEventFlagItemCloned'
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -60,5 +60,7 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.babariviere ];
|
||||
# ld: symbol(s) not found for architecture x86_64
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -33,8 +33,7 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoBuildFlags = [ "--all" ];
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation";
|
||||
description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation";
|
||||
homepage = "https://www.tremor.rs/";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
|
|
@ -32,6 +32,6 @@ buildGoModule rec {
|
|||
You can feed it standard input, any number of files or any number of directories to recurse into.
|
||||
'';
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ zowoq ];
|
||||
maintainers = with maintainers; [ zowoq SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2897,7 +2897,10 @@ in {
|
|||
|
||||
gspread = callPackage ../development/python-modules/gspread { };
|
||||
|
||||
gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; };
|
||||
gssapi = callPackage ../development/python-modules/gssapi {
|
||||
inherit (pkgs) krb5Full;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) GSS;
|
||||
};
|
||||
|
||||
gst-python = callPackage ../development/python-modules/gst-python {
|
||||
inherit (pkgs) meson;
|
||||
|
@ -3134,9 +3137,7 @@ in {
|
|||
|
||||
hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4;
|
||||
|
||||
hypothesmith = callPackage ../development/python-modules/hypothesmith {
|
||||
libcst = self.libcst.override { doCheck = false; };
|
||||
};
|
||||
hypothesmith = callPackage ../development/python-modules/hypothesmith { };
|
||||
|
||||
hyppo = callPackage ../development/python-modules/hyppo { };
|
||||
|
||||
|
@ -8472,7 +8473,9 @@ in {
|
|||
|
||||
wasmer = callPackage ../development/python-modules/wasmer { };
|
||||
|
||||
watchdog = callPackage ../development/python-modules/watchdog { };
|
||||
watchdog = callPackage ../development/python-modules/watchdog {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
waterfurnace = callPackage ../development/python-modules/waterfurnace { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue