diff options
Diffstat (limited to 'pkgs/development')
20 files changed, 105 insertions, 46 deletions
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 682a8aa4eed9..f90e6b4bcfe0 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20190909"; + version = "20200204"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0km45pz19dz1hi8vjj290hyxdhr379iixmml0rs8crr4gvs3685w"; + sha256 = "0diqnvyfh8w7yf7l5zqvb4msw07n50k9grz0k2znykaqwmjsidx9"; }; sourceRoot = "."; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 9f0f16d5cee2..6c0b3c867a48 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.800.4"; + version = "9.850.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1vcgqshlah5cv1954r1jv02y2iyr0gi5jqc8zz8wmvgm56vm83mw"; + sha256 = "07y0s87srj2wxbywmnxam9bif0x625n6b8np19832mvsb6wqkhyl"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index e32ec1695792..c1415a2837c4 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "187r7vc4kpd0v6bb1y51zwqm9y1lh0m84vkwmrxn8rrp4bwdxlpj"; + sha256 = "04p3kgk1zadadl6n0prwc77nfxrbdasbwbqpws1y9y6f77lrcxdn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index c36633edfff3..32251afffde5 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libmypaint"; - version = "1.4.0"; + version = "1.5.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "1ynm2g2wdb9zsymncndlgs6gpcbsa122n52d11161jrj5nrdliaq"; + sha256 = "06szsadj589vlvn33gzybygdknsaahr4cpigh2xyg8mr3h9ngqrl"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 90da6c192120..8fb586bcd732 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "1ryf5v2h07c7b42q2p9id88i270ajyz5rlsradp00dy8in6dn2yr"; + sha256 = "0d79adxw09cd6xfyb2sxp38j03h3g7gn4ki85zhp9nicrrm179qz"; # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. # submodules increase src size and compile times significantly # not currently feasible due to how integrated cmake build is with git diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 75a2dab970ee..3e8ac82add4c 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "odoc"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ocaml"; repo = pname; rev = version; - sha256 = "0rvhx139jx6wmlfz355mja6mk03x4swq1xxvk5ky6jzhalq3cf5i"; + sha256 = "14ilq2glcvda8mfhj27jqqwx3392q8ssp9bq9agz7k1k6ilp9dai"; }; buildInputs = [ astring cmdliner cppo fpath result tyxml ]; diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 7bb805e4f35d..049db8a648fb 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -137,6 +137,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "flask>=1.1.0, <2.0" "flask" \ + --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ + --replace "pandas>=0.17.1, <1.0.0" "pandas" \ --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \ --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ --replace "pendulum==1.4.4" "pendulum" \ @@ -156,7 +158,7 @@ buildPythonPackage rec { --replace "sqlalchemy~=1.3" "sqlalchemy" \ --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \ --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug" - + # dumb-init is only needed for CI and Docker, not relevant for NixOS. substituteInPlace setup.py \ --replace "'dumb-init>=1.2.2'," "" diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 7066a188c773..585f96341eef 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.5.2"; + version = "2.6.0"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "09pgzx2m04hzpckwgz4iz9590ll5fk1mirlra89qps8ig1xmz5m5"; + sha256 = "1bsxc9x3yx5dy2r3b3lzi97wz0ma3ncd14jr27n6lbqvl20w92mm"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index de180ca03e55..c492e65854a7 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python, django, six }: -if stdenv.lib.versionAtLeast django.version "2.0" -then throw "django-compat requires django < 2.0" -else + buildPythonPackage rec { pname = "django-compat"; version = "1.0.15"; + # django-compat requires django < 2.0 + disabled = stdenv.lib.versionAtLeast django.version "2.0"; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 7d293edba35a..22b1c31ece95 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.4.0"; + version = "1.4.1"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1fmwy7plcgxam09cx3z11068k0c98wcsgclmxdq8chsd6id3632y"; + sha256 = "1xgz4aml3g3q2011wxarg25xl3g9zny313p52w9abyy16f40vjy0"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 48ea6004426c..fc43af9294f1 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, fetchurl +, fetchFromGitHub , imageio , numpy , opencv3 @@ -13,18 +13,20 @@ buildPythonPackage rec { pname = "imgaug"; - version = "0.3.0"; + version = "0.4.0"; - src = fetchurl { - url = "https://github.com/aleju/imgaug/archive/c3d99a420efc45652a1264920dc20378a54b1325.zip"; - sha256 = "sha256:174nvhyhdn3vz0i34rqmkn26840j3mnfr55cvv5bdf9l4y9bbjq2"; + src = fetchFromGitHub { + owner = "aleju"; + repo = "imgaug"; + rev = version; + sha256 = "17hbxndxphk3bfnq35y805adrfa6gnm5x7grjxbwdw4kqmbbqzah"; }; postPatch = '' substituteInPlace requirements.txt \ --replace "opencv-python-headless" "" substituteInPlace setup.py \ - --replace "opencv-python-headless" "" + --replace "opencv-python-headless" "" substituteInPlace pytest.ini \ --replace "--xdoctest --xdoctest-global-exec=\"import imgaug as ia\nfrom imgaug import augmenters as iaa\"" "" ''; @@ -39,8 +41,9 @@ buildPythonPackage rec { six ]; + # augmenters requires a significant increase in packages requires checkPhase = '' - pytest ./test + pytest ./test --ignore=test/augmenters ''; checkInputs = [ opencv3 pytest ]; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 567a1c66e029..d27fd8620459 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -18,9 +19,6 @@ , chardet }: -if stdenv.lib.versionOlder django.version "1.11" || stdenv.lib.versionAtLeast django.version "2.0" -then throw "mezzanine requires django-1.11. Consider overriding python package set to use django_1_11" -else buildPythonPackage rec { version = "4.3.1"; pname = "Mezzanine"; @@ -30,7 +28,8 @@ buildPythonPackage rec { sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3"; }; - disabled = isPyPy; + disabled = isPyPy || stdenv.lib.versionOlder django.version "1.11" + || stdenv.lib.versionAtLeast django.version "2.0"; buildInputs = [ pyflakes pep8 ]; propagatedBuildInputs = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ]; @@ -44,7 +43,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - meta = with stdenv.lib; { + meta = with lib; { description = '' A content management platform built using the Django framework ''; @@ -63,11 +62,13 @@ buildPythonPackage rec { Mezzanine provides most of its functionality by default. This approach yields a more integrated and efficient platform. ''; - homepage = http://mezzanine.jupo.org/; - downloadPage = https://github.com/stephenmcd/mezzanine/releases; + homepage = "http://mezzanine.jupo.org/"; + downloadPage = "https://github.com/stephenmcd/mezzanine/releases"; license = licenses.free; maintainers = with maintainers; [ prikhi ]; platforms = platforms.unix; + # mezzanine requires django-1.11. Consider overriding python package set to use django_1_11" + broken = versionOlder django.version "1.11" || versionAtLeast django.version "2.0"; }; } diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 984304e9ccbf..de4803c60e49 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "79b5f81b9315b03ac3744d12448032490f5028b5117b721775ba97118ecd5e45"; + sha256 = "0av5kraczczp0hvwpkdaw7kl2hk9k4dyll08rg180n52a2dm0pra"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 4529b80556ba..829a983e3801 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -1,4 +1,5 @@ { stdenv +, pythonOlder , fetchPypi , python , buildPythonPackage @@ -15,6 +16,8 @@ buildPythonPackage rec { version = "0.48.0"; pname = "numba"; + # uses f-strings + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 10c42fea033e..5532a8afa9b1 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , nose , pandas @@ -9,6 +10,8 @@ buildPythonPackage rec { pname = "seaborn"; version = "0.10.0"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "59fe414e138d7d5ea08b0feb01b86caf4682e36fa748e3987730523a89aecbb9"; @@ -30,4 +33,4 @@ buildPythonPackage rec { license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index eb8be17797f3..84e92fa9f7c7 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, isPy27 , asn1crypto , azure-storage-blob , boto3 @@ -24,11 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.1.2"; + version = "2.2.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06061d59lapqrlg3gzdk4bi3v9c3q5zxfs0if5v2chg1f2l80ncr"; + sha256 = "1d3qxjqc79fi2l4sns5svbc6kfaihivsrpycflmh50h7x0k9sv7f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix new file mode 100644 index 000000000000..063a2c198dab --- /dev/null +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "samurai"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "michaelforney"; + repo = pname; + rev = version; + sha256 = "1jsxfpwa6q893x18qlvpsiym29rrw5cj0k805wgmk2n57j9rw4f2"; + }; + + makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "ninja-compatible build tool written in C"; + homepage = "https://github.com/michaelforney/samurai"; + license = with licenses; [ mit asl20 ]; # see LICENSE + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 09e6513d2b16..41303439d76b 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -3,16 +3,16 @@ let zshCompletion = version: fetchurl { url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; - sha256 = "0gfr1q66crh6si4682xbxnj41igws83qj710npgm2bvq90xa8m49"; + sha256 = "1mn6cdmf59nkz5012wgd3gd6hpk2w4629sk8z95230ky8487dac3"; }; in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.0-RC3-3"; + version = "2.0.0-RC6-4"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "1qrybajwk46h6d1yp6n4zxdvrfl19lqhjsqxbm48vk3wbvj31vyl"; + sha256 = "0i8jvs5l7f2xzkdlxk784mx5h86hq7xh5ffzb4zalczw9bzmmds1"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix new file mode 100644 index 000000000000..31e0158eb6b3 --- /dev/null +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-license-detector"; + version = "3.0.2"; + + src = fetchFromGitHub { + owner = "src-d"; + repo = pname; + rev = "v${version}"; + sha256 = "0gp7na2hqn5crr5x4khllsq7ka9h7rx8b4y10yzxmi0wpmxr53sw"; + }; + + modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb"; + + meta = with lib; { + description = "Reliable project licenses detector"; + homepage = "https://github.com/src-d/go-license-detector"; + license = licenses.asl20; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 56cb5560f946..11ee7b584df4 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.21"; + version = "0.5.24"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "08mpnj3l6bcm1jg22lw1gcs0lkm4320fwl4p5y1s44w64963kzf7"; + sha256 = "1haq8gv4k6qgihyjplf76589d2hbb1720g6yvwk88aksjxmqj4jm"; }; - cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp"; + cargoSha256 = "011r5n68ay94dvfm37xpd9s8x086l6qsll74iw98hcvw3inxp1ws"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; |