diff options
Diffstat (limited to 'pkgs/development')
44 files changed, 473 insertions, 370 deletions
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index c9c849f0a68a3..d05d01bc6c078 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.13.8.0"; + version = "1.13.9.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - hash = "sha256-AixN3cj6r/PUGvAhVN4wGfpuLiBt5LglgJp68hFfJMo="; + hash = "sha256-3HSmiIvGk+C5rnHzCXnYlFVeOWYa5M0WZRLTSb8Zsh8="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index fc71ced98101b..743ef904dcdf9 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "24.04"; + version = "24.05"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-DuQG5AsfLtWHVun9P8iiBqp3xtb67feC5b2gveIRqpA="; + sha256 = "sha256-YL5JT/1JTfeKaLUEMnud6OOMk/NSCnBjohk+6qRaU60="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index 4d6c5671f0e28..da74ec243cefa 100644 --- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { description = "GStreamer Plugin for MIPI camera support through the IPU6/IPU6EP/IPU6SE on Intel Tigerlake/Alderlake/Jasperlake platforms"; homepage = "https://github.com/intel/icamerasrc/tree/icamerasrc_slim_api"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/development/libraries/ipu6-camera-hal/default.nix index 3ec63fd0807d3..ff490414da858 100644 --- a/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { description = "HAL for processing of images in userspace"; homepage = "https://github.com/intel/ipu6-camera-hal"; license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 722a1534e92ca..b1a091d12b3d9 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { homepage = "https://lttng.org/urcu"; changelog = "https://github.com/urcu/userspace-rcu/raw/v${version}/ChangeLog"; license = licenses.lgpl21Plus; - platforms = platforms.unix; + # https://git.liburcu.org/?p=userspace-rcu.git;a=blob;f=include/urcu/arch.h + platforms = intersectLists platforms.unix (platforms.x86 ++ platforms.power ++ platforms.s390 ++ platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.m68k ++ platforms.riscv); maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 08874ce2e0fc2..61b3c53e834cb 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pythonAtLeast , pythonOlder +, llvmPackages , pytest7CheckHook , setuptools , numpy @@ -33,6 +34,10 @@ buildPythonPackage rec { hash = "sha256-E20pI5BrcTrMYrhriuOUl5/liSaQQy6eqRyCoauwb9Q="; }; + buildInputs = [ + llvmPackages.openmp + ]; + build-system = [ setuptools ]; dependencies = [ @@ -103,6 +108,8 @@ buildPythonPackage rec { "accelerate" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://huggingface.co/docs/accelerate"; description = "A simple way to train and use PyTorch models with multi-GPU, TPU, mixed-precision"; diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index 1633be12bb97a..514e585d60338 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -1,29 +1,34 @@ { lib -, aesara , buildPythonPackage +, pythonOlder , fetchFromGitHub -, numdifftools +, setuptools +, aesara , numpy -, pytestCheckHook -, pythonOlder , scipy +, numdifftools +, pytestCheckHook }: buildPythonPackage rec { pname = "aeppl"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aesara-devs"; - repo = pname; + repo = "aeppl"; rev = "refs/tags/v${version}"; hash = "sha256-mqBbXwWJwQA2wSHuEdBeXQMfTIcgwYEjpq8AVmOjmHM="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aesara numpy scipy @@ -47,6 +52,14 @@ buildPythonPackage rec { "test_initial_values" ]; + pytestFlagsArray = [ + # `numpy.distutils` is deprecated since NumPy 1.23.0, as a result of the deprecation of `distutils` itself. + # It will be removed for Python >= 3.12. For older Python versions it will remain present. + "-Wignore::DeprecationWarning" + # Blas cannot be found, allow fallback to the numpy slower implementation + "-Wignore::UserWarning" + ]; + meta = with lib; { description = "Library for an Aesara-based PPL"; homepage = "https://github.com/aesara-devs/aeppl"; diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 589799c1b848f..edf3f989ecbc1 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -16,6 +16,7 @@ , numba-scipy , numpy , pytestCheckHook +, pythonAtLeast , pythonOlder , scipy , typing-extensions @@ -24,9 +25,10 @@ buildPythonPackage rec { pname = "aesara"; version = "2.9.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + # Python 3.12 is not supported: https://github.com/aesara-devs/aesara/issues/1520 + disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "aesara-devs"; @@ -35,13 +37,13 @@ buildPythonPackage rec { hash = "sha256-aO0+O7Ts9phsV4ghunNolxfAruGBbC+tHjVkmFedcCI="; }; - nativeBuildInputs = [ + build-system = [ cython hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ cons etuples filelock @@ -62,7 +64,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--durations=50" "" + --replace-fail "--durations=50" "" \ + --replace-fail "hatch-vcs >=0.3.0,<0.4.0" "hatch-vcs" ''; preBuild = '' @@ -81,12 +84,23 @@ buildPythonPackage rec { "tests/sparse/sandbox/" # JAX is not available on all platform and often broken "tests/link/jax/" + + # 2024-04-27: The current nixpkgs numba version is too recent and incompatible with aesara 2.9.3 + "tests/link/numba/" ]; disabledTests = [ # Disable all benchmark tests "test_scan_multiple_output" "test_logsumexp_benchmark" + + # TypeError: exceptions must be derived from Warning, not <class 'NoneType'> + "test_api_deprecation_warning" + # AssertionError: assert ['Elemwise{Co..._i{0} 0', ...] == ['Elemwise{Co..._i{0} 0', ...] + # At index 3 diff: '| |Gemv{inplace} d={0: [0]} 2' != '| |CGemv{inplace} d={0: [0]} 2' + "test_debugprint" + # ValueError: too many values to unpack (expected 3) + "test_ExternalCOp_c_code_cache_version" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index 1de36e510197b..7e15fcf6c116a 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -1,19 +1,21 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools +, deepdiff , numpy , opencv4 , pyyaml -, qudida , scikit-image +, scikit-learn , scipy -, deepdiff +, pydantic , pytestCheckHook , pythonOlder , pythonRelaxDepsHook , torch , torchvision +, typing-extensions }: buildPythonPackage rec { @@ -23,9 +25,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-VNpClOBdoaQOqU92Mm/Z5Q7P+fZzR+m43SFA9pSi1M0="; + src = fetchFromGitHub { + owner = "albumentations-team"; + repo = "albumentations"; + rev = "refs/tags/${version}"; + hash = "sha256-7t1+22zzFtkZaAyOo6xjk+MXT9N44PmQ/NRRfvLeRVk="; }; nativeBuildInputs = [ @@ -34,6 +38,7 @@ buildPythonPackage rec { pythonRemoveDeps = [ "opencv-python" + "pydantic" ]; build-system = [ @@ -43,10 +48,12 @@ buildPythonPackage rec { dependencies = [ numpy opencv4 + pydantic pyyaml - qudida scikit-image + scikit-learn scipy + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix index 2ab159cfc6f8d..879bffb8a0d0a 100644 --- a/pkgs/development/python-modules/augmax/default.nix +++ b/pkgs/development/python-modules/augmax/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , einops -, fetchFromGitHub +, fetchPypi , jax , jaxlib , lib @@ -10,16 +10,17 @@ buildPythonPackage rec { pname = "augmax"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disbaled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = "khdlr"; - repo = "augmax"; - rev = "refs/tags/v${version}"; - hash = "sha256-hDNNoE7KVaH3jrXZA4A8f0UoQJPl6KHA3XwMc3Ccohk="; + # Using fetchPypi because the latest version was not tagged on GitHub. + # Switch back to fetchFromGitHub when a tag will be available + # https://github.com/khdlr/augmax/issues/8 + src = fetchPypi { + inherit pname version; + hash = "sha256-pf1DTaHA7D+s2rqwwGYlJrJOI7fok+WOvOCtZhOOGHo="; }; nativeBuildInputs = [ @@ -37,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Efficiently Composable Data Augmentation on the GPU with Jax"; homepage = "https://github.com/khdlr/augmax"; - changelog = "https://github.com/khdlr/augmax/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/khdlr/augmax/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; }; diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index 11d26f32fbae8..47ff7565a297a 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -1,19 +1,23 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, gssapi -, hatchling -, ldap3 -, pyasn1 -, pytestCheckHook -, pythonOlder -, winacl +{ + lib, + asn1crypto, + buildPythonPackage, + cryptography, + dnspython, + fetchFromGitHub, + gssapi, + hatchling, + ldap3, + msldap, + pyasn1, + pytestCheckHook, + pythonOlder, + winacl, }: buildPythonPackage rec { pname = "bloodyad"; - version = "1.1.1"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,28 +26,25 @@ buildPythonPackage rec { owner = "CravateRouge"; repo = "bloodyAD"; rev = "refs/tags/v${version}"; - hash = "sha256-wnq+HTAPnC7pSGI2iytSyHmdqtUq2pUnNwZnsGX8CL4="; + hash = "sha256-+Lw9Apm+zzUlM19fGgxOb2bTmmKQ1Nd7dUjF9rhHXKQ="; }; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ + asn1crypto cryptography + dnspython gssapi ldap3 + msldap pyasn1 winacl ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "bloodyAD" - ]; + pythonImportsCheck = [ "bloodyAD" ]; disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index a534257c6dbef..66a7a05676a96 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "btrfs"; - version = "13"; + version = "14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NSyzhpHYDkunuU104XnbVCcVRNDoVBz4KuJRrE7WMO0="; + hash = "sha256-BPKPwT33i8fQYJkUZbnJ8nQNbmKw0Dq6ekb9mr7awEY="; }; # no tests (in v12) diff --git a/pkgs/development/python-modules/courlan/default.nix b/pkgs/development/python-modules/courlan/default.nix index bd73aad1977d8..fd2cfc01b6e8d 100644 --- a/pkgs/development/python-modules/courlan/default.nix +++ b/pkgs/development/python-modules/courlan/default.nix @@ -1,56 +1,58 @@ -{ lib -, buildPythonPackage -, fetchPypi -, langcodes -, pytestCheckHook -, tld -, urllib3 -, pythonOlder +{ + lib, + babel, + buildPythonPackage, + fetchPypi, + langcodes, + pytestCheckHook, + pythonOlder, + setuptools, + tld, + urllib3, }: buildPythonPackage rec { pname = "courlan"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-PDVRHDZSXLL5Qc1nCbejp0LtlfC55WyX7sDBb9wDUYM="; + hash = "sha256-1wZoQzTxi+StofvVfyaArfADZkj22ECFL3pIItOt/Y0="; }; - propagatedBuildInputs = [ + # Tests try to write to /tmp directly. use $TMPDIR instead. + postPatch = '' + substituteInPlace tests/unit_tests.py \ + --replace-fail "\"courlan --help\"" "\"$out/bin/courlan --help\"" \ + --replace-fail "courlan_bin = \"courlan\"" "courlan_bin = \"$out/bin/courlan\"" \ + --replace-fail "/tmp" "$TMPDIR" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + babel langcodes tld urllib3 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; # disable tests that require an internet connection - disabledTests = [ - "test_urlcheck" - ]; - - # tests try to write to /tmp directly. use $TMPDIR instead. - postPatch = '' - substituteInPlace tests/unit_tests.py \ - --replace "\"courlan --help\"" "\"$out/bin/courlan --help\"" \ - --replace "courlan_bin = \"courlan\"" "courlan_bin = \"$out/bin/courlan\"" \ - --replace "/tmp" "$TMPDIR" - ''; + disabledTests = [ "test_urlcheck" ]; pythonImportsCheck = [ "courlan" ]; meta = with lib; { description = "Clean, filter and sample URLs to optimize data collection"; - mainProgram = "courlan"; homepage = "https://github.com/adbar/courlan"; changelog = "https://github.com/adbar/courlan/blob/v${version}/HISTORY.md"; license = licenses.asl20; maintainers = with maintainers; [ jokatzke ]; + mainProgram = "courlan"; }; } diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 708c971943ec8..f406bcd4cc5be 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.5.6"; - format = "pyproject"; + version = "4.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-txUWRCWLQ6jWrdEJ/D5+CsflNad5Onr/wLycENri1z8="; + hash = "sha256-6FtxfY0vjCbCueeXdAXOy6XSjne4I7brQ5OvJ+Q1KsQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ packaging ] ++ lib.optionals stdenv.isLinux [ dbus-next diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 29395e91a5f1d..dde6772864b3a 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 +, setuptools , futures ? null , docloud , requests @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "docplex"; version = "2.27.239"; - format = "setuptools"; + pyproject = true; # No source available from official repo src = fetchPypi { @@ -18,6 +19,15 @@ buildPythonPackage rec { hash = "sha256-Ug5+jDBBbamqd0JebzHvjLZoTRRPYWQiJl6g8BK0aMQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=68.2.2" "setuptools>=68.2.2" + ''; + + build-system = [ + setuptools + ]; + propagatedBuildInputs = [ docloud requests diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 762b9b7ff8cf2..b090f81da9757 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, requests , setuptools +, requests , six , stone , mock @@ -15,9 +15,10 @@ buildPythonPackage rec { pname = "dropbox"; version = "11.36.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; + outputs = ["out" "doc"]; src = fetchFromGitHub { @@ -27,9 +28,12 @@ buildPythonPackage rec { hash = "sha256-d++lxsbwPxnz1JPguWkImHXB+GQpMa9Uo3JNIxIe2ok="; }; - propagatedBuildInputs = [ - requests + build-system = [ setuptools + ]; + + dependencies = [ + requests six stone ]; diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 369d991aaa939..92eb19e0a0eec 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -1,30 +1,30 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python -, pythonOlder -, cython +{ + lib, + buildPythonPackage, + cython, + fetchPypi, + python, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "fastbencode"; - version = "0.2"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-V465xHANZwXXH7yNfVe8os2Yfsos7B2ed7ngcC2x5W8="; + hash = "sha256-X+DLfRc2iRr2HSreQM6UiUHUbpCLFvU4P1XxJ4SNoZc="; }; - nativeBuildInputs = [ - cython - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "fastbencode" - ]; + nativeBuildInputs = [ cython ]; + + pythonImportsCheck = [ "fastbencode" ]; checkPhase = '' ${python.interpreter} -m unittest fastbencode.tests.test_suite @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast implementation of bencode"; homepage = "https://github.com/breezy-team/fastbencode"; + changelog = "https://github.com/breezy-team/fastbencode/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index f19df6658fd22..37194dc41b015 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MIeRrDudrQFbNZFylwc5qjdT3VQhQqQW0H+foEfiI4Y="; + hash = "sha256-EKEfHhu4Rw/1ADDBrNcps6unopreLDDPHRyRcpE2bGc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 7f3a173cf1aef..d5fc508e16229 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -202,6 +202,8 @@ buildPythonPackage rec { #"-W" "ignore" # uncomment for debugging help ]; + __darwinAllowLocalNetworking = true; + # check the binary works outside the build env doInstallCheck = true; postInstallCheck = '' diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix index 00d2fb426d381..43d7ca228bb0e 100644 --- a/pkgs/development/python-modules/html-text/default.nix +++ b/pkgs/development/python-modules/html-text/default.nix @@ -1,37 +1,43 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, lxml -, six -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + lxml, + lxml-html-clean, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "html-text"; - version = "0.5.2"; - format = "setuptools"; + version = "0.6.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "TeamHG-Memex"; + owner = "zytedata"; repo = "html-text"; - rev = version; - hash = "sha256-jw/hpz0QfcgP5OEJcmre0h1OzOfpPtaROxHm+YUqces="; + rev = "refs/tags/${version}"; + hash = "sha256-e9gkibQv8mn1Jbt77UmpauOeTqhJQhY9R5Sge/iYi+U="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lxml + lxml-html-clean ]; - nativeCheckInputs = [ - pytestCheckHook - six - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "html_text" ]; meta = with lib; { description = "Extract text from HTML"; - homepage = "https://github.com/TeamHG-Memex/html-text"; + homepage = "https://github.com/zytedata/html-text"; + changelog = "https://github.com/zytedata/html-text/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ ambroisie ]; }; diff --git a/pkgs/development/python-modules/htseq/default.nix b/pkgs/development/python-modules/htseq/default.nix index 9d69a8bfef542..caa47f5197d60 100644 --- a/pkgs/development/python-modules/htseq/default.nix +++ b/pkgs/development/python-modules/htseq/default.nix @@ -1,29 +1,79 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + swig, + cython, + matplotlib, + numpy, + pandas, + pysam, + setuptools, + pytestCheckHook, + nix-update-script, +}: buildPythonPackage rec { - version = "0.12.4"; - format = "setuptools"; pname = "htseq"; + version = "2.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "htseq"; repo = "htseq"; rev = "release_${version}"; - sha256 = "0y7vh249sljqjnv81060w4xkdx6f1y5zdqkh38yk926x6v9riijm"; + hash = "sha256-7ocrmuj9LOtPz9XbI5rKGcdE5JbFz/pZh00Nie65XxE="; }; - nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy pysam matplotlib ]; + patches = [ + # https://github.com/htseq/htseq/pull/84 + (fetchpatch { + name = "replace-distutils-with-sysconfig.patch"; + url = "https://github.com/htseq/htseq/commit/f0f1e464ee9aee56f0b44f905e7b3355b0bb8f29.patch"; + hash = "sha256-yDYkXCPy+YFgnk1rnXwCB998aZwVd5nJeejZIgeEzAo="; + }) + ]; - checkPhase = lib.optionalString isPy27 '' - ${python.interpreter} python2/test/test_general.py - '' + lib.optionalString isPy3k '' - ${python.interpreter} python3/test/test_general.py + nativeBuildInputs = [ swig ]; + + build-system = [ + cython + numpy + pysam + setuptools + ]; + + dependencies = [ + numpy + pysam + ]; + + optional-dependencies = { + htseq-qa = [ matplotlib ]; + }; + + pythonImportsCheck = [ "HTSeq" ]; + + nativeCheckInputs = [ + pandas + pytestCheckHook + ] ++ optional-dependencies.htseq-qa; + + preCheck = '' + rm -r src HTSeq + export PATH=$out/bin:$PATH ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release_(.+)" + ]; + }; + meta = with lib; { homepage = "https://htseq.readthedocs.io/"; description = "A framework to work with high-throughput sequencing data"; maintainers = with maintainers; [ unode ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 98f38528c1442..8aa1583cc8a87 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.11.4"; + version = "0.11.5"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-sR9OqsBxP2DvcYz1dhIP29rrQ56CRKW02oNAXUNttio="; + hash = "sha256-nfXCAjTKxtslVk17h60+v/JQusQTmaTRCPvvFG4/OPk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 2cfb69178b109..3991ce9a4339a 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "1.0"; + version = "1.1"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-a1M3YihN71M9TnkldAzN6N1UuPksDk6SPiBgr4HyC8g="; + hash = "sha256-auzArRwiue2CFo2DNS0NAF+aoZFvadhP6ARM0lRGcSA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 852b529e8bcc1..2ed276bfaef37 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "6.2.0"; + version = "6.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-kV2g1qbS5L7bEqfPijj60eK+pbTc8SAs/tctpNv0PFs="; + hash = "sha256-RD9VQFlwLJ3TiReKty+q056CjsOnSD2J2bpASmqHIEM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index d2938eb59446b..fe26d306a3985 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.56"; + version = "0.1.57"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-S+l+KA+7kZZX4OeJICeYmK7l7SxSXWiZiV9JgM+JTl8="; + hash = "sha256-L725AfkmBEe44LkJ0y6PdDvbnbCf31LXL3YdnOshnqE="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index 0f15b6a1066cb..204003bdddbc7 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/pkgs/development/python-modules/malduck/default.nix @@ -1,34 +1,38 @@ -{ lib -, buildPythonPackage -, capstone -, click -, cryptography -, dnfile -, fetchFromGitHub -, pefile -, pycryptodomex -, pyelftools -, pythonOlder -, pytestCheckHook -, typing-extensions -, yara-python +{ + lib, + buildPythonPackage, + capstone, + click, + cryptography, + dnfile, + fetchFromGitHub, + pefile, + pycryptodomex, + pyelftools, + pythonOlder, + setuptools, + pytestCheckHook, + typing-extensions, + yara-python, }: buildPythonPackage rec { pname = "malduck"; - version = "4.4.0"; - format = "setuptools"; + version = "4.4.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "malduck"; rev = "refs/tags/v${version}"; - hash = "sha256-CXHbU1AudvOJrG9MKYDQXeEtwrJODRPQtK43dQzZASE="; + hash = "sha256-Btx0HxiZWrb0TDpBokQGtBE2EDK0htONe/DwqlPgAd4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ capstone click cryptography @@ -40,26 +44,16 @@ buildPythonPackage rec { yara-python ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "pefile==2019.4.18" "pefile" \ - --replace "dnfile==0.11.0" "dnfile" - ''; - - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "malduck" - ]; + pythonImportsCheck = [ "malduck" ]; meta = with lib; { description = "Helper for malware analysis"; - mainProgram = "malduck"; homepage = "https://github.com/CERT-Polska/malduck"; changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "malduck"; }; } diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index 971688348a1d5..a99b36c787659 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -11,6 +11,7 @@ , wheel , astunparse , numpy +, packaging , pyparsing , scipy , gsd @@ -39,9 +40,31 @@ buildPythonPackage rec { url = "https://github.com/mdtraj/mdtraj/commit/81209d00817ab07cfc4668bf5ec88088d16904c0.patch"; hash = "sha256-ttNmij7csxF0Z5wPPwhGumRX055W2IgFjRAe6nI6GNY="; }) + # remove pkg_resources usage + # https://github.com/mdtraj/mdtraj/pull/1837 + (fetchpatch { + name = "fix-runtime-error.patch"; + url = "https://github.com/mdtraj/mdtraj/commit/02d44d4db7039fceb199c85b4f993244804f470d.patch"; + hash = "sha256-nhbi3iOrDSM87DyIp1KVt383Vvb6aYOgkjuYzviqiq8="; + }) + # remove distutils usage + # https://github.com/mdtraj/mdtraj/pull/1834 + (fetchpatch { + name = "python312-compatibility.patch"; + url = "https://github.com/mdtraj/mdtraj/commit/95d79747deef42c976ca362a57806b61933409f3.patch"; + hash = "sha256-Cq7/d745q6ZgAyWGM4ULnSsWezsbnu1CjSz5eqYSb+g="; + }) + # disable intrinsics when SIMD is not available + # TODO: enable SIMD with python3.12 + # https://github.com/mdtraj/mdtraj/pull/1884 + (fetchpatch { + name = "fix-intrinsics-flag.patch"; + url = "https://github.com/mdtraj/mdtraj/commit/d6041c645d51898e2a09030633210213eec7d4c5.patch"; + hash = "sha256-kcnlHMoA/exJzV8iQltH+LWXrvSk7gsUV+yWK6xn0jg="; + }) ]; - nativeBuildInputs = [ + build-system = [ cython_0 oldest-supported-numpy setuptools @@ -54,9 +77,10 @@ buildPythonPackage rec { llvmPackages.openmp ]; - propagatedBuildInputs = [ + dependencies = [ astunparse numpy + packaging pyparsing scipy ]; @@ -87,7 +111,9 @@ buildPythonPackage rec { "test_read_atomindices_2" # flaky test + "test_compare_rdf_t_master" "test_distances_t" + "test_precentered_2" ]; pythonImportsCheck = [ "mdtraj" ]; diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 3724fa64d06e7..a84fe51da4f2b 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -1,48 +1,32 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchpatch2 -, html5lib -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + html5lib, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "mechanize"; - version = "0.4.9"; + version = "0.4.10"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE="; + hash = "sha256-HeqUf5vn6gq2EPe7xKTja0XWv9/O6imtPTiaiKGVfd8="; }; - patches = [ - (fetchpatch2 { - # python 3.11+ compat - url = "https://github.com/python-mechanize/mechanize/commit/1324b09b661aaac7d4cdc7e1e9d49e1c3851db2c.patch"; - hash = "sha256-d0Zuz6m2Uv8pnR8TC0L+AStS82rPPTpQrrjkCZnJliE="; - }) - ]; - - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - html5lib - ]; + dependencies = [ html5lib ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "mechanize" - ]; + pythonImportsCheck = [ "mechanize" ]; disabledTestPaths = [ # Tests require network access diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix index 9cc654911fc5f..311f8761bc44e 100644 --- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mindsdb-evaluator"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mindsdb_evaluator"; inherit version; - hash = "sha256-SqcBtoY7WZcorAaoyhqNDscf1MkSz0pE993mz1MRXCU="; + hash = "sha256-SW3GYe9ykbs6ZViScdAgwiBAP9ix4v1VbSm/kJK2jDA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 8bd0aea36ca47..20a2eba687d2c 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -1,14 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "minidb"; - version = "2.0.7"; - format = "setuptools"; + version = "2.0.8"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,16 +18,14 @@ buildPythonPackage rec { owner = "thp"; repo = "minidb"; rev = "refs/tags/${version}"; - hash = "sha256-0f2usKoHs4NO/Ir8MhyiAVZFYnUkVH5avdh3QdHzY6s="; + hash = "sha256-e7wVR+xr+5phNoRnGIxnmrjB1QU9JmyfQiu88PYapA8="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "minidb" - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "minidb" ]; meta = with lib; { description = "SQLite3-based store for Python objects"; @@ -34,4 +34,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ tv ]; }; } - diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index d23d2fdc57ed8..d4b5265ba8ed7 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "neo"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VnXR+jgaU8LH7ri16SnsA5neILsLUkU+G5nsbWbckfM="; + hash = "sha256-gVhbKLZaTciakucc7TlCxdv9qnG90sw4U3G3ebVlTK0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index b2dae6f29b1ee..bc7dd2a582653 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -3,20 +3,17 @@ , cmake , fetchFromGitHub , joblib -, jupyter -, jupyter-client , matplotlib -, nbconvert , ninja -, numba , numpy , pandas +, pathspec +, pyproject-metadata , pybind11 , pytestCheckHook , pythonOlder -, scikit-build +, scikit-build-core , scipy -, setuptools }: buildPythonPackage rec { @@ -24,7 +21,7 @@ buildPythonPackage rec { version = "0.12.4"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "KaveIO"; @@ -33,58 +30,39 @@ buildPythonPackage rec { hash = "sha256-YsH7vVn6gzejunUjUY/RIcvWtaQ/W1gbciJWKi5LDTk="; }; - nativeBuildInputs = [ + build-system = [ cmake ninja - scikit-build - setuptools + pathspec + pybind11 + pyproject-metadata + scikit-build-core ]; - propagatedBuildInputs = [ + dependencies = [ joblib + matplotlib numpy - scipy pandas - matplotlib - numba - pybind11 + scipy ]; nativeCheckInputs = [ pytestCheckHook - nbconvert - jupyter - jupyter-client ]; - # Uses setuptools to drive build process + # Uses scikit-build-core to drive build process dontUseCmakeConfigure = true; pythonImportsCheck = [ "phik" ]; - postInstall = '' - rm -r $out/bin - ''; - preCheck = '' # import from $out rm -r phik ''; - disabledTests = [ - # TypeError: 'numpy.float64' object cannot be interpreted as an integer - # https://github.com/KaveIO/PhiK/issues/73 - "test_significance_matrix_hybrid" - "test_significance_matrix_mc" - ]; - - disabledTestPaths = [ - # Don't test integrations - "tests/phik_python/integration/" - ]; - meta = with lib; { description = "Phi_K correlation analyzer library"; longDescription = '' diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 8dad1316c1a7f..b312b78a2bfb2 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.19.1"; + version = "2.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-kXRz78UHQtVyHFFnURSjOOXX8Me2I5tG2bX+u2yGyzY="; + hash = "sha256-Mng5YUM2+T3OFrr4uGVvq5mP0aq10r21pp46tw6lLno="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 35ab0ecec5095..b96dcac4fd35e 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -1,16 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, parameterized -, ply -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + parameterized, + ply, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyomo"; - version = "6.7.1"; - format = "setuptools"; + version = "6.7.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,21 +20,19 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-eTItw+wYo5lCla4oKSF97N4TFajjFtCMMq4DU9ahi1U="; + hash = "sha256-v3KVb9KZPbUlpRySzJV8dmApScKT06aJc8SULCHcnPI="; }; - propagatedBuildInputs = [ - ply - ]; + build-system = [ setuptools ]; + + dependencies = [ ply ]; nativeCheckInputs = [ parameterized pytestCheckHook ]; - pythonImportsCheck = [ - "pyomo" - ]; + pythonImportsCheck = [ "pyomo" ]; preCheck = '' export HOME=$(mktemp -d); @@ -53,10 +53,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python Optimization Modeling Objects"; - mainProgram = "pyomo"; - homepage = "http://pyomo.org"; + homepage = "http://www.pyomo.org/"; changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; + mainProgram = "pyomo"; }; } diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 31e730a0b9432..7d746131636e1 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-/j7aJ34W7KP+O5ugl+xrA/X42SIjc+zfiBeSd1/4YZI="; + hash = "sha256-qyaERNaisfDWXW1IeyFMOV6nLqT+0O9QJ4U02LOyiuE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix index ab9961af33958..31440a40e5a34 100644 --- a/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonAtLeast, setuptools, tomli, pytestCheckHook, @@ -12,17 +11,16 @@ buildPythonPackage rec { pname = "setuptools-gettext"; - version = "0.1.11"; + version = "0.1.14"; pyproject = true; - # >=3.12 doesn't work because the package depends on `distutils` - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "breezy-team"; repo = "setuptools-gettext"; rev = "refs/tags/v${version}"; - hash = "sha256-yLKn4wwGgRdlsISAT71lD2vkIefsTJRB+OEA030adZY="; + hash = "sha256-05xKWRxmoI8tnRENuiK3Z3WNMyjgXIX5p3vhzSUeytQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index e7b85cf199b60..6770e65194cc2 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -1,41 +1,34 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, zeep +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + zeep, }: buildPythonPackage rec { pname = "total-connect-client"; - version = "2024.4"; + version = "2024.5"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-LuPyhidbAzt/AU5WuXyxggGxjm9yArHsbn6iAaccMEc="; + hash = "sha256-NGiI4gn59U7NiRYtB6UydxOu+lVtmbl8qF3nbAjiYwk="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - zeep - ]; + dependencies = [ zeep ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "total_connect_client" - ]; + pythonImportsCheck = [ "total_connect_client" ]; meta = with lib; { description = "Interact with Total Connect 2 alarm systems"; diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index 35212c3434438..a8183bf3f8411 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/pkgs/development/python-modules/trafilatura/default.nix @@ -1,35 +1,43 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -, pythonOlder -, certifi -, charset-normalizer -, courlan -, htmldate -, justext -, lxml -, urllib3 -, setuptools +{ + lib, + buildPythonPackage, + certifi, + charset-normalizer, + courlan, + fetchPypi, + htmldate, + justext, + lxml, + pytestCheckHook, + pythonOlder, + setuptools, + urllib3, }: buildPythonPackage rec { pname = "trafilatura"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-a4eN/b1cXftV0Pgwfyt9wVrDRYBU90hh/5ihcvXjhyA="; + hash = "sha256-5oM9KauKE+2FOTfXyR5oaLxi774QIUrCsQZDbdI9FBI="; }; - nativeBuildInputs = [ - setuptools - ]; + # Patch out gui cli because it is not supported in this packaging and + # nixify path to the trafilatura binary in the test suite + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"trafilatura_gui=trafilatura.gui:main",' "" + substituteInPlace tests/cli_tests.py \ + --replace-fail "trafilatura_bin = 'trafilatura'" "trafilatura_bin = '$out/bin/trafilatura'" + ''; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ certifi charset-normalizer courlan @@ -39,34 +47,22 @@ buildPythonPackage rec { urllib3 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Disable tests that require an internet connection + "test_cli_pipeline" + "test_crawl_page" "test_download" "test_fetch" - "test_redirection" "test_meta_redirections" - "test_crawl_page" - "test_whole" "test_probing" - "test_cli_pipeline" + "test_queue" + "test_redirection" + "test_whole" ]; - # patch out gui cli because it is not supported in this packaging - # nixify path to the trafilatura binary in the test suite - postPatch = '' - substituteInPlace setup.py \ - --replace-fail '"trafilatura_gui=trafilatura.gui:main",' "" - substituteInPlace tests/cli_tests.py \ - --replace-fail "trafilatura_bin = 'trafilatura'" "trafilatura_bin = '$out/bin/trafilatura'" - ''; - - pythonImportsCheck = [ - "trafilatura" - ]; + pythonImportsCheck = [ "trafilatura" ]; meta = with lib; { description = "Python package and command-line tool designed to gather text on the Web"; diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index b94b06e8a1cba..d9b1b0717f956 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -25,7 +25,7 @@ let in buildPythonPackage rec { pname = "type-infer"; - version = "0.0.19"; + version = "0.0.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "type_infer"; inherit version; - hash = "sha256-7fWRM776lAyOncp6WZDLH9ouVBhVvV23105xvhw8V24="; + hash = "sha256-F+gfA7ofrbMEE5SrVt9H3s2mZKQLyr6roNUmL4EMJbI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 51c1d12b184d8..2ae7abe457db5 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tests/__init__.py \ --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" \ - --replace "'3.9', '3.10']" "'3.9', '3.10', '3.11']" # if the Python version used isn't in this list, tests fail + --replace "'3.9', '3.10']" "'3.9', '3.10', '3.11', '3.12']" # if the Python version used isn't in this list, tests fail substituteInPlace tests/test_virtualenv_sys.py \ --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 73f896e5541d5..9047bc8fb1762 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.5.7"; + version = "4.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-VIGcfAzU/0nrVqhny2Ix6rU0DkDhRvX9UkfK8k412QU="; + hash = "sha256-F4FFG8W8zjEcD1OssioKTik0sy6B/kGITYfW+bqhNkQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/wsgitools/default.nix b/pkgs/development/python-modules/wsgitools/default.nix index 948f932271c18..17eb56ec4e2b1 100644 --- a/pkgs/development/python-modules/wsgitools/default.nix +++ b/pkgs/development/python-modules/wsgitools/default.nix @@ -1,18 +1,32 @@ -{lib -,buildPythonPackage -,fetchPypi +{ + lib, + buildPythonPackage, + pythonAtLeast, + fetchPypi, + setuptools, + pyasyncore, + unittestCheckHook, }: buildPythonPackage rec { pname = "wsgitools"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "0q6kmrkqf02fgww7z1g9cw8f70fimdzs1bvv9inb7fsk0c3pcf1i"; + hash = "sha256-MTh2BwNTu7NsTHuvoH+r0YHjEGfphX84f04Ah2eu02A="; }; + build-system = [ setuptools ]; + + # the built-in asyncore library was removed in python 3.12 + dependencies = lib.optionals (pythonAtLeast "3.12") [ pyasyncore ]; + + pythonImportsCheck = [ "wsgitools" ]; + + nativeCheckInputs = [ unittestCheckHook ]; + meta = with lib; { maintainers = with maintainers; [ clkamp ]; description = "A set of tools working with WSGI"; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 2565d1004fb3f..8d4004d7580f3 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -380,6 +380,7 @@ let LOMAR = [ pkgs.gmp.dev ]; lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; lwgeom = with pkgs; [ proj geos gdal ]; + rsbml = [ pkgs.pkg-config ]; rvg = [ pkgs.libpng.dev ]; MAGEE = [ pkgs.zlib.dev pkgs.bzip2.dev ]; magick = [ pkgs.imagemagick.dev ]; @@ -589,6 +590,7 @@ let gdtools = [ pkgs.pkg-config ]; archive = [ pkgs.libarchive]; gdalcubes = with pkgs; [ proj.dev gdal sqlite.dev netcdf ]; + rsbml = [ pkgs.libsbml ]; SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev]; specklestar = [ pkgs.fftw.dev ]; cartogramR = [ pkgs.fftw.dev ]; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index f4d8137c33eba..f54f77113e42e 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.43.1"; + version = "4.44.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-AQOHVuDREp6OpwlPFwpCUOQACOsDRH0uM6WwKyEK4JI="; + hash = "sha256-5l948J0NTeWOeUMlcoEQZws8viqtARdkJsGch4c6Trw="; }; - vendorHash = "sha256-9GCqZS0fguJo8GkVPMgbstEVzrjIS0kdbNQEaT1HSFI="; + vendorHash = "sha256-j5vcx5wW2v1kNc2QCPR11JEb1fTA9q4E4mbJ2VJC37A="; nativeBuildInputs = [ installShellFiles ]; |