diff options
Diffstat (limited to 'pkgs/development')
23 files changed, 256 insertions, 243 deletions
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 0716453c34c94..8747215cce0d6 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -28,7 +28,7 @@ , sysctl , buildLlvmTools , debugVersion ? false -, doCheck ? (if lib.versionOlder release_version "15" then stdenv.isLinux else true) +, doCheck ? !stdenv.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.isLinux else true) && (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) && (stdenv.hostPlatform == stdenv.buildPlatform) , enableManpages ? false 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/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/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index f999cd3b3b344..cdd6ac9b97811 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -1,32 +1,33 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytestCheckHook -, pythonOlder +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "asyncio-dgram"; - version = "2.1.2"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jsbronder"; - repo = pname; - rev = "refs/tagsv${version}"; + repo = "asyncio-dgram"; + rev = "refs/tags/v${version}"; hash = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + build-system = [ setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio + pytestCheckHook ]; # OSError: AF_UNIX path too long @@ -38,9 +39,7 @@ buildPythonPackage rec { "test_from_socket_bad_socket" ]; - pythonImportsCheck = [ - "asyncio_dgram" - ]; + pythonImportsCheck = [ "asyncio_dgram" ]; meta = with lib; { description = "Python support for higher level Datagram"; 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/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index bb0a67a7ede09..6019b702efd55 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.101"; + version = "1.34.103"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-GexON+k1FlMZID3tULcKLLxrVUscVMzS9fZNgD+rB4U="; + hash = "sha256-MxMTEnOQKpgEYyL4wZkl7NUykk66ZOm/wFKNBGrrbYw="; }; build-system = [ setuptools ]; 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/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/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/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/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index c59205aa3f1a3..93f5e3567839b 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -1,26 +1,30 @@ -{ lib -, buildPythonPackage -, fetchPypi -, gitpython -, pytestCheckHook -, pythonOlder -, requests +{ + lib, + buildPythonPackage, + fetchPypi, + gitpython, + pytestCheckHook, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.9"; - format = "setuptools"; + version = "0.2.16"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-q16YB0lLlw9nXohcT20l41Bv40CqshWzE8nVBBSEppE="; + hash = "sha256-PP9dR8Jl4eWsky3vO9Pgraw0plik/5aWvmOAEc2/Qpo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ gitpython requests ]; @@ -28,14 +32,12 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "pyExploitDb" - ]; + pythonImportsCheck = [ "pyExploitDb" ]; meta = with lib; { description = "Library to fetch the most recent exploit-database"; homepage = "https://github.com/GoVanguard/pyExploitDb"; - changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/Changelog.txt"; + changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; 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/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index e6a696dec9bb8..4a125dd1775bc 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -1,32 +1,34 @@ -{ lib -, buildPythonPackage -, cython -, fetchFromGitHub -, ply -, pythonOlder -, six -, tornado +{ + lib, + buildPythonPackage, + cython, + fetchFromGitHub, + ply, + pythonOlder, + six, + setuptools, + tornado, }: buildPythonPackage rec { pname = "thriftpy2"; - version = "0.4.20"; - format = "setuptools"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Thriftpy"; - repo = pname; + repo = "thriftpy2"; rev = "refs/tags/v${version}"; - hash = "sha256-IEYoSLaJUeQdwHaXR0UUlCZg5zBEh5Y2/IwB4RVEAcg="; + hash = "sha256-Pjy9OPwFfKaw+XVl7IbbAKPz050TlqI4+yLqSITOkSY="; }; - nativeBuildInputs = [ - cython - ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + dependencies = [ ply six tornado @@ -35,9 +37,7 @@ buildPythonPackage rec { # Not all needed files seems to be present doCheck = false; - pythonImportsCheck = [ - "thriftpy2" - ]; + pythonImportsCheck = [ "thriftpy2" ]; meta = with lib; { description = "Python module for Apache Thrift"; 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/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 ]; |