diff options
Diffstat (limited to 'pkgs/development')
48 files changed, 391 insertions, 105 deletions
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index ed31f58fd2277..58dd5b4570ddb 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { inherit libsigsegv gettext coreutils; - ffcallAvailable = libffcall != null; + ffcallAvailable = stdenv.isLinux && (libffcall != null); buildInputs = [libsigsegv] ++ lib.optional (gettext != null) gettext @@ -101,7 +101,8 @@ stdenv.mkDerivation rec { homepage = "http://clisp.cons.org"; maintainers = lib.teams.lisp.members; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isAarch64; + # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; license = lib.licenses.gpl2; }; } diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index c225604463445..91602ad93786a 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation rec { homepage = "http://clisp.cons.org"; maintainers = lib.teams.lisp.members; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 - platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index 01c87362d9d49..c9ad4a02487ee 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "example-robot-data"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "Gepetto"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-KE+wmYlgETt6RtyN/BMApgS075/WtuhY+rM7YFkBH0E="; + hash = "sha256-X1BQGM7MMe753RMb/rVYv7kNnjk/q30u/VJARAXiTAI="; }; strictDeps = true; diff --git a/pkgs/development/libraries/libphonenumber/build-reproducibility.patch b/pkgs/development/libraries/libphonenumber/build-reproducibility.patch new file mode 100644 index 0000000000000..202370a80fc53 --- /dev/null +++ b/pkgs/development/libraries/libphonenumber/build-reproducibility.patch @@ -0,0 +1,24 @@ +diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc +index 205947e831..1e628e2cd2 100644 +--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc ++++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc +@@ -97,7 +97,8 @@ class DirEntry { + DirEntryKinds kind_; + }; + +-// Lists directory entries in path. "." and ".." are excluded. Returns true on ++// Lists directory entries in path. "." and ".." are excluded. Entries are ++// returned in a consistent order to ensure reproducibility. Returns true on + // success. + bool ListDirectory(const string& path, vector<DirEntry>* entries) { + entries->clear(); +@@ -135,6 +136,9 @@ bool ListDirectory(const string& path, vector<DirEntry>* entries) { + } + entries->push_back(DirEntry(entry->d_name, kind)); + } ++ std::sort( ++ entries->begin(), entries->end(), ++ [](const DirEntry& a, const DirEntry& b) { return a.name() < b.name(); }); + } + + // Returns true if s ends with suffix. diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 1c6d355da4299..a9b0df3304be5 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-xLxadSxVY3DjFDQrqj3BuOvdMaKdFSLjocfzovJCBB0="; }; + patches = [ + # Submitted upstream: https://github.com/google/libphonenumber/pull/2921 + ./build-reproducibility.patch + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/development/ocaml-modules/uring/default.nix b/pkgs/development/ocaml-modules/uring/default.nix index b6cc3e4c99453..0287f5843a4c3 100644 --- a/pkgs/development/ocaml-modules/uring/default.nix +++ b/pkgs/development/ocaml-modules/uring/default.nix @@ -10,14 +10,14 @@ buildDunePackage rec { pname = "uring"; - version = "0.5"; + version = "0.6"; minimalOCamlVersion = "4.12"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/ocaml-multicore/ocaml-uring/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "106w7mabqihdhj4csk9jfqag220rwhqdp5lapn0xmw2035scvxvk"; + url = "https://github.com/ocaml-multicore/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "ZltD9JnF1lJs0xjWwFXBfWMP8e5XRhCaB2P4iqHFreo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index ad0729c0ffa7c..04f08687da355 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aionotion"; - version = "2023.05.1"; + version = "2023.05.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - hash = "sha256-gCHJBgPWe5aSzTvvETjfn3zoEuuCJV1s4lMQLP72a/8="; + hash = "sha256-iQQbLMb3Bi+BzKeN5oEHWjCJryf+TUiINueqStGyktQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index 6254a902eeab3..ac00576cc297b 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -14,7 +14,7 @@ , pytestCheckHook , pythonOlder , reproject -, scikitimage +, scikit-image , shapely }: @@ -44,7 +44,7 @@ buildPythonPackage rec { pyavm pyregion reproject - scikitimage + scikit-image shapely ]; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index 9e0c815704452..a20598b61d017 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -9,7 +9,7 @@ , fetchpatch , scipy , scikit-learn -, scikitimage +, scikit-image , threadpoolctl }: @@ -33,7 +33,7 @@ buildPythonPackage rec { pillow scipy scikit-learn - scikitimage + scikit-image threadpoolctl ]; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 00cc61a3092e8..5112d9d46167f 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.35.2"; + version = "0.35.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-I9PXFdRXHQ7OnzCdB631nlfnkpConl+j5Z3iiH7RcA4="; + hash = "sha256-JpRL4RxVcH+hzz7YTlRw+FHH95RavS/m1HWyBiLLWME="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index cb1ef6a35ea24..75bd3c2e561be 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -4,7 +4,7 @@ , python , xvfb-run , matplotlib -, scikitimage +, scikit-image , numpy , pandas , imageio @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib - scikitimage + scikit-image numpy pandas imageio diff --git a/pkgs/development/python-modules/bsuite/default.nix b/pkgs/development/python-modules/bsuite/default.nix index 0a5f22511120e..e039bf0fa07f9 100644 --- a/pkgs/development/python-modules/bsuite/default.nix +++ b/pkgs/development/python-modules/bsuite/default.nix @@ -10,7 +10,7 @@ , absl-py , dm-env , plotnine -, scikitimage +, scikit-image , dm-tree , patsy , tensorflow-probability @@ -45,7 +45,7 @@ let bsuite = buildPythonPackage rec { pandas patsy plotnine - scikitimage + scikit-image scipy statsmodels termcolor diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index f408903a0a13d..c2db1cd1108f5 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -60,6 +60,12 @@ buildPythonPackage rec { requests-mock ]; + disabledTests = [ + # too closely affected by bs4 updates + "test_pretty_format_html" + "test_assert_html_snapshot_by_css_selector" + ]; + disabledTestPaths = [ "bx_py_utils_tests/tests/test_project_setup.py" ]; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index 01a6948e3cacf..c01b42c64b83b 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -1,19 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: buildPythonPackage rec { - pname = "Cheetah3"; - version = "3.2.6.post2"; + pname = "cheetah3"; + version = "3.3.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "CheetahTemplate3"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-op8CwYISD2Gfsh0Olr8H07yvaT1maKyizb/IN9ZHwmQ="; }; doCheck = false; # Circular dependency + pythonImportsCheck = [ + "Cheetah" + ]; + meta = with lib; { - homepage = "http://www.cheetahtemplate.org/"; description = "A template engine and code generation tool"; + homepage = "http://www.cheetahtemplate.org/"; + changelog = "https://github.com/CheetahTemplate3/cheetah3/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ pjjw ]; }; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index b658a6e8dbe7d..3ae2278298a71 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -7,7 +7,7 @@ , pims , pytestCheckHook , pythonOlder -, scikitimage +, scikit-image , scipy }: @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - scikitimage + scikit-image ]; postPatch = '' diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 5444700999fab..e5b9c164b1efc 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UiV9eshlUqzmoI+04BXMFVI8pm7OYQZFa9lmIQrmlRg="; + hash = "sha256-Rabw6FIoSg9Cj4+tRO3BmBAeo9yr8KwU5xTPFL0JkOs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dm-haiku/tests.nix b/pkgs/development/python-modules/dm-haiku/tests.nix index a951323e5d893..208fb14e76beb 100644 --- a/pkgs/development/python-modules/dm-haiku/tests.nix +++ b/pkgs/development/python-modules/dm-haiku/tests.nix @@ -12,7 +12,7 @@ , bsuite , frozendict , dm-env -, scikitimage +, scikit-image , rlax , distrax , tensorflow-probability @@ -42,7 +42,7 @@ buildPythonPackage rec { pytestCheckHook optax rlax - scikitimage + scikit-image tensorflow tensorflow-probability ]; diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix index 2a5e82cc8e232..c94a0647ba40c 100644 --- a/pkgs/development/python-modules/easyocr/default.nix +++ b/pkgs/development/python-modules/easyocr/default.nix @@ -9,7 +9,7 @@ , pyclipper , python-bidi , torch -, scikitimage +, scikit-image , scipy , shapely , torchvision @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - scikitimage + scikit-image hdf5 python-bidi numpy diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index ed19595cc6bba..7774b3c538040 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -7,7 +7,7 @@ , openjpeg , pytestCheckHook , pythonOlder -, scikitimage +, scikit-image , setuptools }: @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ lxml pytestCheckHook - scikitimage + scikit-image ]; postConfigure = '' diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index a59f7e08b9886..799f7888cfb22 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikitimage }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikit-image }: buildPythonPackage { pname = "image-match"; @@ -14,7 +14,7 @@ buildPythonPackage { buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ - scikitimage + scikit-image ]; # remove elasticsearch requirement due to version incompatibility diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index ee1df820a401a..f3450d7df17d8 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , numpy -, scikitimage +, scikit-image , lib , opencv3 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - scikitimage + scikit-image opencv3 ]; diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 1f91e41345e52..c67f7fa5b949f 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -5,7 +5,7 @@ , numpy , opencv3 , pytestCheckHook -, scikitimage +, scikit-image , scipy , shapely , six @@ -37,7 +37,7 @@ buildPythonPackage rec { imagecorruptions numpy opencv3 - scikitimage + scikit-image scipy shapely six @@ -79,6 +79,6 @@ buildPythonPackage rec { platforms = platforms.linux; # Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0 # and https://github.com/scikit-image/scikit-image/issues/6093 - broken = lib.versionAtLeast scikitimage.version "0.19"; + broken = lib.versionAtLeast scikit-image.version "0.19"; }; } diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index 4f4692dbfad46..f784dc0679532 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -10,7 +10,7 @@ , pydicom , pymedio , scikit-fuzzy -, scikitimage +, scikit-image , scikit-learn , scipy , simpleitk @@ -45,7 +45,7 @@ buildPythonPackage rec { pydicom pymedio scikit-fuzzy - scikitimage + scikit-image scikit-learn scipy simpleitk diff --git a/pkgs/development/python-modules/mask-rcnn/default.nix b/pkgs/development/python-modules/mask-rcnn/default.nix index 337e7d27533c6..471b1fa61d42b 100644 --- a/pkgs/development/python-modules/mask-rcnn/default.nix +++ b/pkgs/development/python-modules/mask-rcnn/default.nix @@ -11,7 +11,7 @@ , numpy , opencv3 , pillow -, scikitimage +, scikit-image , scipy , tensorflow }: @@ -54,7 +54,7 @@ buildPythonPackage rec { numpy opencv3 pillow - scikitimage + scikit-image scipy tensorflow ]; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index a353816d252e7..ab4b97c24552a 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -12,7 +12,7 @@ # Advanced image processing (triples size of output) , advancedProcessing ? false , opencv3 -, scikitimage +, scikit-image , scikit-learn , scipy , matplotlib @@ -48,7 +48,7 @@ buildPythonPackage rec { proglog ] ++ lib.optionals advancedProcessing [ opencv3 - scikitimage + scikit-image scikit-learn scipy matplotlib diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 0e41999470397..769134bcd4e55 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -22,7 +22,7 @@ , pillow , pythonOlder , pyyaml -, scikitimage +, scikit-image , scipy , setuptools-scm , sphinx @@ -84,7 +84,7 @@ mkDerivationWith buildPythonPackage rec { pydantic pyopengl pyyaml - scikitimage + scikit-image scipy sphinx superqt diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index b5be85bf1151a..d874935cf5442 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -9,7 +9,7 @@ , fsspec , numpy , requests -, scikitimage +, scikit-image , s3fs , toolz , zarr @@ -44,7 +44,7 @@ buildPythonPackage rec { aiohttp requests s3fs - scikitimage + scikit-image toolz ]; diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 531cad0bc0698..f92c44b9b033b 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -5,7 +5,7 @@ , numpy , pytestCheckHook , pythonOlder -, scikitimage +, scikit-image , slicerator }: @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - scikitimage + scikit-image ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index f0baddf628db3..f1ef45d14c36b 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -4,7 +4,7 @@ , pythonOlder , docopt , pillow -, scikitimage +, scikit-image , aggdraw , pytestCheckHook , ipython @@ -34,7 +34,7 @@ buildPythonPackage rec { docopt ipython pillow - scikitimage + scikit-image ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 4c6b922e4efe7..ece05b267b19f 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.17.6"; + version = "0.18.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-0AmtB0T8xqsd8TOh2MN+CBSLLq8hIl7QT+a2HdmGRYI="; + hash = "sha256-a1X7aRWURteIBVwl+pgHcaeWXAWv+zicz154fJgWVy4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywick/default.nix b/pkgs/development/python-modules/pywick/default.nix index 0596ce02fe2ee..5d685d2496e61 100644 --- a/pkgs/development/python-modules/pywick/default.nix +++ b/pkgs/development/python-modules/pywick/default.nix @@ -13,7 +13,7 @@ , pyyaml , scipy , requests -, scikitimage +, scikit-image , six , tabulate , torch @@ -52,7 +52,7 @@ buildPythonPackage rec { pyyaml scipy requests - scikitimage + scikit-image tabulate torch torchvision diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 1a55c4f9e866c..711e6bd34f35b 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -43,7 +43,7 @@ , pyyaml , redis , requests -, scikitimage +, scikit-image , scipy , setproctitle , smart-open @@ -103,7 +103,7 @@ buildPythonPackage rec { gym lz4 matplotlib - scikitimage + scikit-image pyyaml scipy ]; diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index a2c004fba7b85..442191cbd7bc7 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.11.2"; + version = "2023.05.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0ih0qlN9NxkYkcRl990gVyZF33ymSNUJoNFzpcnqu1o="; + hash = "sha256-u6GHDiTGa7v9tK/4VTVPQL/2kjomo0x/EGC7LD8lMvM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index 76d96346b26e1..47e3f58f58174 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -8,7 +8,7 @@ , pathlib , numpy , requests -, scikitimage +, scikit-image , six , pytestCheckHook , isPy27 @@ -32,7 +32,7 @@ buildPythonPackage rec { packaging numpy requests - scikitimage + scikit-image six tifffile ] ++ lib.optionals isPy27 [ pathlib enum34 ]; diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 3817856f01f7f..5bc0a4af75e68 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -25,7 +25,7 @@ , pythonOlder , qdarkstyle , qimage2ndarray -, scikitimage +, scikit-image , scipy , tables }: @@ -57,7 +57,7 @@ buildPythonPackage rec { pandas tables git - scikitimage + scikit-image matplotlib qdarkstyle gitpython diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index fc4ccd2846890..5d07c631fc589 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -21,7 +21,7 @@ , pytest-mock , python-dateutil , pythonOlder -, scikitimage +, scikit-image , scipy , setuptools-scm , sqlalchemy @@ -62,7 +62,7 @@ buildPythonPackage rec { sqlalchemy ]; image = [ - scikitimage + scikit-image scipy ]; net = [ diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 13777b7e76a1a..e1e19b02660ba 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -29,7 +29,7 @@ , pytest-xdist , pytestCheckHook , requests -, scikitimage +, scikit-image , scipy , six , tensorflow @@ -96,7 +96,7 @@ buildPythonPackage rec { pydub pytest-xdist pytestCheckHook - scikitimage + scikit-image scipy tensorflow tifffile diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 2fc9ace70c9ec..e3d51f7b551f2 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cloudpickle , scikit-learn -, scikitimage +, scikit-image , packaging , psutil , py-deprecate @@ -40,7 +40,7 @@ buildPythonPackage { nativeCheckInputs = [ pytorch-lightning scikit-learn - scikitimage + scikit-image cloudpickle psutil pytestCheckHook diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 49c2e4827ad57..dde5915652a70 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -29,6 +29,7 @@ , protobuf , psutil , pydantic +, pyfakefs , pytest-mock , pytest-xdist , pytestCheckHook @@ -50,7 +51,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.15.0"; + version = "0.15.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -59,7 +60,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UULsvvk9BsWUrJ8eD7uD2UnUJqmPrmjrJvCA7WRC/Cw="; + hash = "sha256-cAmX3r6XhCBUnC/fNNPakZUNEcDFke0DJMi2PW7sOho="; }; patches = [ @@ -111,6 +112,7 @@ buildPythonPackage rec { pandas parameterized pydantic + pyfakefs pytest-mock pytest-xdist pytestCheckHook @@ -131,6 +133,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. + "tests/pytest_tests/system_tests/test_notebooks/test_notebooks.py" "tests/pytest_tests/unit_tests_old/test_cli.py" "tests/pytest_tests/unit_tests_old/test_data_types.py" "tests/pytest_tests/unit_tests_old/test_file_stream.py" @@ -156,7 +159,6 @@ buildPythonPackage rec { "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_docker.py" "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_kubernetes.py" "tests/pytest_tests/unit_tests_old/tests_launch/test_launch.py" - "tests/pytest_tests/unit_tests_old/tests_s_nb/test_notebooks.py" "tests/pytest_tests/unit_tests/test_cli.py" "tests/pytest_tests/unit_tests/test_data_types.py" "tests/pytest_tests/unit_tests/test_internal_api.py" @@ -206,9 +208,11 @@ buildPythonPackage rec { "tests/pytest_tests/system_tests/test_importers/test_import_mlflow.py" "tests/pytest_tests/system_tests/test_sweep/test_public_api.py" "tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py" + "tests/pytest_tests/system_tests/test_sweep/test_sweep_utils.py" "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent_full.py" "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py" "tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py" + "tests/pytest_tests/system_tests/test_system_metrics/test_open_metrics.py" "tests/pytest_tests/system_tests/tests_launch/test_github_reference.py" "tests/pytest_tests/system_tests/tests_launch/test_job.py" "tests/pytest_tests/system_tests/tests_launch/test_launch_add.py" @@ -216,6 +220,7 @@ buildPythonPackage rec { "tests/pytest_tests/system_tests/tests_launch/test_launch_kubernetes.py" "tests/pytest_tests/system_tests/tests_launch/test_launch_local_container.py" "tests/pytest_tests/system_tests/tests_launch/test_launch_run.py" + "tests/pytest_tests/system_tests/tests_launch/test_launch_sweep_cli.py" "tests/pytest_tests/system_tests/tests_launch/test_launch_sweep.py" "tests/pytest_tests/system_tests/tests_launch/test_launch.py" "tests/pytest_tests/system_tests/tests_launch/test_wandb_reference.py" diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix index 4c7c0bfc42c54..2240c23433afa 100644 --- a/pkgs/development/tools/database/mermerd/default.nix +++ b/pkgs/development/tools/database/mermerd/default.nix @@ -1,30 +1,45 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib +, testers +, mermerd }: buildGoModule rec { pname = "mermerd"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "KarnerTh"; repo = "mermerd"; rev = "refs/tags/v${version}"; - hash = "sha256-nlertvmuP9Fiuc4uVrgKzfxjOY/sE9udKZLe51t0GEY="; + hash = "sha256-15eaZ7EwKysRjXGbS0okMUkmwSxtb+CP08JWLoj/L8c="; }; vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ="; + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + ]; + # the tests expect a database to be running doCheck = false; + passthru.tests = { + version = testers.testVersion { + package = mermerd; + command = "mermerd version"; + }; + }; + meta = with lib; { description = "Create Mermaid-Js ERD diagrams from existing tables"; homepage = "https://github.com/KarnerTh/mermerd"; - license = licenses.mit; - maintainers = with lib.maintainers; [ austin-artificial ]; changelog = "https://github.com/KarnerTh/mermerd/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ austin-artificial ]; }; - } diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 157d86b885d05..dd54db22925dd 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ddosify"; - version = "0.16.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AWYUJalXggNJonYE71c9uH+ebAms1LJTLcYgHzmUzR0="; + sha256 = "sha256-QinC03SdJ0V2t69LJYsoV+KV13D+OcTkLetFe8vLF3Y="; }; - vendorHash = "sha256-/kxHK3dX1RXB3Z5suSKsTHF7xaklCoyzUTbU1lcYwwg="; + vendorHash = "sha256-cGhMhX+SEv9fejViLZrEwXg584o204OQ5iR6AkxKnXo="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/misc/unixbench/common.patch b/pkgs/development/tools/misc/unixbench/common.patch new file mode 100644 index 0000000000000..68961cbe2eddb --- /dev/null +++ b/pkgs/development/tools/misc/unixbench/common.patch @@ -0,0 +1,108 @@ +diff --git a/UnixBench/Run b/UnixBench/Run +index 34d2c72..130b56e 100755 +--- a/UnixBench/Run ++++ b/UnixBench/Run +@@ -81,23 +81,23 @@ my $longIterCount = 10; + my $shortIterCount = 3; + + # C compiler to use in compilation tests. +-my $cCompiler = 'gcc'; ++my $cCompiler = 'cc -w'; + + # Establish full paths to directories. These need to be full pathnames + # (or do they, any more?). They can be set in env. + # variable names are the first parameter to getDir() below. + + # Directory where the test programs live. +-my $BINDIR = getDir('UB_BINDIR', $FindBin::Bin . "/pgms"); ++my $BINDIR = getDir('UB_BINDIR', '@out@/libexec/pgms'); + + # Temp directory, for temp files. +-my $TMPDIR = getDir('UB_TMPDIR', $FindBin::Bin . "/tmp"); ++my $TMPDIR = getDir('UB_TMPDIR', "$ENV{'PWD'}/unixbench/temp"); + + # Directory to put results in. +-my $RESULTDIR = getDir('UB_RESULTDIR', $FindBin::Bin . "/results"); ++my $RESULTDIR = getDir('UB_RESULTDIR', "$ENV{'PWD'}/unixbench/results"); + + # Directory where the tests are executed. +-my $TESTDIR = getDir('UB_TESTDIR', $FindBin::Bin . "/testdir"); ++my $TESTDIR = getDir('UB_TESTDIR', '@out@/share/testdir'); + + + ############################################################################ +@@ -330,19 +330,19 @@ my $testParams = { + "logmsg" => "Shell Scripts (1 concurrent)", + "cat" => 'system', + "prog" => "${BINDIR}/looper", +- "options" => "60 \"${BINDIR}/multi.sh\" 1", ++ "options" => "60 \"${BINDIR}/multi.sh\" 1 ${TMPDIR} ${TESTDIR}", + }, + "shell8" => { + "logmsg" => "Shell Scripts (8 concurrent)", + "cat" => 'system', + "prog" => "${BINDIR}/looper", +- "options" => "60 \"${BINDIR}/multi.sh\" 8", ++ "options" => "60 \"${BINDIR}/multi.sh\" 8 ${TMPDIR} ${TESTDIR}", + }, + "shell16" => { + "logmsg" => "Shell Scripts (16 concurrent)", + "cat" => 'system', + "prog" => "${BINDIR}/looper", +- "options" => "60 \"${BINDIR}/multi.sh\" 16", ++ "options" => "60 \"${BINDIR}/multi.sh\" 16 ${TMPDIR} ${TESTDIR}", + }, + + ########################## +@@ -434,7 +434,7 @@ my $testParams = { + "logmsg" => "C Compiler Throughput ($cCompiler)", + "cat" => 'misc', + "prog" => "${BINDIR}/looper", +- "options" => "60 $cCompiler cctest.c", ++ "options" => "60 $cCompiler $TESTDIR/cctest.c -o $TMPDIR/cctest", + }, + "arithoh" => { + "logmsg" => "Arithoh", +@@ -873,16 +873,6 @@ sub preChecks { + # Set the language. + $ENV{'LANG'} = $language; + +- # Check that the required files are in the proper places. +- my $make = $ENV{MAKE} || "make"; +- system("$make check"); +- if ($? != 0) { +- system("$make all"); +- if ($? != 0) { +- abortRun("\"$make all\" failed"); +- } +- } +- + # Create a script to kill this run. + system("echo \"kill -9 $$\" > \"${TMPDIR}/kill_run\""); + chmod(0755, $TMPDIR . "/kill_run"); +@@ -923,7 +913,10 @@ sub parseArgs { + $params->{'copies'} = [ ]; + } + push(@{$params->{'copies'}}, shift(@words)); +- } else { ++ } elsif ($word eq "--help" || $word eq "-h") { ++ print "Run: please see ubench(1) for available options\n"; ++ exit 0; ++ }else { + die("Run: unknown option $word\n"); + } + } +diff --git a/UnixBench/pgms/multi.sh b/UnixBench/pgms/multi.sh +index 72e8716..d2f5f48 100755 +--- a/UnixBench/pgms/multi.sh ++++ b/UnixBench/pgms/multi.sh +@@ -15,7 +15,8 @@ + ############################################################################### + ID="@(#)multi.sh:3.4 -- 5/15/91 19:30:24"; + instance=1 +-sort_src=sort.src ++sort_src=$3/sort.src ++cd $2 + work_factor=${MULTI_SH_WORK_FACTOR:-1} + if [ $work_factor -gt 1 ]; then + inputs= diff --git a/pkgs/development/tools/misc/unixbench/default.nix b/pkgs/development/tools/misc/unixbench/default.nix new file mode 100644 index 0000000000000..3d1b424ab0b8f --- /dev/null +++ b/pkgs/development/tools/misc/unixbench/default.nix @@ -0,0 +1,109 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, pandoc +, installShellFiles +, perl +, xorg +, libGL +, coreutils +, unixtools +, targetPackages +, gnugrep +, gawk +, withGL? true +, withX11perf? true +}: + +stdenv.mkDerivation rec { + pname = "unixbench"; + version = "unstable-2023-02-27"; + + src = fetchFromGitHub { + owner = "kdlucas"; + repo = "byte-unixbench"; + rev = "a07fcc03264915c624f0e4818993c5b4df3fa703"; + hash = "sha256-gmRWAqE9/HBb0S9rK0DXoaCoiGbtat0gmdeozhbv0NI="; + }; + + patches = [ + ./common.patch + ]; + + patchFlags = [ "-p2" ]; + + sourceRoot = "source/UnixBench"; + + postPatch = '' + substituteInPlace Makefile \ + --replace "-Wa,-q" "" + ''; + + nativeBuildInputs = [ + makeWrapper + pandoc + installShellFiles + ]; + + buildInputs = [ perl ] ++ lib.optionals withGL [ + xorg.libX11 + xorg.libXext + libGL + ]; + + runtimeDependencies = [ + coreutils + unixtools.nettools + unixtools.locale + targetPackages.stdenv.cc + gnugrep + gawk + ] ++ lib.optionals withX11perf [ + xorg.x11perf + ]; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ] ++ lib.optionals withGL [ + "GRAPHIC_TESTS=defined" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,libexec,share} + install -D Run $out/bin/ubench + cp -r pgms $out/libexec/ + cp -r testdir $out/share/ + runHook postInstall + ''; + + postInstall = '' + substituteInPlace USAGE \ + --replace 'Run"' 'ubench"' \ + --replace './Run' 'ubench' \ + --replace 'Run ' 'ubench ' + pandoc -f rst -t man USAGE -o ubench.1 + installManPage ubench.1 + ''; + + preFixup = '' + substituteInPlace $out/libexec/pgms/multi.sh \ + --replace '/bin/sh "$' '${targetPackages.runtimeShell} "$' + + substituteInPlace $out/bin/ubench \ + --subst-var out + + wrapProgram $out/bin/ubench \ + --prefix PATH : ${lib.makeBinPath runtimeDependencies} + ''; + + meta = with lib; { + description = "A basic indicator of the performance of a Unix-like system"; + homepage = "https://github.com/kdlucas/byte-unixbench"; + license = licenses.gpl2Plus; + mainProgram = "ubench"; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index 7e9a4e5104f22..ff6b0e933a71b 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -15918,7 +15918,7 @@ "cython", "setuptools" ], - "scikitimage": [ + "scikit-image": [ "cython", "setuptools" ], diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/development/tools/toast/default.nix index 336f6a375943e..9b3b7b249ef53 100644 --- a/pkgs/development/tools/toast/default.nix +++ b/pkgs/development/tools/toast/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "toast"; - version = "0.47.1"; + version = "0.47.2"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CW7rPylP3Swyv+rxwbeooUC6XEkmGCCpGEqM7zNG1b4="; + sha256 = "sha256-SWypxCtgVORYGOAiepfAfqnB4JjMwCC3e8lFZ/9tiCM="; }; - cargoHash = "sha256-yO0wcijM8q81g/HSmouHduUb12kaNVRIv4pECs8XyFw="; + cargoHash = "sha256-OaPh3/Z9mF56NeHpCehsuJHU6ClzE+beRsAG/lWIwp0="; checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index f3fab78b98d08..060b75ed2914c 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wasm-pack"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-pack"; rev = "v${version}"; - sha256 = "sha256-3iwXoYnmrZsbwFUR41uI/4jnCF0OjeRO7UqVDaGJJbQ="; + sha256 = "sha256-oIMS0kln+HCW9kFfLU+Vi0/4EYKYzzlA1BQHZNQkJMI="; }; - cargoHash = "sha256-Z0hmJ4/o9DNYz3JVXGgaDfw1JNcvvTCLngmhIDiVR6E="; + cargoHash = "sha256-l6zn714DMQ+frU9Mppz4LuGY6Zf9qmxZ9MuwIvYvQMU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index f5ec698c9ceab..ebb147a647e46 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.33.2"; + version = "1.33.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-YXOo3YrycsZ8Njxx20B4ySjyfI5jiDCZenYr4ONC9fM="; + hash = "sha256-E1Usmj4f3jvzllKIrItzOIe4kf0DRQWwobVGuN291Ys="; }; - cargoHash = "sha256-dQwcY8OnzW6xcmQPbteN18uqgxlq52tVZWynTv6Ci9E="; + cargoHash = "sha256-8L9UrFQTpwG2Gw4V72NvqdqQicG0HPRdmNJPhkWqj4s="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 874d6dc344d1f..1746e67aaa838 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.71.0"; + version = "0.71.1"; shas = { - x86_64-linux = "sha256-52usT7MsLme3o3tjxcRJ0U3iX0fKtnvEvyKJeuL1Bvc="; - aarch64-linux = "sha256-E7CjpBO1cV5wFtLTIPPltGAyX1OEPjfhnVUQ4u3Mzxs="; - x86_64-darwin = "sha256-+Vj0SgvenrCuHPSYKFoxXTyfWDFbnUgHtWibNnXwbVk="; - aarch64-darwin = "sha256-p7BaC2nkZ+BGRPSXogpHshBblDe3ZDMGV93gA4sqpUc="; + x86_64-linux = "sha256-QCqCJdNaOLXggIGQhLOV/NvbMebfA3g1iyiBtkPDS9A="; + aarch64-linux = "sha256-r9/1086GQolGfc3iqIxZzTmoC7G/1vK4QG4Qvm0zUOo="; + x86_64-darwin = "sha256-kMpB9F2sTxjqnplOznvv20fa7AhdnEeIb3yb4qa72e0="; + aarch64-darwin = "sha256-jWjPJa3bWynoMUmccASggvu25NaHpn/AsTnC/JMyr8o="; }; } |