diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-20 12:01:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-20 12:01:26 +0000 |
commit | 81f22730b09c9b201c576195964d7b715f96c90a (patch) | |
tree | fd4ef6e99988e6a0ab7eb57c1f6a41b656db3bc5 /pkgs/development | |
parent | 29056531db0b4ac0fdffdd5c9165f9b1fd0b958a (diff) | |
parent | 2aa3d6edac32122e79b2f49e710d5e38f0f8a935 (diff) | |
download | nixlib-81f22730b09c9b201c576195964d7b715f96c90a.tar nixlib-81f22730b09c9b201c576195964d7b715f96c90a.tar.gz nixlib-81f22730b09c9b201c576195964d7b715f96c90a.tar.bz2 nixlib-81f22730b09c9b201c576195964d7b715f96c90a.tar.lz nixlib-81f22730b09c9b201c576195964d7b715f96c90a.tar.xz nixlib-81f22730b09c9b201c576195964d7b715f96c90a.tar.zst nixlib-81f22730b09c9b201c576195964d7b715f96c90a.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development')
61 files changed, 586 insertions, 291 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2674971670fe..7f60ba036c5f 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -109,9 +109,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "a2"; + suffix = "a3"; }; - hash = "sha256-ttRrRBkMTAJCHraaBC0WsMVUgb3agYxsQW3CRBE6nC0="; + hash = "sha256-IHhMgwTrHGnID5ZuvfB3W+LjfiPfO2JGHuwSqF3Pfq0="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 37c007db20b4..57fe21a27c7b 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,26 +1,28 @@ { lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { - pname = "khronos-ocl-icd-loader"; - version = "2022.01.04"; + pname = "opencl-icd-loader"; + version = "2023.12.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - sha256 = "sha256-T2tBoN0yv41W+UksFABVjsetdkXlnEFUINfxumGgC04="; + hash = "sha256-/4ixQAwJpygdg+qtR1ccBlz8hmtYYxRgUV5dlJabsg8="; }; - patches = lib.optional withTracing ./tracing.patch; - nativeBuildInputs = [ cmake ]; buildInputs = [ opencl-headers ]; + cmakeFlags = [ + (lib.cmakeBool "OCL_ICD_ENABLE_TRACE" withTracing) + ]; + meta = with lib; { description = "Official Khronos OpenCL ICD Loader"; homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch deleted file mode 100644 index cef22457e5a1..000000000000 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/loader/icd.h b/loader/icd.h -index 34751e9..01a33fd 100644 ---- a/loader/icd.h -+++ b/loader/icd.h -@@ -123,7 +123,7 @@ void khrIcdContextPropertiesGetPlatform( - cl_platform_id *outPlatform); - - // internal tracing macros --#if 0 -+#if 1 - #include <stdio.h> - #define KHR_ICD_TRACE(...) \ - do \ diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 08921c2ca3c0..12cd3f074fcb 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.84.0"; + version = "1.84.1"; src = fetchurl { url = "https://github.com/DanBloomberg/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-QqApMSod8M1WQBlal5voG/ZiMOFTFkysRWR4RU5yBtU="; + hash = "sha256-Kz4SVLHMo4HnfIGbWcqZd0/0NTAgm5rrUR4dRliKZPY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index e90078b0c840..3d8cf70b0db6 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,15 +9,19 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "5.4.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-U+ZlD/I7RHtdYNbFhAmeU4qREe45dYJDIAC3Bup2tr0="; + hash = "sha256-qcVVp+81S3Y0fxDWA/PWQeFT2g0N6tIHNUaOHSru2GA="; }; + postPatch = '' + sed -i 's/libcint.so/libcint${stdenv.hostPlatform.extensions.sharedLibrary}/g' testsuite/*.py + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ blas ]; cmakeFlags = [ @@ -46,5 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 96b8e3c02937..558e6d6fa894 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,34 +6,37 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20220303"; + version = "20231214"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc="; + hash = "sha256-VSoQLoqiq8xBYJDewvb4DaWfl/kfV5aOnp17PcAF268="; }; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace "-arch x86_64" "-arch ${stdenv.hostPlatform.darwinArch}" - ''; + patches = [ + ./nixos-darwin-no-fat-dylib.patch + ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib,include/hdhomerun} install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib install -Dm555 hdhomerun_config $out/bin cp *.h $out/include/hdhomerun + + runHook postInstall ''; meta = with lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; homepage = "https://www.silicondust.com/support/linux"; license = licenses.lgpl21Only; + maintainers = with maintainers; [ sielicki titanous ]; platforms = platforms.unix; - maintainers = [ maintainers.titanous ]; }; } diff --git a/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch b/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch new file mode 100644 index 000000000000..99c389a19434 --- /dev/null +++ b/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch @@ -0,0 +1,52 @@ +From 6b9ed19d7874b88b7db5b740dac3dcd7dcda6c8c Mon Sep 17 00:00:00 2001 +From: Nicholas Sielicki <git@opensource.nslick.com> +Date: Sat, 25 Nov 2023 13:54:39 -0600 +Subject: [PATCH] nixos-darwin-no-fat-dylib + +Signed-off-by: Nicholas Sielicki <git@opensource.nslick.com> +--- + Makefile | 24 ++++-------------------- + 1 file changed, 4 insertions(+), 20 deletions(-) + +diff --git a/Makefile b/Makefile +index 1d8fb9f..35c7d15 100644 +--- a/Makefile ++++ b/Makefile +@@ -42,30 +42,14 @@ LIBSRCS += hdhomerun_video.c + + ifeq ($(OS),Darwin) + +-TARGET_X64 := -target x86_64-apple-macos10.11 +-TARGET_ARM64 := -target arm64-apple-macos11 +- + all : hdhomerun_config libhdhomerun.dylib + +-hdhomerun_config_x64 : hdhomerun_config.c $(LIBSRCS) +- $(CC) $(TARGET_X64) $(CFLAGS) $+ $(LDFLAGS) -o $@ +- $(STRIP) $@ +- +-hdhomerun_config_arm64 : hdhomerun_config.c $(LIBSRCS) +- $(CC) $(TARGET_ARM64) $(CFLAGS) $+ $(LDFLAGS) -o $@ ++hdhomerun_config: hdhomerun_config.c $(LIBSRCS) ++ $(CC) $(CFLAGS) $+ $(LDFLAGS) -o $@ + $(STRIP) $@ + +-hdhomerun_config : hdhomerun_config_x64 hdhomerun_config_arm64 +- lipo -create -output hdhomerun_config hdhomerun_config_x64 hdhomerun_config_arm64 +- +-libhdhomerun_x64.dylib : $(LIBSRCS) +- $(CC) $(TARGET_X64) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ +- +-libhdhomerun_arm64.dylib : $(LIBSRCS) +- $(CC) $(TARGET_ARM64) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ +- +-libhdhomerun.dylib : libhdhomerun_x64.dylib libhdhomerun_arm64.dylib +- lipo -create -output libhdhomerun.dylib libhdhomerun_x64.dylib libhdhomerun_arm64.dylib ++libhdhomerun.dylib : $(LIBSRCS) ++ $(CC) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ + + else + +-- +2.42.0 + diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/development/libraries/mdk-sdk/default.nix index 1bf8992f948c..711833cbda8a 100644 --- a/pkgs/development/libraries/mdk-sdk/default.nix +++ b/pkgs/development/libraries/mdk-sdk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.23.1"; + version = "0.24.0"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-qC6FL76MJZ2XrrYePQFpWk5VPLTeoRd5ns93AK3iZjw="; + hash = "sha256-kRihFM2+vPg6OAL4ARz0dLLUvAFvZsbrCu5TBI6b2RI="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 32544bc327bc..3c739d30d386 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.32"; + version = "1.0.33"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-Np91NevE0XiFSZ27cpwAUjm0XY2/IuugGDcfG17aV2c="; + sha256 = "sha256-26CRpxiTfZOq6sQSl0H53UmYzPY/6mP33EPObdkwnQs="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index 8a415a4df77c..f58f50b4a72f 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "xml-tooling-c"; - version = "3.0.4"; + version = "3.2.4"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; rev = version; - sha256 = "0frj4w70l06nva6dvdcivgm1ax69rqbjdzzbgp0sxhiqhddslbas"; + sha256 = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU="; }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index d21667aa0622..ee393c91d568 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -13,42 +13,42 @@ }: let - version = "0.6.8"; + version = "0.7.0"; hashes = { "aarch64-darwin" = { platform = "darwin-arm64"; hash = { - "8.0" = "sha256-DDn5JcRux8DN1728cqMWL7eMwueiY+jO/+fw2+ND394="; - "8.1" = "sha256-4r954EKFUA45G55MpnnKcYONCNe45dIffiygs6r8OOI="; - "8.2" = "sha256-qB2IWSsyAKzbUxjt2nz5uLp7PkgPPna1mEBqvz8oTHc="; - "8.3" = "sha256-0s+4zNknH8lEfGS8oU3JjVEuX3mZEo9AULE0hlv11mQ="; + "8.0" = "sha256-pd/9TWZPgAfmVM0/QVYRHu5k4gANcxCSnfAl38irO0Y="; + "8.1" = "sha256-OpxE/nu8MZedTmKGQeyJm36pyyHlRpW11avuGcnGP68="; + "8.2" = "sha256-+CMPdXZotUr43Qda1FwGpuWPEE1K4RuBNE9fiokAtoY="; + "8.3" = "sha256-lbKVxOd5gK5VDGnJ42w7L5DFKsBQDZXgEZLR/Y0gP88="; }; }; "aarch64-linux" = { platform = "debian-aarch64+libssl3"; hash = { - "8.0" = "sha256-tLrampq1BBrhC+F/v2vcNBJp+16wzjHC8CGFKSswPUo="; - "8.1" = "sha256-DQG3maP9ImwSCTEmP152l5wr7A964lg9kNFAmVQhPqA="; - "8.2" = "sha256-3Ygb2J+MFL+H1zsepBaQKg/ybqgXVwFWt2QrNRctT8o="; - "8.3" = "sha256-MKpN09+Ai9NFARUEL+pkxQxbpRpFTx78als8ViXMdB8="; + "8.0" = "sha256-NfeC3p0YLYz3NbjzjMRRuzMsnYe9JRwlBjddAG2WV7g="; + "8.1" = "sha256-kvO0PE3BSgFSfe1zHh3WnygQfVV+5V0YFfClBim1Kj4="; + "8.2" = "sha256-illxRqqwMKVNAp6BD+mktKDccM7B/Q1W1KF9UB6aMUQ="; + "8.3" = "sha256-QdB7g+ePJU8qt/BVo1CFnQ2vfkqR29WueBy3dLOOaR0="; }; }; "x86_64-darwin" = { platform = "darwin-x86-64"; hash = { - "8.0" = "sha256-jYnhJowVgryKSec+rOfyBiH2gZyasr1h1I+sjPiLods="; - "8.1" = "sha256-VKvVo6so0NOfiq7JjnanBEUDa1Iqmkn9egKnOJSCHTg="; - "8.2" = "sha256-WXWhSljy199UbZiEjfC50XvnKfVEU54lPa6e2+jCqiQ="; - "8.3" = "sha256-CrJoONSm0aXlBWjsRqAJC39qB4tHkMuLAvM5d847DsE="; + "8.0" = "sha256-rd3pt2N22bF4a8OOwksI7KJjR91IoxHwk3LcKuHSpV0="; + "8.1" = "sha256-Y/moZrBe4rooQBSQKS8vPCTjviHKy4O7d4T1kD3udC4="; + "8.2" = "sha256-H3EWFk/ZmE+fSU98nLHyq1p1vtU/TYp28OzNLox6kYY="; + "8.3" = "sha256-vZTarrauo7U2JLOXUCwmu2h+vBtWZpm0Q39KkuLyVgY="; }; }; "x86_64-linux" = { platform = "debian-x86-64+libssl3"; hash = { - "8.0" = "sha256-kzPlotJWsUIhYUFUwcXEBGv5eNfCNLDNgrs+IqZPH5c="; - "8.1" = "sha256-QBnKHXBW2XpD4GvphzyMPiIrOfs9pzyG2Fv/VyV+h9k="; - "8.2" = "sha256-yk+dkULtWVIccKurBdT96HOPbW8Q9l44iYpAAcoZYog="; - "8.3" = "sha256-MpMupGFGxipghoA57EOytSsDsm9b25rc/VPIza+QMfM="; + "8.0" = "sha256-jq/nHC9IGevYBqbM08nF71P9jH6z4NB8s1NdjHOfXQA="; + "8.1" = "sha256-vbFONNHpuSTQsZMrAIdGEoBl5ySchcFkSuhW5uZKbWg="; + "8.2" = "sha256-mXUAMkxwtuPZbIyCybBcxpmaBplr5h59pZEdgJ3PWtA="; + "8.3" = "sha256-YL0P8GtFkV0cmJX1y6wd/HtA0LFzeuOcKDLUCagxHxE="; }; }; }; diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 3eb23c4a6641..59367acb041a 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -15,23 +15,26 @@ buildPythonPackage rec { pname = "aiogithubapi"; version = "23.11.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "aiogithubapi"; rev = "refs/tags/${version}"; hash = "sha256-SbpfHKD4QJuCe3QG0GTvsffkuFiGPLEUXOVW9f1gyTI="; }; + __darwinAllowLocalNetworking = true; + postPatch = '' # Upstream is releasing with the help of a CI to PyPI, GitHub releases # are not in their focus substituteInPlace pyproject.toml \ --replace 'version = "0"' 'version = "${version}"' \ - --replace 'backoff = "^1.10.0"' 'backoff = "*"' + --replace 'backoff = "^1.10.0"' 'backoff = "*"' \ + --replace 'sigstore = "<2"' 'sigstore = "*"' ''; nativeBuildInputs = [ @@ -55,10 +58,19 @@ buildPythonPackage rec { "--asyncio-mode=auto" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "aiogithubapi" ]; + disabledTests = [ + # sigstore.errors.TUFError: Failed to refresh TUF metadata + "test_sigstore" + ]; + meta = with lib; { description = "Python client for the GitHub API"; homepage = "https://github.com/ludeeus/aiogithubapi"; diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 1cfee59a0003..744a940957b6 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,11 +21,12 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-4mvd5G4qpebocg74Kz/+XtJovDnGJJYPigyhke9YDjA="; + hash = "sha256-6lgjblCyc4NSnw+nlCH0SKV7f9aa4qcfa7v9pgzusKo="; }; postPatch = '' substituteInPlace pyproject.toml \ + --replace 'pydantic = "^1.9"' 'pydantic = "*"' \ --replace " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" "" ''; diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index f17fabec994f..f5cc7d9253ea 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -13,6 +13,7 @@ , pytestCheckHook , pytest-asyncio , pytest-mock +, typing-extensions , tomlkit , grpcio-tools }: @@ -20,21 +21,25 @@ buildPythonPackage rec { pname = "betterproto"; version = "2.0.0b6"; - format = "pyproject"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "danielgtaylor"; repo = "python-betterproto"; - rev = "v.${version}"; + rev = "refs/tags/v.${version}"; hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ grpclib python-dateutil + typing-extensions ]; passthru.optional-dependencies.compiler = [ @@ -43,16 +48,18 @@ buildPythonPackage rec { isort ]; - pythonImportsCheck = [ "betterproto" ]; - nativeCheckInputs = [ + grpcio-tools pydantic - pytestCheckHook pytest-asyncio pytest-mock + pytestCheckHook tomlkit - grpcio-tools - ] ++ passthru.optional-dependencies.compiler; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "betterproto" + ]; # The tests require the generation of code before execution. This requires # the protoc-gen-python_betterproto script from the package to be on PATH. @@ -62,14 +69,24 @@ buildPythonPackage rec { ${python.interpreter} -m tests.generate ''; + disabledTestPaths = [ + # https://github.com/danielgtaylor/python-betterproto/issues/530 + "tests/inputs/oneof/test_oneof.py" + ]; + + disabledTests = [ + "test_pydantic_no_value" + ]; + meta = with lib; { - description = "Clean, modern, Python 3.6+ code generator & library for Protobuf 3 and async gRPC"; + description = "Code generator & library for Protobuf 3 and async gRPC"; longDescription = '' This project aims to provide an improved experience when using Protobuf / gRPC in a modern Python environment by making use of modern language features and generating readable, understandable, idiomatic Python code. ''; homepage = "https://github.com/danielgtaylor/python-betterproto"; + changelog = "https://github.com/danielgtaylor/python-betterproto/blob/v.${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ nikstur ]; }; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 85a58ae3711c..f2d1d8ff1f8c 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.20"; + version = "1.34.23"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QxhR6oK4WW+PpJ3nAUVUrg8vosxqCVRFl4ejuTh5bGg="; + hash = "sha256-VNez2P7s72huTjRfNBvkxZGsjcxkExn7aSCudhuAt4Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index a8164c800530..7dfb8dc31994 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.21"; + version = "1.34.23"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-xc3pikb8lNUNTs1GXdXGRQEiHJT+KJWmBt5cReyDdkM="; + hash = "sha256-aSfRj6JrFOhTJXO/BmIEDb+OOUOg9uNTEhziVXnlyUI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 5b5ca31e4d02..5a1096cb1505 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -30,20 +30,13 @@ buildPythonPackage rec { }) ]; - # This differs slightly from the default python installPhase in that it pip-installs - # "." instead of "*.whl". - # That is because while the default install phase succeeds to build the package, - # it fails to generate the file "auto_paridecl.pxd". - installPhase = '' - export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - - # install "." instead of "*.whl" - pip install . --no-index --no-warn-script-location --prefix="$out" --no-cache + preBuild = '' + # generate cythonized extensions (auto_paridecl.pxd is crucial) + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace ''; nativeBuildInputs = [ pari - python.pythonOnBuildForHost.pkgs.pip ]; buildInputs = [ @@ -56,6 +49,7 @@ buildPythonPackage rec { ]; checkPhase = '' + test -f "$out/${python.sitePackages}/cypari2/auto_paridecl.pxd" make check ''; diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index fe0ca2e17a09..b64d3f8d7174 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -1,8 +1,9 @@ { lib , autoreconfHook +, fetchpatch , fetchPypi , buildPythonPackage -, cython_3 +, cython , pariSupport ? true, pari # for interfacing with the PARI/GP signal handler }: @@ -18,6 +19,14 @@ buildPythonPackage rec { hash = "sha256-Dx4yHlWgf5AchqNqHkSX9v+d/nAGgdATCjjDbk6yOMM="; }; + patches = [ + # https://github.com/sagemath/cysignals/pull/193 + (fetchpatch { + url = "https://github.com/sagemath/cysignals/commit/474179c87ab0ff562fdfd2471b02797e4bdd3148.diff"; + sha256 = "sha256-qEAmf4kU+QDI/JPFNjQMZIjMBk8dnaLmOpagIBMsh7w="; + }) + ]; + # explicit check: # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE" hardeningDisable = [ @@ -34,7 +43,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - cython_3 + cython ] ++ lib.optionals pariSupport [ # When cysignals is built with pari, including cysignals into the # buildInputs of another python package will cause cython to link against diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 9c314e6ea09a..1375dd7e780a 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.47.0"; - format = "pyproject"; + version = "0.48.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R747LD1wmn9bcJ6xJu1P5sx5d9YY/lwVjdicKp99mRY="; + hash = "sha256-1NZhNYw+f4Afv+FRGPXM8Iub2bH0W4uRBgWWUoPtrWQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index 6af89e238ccd..00a25158bc87 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage +, colorlog +, dataclasses-json , fetchPypi -, pythonOlder -, poetry-core +, nltk-data , numpy , pandas +, poetry-core +, pydantic , pydateinfer , python-dateutil +, pythonOlder +, pythonRelaxDepsHook , scipy -, type-infer -, dataclasses-json -, colorlog -, pydantic -, nltk-data , symlinkJoin +, type-infer }: let testNltkData = symlinkJoin { name = "nltk-test-data"; - paths = [ nltk-data.punkt nltk-data.stopwords ]; + paths = [ + nltk-data.punkt + nltk-data.stopwords + ]; }; in buildPythonPackage rec { @@ -35,20 +39,25 @@ buildPythonPackage rec { hash = "sha256-BtnRmj5JtgNdCFowgNdpIZn5vUdw8QYCWneHfDgC4/c="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + colorlog + dataclasses-json numpy pandas + pydantic pydateinfer python-dateutil scipy type-infer - dataclasses-json - colorlog - pydantic ]; # PyPI tarball has no tests diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index c032eef5f4e3..62fb5caa8efb 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -7,8 +7,8 @@ buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.3"; - format = "pyproject"; + version = "1.7.4"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "delfick"; repo = "python-dict2xml"; rev = "refs/tags/release-${version}"; - hash = "sha256-0Ahc+8pb1gHvcpnYhKAJYLIaQ5Wbp7Q8clzMVcnVdYs="; + hash = "sha256-58sWvdkbt+czo96RUxB2vdOl/wqSU3BNIozSEdixWO8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 6803c26b01c5..026788caf646 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -12,6 +12,7 @@ , django , pytest-django , pytestCheckHook +, nixosTests }: buildPythonPackage rec { @@ -46,6 +47,8 @@ buildPythonPackage rec { "django_mailman3" ]; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = with lib; { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 529c940dd45c..8c179349e18e 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "environs"; - version = "10.1.0"; + version = "10.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; rev = "refs/tags/${version}"; - hash = "sha256-G9dgOugmFRHSLlmVHs2H5XyF3UKghAGtuzTWn4IB4dI="; + hash = "sha256-D6Kp8aHiUls7+cACJ3DwrS4OftA5uMbAu4l5IyR4F5U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 2de77cfbd69d..be738b90e198 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,10 +1,11 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage # build-system , cysignals -, cython_3 +, cython , pkgconfig , setuptools @@ -30,8 +31,21 @@ buildPythonPackage rec { hash = "sha256-EyReCkVRb3CgzIRal5H13OX/UdwWi+evDe7PoS1qP4A="; }; + # temporarily revert to cython 0.29 + patches = [ + (fetchpatch { + url = "https://github.com/fplll/fpylll/commit/528243c6fa6491c8e9652b99bdf9758766273d66.diff"; + revert = true; + sha256 = "sha256-IRppkESy0CRwARhxBAsZxP6JkTe0M91apG4CTSSYNUU="; + excludes = ["requirements.txt"]; + }) + ]; + postPatch = '' + substituteInPlace requirements.txt --replace "Cython>=3.0" "Cython" + ''; + nativeBuildInputs = [ - cython_3 + cython cysignals pkgconfig setuptools diff --git a/pkgs/development/python-modules/gitignore-parser/default.nix b/pkgs/development/python-modules/gitignore-parser/default.nix index 7f3b41b5899e..50239a9b2653 100644 --- a/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/pkgs/development/python-modules/gitignore-parser/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , unittestCheckHook }: buildPythonPackage rec { pname = "gitignore-parser"; - version = "0.1.10"; - format = "setuptools"; + version = "0.1.11"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "mherrmann"; repo = "gitignore_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-uILXtozXRTOJeVpF1lpM19xaibebiwIMyHzdrlnfoec="; + hash = "sha256-y8A8OLgJccYWvKTJs7um8RwFFM0CswbwRojknBmk3TY="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 9e347d9a1553..bdb5311e3c75 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-oPdKmaj2wKgOQw7QYwOQc8efcNtQiGryZgNJ+bbB6L8="; + hash = "sha256-iFMs4FXl82ZkOKNad0XY8Ci9gHwdkyzP5LiYJ4/uyzY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index dfbe2d7d638e..3fa36c938fda 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -11,6 +11,7 @@ , pygments , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pytz , pyyaml , requests @@ -19,19 +20,24 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; version = "0.46"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "coveooss"; - repo = pname; + repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; hash = "sha256-wTO+d0O3SKT2jJ2zNubT2q76PdJ7+kT9RBEw5MMH1yg="; }; + pythonRelaxDeps = [ + "dataclasses-json" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix index 79be6d7b5bc7..d28c5cc6c69d 100644 --- a/pkgs/development/python-modules/maison/default.nix +++ b/pkgs/development/python-modules/maison/default.nix @@ -6,25 +6,31 @@ , pydantic , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , toml }: buildPythonPackage rec { pname = "maison"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dbatten5"; repo = "maison"; rev = "refs/tags/v${version}"; - hash = "sha256-XNo7QS8BCYzkDozLW0T+KMQPI667lDTCFtOqKq9q3hw="; + hash = "sha256-2hUmk91wr5o2cV3un2nMoXDG+3GT7SaIOKY+QaZY3nw="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -47,6 +53,5 @@ buildPythonPackage rec { changelog = "https://github.com/dbatten5/maison/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 24d117eb322e..dfdb85ebf9c7 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -4,22 +4,32 @@ , marshmallow , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "marshmallow-polyfield"; - version = "5.10"; - format = "setuptools"; + version = "5.11"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Bachmann1234"; - repo = pname; - rev = "v${version}"; - hash = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; + repo = "marshmallow-polyfield"; + rev = "refs/tags/v${version}"; + hash = "sha256-jbpeyih2Ccw1Rk+QcXRO9AfN5B/DhZmxa/M6FzXHqqs="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=marshmallow_polyfield" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ marshmallow ]; @@ -28,11 +38,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=marshmallow_polyfield" "" - ''; - pythonImportsCheck = [ "marshmallow" ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index bbe9c9bf157d..880e3c869aab 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -6,22 +6,27 @@ , pytz , simplejson , packaging +, setuptools }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.20.1"; - format = "setuptools"; + version = "3.20.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marshmallow-code"; - repo = pname; + repo = "marshmallow"; rev = "refs/tags/${version}"; - hash = "sha256-sPYiup7ontnubtBxv+rIT0up4IHPJNCUlH9J4FlHsss="; + hash = "sha256-z6Quf6uTelGwB/uYayVXtVmculwaoI5LL8I0kKiM/e8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index 4a4f175a8943..bc5d712913b8 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -5,28 +5,34 @@ , numpy , pandas , poetry-core -, scikit-learn -, toml-adapt , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, scikit-learn +, toml-adapt }: buildPythonPackage rec { pname = "niaaml"; version = "1.1.12"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "lukapecnik"; repo = "NiaAML"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-GAUXEkUOD04DQtRG/RAeeeLmenBd25h18Lmrxbm4X3A="; }; + pythonRelaxDeps = [ + "pandas" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook toml-adapt ]; @@ -54,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python automated machine learning framework"; homepage = "https://github.com/lukapecnik/NiaAML"; + changelog = "https://github.com/lukapecnik/NiaAML/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix index 89d8ae746aed..eca766c67a0f 100644 --- a/pkgs/development/python-modules/niaclass/default.nix +++ b/pkgs/development/python-modules/niaclass/default.nix @@ -5,28 +5,34 @@ , numpy , pandas , poetry-core -, scikit-learn -, toml-adapt , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, scikit-learn +, toml-adapt }: buildPythonPackage rec { pname = "niaclass"; version = "0.1.4"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "lukapecnik"; repo = "NiaClass"; rev = "refs/tags/${version}"; - sha256 = "sha256-md1e/cOIOQKoB760E5hjzjCsC5tS1CzgqAPTeVtrmuo="; + hash = "sha256-md1e/cOIOQKoB760E5hjzjCsC5tS1CzgqAPTeVtrmuo="; }; + pythonRelaxDeps = [ + "pandas" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook toml-adapt ]; @@ -42,7 +48,7 @@ buildPythonPackage rec { toml-adapt -path pyproject.toml -a change -dep scikit-learn -ver X ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -53,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework for solving classification tasks using Nature-inspired algorithms"; homepage = "https://github.com/lukapecnik/NiaClass"; + changelog = "https://github.com/lukapecnik/NiaClass/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/pkgs/development/python-modules/nianet/default.nix b/pkgs/development/python-modules/nianet/default.nix index 4adca2e5b701..d91f278a5906 100644 --- a/pkgs/development/python-modules/nianet/default.nix +++ b/pkgs/development/python-modules/nianet/default.nix @@ -9,26 +9,27 @@ , pythonOlder , scikit-learn , toml-adapt +, tomli , torch }: buildPythonPackage rec { pname = "nianet"; version = "1.1.4"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "SasoPavlic"; - repo = pname; - rev = "version_${version}"; + repo = "nianet"; + rev = "refs/tags/version_${version}"; sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY="; }; nativeBuildInputs = [ - toml-adapt poetry-core + toml-adapt ]; propagatedBuildInputs = [ @@ -44,8 +45,9 @@ buildPythonPackage rec { toml-adapt -path pyproject.toml -a change -dep torch -ver X ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + tomli ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 48d5ba86ff75..3d2da5207656 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.0.4"; + version = "4.2.1"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-mGCi3nFnyzA+yKD5qtpErXYjOA6liZRiy7qJTbTGGnQ="; + hash = "sha256-dCgbMyyVmYGPV8GyZUrMR+IO8nGoQ//dnmHmhFH2iJo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 1871ce74dd73..154a9c712c5a 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -66,6 +66,8 @@ buildPythonPackage rec { "test_bad_setup_file" # Assertion error "test_compile_recursive_extras" + "test_combine_different_extras_of_the_same_package" + "test_diff_should_not_uninstall" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 3d3590a37104..ad97cd944250 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -5,6 +5,7 @@ , marshmallow-dataclass , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests , responses , setuptools @@ -26,7 +27,12 @@ buildPythonPackage rec { hash = "sha256-ybl6QOLb1xE6v0D1C2wKMsSU+r2gWzj24Q4pPIMBsCY="; }; + pythonRelaxDeps = [ + "marshmallow-dataclass" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index f62b039bbb45..c98654ef8732 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -5,12 +5,14 @@ , gitpython , grpcio , grpcio-testing +, minio , mmh3 , pandas +, pyarrow , pytestCheckHook -, python , pythonOlder , pythonRelaxDepsHook +, requests , scikit-learn , setuptools-scm , ujson @@ -19,19 +21,20 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.3.3"; - format = "pyproject"; + version = "2.3.5"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "milvus-io"; - repo = pname; + repo = "pymilvus"; rev = "refs/tags/v${version}"; - hash = "sha256-qnm6JaeF2Li2NgVGZ6yJ2yz1n3pVZqkF4Ee+q4v/kdA="; + hash = "sha256-OKvaJyy6v79wcE9T0v2KwOBKShhDE8g0adIWce0bESs="; }; pythonRelaxDeps = [ + "environs" "grpcio" ]; @@ -45,8 +48,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ environs grpcio + minio mmh3 pandas + pyarrow + requests ujson ]; diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 65a27c9b53cf..9b6ffe4e0fe8 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -7,6 +7,7 @@ , openpyxl , orjson , phonenumbers +, beautifulsoup4 , pytestCheckHook , python-dateutil , python-decouple @@ -16,7 +17,7 @@ , pythonRelaxDepsHook , pyyaml , requests -, six +, setuptools , toml , xlrd , xmltodict @@ -24,52 +25,94 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.33.0"; - format = "setuptools"; + version = "0.33.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fabiocaccamo"; - repo = pname; + repo = "python-benedict"; rev = "refs/tags/${version}"; - hash = "sha256-SJBU7jMnyLBdWQPQ/UGbVklKUOrCM3fMnOkXKHQnyPI="; + hash = "sha256-QRWyMqHW4C3+718mgp9z/dQ1loesm0Vaf2TzW3yqF3A="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "boto3" ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + propagatedBuildInputs = [ - boto3 - ftfy - mailchecker - openpyxl - phonenumbers - python-dateutil python-fsutil python-slugify - pyyaml requests - toml - xlrd - xmltodict ]; + passthru.optional-dependencies = { + all = [ + beautifulsoup4 + boto3 + ftfy + mailchecker + openpyxl + phonenumbers + python-dateutil + pyyaml + toml + xlrd + xmltodict + ]; + html = [ + beautifulsoup4 + xmltodict + ]; + io = [ + beautifulsoup4 + openpyxl + pyyaml + toml + xlrd + xmltodict + ]; + parse = [ + ftfy + mailchecker + phonenumbers + python-dateutil + ]; + s3 = [ + boto3 + ]; + toml = [ + toml + ]; + xls = [ + openpyxl + xlrd + ]; + xml = [ + xmltodict + ]; + yaml = [ + pyyaml + ]; + }; + nativeCheckInputs = [ orjson pytestCheckHook python-decouple - six - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = [ # Tests require network access "test_from_base64_with_valid_url_valid_content" + "test_from_html_with_valid_file_valid_content" + "test_from_html_with_valid_url_valid_content" "test_from_json_with_valid_url_valid_content" "test_from_pickle_with_valid_url_valid_content" "test_from_plist_with_valid_url_valid_content" diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index dd2b64173794..f1b8467bda18 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -1,8 +1,10 @@ { lib +, aiohttp , anyio , async-timeout , asyncclick , buildPythonPackage +, cryptography , fetchFromGitHub , kasa-crypt , orjson @@ -17,16 +19,16 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.5.4"; - format = "pyproject"; + version = "0.6.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "python-kasa"; + repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-wGPMrYaTtKkkNW88eyiiciFcBSTRqqChYi6e15WUCHo="; + hash = "sha256-JFd9Ka/96Y4nu2HnL/Waf5EBKb06+7rZdI72F8G472I="; }; nativeBuildInputs = [ @@ -34,9 +36,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp anyio async-timeout asyncclick + cryptography pydantic ]; diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 424c1635f91a..2605080729c7 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.4.2"; + version = "1.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-stuHXGcgwblayCyD6lLOu5RMQHvmii7wN8zdi6ucxTw="; + hash = "sha256-YmC+/4NaNdOgrsTx2jUbC+nKoaDZSmy6lAp82Nz2Ymk="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 67acfee32d73..ab043450e40e 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.8.4"; + version = "1.8.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-dy0+q1i/rE+eIQUZXX9S4y2RiOBM0Kc49PqdvtFAE90="; + hash = "sha256-wAOmO5bev1zgPcJoiqKlS4anUKayo8HsncQXM+b1clQ="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 488a045211a1..bbab3a462dbb 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -4,7 +4,7 @@ , astropy-healpix , buildPythonPackage , cloudpickle -, cython +, cython_3 , dask , fetchPypi , fsspec @@ -21,9 +21,9 @@ buildPythonPackage rec { pname = "reproject"; version = "0.13.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-extension-helpers - cython + cython_3 numpy oldest-supported-numpy setuptools-scm @@ -75,6 +75,7 @@ buildPythonPackage rec { description = "Reproject astronomical images"; downloadPage = "https://github.com/astropy/reproject"; homepage = "https://reproject.readthedocs.io"; + changelog = "https://github.com/astropy/reproject/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; }; diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix index e5b2108831df..4131200f2276 100644 --- a/pkgs/development/python-modules/ruyaml/default.nix +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -11,32 +11,23 @@ buildPythonPackage rec { pname = "ruyaml"; version = "0.91.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pycontribs"; - repo = pname; - rev = "v${version}"; - sha256 = "0gxvwry7n1gczxkjzyfrr3fammllkvnnamja4yln8xrg3n1h89al"; + repo = "ruyaml"; + rev = "refs/tags/v${version}"; + hash = "sha256-A37L/voBrn2aZ7xT8+bWdZJxbWRjnxbstQtSyUeN1sA="; }; - patches = [ - (fetchpatch { - name = "remove-setuptools-scm-git-archive-from-setupcfg.patch"; - url = "https://github.com/pycontribs/ruyaml/commit/8922dd826cbb97b29e9826b00fb28a65d584e985.patch"; - includes = [ "setup.cfg" ]; - hash = "sha256-XAsORoPvYRElHswlZ4S377UwuJNCU1JuCz5iyFXoXOQ="; - }) - + postPatch = '' # https://github.com/pycontribs/ruyaml/pull/107 - (fetchpatch { - name = "remove-setuptools-scm-git-archive-from-pyproject.patch"; - url = "https://github.com/pycontribs/ruyaml/commit/4d605bf63f799696c8ba3c1f0a0f505db0ca33ce.patch"; - hash = "sha256-X6HWXBot5ZIo+odoSHhXMb03tgpQfRw/Ze8nFgH43ZI="; - }) - ]; + substituteInPlace pyproject.toml \ + --replace '"pip >= 19.3.1",' "" \ + --replace '"setuptools_scm_git_archive >= 1.1",' "" + ''; nativeBuildInputs = [ setuptools-scm @@ -58,9 +49,17 @@ buildPythonPackage rec { "ruyaml" ]; + disabledTests = [ + # Assertion error + "test_issue_60" + "test_issue_60_1" + "test_issue_61" + ]; + meta = with lib; { description = "YAML 1.2 loader/dumper package for Python"; homepage = "https://ruyaml.readthedocs.io/"; + changelog = "https://github.com/pycontribs/ruyaml/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index a4027953796b..11d1df937702 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.39.0"; + version = "1.39.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-tYfnQ6L91KrRCR32dgzcDtA7eO+LHRAHBklxU8cXkK8="; + hash = "sha256-MC+9w53fsC5XB7CR9SS+z4bu2GgxkqdeYWERhk8lhcA="; }; nativeBuildInputs = [ @@ -133,11 +133,12 @@ buildPythonPackage rec { disabledTests = [ # Issue with the asseration "test_auto_enabling_integrations_catches_import_error" + "test_default_release" ]; disabledTestPaths = [ # Varius integration tests fail every once in a while when we - # upgrade depencies, so don't bother testing them. + # upgrade dependencies, so don't bother testing them. "tests/integrations/" ] ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ # test crashes on aarch64 diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index ae64e1eb057b..24322a18723e 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -1,27 +1,23 @@ { lib +, appdirs , buildPythonPackage +, cryptography , fetchFromGitHub - -# build-system , flit-core - -# dependencies -, appdirs -, cryptography , id , importlib-resources +, pretend , pydantic , pyjwt , pyopenssl +, pytestCheckHook , requests , rich , securesystemslib , sigstore-protobuf-specs , sigstore-rekor-types , tuf - -# tests -, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -29,10 +25,12 @@ buildPythonPackage rec { version = "2.1.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "sigstore"; repo = "sigstore-python"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-WH6Pme8ZbfW5xqBT056eVJ3HZP1D/lAULtyN6k0uMaA="; }; @@ -57,17 +55,35 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pretend pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "sigstore" ]; + disabledTests = [ + # Tests require network access + "test_fail_init_url" + "test_get_identity_token_bad_code" + "test_identity_proof_claim_lookup" + "test_init_url" + "test_production" + "test_sct_verify_keyring" + "test_sign_rekor_entry_consistent" + "test_verification_materials_retrieves_rekor_entry" + "test_verifier" + ]; + meta = with lib; { description = "A codesigning tool for Python packages"; homepage = "https://github.com/sigstore/sigstore-python"; - changelog = "https://github.com/sigstore/sigstore-python/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix index 0064454a1eaf..56ffdfe8c080 100644 --- a/pkgs/development/python-modules/spyse-python/default.nix +++ b/pkgs/development/python-modules/spyse-python/default.nix @@ -7,32 +7,23 @@ , pythonOlder , requests , responses +, setuptools }: buildPythonPackage rec { pname = "spyse-python"; version = "2.2.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "spyse-com"; - repo = pname; - rev = "v${version}"; - sha256 = "041k0037anwaxp2mh7mdk8rdsw9hdr3arigyyqfxfn35x8j41c3k"; + repo = "spyse-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-c7BAJOplWNcd9v7FrEZuMHHdMpqtHljF7YpbdQYAMxA="; }; - propagatedBuildInputs = [ - requests - dataclasses-json - responses - limiter - ]; - - # Tests requires an API token - doCheck = false; - patches = [ # Update limiter import and rate limit, https://github.com/spyse-com/spyse-python/pull/11 (fetchpatch { @@ -45,11 +36,26 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "'dataclasses~=0.6'," "" \ + --replace "dataclasses-json~=0.5.4" "dataclasses-json>=0.5.4" \ --replace "responses~=0.13.3" "responses>=0.13.3" \ --replace "limiter~=0.1.2" "limiter>=0.1.2" \ --replace "requests~=2.26.0" "requests>=2.26.0" ''; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + dataclasses-json + responses + limiter + ]; + + # Tests requires an API token + doCheck = false; + pythonImportsCheck = [ "spyse" ]; @@ -57,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for spyse.com API"; homepage = "https://github.com/spyse-com/spyse-python"; + changelog = "https://github.com/spyse-com/spyse-python/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index df64dbebab50..f7e527eae146 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -1,23 +1,23 @@ { lib +, arrow , buildPythonPackage , fetchPypi -, nose -, setuptools -, setuptools-scm -, wheel -, arrow -, requests -, units , pint , pydantic +, pythonOlder , pytz -, six +, requests +, responses +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "stravalib"; version = "1.5"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; @@ -27,31 +27,31 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel - ]; - - nativeCheckInputs = [ - nose ]; propagatedBuildInputs = [ arrow - requests - units pint pydantic pytz - six + requests + responses ]; - # tests require network access - # testing strava api + # Tests require network access, testing strava API doCheck = false; + pythonImportsCheck = [ + "stravalib" + ]; + meta = with lib; { description = "Python library for interacting with Strava v3 REST API"; homepage = "https://github.com/stravalib/stravalib"; + changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ ]; + # Support for pydantic > 2, https://github.com/stravalib/stravalib/issues/379 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix index b7d2661ce2c8..b3ae130af270 100644 --- a/pkgs/development/python-modules/strenum/default.nix +++ b/pkgs/development/python-modules/strenum/default.nix @@ -1,14 +1,16 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "strenum"; version = "0.4.15"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +21,15 @@ buildPythonPackage rec { hash = "sha256-LrDLIWiV/zIbl7CwKh7DAy4LoLyY7+hfUu8nqduclnA="; }; + patches = [ + # Replace SafeConfigParser and readfp, https://github.com/milanmeu/aioaseko/pull/6 + (fetchpatch { + name = "replace-safeconfigparser.patch"; + url = "https://github.com/irgeek/StrEnum/commit/896bef1b7e4a50c8b53d90c8d2fb5c0164f08ecd.patch"; + hash = "sha256-dmmEzhy17huclo1wOubpBUDc2L7vqEU5b/6a5loM47A="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" @@ -26,6 +37,10 @@ buildPythonPackage rec { --replace " --cov=strenum --cov-report term-missing --black --pylint" "" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,7 +50,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "MOdule for enum that inherits from str"; + description = "Module for enum that inherits from str"; homepage = "https://github.com/irgeek/StrEnum"; changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix index 8d240fe19e3e..1297ef2895c1 100644 --- a/pkgs/development/python-modules/thefuzz/default.nix +++ b/pkgs/development/python-modules/thefuzz/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "thefuzz"; - version = "0.20.0"; + version = "0.22.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ol5JeGscRgPH/G4taea8ZgmCopGWmLU2/4NU4GMcxA0="; + hash = "sha256-cTgDmn7PVA2jI3kthZLvmQKx1563jBR9TyBmTeefNoA="; }; propagatedBuildInputs = [ levenshtein ]; diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index 497d10d84fe8..0805ee9dea39 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -2,14 +2,16 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "token-bucket"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,11 +22,24 @@ buildPythonPackage rec { hash = "sha256-dazqJRpC8FUHOhgKFzDnIl5CT2L74J2o2Hsm0IQf4Cg="; }; + patches = [ + # Replace imp with importlib, https://github.com/falconry/token-bucket/pull/24 + (fetchpatch { + name = "remove-imp.patch"; + url = "https://github.com/falconry/token-bucket/commit/10a3c9f4de00f4933349f66b4c72b6c96db6e766.patch"; + hash = "sha256-Hk5+i3xzeA3F1kXRaRarWT9mff2lT2WNmTfTZvYzGYI="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'" "" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index f2f924b5c124..0e7bf3a3f185 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -37,7 +37,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \ - --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" + --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" \ + --replace "django-taggit>=2.0,<5.0" "django-taggit>=2.0,<6.0" \ + --replace "Willow[heif]>=1.6.2,<1.7" "Willow[heif]>=1.6.2,<2" ''; propagatedBuildInputs = [ @@ -64,7 +66,9 @@ buildPythonPackage rec { # on wagtail (wagtail-factories) doCheck = false; - passthru.tests.wagtail = callPackage ./tests.nix {}; + passthru.tests.wagtail = callPackage ./tests.nix { }; + + pythonImportsCheck = [ "wagtail" ]; meta = with lib; { description = "A Django content management system focused on flexibility and user experience"; diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 122a39d82615..26b39ed87ed5 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -3,7 +3,8 @@ , click , fetchFromGitHub , maison -, pdm-pep517 +, pdm-backend +, pytest-freezegun , pytest-xdist , pytestCheckHook , pythonOlder @@ -13,21 +14,21 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.13.0"; - format = "pyproject"; + version = "1.16.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lyz-code"; - repo = pname; + repo = "yamlfix"; rev = "refs/tags/${version}"; - hash = "sha256-GoCQtanQHYOFrhRvZjzk/cCPnUFwYUAclZuYGZfNg5E="; + hash = "sha256-nadyBIzXHbWm0QvympRaYU38tuPJ3TPJg8EbvVv+4L0="; }; nativeBuildInputs = [ setuptools - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -37,14 +38,39 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-freezegun pytest-xdist pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "yamlfix" ]; + disabledTests = [ + # AssertionError: assert ... Fixed <stdin> in... + "test_check_one_file_no_changes" + "test_config_parsing" + "test_corrects_code_from_stdin" + "test_corrects_one_file" + "test_corrects_three_files" + "test_empty_list_inline_comment_indentation" + "test_find_files" + "test_fix_code_converts_non_valid_false_booleans" + "test_ignores_correct_files" + "test_include_exclude_files" + "test_read_prefixed_environment_variables" + "test_section_whitelines" + "test_whitelines" + "test_sequence_style_env_enum_parsing" + "test_verbose_option" + "test_enforcing_flow_style_together_with_adjustable_newlines" + ]; + meta = with lib; { description = "Python YAML formatter that keeps your comments"; homepage = "https://github.com/lyz-code/yamlfix"; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 4880659c0438..b9928c41ba60 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.24.0"; + version = "4.25.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-bs9jinW1AbeYGJ2oJOFn8p25NHcYYQnyVJUIxiZtCyo="; + hash = "sha256-iyt6qOx1XU7lL6AhDNKiRP0W7WlfxKciRVYpUHdtKlY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix index 3ac24cb22936..d403a551d3c8 100644 --- a/pkgs/development/tools/extism-cli/default.nix +++ b/pkgs/development/tools/extism-cli/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "extism-cli"; - version = "0.3.9"; + version = "1.0.1"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-t53VJOc1umIwPyS6hkAm+u9KsKiYas4iRrlraofJSEY="; + hash = "sha256-+8/xyHL+Dvm8Z5DXk1VkmFYP7Gg/YadIyc3xI9L0Jow="; }; modRoot = "./extism"; - vendorHash = "sha256-Ukbg2CG2qeLmM9HijKXZY/fEY2QfJXTyaTIsEDT5W6E="; + vendorHash = "sha256-kJnYp4X4dzkpXw0j7CI3Q3GdCQrCzslZxz2/IkVPqMk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 0290eda782b9..e9a2f398a7bf 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.14.1"; + version = "3.14.4"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-acF9y0EHjALB+h/mf96MfCUlSTvp3QdhwEbu3gBA/y4="; + hash = "sha256-BwXO03q/vG6DWon0jhGNYckF8DHzaN9RtrX452VC6ls="; }; - vendorHash = "sha256-RI2UMmdFCNo6iE9MnWwsJtholjF4jNbCNNLk8nylgtc="; + vendorHash = "sha256-z4oXiGEcXKZTS57p/3gHhCCUDKh/imNu2n5e6+6BjKg="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index aadecc823bbe..fe748a7dbeb5 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.5.1"; + version = "8.5.2"; src = fetchFromGitHub { owner = "watchexec"; repo = pname; rev = "v${version}"; - hash = "sha256-MzwifQsOSJt9wq8bhVAY6HqXP4Zs4+a2GcG79PdAiMY="; + hash = "sha256-Vf6BFr8MphaUJoHMtksbbVQb+jha7jowhktQCVFxlxQ="; }; - cargoHash = "sha256-wyyIZ7i1icvD53hnUM4H/kvxj6K/pVzAAvKKp5LzwTE="; + cargoHash = "sha256-skUG1B6TCFEXeQSRwA6vWjXmNifk5bTR4+JESw7CZMo="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation Cocoa ]; diff --git a/pkgs/development/tools/schemacrawler/default.nix b/pkgs/development/tools/schemacrawler/default.nix index 4328965c3cc3..5093011ca3dd 100644 --- a/pkgs/development/tools/schemacrawler/default.nix +++ b/pkgs/development/tools/schemacrawler/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.20.7"; + version = "16.20.8"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-5TyciQVrJhu8RlT6feHEH9H43fi1NWJX1dGipebf46k="; + hash = "sha256-uNk85AqdctxelImyx06yCsY15AxMFEEclOyao6Hu89A="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index a875bacb36af..cb7d184329cf 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-6PSxYM6u727vHf4FP0ju0TAuqj4R4bxQEdyZHvC4qBA="; + hash = "sha256-PYPlhlliqd6j3KbMgelg+spqXOl1ZnA0qd1Xyf8F4wY="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index fe4780176a67..a2fe5608860b 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.2.0"; + version = "3.2.1"; src = fetchzip { url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; - hash = "sha256-C9hWIH6lFDa9dzH5iYZlawt+7SSPt3gxcXM62qd0zbo="; + hash = "sha256-hZexasMid9yZqTyX7LouTg44rG7WO/KU+CmAtSdpc2Q="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 1df8887afe68..fc050ab9c9b6 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytt"; - version = "0.46.3"; + version = "0.47.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-K2+5NplyQuvc78NnNDiQhfrewqn84jDbiAyN8J9iTm0="; + sha256 = "sha256-aoKgXagCygK4pzRHw5Nf8LCzpzZd2X77th9tJA5f1aA="; }; vendorHash = null; diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/development/web/bootstrap-studio/default.nix index 796095e109a5..2ba780245668 100644 --- a/pkgs/development/web/bootstrap-studio/default.nix +++ b/pkgs/development/web/bootstrap-studio/default.nix @@ -2,10 +2,10 @@ let pname = "bootstrap-studio"; - version = "6.5.1"; + version = "6.6.0"; src = fetchurl { url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage"; - sha256 = "sha256-mx9KkMwFzdjhzofr+4l7MTerGfSSsI8+z8jmaoV8uvo="; + sha256 = "sha256-kXYptuLmhYJ3YiKtfIMiOs4zssJ1+v+JgDHWVtbWQ+Y="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in |