diff options
Diffstat (limited to 'pkgs/development')
5 files changed, 37 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 96dbd463370..abd6c7bbf6c 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation { - name = "libjpeg-9c"; + name = "libjpeg-9d"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v9c.tar.gz; - sha256 = "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5"; + url = http://www.ijg.org/files/jpegsrc.v9d.tar.gz; + sha256 = "0clwys9lcqlxqgcw8s1gwfm5ix2zjlqpklmd3mbvqmj5ibj51jwr"; }; configureFlags = optional static "--enable-static --disable-shared"; diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 56c5754831e..ca2c7d9b70f 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = true; + # Building the tests currently fails on AArch64 due to internal compiler + # errors (with GCC 9.2): + cmakeFlags = stdenv.lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF"; + + doCheck = !stdenv.isAarch64; checkTarget = "test"; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 6a497358404..02adb5a8d16 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -1,7 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which -, contextlib2 +{ stdenv, fetchurl, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +, contextlib2, osxfuse }: +let + inherit (stdenv.lib) optionals optionalString; +in + buildPythonPackage rec { pname = "llfuse"; version = "1.3.6"; @@ -11,14 +15,29 @@ buildPythonPackage rec { sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii"; }; + patches = [ + # https://github.com/python-llfuse/python-llfuse/pull/23 (2 commits) + (fetchpatch { + url = "https://github.com/python-llfuse/python-llfuse/commit/7579b0e626da1a7882b13caedcdbd4a834702e94.diff"; + sha256 = "0vpybj4k222h20lyn0q7hz86ziqlapqs5701cknw8d11jakbhhb0"; + }) + (fetchpatch { + url = "https://github.com/python-llfuse/python-llfuse/commit/438c00ab9e10d6c485bb054211c01b7f8524a736.diff"; + sha256 = "1zhb05b7k3c9mjqshy9in8yzpbihy7f33x1myq5kdjip1k50cwrn"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse ]; - checkInputs = [ pytest attr which ]; + buildInputs = + optionals stdenv.isLinux [ fuse ] + ++ optionals stdenv.isDarwin [ osxfuse ]; + checkInputs = [ pytest which ] ++ + optionals stdenv.isLinux [ attr ]; propagatedBuildInputs = [ contextlib2 ]; checkPhase = '' - py.test -k "not test_listdir" + py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index ceb9f841a46..c12084f008e 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.4.0"; + version = "0.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d5ddf363b7e0e562652f283f74a89bf35601baf16b70f2cd2736a2f8c6638748"; + sha256 = "a6101fd435ac89ba5205a105a26a6ede9e4ddbb4408a6e167852efca47806d11"; }; checkInputs = [ pytestCheckHook colorama ]; disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; meta = with stdenv.lib; { homepage = https://github.com/Delgan/loguru; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index c2cc553f86d..ab9ba1758d0 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.5.6"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "16fjbgsy6fz1vw1s883z7xv380525rr47j7pcc365p5nm8y1hfp1"; + sha256 = "0pdyv3bk2d50gqqd9h4a2i4yym4k01p7qkwhzz2mxa18f64777s9"; }; nativeBuildInputs = [ makeWrapper ]; |