diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-17 00:12:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-17 00:12:14 +0000 |
| commit | 2f576c19f72184165ac7a318f9dee5936a15ef7b (patch) | |
| tree | b644916bc1fa9227e85c90f68fbc4c0a967b0d07 /pkgs/development | |
| parent | 02be936be36984757771364804ea47078adb02b6 (diff) | |
| parent | 276ae1146d5da0683339cea0508586209e19ed48 (diff) | |
| download | nixlib-2f576c19f72184165ac7a318f9dee5936a15ef7b.tar nixlib-2f576c19f72184165ac7a318f9dee5936a15ef7b.tar.gz nixlib-2f576c19f72184165ac7a318f9dee5936a15ef7b.tar.bz2 nixlib-2f576c19f72184165ac7a318f9dee5936a15ef7b.tar.lz nixlib-2f576c19f72184165ac7a318f9dee5936a15ef7b.tar.xz nixlib-2f576c19f72184165ac7a318f9dee5936a15ef7b.tar.zst nixlib-2f576c19f72184165ac7a318f9dee5936a15ef7b.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development')
78 files changed, 741 insertions, 502 deletions
diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index e3462c826c76..4057ec157eba 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -31,12 +31,12 @@ }: let - version = "3.0.4"; + version = "3.1.0"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-U8BW1Aq9t3je0YDV8NkE0MzdnjwXBJQbmekh5ufOs3k="; + sha256 = "sha256-Twm2Hr8BQ0xTdA30e2Az/57525jTUkmv2Zs/+SNiQns="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index 7ca44f39e0e8..790c264d28bd 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -10,12 +10,14 @@ mkCoqDerivation rec { release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo="; release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ="; release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s="; + release."0.1.8+8.19".sha256 = "sha256-aO3hUAWEqVxvCF7uJs+S4yrRxSMe/GaLKVfW/vawzNs="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "0.1.8+8.16"; } { case = isEq "8.17"; out = "0.1.8+8.17"; } { case = isEq "8.18"; out = "0.1.8+8.18"; } + { case = isEq "8.19"; out = "0.1.8+8.19"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index ca50f35646b0..f48cce55d4dc 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -2,6 +2,7 @@ let release = { + "8.19.0+0.19.0".sha256 = "sha256-M9d0ne2veTjf8/mFIDwtWdHi64JXjwCPWupnO2Ztd/Y="; "8.18.0+0.18.0".sha256 = "sha256-c+3yG9vcbek/uvQ27OOQGqqsIHU1VuQhQvNVOjfucbo="; "8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI="; "8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc="; @@ -20,6 +21,7 @@ in defaultVersion = with versions; lib.switch coq.version [ + { case = isEq "8.19"; out = "8.19.0+0.19.0"; } { case = isEq "8.18"; out = "8.18.0+0.18.0"; } { case = isEq "8.17"; out = "8.17.0+0.17.0"; } { case = isEq "8.16"; out = "8.16.0+0.16.3"; } diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/development/interpreters/cel-go/default.nix index 60d0586e094e..88d0b19fc0a4 100644 --- a/pkgs/development/interpreters/cel-go/default.nix +++ b/pkgs/development/interpreters/cel-go/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cel-go"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "google"; repo = "cel-go"; rev = "v${version}"; - hash = "sha256-r3xBg+8C3VZ3sHYKMyQoBVGe+puWdRO4q3e9bur9ZoY="; + hash = "sha256-rjhTKZ2d1jDby4tacLfbKJj0Y7F/KkECWAL/WsqJ6sg="; }; modRoot = "repl"; - vendorHash = "sha256-7WBom6FS/GX+pM3zv59BZOwmAIokKkZcN3yGbcQb09Q="; + vendorHash = "sha256-h+f/ILk6mDzRBW1FI1jFyWxkV3bvrJ/BMsCuuf+E+J0="; subPackages = [ "main" diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix index e4d1df23b7e5..f587cf33308d 100644 --- a/pkgs/development/libraries/cxxopts/default.nix +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cxxopts"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "jarro2783"; repo = "cxxopts"; rev = "v${version}"; - sha256 = "sha256-lJPMaXBfrCeUhhXha5f7zmOGtyEDzU3oPTMirPTFZzQ="; + sha256 = "sha256-tOO0YCIG3MxSJZhurNcDR1pWIUEO/Har9mrCrZs3iVk="; }; buildInputs = lib.optionals enableUnicodeHelp [ icu.dev ]; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index ff379c1a78b3..2ed5417c8026 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.16.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8MPAyCqqjDpDHSyiZ1cvvgflaOLNzPGswZSsSjSffvw="; + hash = "sha256-rzKZvVybKLQKT9ZiGT/9LgU7hxI6knVXkPawNhbW/DQ="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index fb2db6a963e7..f080bd804b48 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.28.1"; + version = "0.28.2"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -28,16 +28,9 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - hash = "sha256-Jim8vYWyCa16LAJ1GuP8cCzhXIc2ouo6hVsHg3UQbdg="; + hash = "sha256-0TgvIiuHMeohStIwmHOq4yvTj2H07wyx4w3iIdkrLTc="; }; - patches = [ - (fetchpatch { - url = "https://github.com/Exiv2/exiv2/commit/c351c7cce317571934abf693055779a59df30d6e.patch"; - hash = "sha256-fWJT4IUBrAELl6ku0M1iTzGFX74le8Z0UzTJLU/gYls="; - }) - ]; - nativeBuildInputs = [ cmake doxygen @@ -94,7 +87,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a + remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 ''; disallowedReferences = [ stdenv.cc.cc ]; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index b0017e03ebc7..55915b4bb523 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.9"; + version = "0.10.10"; src = fetchFromGitHub { owner = "igraph"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-Iaez6Rrd684vsraCkEH5a16rXfc53MyPXcYf3sOcaOY="; + hash = "sha256-xFX48qAr0x0iNRns/aGH9UKL0wGJyfccQLdEXUFI/TU="; }; postPatch = '' diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix index 8452ccffe389..c33b8881a03a 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkg-config , marisa, qttools, qtlocation }: mkDerivation rec { @@ -12,6 +12,16 @@ mkDerivation rec { sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g="; }; + patches = [ + # Fix build with libxml v2.12 + # FIXME: Remove at next package update + (fetchpatch { + name = "libxml-2.12-fix.patch"; + url = "https://github.com/Framstag/libosmscout/commit/db7b307de1a1146a6868015a0adfc2e21b7d5e39.patch"; + hash = "sha256-5NDamzb2K18sMVfREnUNksgD2NL7ELzLl83SlGIveO0="; + }) + ]; + cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 43cb876fa884..dfc8a21e206c 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.97"; - hash = "sha256-d26v8a+5EkQ6cFg5SZirT4L22AxfIteiUx4I42msyqw="; + version = "3.98"; + hash = "sha256-0p1HzspxyzhzX46O7ax8tmYiaFEBeqEqEvman4NIiQc="; } diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 9c485949a5c0..e3bf614d9886 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uDKCT0Uoa5WQekMUFm2iZmzm+oWAZ6IWMwfpchkUZY0="; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "static" ]; nativeBuildInputs = [ cmake @@ -65,7 +65,9 @@ stdenv.mkDerivation rec { NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) ''; - postInstall = "rm $out/lib/*.a"; + postInstall = '' + moveToOutput "lib/*.a" $static + ''; meta = { description = "An Open-Source subdivision surface library"; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index ebfd8e5670ff..6589e718f10e 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, fetchpatch, unzip }: let version = "2.6.2"; @@ -21,6 +21,17 @@ in stdenv.mkDerivation { # Use CC, CXX, and LD from environment ./2.6.2-cxx.patch + + (fetchpatch { + name = "CVE-2023-34194.patch"; + url = "https://salsa.debian.org/debian/tinyxml/-/raw/2366e1f23d059d4c20c43c54176b6bd78d6a83fc/debian/patches/CVE-2023-34194.patch"; + hash = "sha256-ow4LmLQV24SAU6M1J8PXpW5c95+el3t8weM9JK5xJfg="; + }) + (fetchpatch { + name = "CVE-2021-42260.patch"; + url = "https://salsa.debian.org/debian/tinyxml/-/raw/dc332a9f4e05496c8342b778c14b256083beb1ee/debian/patches/CVE-2021-42260.patch"; + hash = "sha256-pIM0uOnUQOW93w/PEPuW3yKq1mdvNT/ClCYVc2hLoY8="; + }) ]; preConfigure = "export LD=${stdenv.cc.targetPrefix}c++"; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index f9a7be69f561..5f80a44ed7df 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -2,8 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch -, pythonAtLeast , pythonOlder , pytestCheckHook , setuptools @@ -13,6 +11,7 @@ , pyyaml , safetensors , torch +, cudatoolkit , evaluate , parameterized , transformers @@ -52,6 +51,8 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) export PATH=$out/bin:$PATH + '' + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform cudatoolkit) '' + export TRITON_PTXAS_PATH="${cudatoolkit}/bin/ptxas" ''; pytestFlagsArray = [ "tests" ]; disabledTests = [ @@ -74,6 +75,8 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" + # requires ptxas from cudatoolkit, which is unavailable on aarch64-linux + "test_dynamo_extract_model" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # RuntimeError: torch_shm_manager: execl failed: Permission denied "CheckpointTest" diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index 1a5689f3df43..d759a4db6a28 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiopvapi"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,15 +18,9 @@ buildPythonPackage rec { owner = "sander76"; repo = "aio-powerview-api"; rev = "refs/tags/v${version}"; - hash = "sha256-+jhfp8gLEmL8TGPPN7QY8lw1SkV4sMSDb4VSq2OJ6PU="; + hash = "sha256-NfSGu4M0NWfCDc37zRwUjYtZz5jOtw3pYgF6fIsB/Yo="; }; - postPatch = '' - # https://github.com/sander76/aio-powerview-api/pull/31 - substituteInPlace setup.py \ - --replace '"asyncio", ' "" - ''; - nativeBuildInputs = [ setuptools ]; @@ -43,16 +37,6 @@ buildPythonPackage rec { "aiopvapi" ]; - disabledTestPaths = [ - # https://github.com/sander76/aio-powerview-api/issues/32 - "tests/test_shade.py" - "tests/test_scene.py" - "tests/test_room.py" - "tests/test_apiresource.py" - "tests/test_hub.py" - "tests/test_scene_members.py" - ]; - meta = with lib; { description = "Python API for the PowerView API"; homepage = "https://github.com/sander76/aio-powerview-api"; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 4a9ff67c3cba..899fd02e9392 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.4"; + version = "2.3.5"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eaG9E02BPI6jdAWZxv2WGhFCXOd1fy/XJc9W1qGnI2w="; + hash = "sha256-zZ3dV2WHDqPFRbbLR6qtXwTZowpijdP82082eijCIIU="; }; patches = [ diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 5907b74ba220..20da74babff2 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { - pname = "AWSIoTPythonSDK"; - version = "1.5.2"; - format = "setuptools"; + pname = "awsiotpythonsdk"; + version = "1.5.4"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -15,9 +16,13 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GHMnDRxXkaKDTaawwPtMqa7EZJ8Y35+ScgtfEP9PJGs="; + hash = "sha256-TUNIWGal7NQy2qmHVTiw6eX4t/Yt3NnM3HHztBwMfoM="; }; + nativeBuildInputs = [ + setuptools + ]; + # Module has no tests doCheck = false; @@ -28,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for connecting to AWS IoT"; homepage = "https://github.com/aws/aws-iot-device-sdk-python"; + changelog = "https://github.com/aws/aws-iot-device-sdk-python/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 133721ca4d74..b95344d3a661 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "cohere"; version = "4.37"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,15 +24,6 @@ buildPythonPackage rec { hash = "sha256-eIAh2dmSxsMdGYXZXMyyd8cmWILErNekmz5H2ne0vsg="; }; - patches = [ - # https://github.com/cohere-ai/cohere-python/pull/289 - (fetchpatch { - name = "replace-poetry-with-poetry-core.patch"; - url = "https://github.com/cohere-ai/cohere-python/commit/e86480336331c0cf6f67e26b0825467dfca5b277.patch"; - hash = "sha256-P1Ioq5ypzT3tx6cxrI3ep34Fi4cUx88YkfJ5ErN3VHk="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 3b812d671c9d..3f8c177c2bec 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.9.0"; + version = "1.10.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0d2f12108a147d44590c8df63997fcb32f8b2fbc18f8cbb221f0136e2e372b85"; + sha256 = "sha256-Em3dVWkSYI/iBaRUIiIRsc11pg30QAvJYwa1F/Zn9Ik="; }; # it will try to connect to a running instance diff --git a/pkgs/development/python-modules/django-pattern-library/default.nix b/pkgs/development/python-modules/django-pattern-library/default.nix index 89f998c058b9..b93df07d2ef5 100644 --- a/pkgs/development/python-modules/django-pattern-library/default.nix +++ b/pkgs/development/python-modules/django-pattern-library/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "django-pattern-library"; version = "1.1.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "torchbox"; @@ -29,14 +29,6 @@ buildPythonPackage rec { hash = "sha256-9uuLYwG0/NYGouncuaN8S+3CBABSxSOkcrP59p5v84U="; }; - patches = [ - (fetchpatch { - # https://github.com/torchbox/django-pattern-library/pull/232 - url = "https://github.com/torchbox/django-pattern-library/commit/e7a9a8928a885941391fb584eba81578a292ee7d.patch"; - hash = "sha256-3uUoxdVYEiF+to88qZRhOkh1++RfmsqCzO9JNMDqz6g="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix new file mode 100644 index 000000000000..52824049c6c1 --- /dev/null +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -0,0 +1,65 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + click, + essentials, + flask, + hatchling, + httpx, + jinja2, + markupsafe, + pydantic, + pytestCheckHook, + pythonImportsCheckHook, + pyyaml, + rich, + setuptools +}: +buildPythonPackage rec { + pname = "essentials-openapi"; + version = "1.0.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Neoteroi"; + repo = "essentials-openapi"; + rev = "v${version}"; + hash = "sha256-j0vEMNXZ9TrcFx8iIyTFQIwF49LEincLmnAt+qodYmA="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + flask + httpx + pydantic + pytestCheckHook + rich + setuptools + ]; + + propagatedBuildInputs = [ + pyyaml + essentials + markupsafe + ]; + + passthru.optional-dependencies = { + full = [ click jinja2 rich httpx ]; + }; + + pythonImportsCheck = [ + "openapidocs" + ]; + + meta = with lib; { + homepage = "https://github.com/Neoteroi/essentials-openapi"; + description = "Functions to handle OpenAPI Documentation"; + changelog = "https://github.com/Neoteroi/essentials-openapi/releases/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero zimbatm]; + }; +} diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix new file mode 100644 index 000000000000..69a494a0eb5d --- /dev/null +++ b/pkgs/development/python-modules/essentials/default.nix @@ -0,0 +1,38 @@ +{ + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + pythonImportsCheckHook, + lib, +}: +buildPythonPackage rec { + pname = "essentials"; + version = "1.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Neoteroi"; + repo = "essentials"; + rev = "v${version}"; + hash = "sha256-WMHjBVkeSoQ4Naj1U7Bg9j2hcoErH1dx00BPKiom9T4="; + }; + + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "essentials" + ]; + + meta = with lib; { + homepage = "https://github.com/Neoteroi/essentials"; + description = "General purpose classes and functions"; + changelog = "https://github.com/Neoteroi/essentials/releases/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero zimbatm]; + }; +} diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b39241bc9058..a63c257fc680 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -6,19 +6,19 @@ , lupa , poetry-core , pybloom-live +, pyprobables , pytest-asyncio , pytest-mock , pytestCheckHook , pythonOlder , redis -, six , sortedcontainers }: buildPythonPackage rec { pname = "fakeredis"; - version = "2.20.1"; - format = "pyproject"; + version = "2.21.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-TmgHAskR5MF/lzF0NHgXKecLsSCoc7xsm7gRgupm0Ws="; + hash = "sha256-2+ZZTWhUb6rj7oWPnDP0PJUHj0CJpOD8iZxmtO4xSbo="; }; nativeBuildInputs = [ @@ -35,7 +35,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis - six sortedcontainers ]; @@ -54,7 +53,13 @@ buildPythonPackage rec { aioredis ]; bf = [ - pybloom-live + pyprobables + ]; + cf = [ + pyprobables + ]; + probabilistic = [ + pyprobables ]; }; @@ -66,7 +71,7 @@ buildPythonPackage rec { description = "Fake implementation of Redis API"; homepage = "https://github.com/dsoftwareinc/fakeredis-py"; changelog = "https://github.com/cunla/fakeredis-py/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index c3b0c6078f42..8e00a4678ebf 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , pytestCheckHook , go , ffmpeg-headless @@ -9,8 +10,8 @@ buildPythonPackage rec { pname = "ffmpy"; - version = "0.3.1"; - format = "setuptools"; + version = "0.3.2"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "Ch00k"; repo = "ffmpy"; rev = "refs/tags/${version}"; - hash = "sha256-kuLhmCG80BmXdqpW67UanBnuYiL2Oh1jKt7IgmVNEAM="; + hash = "sha256-q41JjAWcIiD2nJck5Zzb/lhfIZ3xJGU1I2crsMN0T8Q="; }; postPatch = '' @@ -34,6 +35,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "ffmpy" ]; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook go diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 2768a79005a8..0cb6f8350dd4 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.12.0"; + version = "2.13.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IvemHgS0qbA9UE7y22aD30YqAy2lP+P7ssNvUlB0q7U="; + hash = "sha256-AhZ5KdSpxJS8jHfwJfLztMtyGZOnCwhb/lalrPZ9jog="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index c975700ce1ef..50346213b253 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.14.0"; + version = "3.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DZDp/aRhIe2bBcn8BVA8jwmDaUrbHAMMRG0LixuvGl0="; + hash = "sha256-v9gBSb9TYvaqF1/g7dJshSkJ2RlCAWXGdf7yPlne0I4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 4fe3dddd3001..90e28d3e65a1 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.13.0"; - format = "setuptools"; + version = "3.15.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mFqptqEvHQAKNevzawDOfQsH0SCn9EanJ2js4vIpCGo="; + hash = "sha256-kZjw+TBXVX5O/OufGN/Y/J0NDX30RiqFqwndnGkUjBE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index aac30f35757d..1a3c2c96b44f 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.3.0"; - format = "setuptools"; + version = "1.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oLqRmxNPbb+nUMN70kGlAtBCji4wXrbRv2DhNMcZV5c="; + hash = "sha256-4O62hAl6uRz74up/AIwq22VSDQDlTwmm8ywKAik4QrQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index e04591791d3c..66b032e856c3 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -7,20 +7,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.12.0"; - format = "setuptools"; + version = "2.13.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-efuO/hWDM+aMBXR+nqhrWYsvQpoS83FJ2DrG+hhFlio="; + hash = "sha256-8ZU9aJPTXNQ9CLK1UgwWWnAOSt584lyiKEAXiQsOWhU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 47e0373d65df..c9be11ab058f 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.19.1"; + version = "2.19.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wQ2V66+QP5I7FKqOxbfICRYTjt8pnGWhwalDH9VmXSU="; + hash = "sha256-pfkoBZjwxKWBm7YwpQxF3IrNoMlK/srgoYNovMv6JlE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 6901c9dc3107..32304fad221f 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -8,20 +8,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.18.0"; - format = "setuptools"; + version = "2.18.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Tkmb0z/3rv8nG9Z0h+IdVAQpeobcSHPuhh1jewGzC04="; + hash = "sha256-MQVV88jLl39KRtRFTsosg/7WoJ88SzW4T2+h+P71UCQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index a4f2ab9ae4b3..016b569492bf 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.24.0"; + version = "2.24.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z7x4xfCbeRPoCbinCrTwIAp9JIvfavFvA1c4/a5UbHQ="; + hash = "sha256-aPW5m1cZNXpbiWCUQs104QH+/rVueanW0yE5TCdgWoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index e8ac6fa628f5..b020e1201fcd 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.13.0"; - format = "setuptools"; + version = "2.13.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ODRF08xxjUrj6PMzfTlcYLqGrgV71OA0VHT44ktQZ4k="; + hash = "sha256-nZQVoV6ciXHZfbr26U4PKFU/sHJPoZNB5j7covnE9aw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 071543ae3caf..ea56c08b3057 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uaaL/CbR4RM4YFU0xd/naGn3xSiLuRqI0/qyZNLKJ3Q="; + hash = "sha256-uHIhWpihTxcV28zv3OZrGf4mj26aBaR2isycRMtMeNM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 4aebfc1cecd1..e2f555121f93 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -3,24 +3,28 @@ , pythonOlder , fetchFromGitHub , pkg-config +, setuptools , igraph , texttable -, unittestCheckHook +, cairocffi +, matplotlib +, plotly +, pytestCheckHook }: buildPythonPackage rec { pname = "igraph"; - version = "0.11.3"; + version = "0.11.4"; disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-Pki0ygcQeuC5E4SwhzGX7oIe9LUSgoBKiXbtcpjL3ng="; + hash = "sha256-sR9OqsBxP2DvcYz1dhIP29rrQ56CRKW02oNAXUNttio="; }; postPatch = '' @@ -29,6 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config + setuptools ]; buildInputs = [ @@ -39,13 +44,25 @@ buildPythonPackage rec { texttable ]; + passthru.optional-dependencies = { + cairo = [ cairocffi ]; + matplotlib = [ matplotlib ]; + plotly = [ plotly ]; + plotting = [ cairocffi ]; + }; + # NB: We want to use our igraph, not vendored igraph, but even with # pkg-config on the PATH, their custom setup.py still needs to be explicitly # told to do it. ~ C. - setupPyGlobalFlags = [ "--use-pkg-config" ]; + env.IGRAPH_USE_PKG_CONFIG = true; nativeCheckInputs = [ - unittestCheckHook + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + disabledTests = [ + "testAuthorityScore" + "test_labels" ]; pythonImportsCheck = [ "igraph" ]; diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index b6d308ee2135..991c6e8813c3 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.0.post1"; + version = "2.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; - rev = "v${version}"; - sha256 = "0ysjn8z1hkscb4cycbrvcb93r04w5793yylsy40h5dvjd04ns5jc"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY="; }; MKLROOT = mkl; diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index da881f658675..6b46ae62258c 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , fetchPypi +, testers , ansible-compat , ansible-core , click-help-colors , enrich , jsonschema +, molecule , withPlugins ? true, molecule-plugins , packaging , pluggy @@ -19,12 +21,12 @@ buildPythonPackage rec { pname = "molecule"; - version = "6.0.3"; + version = "24.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-0qiBBi/MXvHgjB5RJ8BDVNLJUXGVXicL2Cs/v+9y07A="; + hash = "sha256-R8mCp9Bdt4Rtp3/nFZ3rlG8myvsuOI/HGBK+AImkF3Y="; }; nativeBuildInputs = [ @@ -51,6 +53,14 @@ buildPythonPackage rec { # tests can't be easily run without installing things from ansible-galaxy doCheck = false; + passthru.tests.version = (testers.testVersion { + package = molecule; + command = "PY_COLORS=0 ${pname} --version"; + }).overrideAttrs (old: { + # workaround the error: Permission denied: '/homeless-shelter' + HOME = "$(mktemp -d)"; + }); + meta = with lib; { description = "Molecule aids in the development and testing of Ansible roles"; homepage = "https://github.com/ansible-community/molecule"; diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index e550285ccaac..64c6d8dd1ad1 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.32"; + version = "0.3.33"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-xwlrMZLJKRW6iqMsDKS5BDqejADSk/qGOAnQDZ2fTPc="; + hash = "sha256-YTqiZCM5Dvsse+isQ4WSQgHfDGAVtmYVLHPR4Mmme6Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix new file mode 100644 index 000000000000..30b226c6d5bb --- /dev/null +++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix @@ -0,0 +1,63 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + click, + essentials-openapi, + flask, + hatchling, + httpx, + jinja2, + mkdocs, + pytestCheckHook, + pythonImportsCheckHook, + rich, + setuptools, +}: +buildPythonPackage rec { + pname = "neoteroi-mkdocs"; + version = "1.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Neoteroi"; + repo = "mkdocs-plugins"; + rev = "v${version}"; + hash = "sha256-UyTlgKWdBWckI9sBL4GRQtgNHYpHpZlWVOdmdQ+7lss="; + }; + + buildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + flask + setuptools + ]; + + propagatedBuildInputs = [ + essentials-openapi + click + jinja2 + httpx + mkdocs + rich + ]; + + disabledTests = [ + "test_contribs" # checks against its own git repository + ]; + + pythonImportsCheck = [ + "neoteroi.mkdocs" + ]; + + meta = with lib; { + homepage = "https://github.com/Neoteroi/mkdocs-plugins"; + description = "Plugins for MkDocs"; + changelog = "https://github.com/Neoteroi/mkdocs-plugins/releases/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero zimbatm]; + }; +} diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 0e5d643c7d96..15d4ec26e0a3 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.120.0"; + version = "2.121.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-KUiv0cNkkvaouhR2UgdMVBwrZoqCxVif71/eiyjpskI="; + hash = "sha256-oOy0gOTekPXv557dl0A0b8TJVGSUYPq38h2Fu8PN03o="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index eb3e76a5e518..407be029a60b 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.1.0"; + version = "3.2.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-uR90Af/3E8YVZ2ALSVFOkTr59iVw5NkLOnQBm4Us1vk="; + hash = "sha256-RmOKrR89bRzewUwK4oebkM8GmfEcwcx8fKFiChnMD5A="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 3d2da5207656..160a7708bdf6 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "openwebifpy"; - version = "4.2.1"; + version = "4.2.4"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-dCgbMyyVmYGPV8GyZUrMR+IO8nGoQ//dnmHmhFH2iJo="; + hash = "sha256-qL/H2F+/d/JWwmUbZhvoMlZZDGgEpRBmHabt1MWjGAs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index ad542017d1f0..21c987c6d33a 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.16.2"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-bEwCUPZJT1UTD8mQJKg+Nwag6kpn4076uyKocKI/+/M="; + hash = "sha256-101QW6MgCcmSeQ0AefPZKmg5O6+2JlrekYN3fIkukuw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 3312b88030ad..88657c9c37ef 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.6.6"; + version = "19.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4T30jiMRAbPDgGW8Zcolj1k3UpKN1/juXtYSHrjO804="; + hash = "sha256-iaZrPgGD7BM7H+i2R9qQBM55KcFu/Rqyho3AxXw15N0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 2715e1748051..d3b3e4e66949 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; src = fetchPypi { pname = "pinecone_client"; inherit version; - hash = "sha256-+aCDAzPuzhB7TvERneI9rWphv/q38jjmGEFtUcRtKcg="; + hash = "sha256-KtPvdiftxNnuJI2XgYYcQ0HW0noVvAX2vvU9lYg303Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 97b42974993a..7d8b5f666515 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.37.0"; + version = "0.37.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-a/8GVHhVZsK2DD3+mM8UvwkgjMC403Mc9UJSO19AlXs="; + hash = "sha256-6o0g3il4GV6E8avp9V2YrkaVPf2z37asdJOxf6Phbmc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index 12bdef693e20..0954993ccd1f 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-7WYe3X4wVUC7HyYoCVQYWm61C+J3r91Ci8IHNeWBTVE="; + hash = "sha256-OsgFzT5qGyszO4jFYWIAgGY41s0ZBEMwCbWZeY189h4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyformlang/default.nix b/pkgs/development/python-modules/pyformlang/default.nix index 63bf98a0ea5f..9a76ec2a1dfa 100644 --- a/pkgs/development/python-modules/pyformlang/default.nix +++ b/pkgs/development/python-modules/pyformlang/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pyformlang"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LHQM+Vy8YVfTtpWaveYgBlp74AnS/IF3Y1EbgwVku7I="; + hash = "sha256-i4ib18Ktyc9pRu4P+tQIHoZ/IbAOk8Dn0MXJoxw8gAA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 407166e98c90..0d87538a1ce4 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitLab , buildPythonPackage , pillow @@ -9,6 +10,8 @@ , pytestCheckHook , setuptools , setuptools-scm +, withTesseractSupport ? true +, withCuneiformSupport ? stdenv.hostPlatform.isLinux }: buildPythonPackage rec { @@ -27,12 +30,14 @@ buildPythonPackage rec { hash = "sha256-gE0+qbHCwpDdxXFY+4rjVU2FbUSfSVrvrVMcWUk+9FU="; }; - patches = [ - (substituteAll { - src = ./paths.patch; - inherit cuneiform tesseract; - }) - ]; + patches = [] ++ (lib.optional withTesseractSupport (substituteAll { + src = ./paths-tesseract.patch; + inherit tesseract; + tesseractLibraryLocation = "${tesseract}/lib/libtesseract${stdenv.hostPlatform.extensions.sharedLibrary}"; + })) ++ (lib.optional stdenv.hostPlatform.isLinux (substituteAll { + src = ./paths-cuneiform.patch; + inherit cuneiform; + })); propagatedBuildInputs = [ pillow ]; @@ -45,6 +50,6 @@ buildPythonPackage rec { changelog = "https://gitlab.gnome.org/World/OpenPaperwork/pyocr/-/blob/${version}/ChangeLog"; description = "A Python wrapper for Tesseract and Cuneiform"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ symphorien ]; + maintainers = with maintainers; [ symphorien tomodachi94 ]; }; } diff --git a/pkgs/development/python-modules/pyocr/paths-cuneiform.patch b/pkgs/development/python-modules/pyocr/paths-cuneiform.patch new file mode 100644 index 000000000000..a25f08eddd06 --- /dev/null +++ b/pkgs/development/python-modules/pyocr/paths-cuneiform.patch @@ -0,0 +1,101 @@ +commit cfc05af26b571e9ca09e9c709c0fb8934e9e46dd +Author: Guillaume Girol <symphorien+git@xlumurb.eu> +Date: Sat Aug 20 17:48:01 2022 +0200 + + Fix finding cuneiform + +diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py +index 2e5b717..35647e2 100644 +--- a/src/pyocr/cuneiform.py ++++ b/src/pyocr/cuneiform.py +@@ -25,13 +25,9 @@ from . import builders + from .error import CuneiformError + + +-# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY +-CUNEIFORM_CMD = 'cuneiform' ++CUNEIFORM_CMD = '@cuneiform@/bin/cuneiform' + +-CUNEIFORM_DATA_POSSIBLE_PATHS = [ +- "/usr/local/share/cuneiform", +- "/usr/share/cuneiform", +-] ++CUNEIFORM_DATA_POSSIBLE_PATHS = ['@cuneiform@/share/cuneiform'] + + LANGUAGES_LINE_PREFIX = "Supported languages: " + LANGUAGES_SPLIT_RE = re.compile("[^a-z]") +diff --git a/tests/test_cuneiform.py b/tests/test_cuneiform.py +index b76e93c..266f6b2 100644 +--- a/tests/test_cuneiform.py ++++ b/tests/test_cuneiform.py +@@ -21,7 +21,7 @@ class TestCuneiform(BaseTest): + # XXX is it useful? + which.return_value = True + self.assertTrue(cuneiform.is_available()) +- which.assert_called_once_with("cuneiform") ++ which.assert_called_once_with("@cuneiform@/bin/cuneiform") + + @patch("subprocess.Popen") + def test_version(self, popen): +@@ -54,7 +54,7 @@ class TestCuneiform(BaseTest): + self.assertIn("eng", langs) + self.assertIn("fra", langs) + popen.assert_called_once_with( +- ["cuneiform", "-l"], ++ ["@cuneiform@/bin/cuneiform", "-l"], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT + ) + +@@ -110,7 +110,7 @@ class TestCuneiformTxt(BaseTest): + output = cuneiform.image_to_string(self.image) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -126,7 +126,7 @@ class TestCuneiformTxt(BaseTest): + builder=self.builder) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, ++ ["@cuneiform@/bin/cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, + "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT +@@ -143,7 +143,7 @@ class TestCuneiformTxt(BaseTest): + builder=self.builder) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -174,7 +174,7 @@ class TestCuneiformTxt(BaseTest): + output = cuneiform.image_to_string(image, builder=self.builder) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -230,7 +230,7 @@ class TestCuneiformWordBox(BaseTest): + output = cuneiform.image_to_string(self.image, + builder=self.builder) + popen.assert_called_once_with( +- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -284,7 +284,7 @@ class TestCuneiformLineBox(BaseTest): + output = cuneiform.image_to_string(self.image, + builder=self.builder) + popen.assert_called_once_with( +- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths-tesseract.patch index c3c802c20649..1a5aa8b367eb 100644 --- a/pkgs/development/python-modules/pyocr/paths.patch +++ b/pkgs/development/python-modules/pyocr/paths-tesseract.patch @@ -2,28 +2,8 @@ commit cfc05af26b571e9ca09e9c709c0fb8934e9e46dd Author: Guillaume Girol <symphorien+git@xlumurb.eu> Date: Sat Aug 20 17:48:01 2022 +0200 - Fix finding tesseract and cuneiform + Fix finding tesseract -diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py -index 2e5b717..35647e2 100644 ---- a/src/pyocr/cuneiform.py -+++ b/src/pyocr/cuneiform.py -@@ -25,13 +25,9 @@ from . import builders - from .error import CuneiformError - - --# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY --CUNEIFORM_CMD = 'cuneiform' -+CUNEIFORM_CMD = '@cuneiform@/bin/cuneiform' - --CUNEIFORM_DATA_POSSIBLE_PATHS = [ -- "/usr/local/share/cuneiform", -- "/usr/share/cuneiform", --] -+CUNEIFORM_DATA_POSSIBLE_PATHS = ['@cuneiform@/share/cuneiform'] - - LANGUAGES_LINE_PREFIX = "Supported languages: " - LANGUAGES_SPLIT_RE = re.compile("[^a-z]") diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py index 1edec8c..434a336 100644 --- a/src/pyocr/libtesseract/tesseract_raw.py @@ -90,7 +70,7 @@ index 1edec8c..434a336 100644 - "libtesseract.4.dylib", - ] - -+libnames = [ "@tesseract@/lib/libtesseract.so" ] ++libnames = [ "@tesseractLibraryLocation@" ] g_libtesseract = None @@ -125,82 +105,6 @@ index 0fe0d20..c1fdd27 100644 TESSDATA_EXTENSION = ".traineddata" -diff --git a/tests/test_cuneiform.py b/tests/test_cuneiform.py -index b76e93c..266f6b2 100644 ---- a/tests/test_cuneiform.py -+++ b/tests/test_cuneiform.py -@@ -21,7 +21,7 @@ class TestCuneiform(BaseTest): - # XXX is it useful? - which.return_value = True - self.assertTrue(cuneiform.is_available()) -- which.assert_called_once_with("cuneiform") -+ which.assert_called_once_with("@cuneiform@/bin/cuneiform") - - @patch("subprocess.Popen") - def test_version(self, popen): -@@ -54,7 +54,7 @@ class TestCuneiform(BaseTest): - self.assertIn("eng", langs) - self.assertIn("fra", langs) - popen.assert_called_once_with( -- ["cuneiform", "-l"], -+ ["@cuneiform@/bin/cuneiform", "-l"], - stdout=subprocess.PIPE, stderr=subprocess.STDOUT - ) - -@@ -110,7 +110,7 @@ class TestCuneiformTxt(BaseTest): - output = cuneiform.image_to_string(self.image) - self.assertEqual(output, self._get_file_content("text").strip()) - popen.assert_called_once_with( -- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) -@@ -126,7 +126,7 @@ class TestCuneiformTxt(BaseTest): - builder=self.builder) - self.assertEqual(output, self._get_file_content("text").strip()) - popen.assert_called_once_with( -- ["cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, -+ ["@cuneiform@/bin/cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, - "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT -@@ -143,7 +143,7 @@ class TestCuneiformTxt(BaseTest): - builder=self.builder) - self.assertEqual(output, self._get_file_content("text").strip()) - popen.assert_called_once_with( -- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) -@@ -174,7 +174,7 @@ class TestCuneiformTxt(BaseTest): - output = cuneiform.image_to_string(image, builder=self.builder) - self.assertEqual(output, self._get_file_content("text").strip()) - popen.assert_called_once_with( -- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) -@@ -230,7 +230,7 @@ class TestCuneiformWordBox(BaseTest): - output = cuneiform.image_to_string(self.image, - builder=self.builder) - popen.assert_called_once_with( -- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) -@@ -284,7 +284,7 @@ class TestCuneiformLineBox(BaseTest): - output = cuneiform.image_to_string(self.image, - builder=self.builder) - popen.assert_called_once_with( -- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) diff --git a/tests/test_libtesseract.py b/tests/test_libtesseract.py index cc31a50..890c02c 100644 --- a/tests/test_libtesseract.py diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index ebc8c4234375..f6c5d8fc2387 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "2.5.0.4"; + version = "3.0.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - hash = "sha256-Nau4ytOSv5WOly/hbHO2M6Rgx1ileJrzfCfNJFnwVaw="; + hash = "sha256-iW3Mll28Z3Ew+eIJxeF1HR7JhVhXs9FiYaAb5TwYSpg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyprobables/default.nix b/pkgs/development/python-modules/pyprobables/default.nix new file mode 100644 index 000000000000..be4410cce276 --- /dev/null +++ b/pkgs/development/python-modules/pyprobables/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "pyprobables"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "barrust"; + repo = "pyprobables"; + rev = "refs/tags/v${version}"; + hash = "sha256-maikrZlBzhv35zPXmKqdJzAz6eZDmluLUvkOkaPTCDU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "probables" + ]; + + meta = with lib; { + description = "Probabilistic data structures"; + homepage = "https://github.com/barrust/pyprobables"; + changelog = "https://github.com/barrust/pyprobables/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-testinfra/default.nix b/pkgs/development/python-modules/pytest-testinfra/default.nix index bdf97e9c5c31..698b61ce058e 100644 --- a/pkgs/development/python-modules/pytest-testinfra/default.nix +++ b/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pytest-testinfra"; - version = "10.0.0"; + version = "10.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-L7fQGFRYqbpmn/FNDdvsizkAxr3j+2+tmwlzdM5Kt30="; + hash = "sha256-93Qzm5R3Ws3zqMSjeTqOrS6N/HD/NLd4vhWquhQPoZ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 59cd210a0a04..952893fec269 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.8.0"; + version = "4.9.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-btXwx9GRLBcjtcGdgckb2Y/MxC0E/rKTWKgkP8olezo="; + hash = "sha256-FpPGIK5HVtTzDOpORo+WPhS1860P3dm1nJkvakpzsjE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index f8e189f4bd8c..bf6ce265e016 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.10.0"; + version = "5.11.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "refs/tags/v${version}"; - hash = "sha256-nlzTzIswMRjvJ9l9TOtVvRvbKlQPvNH0/P1NIbQCmy8="; + hash = "sha256-miIl/+3JtjtoQaS6Jy0M9lPQJQp3VlpvrO5Hqlrq5JM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-technove/default.nix b/pkgs/development/python-modules/python-technove/default.nix new file mode 100644 index 000000000000..795ddf5b1236 --- /dev/null +++ b/pkgs/development/python-modules/python-technove/default.nix @@ -0,0 +1,64 @@ +{ lib +, aiohttp +, aresponses +, awesomeversion +, backoff +, buildPythonPackage +, cachetools +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "python-technove"; + version = "1.2.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "Moustachauve"; + repo = "pytechnove"; + rev = "refs/tags/v${version}"; + hash = "sha256-kc5jR0IM2OagvmtqhicnBbrwrdk3E/iJhRIgUtKoirI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + awesomeversion + backoff + cachetools + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "technove" + ]; + + meta = with lib; { + description = "Python library to interact with TechnoVE local device API"; + homepage = "https://github.com/Moustachauve/pytechnove"; + changelog = "https://github.com/Moustachauve/pytechnove/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix index e26745e77566..c50def28bc11 100644 --- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix +++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "qcodes-contrib-drivers"; - version = "0.18.0"; + version = "0.21.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "QCoDeS"; repo = "Qcodes_contrib_drivers"; - rev = "v${version}"; - sha256 = "sha256-hg3jSiuOkiuOInnUzzlKtBeoP5zkCDBQ3xP6KCwq+lU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-7WkG6Bq4J4PU4eWX52RaupQ8cNzE+sJ7s3PoXFRxG2w="; }; nativeBuildInputs = [ setuptools versioningit ]; diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index da7941347421..47f06b4741fe 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -1,10 +1,11 @@ { lib -, buildPythonPackage -, pythonOlder , aiobotocore , botocore -, typing-extensions +, buildPythonPackage , fetchPypi +, pythonOlder +, setuptools +, typing-extensions }: let toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str; @@ -13,7 +14,7 @@ let buildPythonPackage rec { pname = "types-aiobotocore-${serviceName}"; inherit version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ let inherit pname version hash; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiobotocore botocore @@ -44,13 +49,13 @@ let }; in rec { - types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.8.0" "sha256-7TmekyZVc2l2er1TIJURP7Qy0n7xRYnXt44FJr5XBWA="; + types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.11.2" "sha256-hUS1ZTj9CbC74Aiinmeh2BEQ2KymcqxuYVSeD12s5xg"; - types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.8.0" "sha256-rVwj3gN9+U5m6xXwytQpE8mSVPTlezzeNIwNH2vgR4Y="; + types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.11.2" "sha256-XtL7R0UrgI/9rSxfNYbA0Lez+DiVyB7R+rhn49Nxerc="; - types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.8.0" "sha256-VzV8viXJpHfI1aD1UtCX+GSSZKhRSTzMX5dnkGhm+9Y="; + types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.11.2" "sha256-vpE1GuvKFPsBf3rTk5V6B4ujFGaHE3wk9yN3j0sM0bo="; - types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.8.0" "sha256-ib044RjF+1projrSoyiMdj9LkbT1BJrfObxs1ukSNHo="; + types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.11.2" "sha256-g9a2ad5hZonlKWGnLQchfT5CAgwqsvseeQBQemCSCQw="; types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.11.2" "sha256-XUzsO3dJmVEyAkwGcZ9BxNb8CceJALCNRIfs6/lFa8M="; @@ -308,7 +313,7 @@ rec { types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.11.2" "sha256-AgZvipboBZnhSlC7K0JRFpH8Z4pNPT2UfdXYjshxF8Y="; - types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.6.0" "sha256-9iV7bpGMnzz9TH+g1YpPjbKBSKY3rcL/OJvMOzwLC1M="; + types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.11.2" "sha256-qDj9RSbqHPpJ5yU+AXPeA+umbbSrf2Ssu1g0aiLvnMw="; @@ -448,7 +453,7 @@ rec { types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.11.2" "sha256-CKCC7W5h6qKv3Zya/e+WcVoWdOtCqoWKRlJFHSTdxaI="; - types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.6.0" "sha256-gbl7jEgjk4twoxGM+WRg4MZ/nkGg7btiPOsPptR7yfw="; + types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.11.2" "sha256-zg/QhW+4Chugyg6rG5HtrE1GAhbWUaveJpaJFemoN94="; diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix index 36fe7e0eb1f8..54fe8f192c02 100644 --- a/pkgs/development/python-modules/uqbar/default.nix +++ b/pkgs/development/python-modules/uqbar/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "uqbar"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pZ2sNs9uK49PK8qxRRqpGMEI1Xr6Fn+fxptlEVv3GSk="; + hash = "sha256-8tjqPlS9Yo3pOFmpfe/sxgW0e1iqLRYhmPJCh5rKKEE="; }; postPatch = '' diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 48d6c19f269a..26239a8b4e4c 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -328,6 +328,7 @@ let chebpol = [ pkgs.fftw.dev ]; ChemmineOB = with pkgs; [ openbabel pkg-config ]; curl = [ pkgs.curl.dev ]; + CytoML = [ pkgs.libxml2.dev ]; data_table = with pkgs; [ pkg-config zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; devEMF = with pkgs; [ xorg.libXft.dev ]; diversitree = with pkgs; [ gsl fftw ]; @@ -425,7 +426,9 @@ let webp = [ pkgs.pkg-config ]; seqminer = with pkgs; [ zlib.dev bzip2 ]; sf = with pkgs; [ gdal proj geos libtiff curl ]; + strawr = with pkgs; [ curl.dev ]; terra = with pkgs; [ gdal proj geos ]; + apcf = with pkgs; [ geos ]; showtext = with pkgs; [ zlib libpng icu freetype.dev ]; simplexreg = [ pkgs.gsl ]; spate = [ pkgs.fftw.dev ]; @@ -525,6 +528,7 @@ let chebpol = [ pkgs.pkg-config ]; fftw = [ pkgs.pkg-config ]; gdtools = [ pkgs.pkg-config ]; + archive = [ pkgs.libarchive]; SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkg-config ]; @@ -626,6 +630,7 @@ let redux = [ pkgs.hiredis ]; RmecabKo = [ pkgs.mecab ]; PoissonBinomial = [ pkgs.fftw.dev ]; + PoissonMultinomial = [ pkgs.fftw.dev ]; rrd = [ pkgs.rrdtool ]; flowWorkspace = [ pkgs.zlib.dev ]; RcppMeCab = [ pkgs.mecab ]; diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 0582c1d6e89a..0da5fcc9efbb 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.13.3"; + version = "2.13.4"; outputs = [ "out" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-JTasjK9EkdGCTGL5Qx9uU3UBFlQzVdpTJ/v1IfzXCLE="; + hash = "sha256-Bz8ACCsxKfN1Y8TpS+oD/6lixLItL1TQR0Ud4gj1txk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 8999d3f4b62a..a4de4f93ce55 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.12.4"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - hash = "sha256-n3mLtthtTN1uAmsmM6dX+Nc7iEo5KzzHiH8iAJmV/Q0="; + hash = "sha256-gsok5aDi5oYJPMXVv3MFAehyKZ5hHBtvwf7z6Ut4dBQ="; }; # tests make dns requests and fails diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 20718c2c909f..f6a82483343f 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.1.1", + "version": "1.1.3", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1sxfwdgqzhxxhgj0kid10iay4sqq9ajndnncxl7jhh2ib59bavj2" + "sha256": "03rxllpnr93ms6j0fny7h2sym9pj1q8xrj0jmhapdjv582j4by82" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1z3xvyjs69iy0y59q2bwpa6blslhc1wdgwrm8xsfd0x8y0dg8kq2" + "sha256": "1msi2ylx2qf6k5gm1jj31qh9qbrxp5fydybzb25zclnpwwg1jlyc" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "05xincadr0y5kly8j058pn41wa6qmqcf6p62s45h881y3ydghxch" + "sha256": "1sl3q59mb56g6795c8sm9kjpdgmpcdd23fxhaw49px2dvyryvxyy" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0knjkkyw7libqdzw770whrbwdcyr5qabnjw7ayps0k4kql43cyns" + "sha256": "17cp6mq0046y21pd7cadxj90aqkqnlz7zx7sdp7mmn3pzjcaynqc" } } } diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix deleted file mode 100644 index de4022ed7d70..000000000000 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, callPackage -, ensureNewerSourcesForZipFilesHook -, python3 -# optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` -, extraTools ? [] -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "waf"; - version = "2.0.26"; - - src = fetchFromGitLab { - owner = "ita1024"; - repo = "waf"; - rev = "waf-${finalAttrs.version}"; - hash = "sha256-AXDMWlwivJ0Xot6iwuIIlbV2Anz6ieghyOI9jA4yrko="; - }; - - nativeBuildInputs = [ - ensureNewerSourcesForZipFilesHook - python3 - ]; - - buildInputs = [ - # waf executable uses `#!/usr/bin/env python` - python3 - ]; - - strictDeps = true; - - configurePhase = '' - runHook preConfigure - - python waf-light configure - - runHook postConfigure - ''; - - buildPhase = let - extraToolsList = - lib.optionalString (extraTools != []) - "--tools=\"${lib.concatStringsSep "," extraTools}\""; - in - '' - runHook preBuild - - python waf-light build ${extraToolsList} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -D waf $out/bin/waf - - runHook postInstall - ''; - - passthru = { - inherit python3 extraTools; - hook = callPackage ./hook.nix { - waf = finalAttrs.finalPackage; - }; - }; - - meta = { - homepage = "https://waf.io"; - description = "The meta build system"; - changelog = "https://gitlab.com/ita1024/waf/blob/${finalAttrs.version}/ChangeLog"; - license = lib.licenses.bsd3; - mainProgram = "waf"; - maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; - inherit (python3.meta) platforms; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - }; -}) diff --git a/pkgs/development/tools/build-managers/waf/hook.nix b/pkgs/development/tools/build-managers/waf/hook.nix deleted file mode 100644 index ac497d227831..000000000000 --- a/pkgs/development/tools/build-managers/waf/hook.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, stdenv -, pkgs -, makeSetupHook -, waf -}: - -makeSetupHook { - name = "waf-setup-hook"; - - substitutions = { - # Sometimes the upstream provides its own waf file; in order to honor it, - # waf is not inserted into propagatedBuildInputs, rather it is inserted - # directly - inherit waf; - wafCrossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) - ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; - }; - - meta = { - description = "A setup hook for using Waf in Nixpkgs"; - inherit (waf.meta) maintainers platforms broken; - }; -} ./setup-hook.sh diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh deleted file mode 100644 index d3e2bf97e682..000000000000 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ /dev/null @@ -1,94 +0,0 @@ -# shellcheck shell=bash disable=SC2206 - -wafConfigurePhase() { - runHook preConfigure - - if ! [ -f "${wafPath:=./waf}" ]; then - echo "copying waf to $wafPath..." - cp @waf@/bin/waf "$wafPath" - fi - - if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then - local prefixFlag="${prefixKey:---prefix=}$prefix" - fi - - if [ -n "${PKG_CONFIG}" ]; then - export PKGCONFIG="${PKG_CONFIG}" - fi - - local flagsArray=( - $prefixFlag - $wafConfigureFlags "${wafConfigureFlagsArray[@]}" - ${wafConfigureTargets:-configure} - ) - - if [ -z "${dontAddWafCrossFlags:-}" ]; then - flagsArray+=(@wafCrossFlags@) - fi - - echoCmd 'waf configure flags' "${flagsArray[@]}" - python "$wafPath" "${flagsArray[@]}" - - if ! [[ -v enableParallelBuilding ]]; then - enableParallelBuilding=1 - echo "waf: enabled parallel building" - fi - - if ! [[ -v enableParallelInstalling ]]; then - enableParallelInstalling=1 - echo "waf: enabled parallel installing" - fi - - runHook postConfigure -} - -wafBuildPhase () { - runHook preBuild - - # set to empty if unset - : "${wafFlags=}" - - local flagsArray=( - ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} - $wafFlags ${wafFlagsArray[@]} - $wafBuildFlags ${wafBuildFlagsArray[@]} - ${wafBuildTargets:-build} - ) - - echoCmd 'waf build flags' "${flagsArray[@]}" - python "$wafPath" "${flagsArray[@]}" - - runHook postBuild -} - -wafInstallPhase() { - runHook preInstall - - if [ -n "$prefix" ]; then - mkdir -p "$prefix" - fi - - local flagsArray=( - ${enableParallelInstalling:+-j ${NIX_BUILD_CORES}} - $wafFlags ${wafFlagsArray[@]} - $wafInstallFlags ${wafInstallFlagsArray[@]} - ${wafInstallTargets:-install} - ) - - echoCmd 'waf install flags' "${flagsArray[@]}" - python "$wafPath" "${flagsArray[@]}" - - runHook postInstall -} - -if [ -z "${dontUseWafConfigure-}" ] && [ -z "${configurePhase-}" ]; then - configurePhase=wafConfigurePhase -fi - -if [ -z "${dontUseWafBuild-}" ] && [ -z "${buildPhase-}" ]; then - buildPhase=wafBuildPhase -fi - -if [ -z "${dontUseWafInstall-}" ] && [ -z "${installPhase-}" ]; then - installPhase=wafInstallPhase -fi diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 576b3095922a..307167b9a2d8 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.26"; + version = "0.8.27"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-Qi9fN66YLow8TO/4GmJBIcj8CnH7jbpyryjnMG6yp0U="; + hash = "sha256-4g5QfeAtPEUW7vwOwkJd8W3V6z1DxAmZngbrroCFr5M="; }; - vendorHash = "sha256-gortoYTYGtvhM1XWVhI2bB+cKtbTADpKl5W9h1QSEPc="; + vendorHash = "sha256-DEUZbqHHYfjD5jGT5nn3UbWT1aODRsLailSorI/W6w4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index 82bd7354ef45..c7477d48e55a 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "goconvey"; - version = "1.8.0"; + version = "1.8.1"; excludedPackages = "web/server/watch/integration_testing"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "smartystreets"; repo = "goconvey"; rev = "v${version}"; - sha256 = "sha256-JgforTGu5aiQHltZrAfy16Bsu4UJ2pj6cCiof6sxz7s="; + hash = "sha256-6SrlPsOqRxNNwEYx2t1v+rEHnQ58GvJtjo87SZo/Omk="; }; - vendorHash = "sha256-CCtWsljI14VOGjPid6ouzvieDbylh9ljoUcAoR9r4b4="; + vendorHash = "sha256-020bxa0LErrvRKe3HirCWZDaBQFfKsWgl4mxfLtl1lg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 123d12306f8f..395303c57861 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.56.1"; + version = "1.56.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-6mwdDi9ltEKpDNa+GPEHiJdQO8csUg6MnuyiKQ02B80="; + hash = "sha256-P1bgyYJCzHWWcmAHmBAyghFzKCwiQW3KNkbk5gogpn8="; }; - vendorHash = "sha256-Y+y3X0pGFYeAMpvRWFgzcWRpHQL+X9J3/ehiO2N2P2o="; + vendorHash = "sha256-9M9BPLEtNlhmZbS/Kn9yh2att2oIgF+smP7y1XCvrjI="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index b421bb6e35af..b77760ecf095 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-V2YKRRJP1KQDo0oIoKU3g/3H1Xeo2oLg3arCDU6NMto="; + sha256 = "sha256-raddO2rhRZa/KeDWsMCxYITlYYgnFt19Dj+FbBgeu0A="; }; excludedPackages = [ "example" ]; diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index 8124d5d12ccf..4f0306d48c40 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "unstable-2024-02-03"; + version = "unstable-2024-02-15"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; - rev = "8dd5629ef78d359fd8d3527157b0375762f22b1e"; - sha256 = "sha256-9WmhP8CyjwohlltfmUn5m29CmBucIH+XrfVjIJX7dS8="; + rev = "a34b75c4d2840f475a5f30b041b0d478bc3f8cce"; + sha256 = "sha256-avY1fXkuP4f8iuoUklcrPb4DpfyftW0FIk6zVUCdBwI="; }; - cargoSha256 = "sha256-W9YA9OZu71/bSx3EwMeueVQSTExeep+UKGYCD8c4yhc="; + cargoSha256 = "sha256-RSmj0Xf55kEPi5EJ72pe0tagQBkUVf7isvsu7ATzsUk="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 869a0c8bbbc3..f29943a6eada 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "A tool to generaet a new Rust project by leveraging a pre-existing git repository as a template"; + description = "A tool to generate a new Rust project by leveraging a pre-existing git repository as a template"; homepage = "https://github.com/cargo-generate/cargo-generate"; changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index 0ff5c5f4afe4..85583e506891 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -1792,7 +1792,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.23.0" +version = "0.24.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index d8702db89cc9..3c625b1edb3e 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-0sbfqiPxo68429q676hs3vB3wRNmF/+OO7Ykg2x7HIQ="; + hash = "sha256-OiChd0qwgs3Wi4Xky27/99vBwaKNsq+4E+gpu5zwFqs="; }; cargoLock = { diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/development/tools/wire/default.nix index 50e57d07d413..601c7fa8df7c 100644 --- a/pkgs/development/tools/wire/default.nix +++ b/pkgs/development/tools/wire/default.nix @@ -2,19 +2,27 @@ buildGoModule rec { pname = "wire"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = "wire"; rev = "v${version}"; - sha256 = "sha256-9xjymiyPFMKbysgZULmcBEMI26naUrLMgTA+d7Q+DA0="; + hash = "sha256-bV/bb577JzGF37HmvRprxr+GWcLLiFRisURwtGDbqko="; }; - vendorHash = "sha256-ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; + patches = [ + # Bump the minimum version of Go required to compile packages in this module, + # as `golang.org/x/tools` requires go1.18 or later. + ./go-modules.patch + ]; + + vendorHash = "sha256-7IW97ZvCGlKCiVh8mKQutTdAxih7oFkXrKo4h3Pl9YY="; subPackages = [ "cmd/wire" ]; + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/google/wire"; description = "A code generation tool that automates connecting components using dependency injection"; diff --git a/pkgs/development/tools/wire/go-modules.patch b/pkgs/development/tools/wire/go-modules.patch new file mode 100644 index 000000000000..cc6facd4d2d0 --- /dev/null +++ b/pkgs/development/tools/wire/go-modules.patch @@ -0,0 +1,79 @@ +diff --git a/go.mod b/go.mod +index 944aef0..ee579ff 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module github.com/google/wire + +-go 1.12 ++go 1.18 + + require ( + github.com/google/go-cmp v0.2.0 +@@ -8,3 +8,5 @@ require ( + github.com/pmezard/go-difflib v1.0.0 + golang.org/x/tools v0.17.0 + ) ++ ++require golang.org/x/mod v0.14.0 // indirect +diff --git a/go.sum b/go.sum +index 8da3aae..fbca3c1 100644 +--- a/go.sum ++++ b/go.sum +@@ -4,56 +4,8 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN + github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= + github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= + github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= + golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= + golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= + golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= + golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= + golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index fb627f52e011..effd541660ea 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.40.7"; + version = "4.41.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-VvA6PYJYRejGlYDb/gyHDQSNOwDWSE7vXPqYGrVLtko="; + hash = "sha256-1zYem/cvvndyrWaE8wYoxouDDnQyT+VeupFF1VkuC2w="; }; vendorHash = "sha256-5jc9AQ1T4818kvAF6SU6JEdCQWt1gRJnESXRMGvqrB0="; diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 6164b6d4c624..d3d3e7bf35fa 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zed"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xyTHCBvklK8x6V7WsWDYytnVEfLcja78crvs62WJJ9o="; + sha256 = "sha256-1k5qw/uWe5gtDUjDcMW54ezoXOBLt4T9lRmiOS06hz8="; }; - vendorHash = "sha256-m8GOKBwXlNhjEIkkbaIOAGslX4WRVPZ0OknGEG29b4E="; + vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU="; subPackages = [ "cmd/zed" "cmd/zq" ]; |