Merge master into staging-next
This commit is contained in:
commit
31dc9fe457
44 changed files with 171 additions and 150 deletions
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://musescore.org/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ yurrriq ];
|
||||
maintainers = [];
|
||||
repositories.git = "https://github.com/musescore/MuseScore";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergo";
|
||||
version = "4.0.7";
|
||||
version = "4.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
|
||||
sha256 = "sha256-CDNH7vYLG7Gn22yl+cXtGAD+c8tbNU52FmdxneTM2u4=";
|
||||
sha256 = "sha256-swU4CnX2BxL3ILH/sXux8ZHMo5nAPLQOIiWmr4C8BOQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -8,13 +8,13 @@ let
|
|||
|
||||
in buildGoModule rec {
|
||||
pname = "go-ethereum";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pEzaEpqr+Ird8d5zmoXMyAoS0aEGBYFmpgdPcH4OsMI=";
|
||||
sha256 = "sha256-4lHT0P8Euau0AJNtg1YstJJRQ58WTUlIH+HCKEjCq/s=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "cointop";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelmota";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4Ae8lzaec7JeYfmeLleatUS/xQUjea7O4XJ9DOgJIMs=";
|
||||
sha256 = "sha256-h4102oWYSuY4uq/Pyo9u25Pdsai7AK2W9yUmS/zdjrw=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/miguelmota/cointop";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.138.6";
|
||||
version = "0.138.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roboll";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-slqHG4uD0sbCNNr5Ve9eemyylUs4w1JizfoIMbrbVeg=";
|
||||
sha256 = "sha256-LFNsSd+S+mQiTk7bCnSD/Kp/D0Jefxo80eRsGkStBhs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to=";
|
||||
|
|
|
@ -157,9 +157,9 @@ in rec {
|
|||
});
|
||||
|
||||
terraform_0_14 = pluggable (generic {
|
||||
version = "0.14.7";
|
||||
sha256 = "0lnq65ibdxrw2rlyipk469a5hh16vgym1698nmfn62ak8fdrd8la";
|
||||
vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb";
|
||||
version = "0.14.8";
|
||||
sha256 = "0kpw8w28pfyr136z5d4pxw7g9ch6rk2lfwh3lwz25mngq1lljmn0";
|
||||
vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
|
||||
patches = [ ./provider-path.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
});
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cagebreak";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-repo";
|
||||
repo = "cagebreak";
|
||||
rev = version;
|
||||
hash = "sha256-P6zBVQEv+fKdverNIXhoEavu51uGKbSHx3Sh5FWsc2E=";
|
||||
hash = "sha256-F7fqDVbJS6pVgmj6C1/l9PAaz5yzcYpaq6oc6a6v/Qk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];
|
||||
|
@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
|
|||
mesonFlags = [
|
||||
"-Dxwayland=${lib.boolToString withXwayland}"
|
||||
"-Dversion_override=${version}"
|
||||
"-Dman-pages=true"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -10,7 +10,7 @@ let
|
|||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
|
|
@ -1,26 +1,26 @@
|
|||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "0g32pzxij72fjy0ycwzy23dg06ypmxcg24dk4scvhjp9b5ajx79k";
|
||||
iosevka-aile = "0yynkwhanza4y593ajn8hkshk46dl9g84qf1shmy21wd3lqr7psx";
|
||||
iosevka-curly = "0zd5hh0hr6prn32yd7fibl2wighv9f6p7jwgfrwcizljai44adnx";
|
||||
iosevka-curly-slab = "147bzw9lr8f54yh0hv8887sxy4571563mxjcag0dfw8z3rfffw8c";
|
||||
iosevka-etoile = "04jjg4vp0fag7xgiqxnql60gyvlpjmgqqj5q4j3rys9nyw3pl0gi";
|
||||
iosevka-slab = "10qwardvknnw6l3yiyji9v02450vfj76lvnlszijv78lfm1xp1qk";
|
||||
iosevka-ss01 = "12z1yjspzcbzgs224n1dxis4ghybfkzpw4dwr1wzza553kplwz6w";
|
||||
iosevka-ss02 = "08vrlzcyqa83mn2155p4h6hsk20jx3sv0yqimxfsyrwcalc63dcq";
|
||||
iosevka-ss03 = "0rhp4rdza36hazs20h4bk524xsgx54pxbw69k235km71m9x6ba59";
|
||||
iosevka-ss04 = "1ijjcy8z0fbfrw2fjqnmxbi9l6r41sixk72h3vp75gzrkq7dbh86";
|
||||
iosevka-ss05 = "06q9wxkyp7iv9pz3xj6d3v8ay82425wcgl9dybr3dfp4mcsdn7zz";
|
||||
iosevka-ss06 = "10pdw28dgdk5343rzbbj5mgmagv4ndl2gg4f02kzq0vlv5xh8vj6";
|
||||
iosevka-ss07 = "16xym710sq398zi223cjzxpcblc851ypl7v2dzhvskgsasvj4ypr";
|
||||
iosevka-ss08 = "14mqs6gi71p544asr1sz48g6q9zl6zj6sadhhcf8gdsnwa475ds2";
|
||||
iosevka-ss09 = "049va8vpzjczslirsxklwcpcsiaqrpc2zm9rmnf5qfyf7f1rn4yd";
|
||||
iosevka-ss10 = "1g8s9d7vlb2yx5d8cgsxcl5hb38g1f80d3l04lj2gr22lzk0y271";
|
||||
iosevka-ss11 = "15j3wfz8ybszp702c8ycv8kwnbdpa07w8kw9njhsfzvb5iw1xx0i";
|
||||
iosevka-ss12 = "1k5250sik2yfa5s5dxaqp0s45wfbxh1s1xn06qjj81ywmw9hy6yg";
|
||||
iosevka-ss13 = "1ym8mn2qqwys01wrkplx11kajkfi0x5vzn8m234cbzn8drlgh0l5";
|
||||
iosevka-ss14 = "0wkc7kwz6bzxxijycm4d4samy83zsghd8lyq0yn6g48rb6kj9fgw";
|
||||
iosevka-ss15 = "0j46sr85vcq25n8ia7nk8rgr3rmgr69wwf7pgllllscablacw73k";
|
||||
iosevka-ss16 = "017vipi1cmcjglx0x6da6ans1bsr3xlr43n4mv5qj7h50j1dv3l6";
|
||||
iosevka-ss17 = "0kbvy54v543znrzb9584mv6h96hfp9fndxb6wg32clqhzm2yh7fw";
|
||||
iosevka = "1fva80sxdcmsl8y3m23ndif3ff54if37g1xqpda1f13yrbd9ii8q";
|
||||
iosevka-aile = "0fy58yd17k8k41j5f48572d4vad3zz7c2mbc6vsiii9abfkwwalr";
|
||||
iosevka-curly = "1lxw8na3qvc5g04prczl7qprdkvd0zf91ybmv276dnkq27abnjn4";
|
||||
iosevka-curly-slab = "19b6xr5vjnb20j34x2ynfji63qibczn0mm2j76d01py304839bws";
|
||||
iosevka-etoile = "0fhcn69idb6w8abpmmvpdp9c08zdhy0zwn8nbyy9jcznwj8vwb7m";
|
||||
iosevka-slab = "0jlm3l13p9c965zx6z4df65lzxzj9yjjvpwlnx94ipayinxa1iff";
|
||||
iosevka-ss01 = "1i6bvslpxj87p3xi198l486ba40ixicdkmj29vcb1d7w1hhr6wnm";
|
||||
iosevka-ss02 = "1raczi1ja4barvjg5cp3j96kyph4aj8qlp9i10q7835sy29q3285";
|
||||
iosevka-ss03 = "0cn9hi5w9rx8xhbh9a75c7s9pxa3dkqfhd24lbp72hwfgv5nk1v0";
|
||||
iosevka-ss04 = "0v8fvif71604vyqanphq9mmlmx4xy0y2bykvplhrj1zmrj6v2ing";
|
||||
iosevka-ss05 = "1fh99av3ml2zhjvdif02r2f82n4hsswpgd2i42d964swjdplxdga";
|
||||
iosevka-ss06 = "0b0kl49djpc77qpmr1g2nzrg0q477xkjiqxb2i33pkrjsxn4vhn7";
|
||||
iosevka-ss07 = "1d2by3najsambqxyzapnmd200hah39jq0mqdalidb2kjh5lx9n6k";
|
||||
iosevka-ss08 = "05m03zn9pfl1khvl9xvgmlaygh1ni67lj2pc8zjgqydyls1vmxl4";
|
||||
iosevka-ss09 = "1hzglj7sclg6h4jc9ibb1777apl11885w1gpscv81b8n1h0qhnb7";
|
||||
iosevka-ss10 = "1fr52sclgp10k0lh86scjn3aylvsfnr7msg7jfsr3bkg61f5x1da";
|
||||
iosevka-ss11 = "1cmdjmlqvhn3qvqdfflwa4wgza364jn9gbj5vq8rsd6qili175ix";
|
||||
iosevka-ss12 = "0bk56hh9894z59rpkk5s9hhmkz1b2gmvfys46frijg3am54xh03q";
|
||||
iosevka-ss13 = "1kgxlxz1cdkzrfbnkavscf48im9lwiya9rcqlaa10k0ssas28br5";
|
||||
iosevka-ss14 = "06djgn86r2yy3ll2ask5mr9qhqibqzr7v95db5dzxcbz7hrmaaxf";
|
||||
iosevka-ss15 = "0qcld7h38c7cif518sa84x50igxjkh38ckav9qhhv7ls1n5h0jpm";
|
||||
iosevka-ss16 = "0qa6h8qx60rajbpp0v4wxia5n3yinp2nvwy2dsi1270prra7r49x";
|
||||
iosevka-ss17 = "1s04vlkll42am6w3lcka518zv2dlrwwnykdid0sp81najwmq0fk3";
|
||||
}
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mujs";
|
||||
version = "1.0.7";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
|
||||
sha256 = "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2";
|
||||
sha256 = "sha256-zKjWafQtO2OEPelF370s5KkArbT+gQv3lQQpYdGw6HY=";
|
||||
};
|
||||
|
||||
buildInputs = [ readline ];
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.14.3";
|
||||
version = "1.14.4";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = "jc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6ofw74onFECJYYSuZlOVcNVAVuJaJKV4pkaJ4cTrvPk=";
|
||||
sha256 = "sha256-RJiJByORpdMWZkA7q7A+WoV4S/UcOP/VZ5TVxFMLYSg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
|
||||
|
|
|
@ -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,28 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, aiohttp
|
||||
, async_generator
|
||||
, buildPythonPackage
|
||||
, doCheck ? true
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, sanic
|
||||
, websockets
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-sanic";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6428ed8cc2e6cfa05b92689a8589149aacdc1f0640fcf9673211aa733e6a5209";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yunstanford";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zpgnw1lqbll59chv4hgcn31mdql1nv4gw9crbihky3ly3d3ncqi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytest
|
||||
aiohttp
|
||||
async_generator
|
||||
httpx
|
||||
pytest
|
||||
websockets
|
||||
];
|
||||
|
||||
# circular dependency on sanic
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
sanic
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
inherit doCheck;
|
||||
|
||||
pythonImportsCheck = [ "pytest_sanic" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pytest plugin for Sanic";
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
{ lib, buildPythonPackage, fetchPypi, doCheck ? true
|
||||
, aiofiles, httptools, httpx, multidict, ujson, uvloop, websockets
|
||||
, pytestCheckHook, beautifulsoup4, gunicorn, httpcore, uvicorn
|
||||
, pytest-asyncio, pytest-benchmark, pytest-dependency, pytest-sanic, pytest-sugar, pytestcov
|
||||
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
|||
sha256 = "06p0lsxqbfbka2yaqlpp0bg5pf7ma44zi6kq7qbb6hhry48dp1w6";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"multidict==5.0.0"' '"multidict"' \
|
||||
--replace '"httpx==0.15.4"' '"httpx"' \
|
||||
|
@ -30,14 +30,19 @@ buildPythonPackage rec {
|
|||
pytest-asyncio pytest-benchmark pytest-dependency pytest-sanic pytest-sugar pytestcov
|
||||
];
|
||||
|
||||
inherit doCheck;
|
||||
|
||||
disabledTests = [
|
||||
"test_gunicorn" # No "examples" directory in pypi distribution.
|
||||
"test_logo" # Fails to filter out "DEBUG asyncio:selector_events.py:59 Using selector: EpollSelector"
|
||||
"test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution.
|
||||
"test_reloader_live" # OSError: [Errno 98] error while attempting to bind on address ('127.0.0.1', 42104)
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
pythonImportsCheck = [ "sanic" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A microframework based on uvloop, httptools, and learnings of flask";
|
||||
homepage = "http://github.com/channelcat/sanic/";
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.20.0";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sjshcppcfdfz29nsrzvrciypcb4r7fbl2sqhlkcq948b7k3jk8b";
|
||||
sha256 = "sha256-zXlsvuc778z1sxnv02mFJXQzkEEft0BdubWecvcytYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorSha256 = "0q6jm2ghwrbjxn76i8wz72xjdmwfvl5dn8n4zilyjjx9vvllwdjw";
|
||||
vendorSha256 = "sha256-QdTD6xeVNswaaMms82rFYb5jLDhxL+wQgaLVXqROSFs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.15085";
|
||||
version = "0.1.15108";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KcC9KfAeUM3pMSNThL+w/kzpQYzcMYV6YoNEN4q6duA=";
|
||||
sha256 = "sha256-r0GSv9JaQQkVLYDh51Rz6OIDTqV75RIT+NIWAFXWcV8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s=";
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jackett";
|
||||
version = "0.17.617";
|
||||
version = "0.17.668";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
|
||||
sha256 = "sha256-rNCtoiv48fzKH5CAzTZJjAjv6Z37BfVVNqsfpRVfY1M=";
|
||||
sha256 = "sha256-+cvUpWVpXEkW+d92aIOli+pNi+ZDHEbxDDQ67O6kOVA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2021-03-01T04-20-55Z";
|
||||
version = "2021-03-10T05-11-33Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-VTmnpZzidongzv6BzPY01qggai0w+ztGL3grDv6VGD4=";
|
||||
sha256 = "sha256-YwlVZE7TO9qr/8lwLXdZqjxy4NGxTkmLyKFDVlTZPqQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-m2Nv3OcPq/qc+4Cu/JUut59fZTDZwJn9gyG4jQ5n6Pg=";
|
||||
vendorSha256 = "sha256-E+j+ysBKKSyTITmJwHieBcpXdF3+rtt4YS7OVPMC6vI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "0.23.9";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liquidata-inc";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fVU3eOhog34fLnfNQ6mWB7yUEkinm74SgpxYXB9MV/g=";
|
||||
sha256 = "sha256-z2F6ru2LNATiI4rSImbvwgxqKxuj8kwzjhwSbsPDBEs=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
|
||||
vendorSha256 = "sha256-Poumvh7DccY8qCZ5ehFFaqEsL945BxNXFfevJvRawUA=";
|
||||
vendorSha256 = "sha256-JO2hGrKbt+5Eh7v7LCZrPBK84Q9gjquchlZ5MfMY3uY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -11,16 +11,16 @@ buildGoModule rec {
|
|||
version = "2.0.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trezor";
|
||||
repo = "trezord-go";
|
||||
rev = "v${version}";
|
||||
owner = "trezor";
|
||||
repo = "trezord-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hzvk0wfgg7b4wpqjk3738yqxlv3pj5i7zxwm0jady2h97hmrqrr";
|
||||
};
|
||||
|
||||
vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61";
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Trezor Communication Daemon aka Trezor Bridge";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "0.158.0";
|
||||
version = "0.159.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ewwJHn55zzry2hhMNuRUlGwC995r0ooPJGqKYaCh4WE=";
|
||||
sha256 = "sha256-02uM37tulJ78IwOAqXm5Ym30kHVepnMBVg+eTMj34qQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-awgkYMidTDcUjQt7hA5cSiwSAsNo5iUqKcG4+2lCXIM=";
|
||||
vendorSha256 = "sha256-whcHI/qkNBPYcR5WLWQCPdHiwYdLEOgorbAKTTYIWDk=";
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
|
|
|
@ -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" ];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "8.6.8";
|
||||
version = "8.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ierNKZ14F3EKtQRdOd7D4jhaA7M6zwnFVSk6aUh4VPc=";
|
||||
sha256 = "sha256-/JS173hIW3doDCP/5v8dUSEW44pyq6VdF17Za6JWtys=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-F/Vxl9Z5LgAmnRt/FOdW9eVN7IVb1ZEKiYOSpT9+L0E=";
|
||||
vendorSha256 = "sha256-5UaOFTm72RG/xsShliU32Vp6qNANDyAotbaRYyan87U=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.35.2";
|
||||
version = "0.35.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XOTHvI80WMn5j52+N/bR/NfaPX9v6cRB2VCVWJ6fJw8=";
|
||||
sha256 = "sha256-DScN/swigecdhucxhfP1mNr2mDX6HbY2dktkN8BxBjI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gping";
|
||||
version = "1.2.0-post";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orf";
|
||||
repo = "gping";
|
||||
rev = "v${version}";
|
||||
sha256 = "0h4cd36lrhr64p3m2l7yvkq22h8fzzm3g61m39d303s1viibm6dg";
|
||||
sha256 = "sha256-lApm1JLXNjDKLj6zj25OaZDVp7lLW3qyrDsvJrudl8I=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0aadalgs5p7wqbbkidm49ccfl716xairb4pirrgm3749zdg55bi9";
|
||||
cargoSha256 = "sha256-2PxhtAqROgufVGGH7VtEJJU6Sa2OrGbbMVRUWYbAD0Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ping, but with a graph";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2021-02-19T05-34-40Z";
|
||||
version = "2021-03-10T05-59-20Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-tkNGWX0QyMlMw+wB8wkYuGfveln6NUoIBLPscRHnQT4=";
|
||||
sha256 = "sha256-IoCM2FA6oNiNT6zWspMEqgq4hZ8tAQVEAqouRlBe/ts=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6l8VcHTSZBbFe96rzumMCPIVFVxUMIWoqiBGMtrx75U=";
|
||||
vendorSha256 = "sha256-aoRdtv/Q7vjn0M7iSYAuyu/3pEH30x6D39xTHqQPvuo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2899,7 +2899,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;
|
||||
|
@ -3136,9 +3139,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 { };
|
||||
|
||||
|
@ -6368,7 +6369,9 @@ in {
|
|||
pytest-runner = self.pytestrunner; # added 2021-01-04
|
||||
pytestrunner = callPackage ../development/python-modules/pytestrunner { };
|
||||
|
||||
pytest-sanic = callPackage ../development/python-modules/pytest-sanic { };
|
||||
pytest-sanic = callPackage ../development/python-modules/pytest-sanic {
|
||||
sanic = self.sanic.override { doCheck = false; };
|
||||
};
|
||||
|
||||
pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { };
|
||||
|
||||
|
@ -8480,7 +8483,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