Merge staging-next into staging
This commit is contained in:
@@ -144,11 +144,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-NghMNvsCRtgZjOTnnSYGn53KhP8ZY0hizkgEmI/+P6A=",
|
||||
"hash": "sha256-2QWaPwqjgtzOoqGB91k2mKnMqhZ559rp4KJWQdkOjHE=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v4.32.0",
|
||||
"rev": "v4.37.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -162,11 +162,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"baiducloud": {
|
||||
"hash": "sha256-rWLmDopC6m2tzh2NEYvclp0QVH0r/5toA+3jBUkcBaY=",
|
||||
"hash": "sha256-9NarSg8uXhdx+kJK7M9ftDoWXr9St1CEqL0N9+OJAXE=",
|
||||
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
|
||||
"owner": "baidubce",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.21.16",
|
||||
"rev": "v1.22.8",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -507,13 +507,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"gitlab": {
|
||||
"hash": "sha256-VOmBHM5h/ZEkCPbsVRRM/Ygkfv7Dom41nlqJ/5+aZ4M=",
|
||||
"hash": "sha256-1OzHzYnNlpHSVX3Q0JfjTTHJ1ux+YeRTe7ImtAsP8JU=",
|
||||
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
|
||||
"owner": "gitlabhq",
|
||||
"repo": "terraform-provider-gitlab",
|
||||
"rev": "v18.0.0",
|
||||
"rev": "v18.1.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-X0vbtUIKYzCeRD/BbMj3VPVAwx6d7gkbHV8j9JXlaFM="
|
||||
"vendorHash": "sha256-G325isVj6JKs58i59V/A51vE8mzgxk/1EqSVvb6TiH4="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-i3gKrK5EcIQbVwJI7sfRam3H0mideGO1VgPuzL4l+Xw=",
|
||||
@@ -651,13 +651,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ibm": {
|
||||
"hash": "sha256-0LrWZQy/PNYcV4m/jeDmVh1LdjwCAqVNKPdDAopRPvg=",
|
||||
"hash": "sha256-cZ7j/bhXxhTIU7J9XB4M4N3zteRKybmOIEeVw9XM62o=",
|
||||
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
|
||||
"owner": "IBM-Cloud",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.79.2",
|
||||
"rev": "v1.80.4",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-GAPhz2xKcLButNJCjHVVS+AbjHqDGY5EsoEtfUVb8zc="
|
||||
"vendorHash": "sha256-lxd5op9QETBR7Q8ndgvYyYBy9URu16+DmtnFydpy3EA="
|
||||
},
|
||||
"icinga2": {
|
||||
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "eza";
|
||||
version = "0.22.1";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/SqkaMt4XCdxMYMp7bYY9dYhe3KKKen/YpPg6Xr4fmI=";
|
||||
hash = "sha256-Lr4FLSYtyr4beiFaTo4/HN8hHClcZOdhCLpQXaDqqgc=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-NwguuIXNKwjFIhNGY1Una78RzxKykkNy+TCTuJvdxnM=";
|
||||
cargoHash = "sha256-MsPwA+y4e/CSuP1SZzhq4eutAy/Gmq2aU/+FqJ9B0es=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -59,13 +59,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.48.0";
|
||||
version = "2.48.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-PYGczt2wmxpExuPlu6U7vecePzuEH9IJIKKZtCC8FgU=";
|
||||
hash = "sha256-+0TN4tSay2fpSl5Aoy8M6y3fsWPKGfWWdLiVvg+r978=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
Generated
+31
-16
@@ -4,10 +4,15 @@
|
||||
"version": "1.44.1",
|
||||
"hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Core",
|
||||
"version": "1.46.1",
|
||||
"hash": "sha256-xpb9A2pFHEQ07yVrzq0gpeFBTN9LTqk7iHhg707a5Mg="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Identity",
|
||||
"version": "1.13.0",
|
||||
"hash": "sha256-BXru3jP4oQchrBF/c3WDekZeRJlUxenBwVZ5YsifseI="
|
||||
"version": "1.14.1",
|
||||
"hash": "sha256-F4CtJqq8wh5g9wZj8exVuzSDQm4pp0Gq5RgrKsQFFzY="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Storage.Blobs",
|
||||
@@ -34,6 +39,11 @@
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.Memory",
|
||||
"version": "9.0.0",
|
||||
@@ -79,6 +89,11 @@
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "8.0.3",
|
||||
"hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "9.0.3",
|
||||
@@ -111,13 +126,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Identity.Client",
|
||||
"version": "4.65.0",
|
||||
"hash": "sha256-gkBVLb8acLYexNM4ZzMJ0qfDp2UqjUt0yiu3MfMcWig="
|
||||
"version": "4.71.1",
|
||||
"hash": "sha256-3KwibXbY1bV1ZQlSdOPtCjP2xQtPJpOb82OTmkwKjpY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Identity.Client.Extensions.Msal",
|
||||
"version": "4.65.0",
|
||||
"hash": "sha256-Xmy/evicLvmbC+6ytxwVE646uVcJB5yMpEK73H5tzD0="
|
||||
"version": "4.71.1",
|
||||
"hash": "sha256-n6+06yWqyMjpKpdj9TmDz+XEQmCvw0KEgpG5dbEf0Io="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
@@ -164,6 +179,11 @@
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM="
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.4.1",
|
||||
"hash": "sha256-BG5ObHp2Kfmg7MT3ikaAKTGpJPEkpWOtQmkiqf14BWc="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.DiagnosticSource",
|
||||
"version": "6.0.1",
|
||||
@@ -179,11 +199,6 @@
|
||||
"version": "8.6.1",
|
||||
"hash": "sha256-vzwoEHRmUBnmlj77lFUZ/nD2oCEmY2rjwyaaXEZxuaU="
|
||||
},
|
||||
{
|
||||
"pname": "System.Interactive.Async",
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-4yzkdop+BMlpQ+qz/H7D7LkH1Ekh9n51t9yteHpv/58="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Hashing",
|
||||
"version": "6.0.0",
|
||||
@@ -194,11 +209,6 @@
|
||||
"version": "9.0.3",
|
||||
"hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68="
|
||||
},
|
||||
{
|
||||
"pname": "System.Linq.Async",
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.5",
|
||||
@@ -214,6 +224,11 @@
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory.Data",
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-RXS82gmLtIOAUaGqTc8J3bVbHTL5pnW3QFE3G+Xb5Jk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.5.0",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "garnet";
|
||||
version = "1.0.75";
|
||||
version = "1.0.78";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "garnet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Kn5ZEBdYS4jIgd/D1RwwCEwsR49jEUa+HeXad7hPUlE=";
|
||||
hash = "sha256-V/h0X4CZ9FOcUetyyvo9umYS+VqJbYehg3QS/yp4OBM=";
|
||||
};
|
||||
|
||||
projectFile = "main/GarnetServer/GarnetServer.csproj";
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lakectl";
|
||||
version = "1.61.0";
|
||||
version = "1.63.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "treeverse";
|
||||
repo = "lakeFS";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GABi7iFSZXpBzzJCKfloAfEva5Xnhyqbb52W/qri0s0=";
|
||||
hash = "sha256-G6MfhrojdH430UdgFXXQAEIr7UULl6qxuvA7Wiy9KIg=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/lakectl" ];
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-y257czudc0kb4wNJkY/mI/tqcblJfFDAgAa812VPvno=";
|
||||
vendorHash = "sha256-2Rkt1drsx0Un4SoD88nPktnOW0GQiCDowccOyrysYlQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "lug-helper";
|
||||
version = "4.0";
|
||||
version = "4.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "starcitizen-lug";
|
||||
repo = "lug-helper";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WCmKr7dgjWr5DqnZow2RWLAdifUaF9Z6BE12o0tK59k=";
|
||||
hash = "sha256-Pj0jReezB/0yCl5EC+EQ7CVtmgGQrJwVR6pvaP/gtWg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.12.2";
|
||||
version = "4.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
rev = version;
|
||||
hash = "sha256-v5Fwbl02t178t+l+VZybeUojIsblLX3Ws5itAAoEZwI=";
|
||||
hash = "sha256-4fsgXyIt5bhdbG0DRFYv6vrGagTyH5SAFcOaAV3uq0g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "scotty";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~phw";
|
||||
repo = "scotty";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VvBnTnW4ngJ0yPT2CV7t7HEUwJlBfWNE3coTHxGcAs4=";
|
||||
hash = "sha256-NvFvayz8B69Vtl+Ghl9UBXqJqvka8p6hi2ClcQ7Xeys=";
|
||||
};
|
||||
|
||||
# Otherwise checks fail with `panic: open /etc/protocols: operation not permitted` when sandboxing is enabled on Darwin
|
||||
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
|
||||
--replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)'
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-5mDY3vlRzoqJleNukB8NcPaAcDLX/UNegUSBYFMzGGA=";
|
||||
vendorHash = "sha256-+Hypr514lp0MuZVH9R9LUP93TYq2VNGuZ+6OWytohc8=";
|
||||
|
||||
env = {
|
||||
# *Some* locale is required to be set
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sydbox";
|
||||
version = "3.35.2";
|
||||
version = "3.36.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,11 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Sydbox";
|
||||
repo = "sydbox";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-n3mvzYXb965eUWNJ5iHezqqAZj6v05gj092osYZuk5s=";
|
||||
hash = "sha256-XGZHUMVTJLlWIwgEqVCMoHDoDkzkFAdTvOOtMtCAw98=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-D0lUkiARl0QL2OsojaJqsACn2fmN9x8Jp7mZzyRjyWY=";
|
||||
cargoHash = "sha256-+NI1poeMXMlR9rafmGKu6i6iFORe2IGVVPj08MP8g3o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandoc
|
||||
|
||||
@@ -18,17 +18,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "turbo-unwrapped";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vercel";
|
||||
repo = "turborepo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PwZYi7B5gqiqal6qIFqciv8SFJbRBeVJKfIc29zuIxA=";
|
||||
hash = "sha256-QQTHgSaVDCnhbxhETo2bSGdtEcbL9lrWed+EpH3Fydk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-zEkpWu/L5plFCnvliAtfu19ljB4pnrEesVQZOycOKRk=";
|
||||
cargoHash = "sha256-PQOUWcUlxATzfgf9QbZT+vLs20/tR4Xmv0lPadzQoZQ=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -1,59 +1,69 @@
|
||||
{
|
||||
lib,
|
||||
astor,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
interface-meta,
|
||||
narwhals,
|
||||
numpy,
|
||||
pandas,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
scipy,
|
||||
sympy,
|
||||
typing-extensions,
|
||||
wrapt,
|
||||
pyarrow,
|
||||
polars,
|
||||
sympy,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "formulaic";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthewwardrop";
|
||||
repo = "formulaic";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7vmnibL0PMZWL/unUQxN4GtLPSYKmGnhDNtE5GRDFHk=";
|
||||
hash = "sha256-+MyMxtX3DCmluf+8dvo0uulc1AeKE6les1xiRGVWjPU=";
|
||||
};
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astor
|
||||
dependencies = [
|
||||
narwhals
|
||||
numpy
|
||||
pandas
|
||||
scipy
|
||||
wrapt
|
||||
typing-extensions
|
||||
interface-meta
|
||||
sympy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
optional-dependencies = {
|
||||
arrow = [ pyarrow ];
|
||||
polars = [ polars ];
|
||||
calculus = [ sympy ];
|
||||
};
|
||||
|
||||
nativeCheckInputs =
|
||||
[
|
||||
pytestCheckHook
|
||||
]
|
||||
++ optional-dependencies.arrow
|
||||
++ optional-dependencies.calculus;
|
||||
|
||||
pythonImportsCheck = [ "formulaic" ];
|
||||
|
||||
disabledTestPaths = [ "tests/transforms/test_poly.py" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-performance implementation of Wilkinson formulas";
|
||||
homepage = "https://matthewwardrop.github.io/formulaic/";
|
||||
|
||||
@@ -143,17 +143,22 @@ buildPythonPackage {
|
||||
pytest-xdist
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
# The following tests are broken on aarch64-darwin with newer compilers and library versions.
|
||||
# See https://github.com/scipy/scipy/issues/18308
|
||||
"test_a_b_neg_int_after_euler_hypergeometric_transformation"
|
||||
"test_dst4_definition_ortho"
|
||||
"test_load_mat4_le"
|
||||
"hyp2f1_test_case47"
|
||||
"hyp2f1_test_case3"
|
||||
"test_uint64_max"
|
||||
"test_large_m4" # https://github.com/scipy/scipy/issues/22466
|
||||
];
|
||||
disabledTests =
|
||||
lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
# The following tests are broken on aarch64-darwin with newer compilers and library versions.
|
||||
# See https://github.com/scipy/scipy/issues/18308
|
||||
"test_a_b_neg_int_after_euler_hypergeometric_transformation"
|
||||
"test_dst4_definition_ortho"
|
||||
"test_load_mat4_le"
|
||||
"hyp2f1_test_case47"
|
||||
"hyp2f1_test_case3"
|
||||
"test_uint64_max"
|
||||
"test_large_m4" # https://github.com/scipy/scipy/issues/22466
|
||||
]
|
||||
++ lib.optionals (python.isPy311) [
|
||||
# https://github.com/scipy/scipy/issues/22789 Observed only with Python 3.11
|
||||
"test_funcs"
|
||||
];
|
||||
|
||||
doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin);
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
defusedxml,
|
||||
fetchFromGitHub,
|
||||
glibcLocales,
|
||||
hatchling,
|
||||
installShellFiles,
|
||||
itemadapter,
|
||||
itemloaders,
|
||||
@@ -36,7 +37,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrapy";
|
||||
version = "2.12.0";
|
||||
version = "2.13.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -45,13 +46,17 @@ buildPythonPackage rec {
|
||||
owner = "scrapy";
|
||||
repo = "scrapy";
|
||||
tag = version;
|
||||
hash = "sha256-o3+57+bZRohgrld2EuoQDU2LioJu0jmaC/RPREvI1t8=";
|
||||
hash = "sha256-M+Lko0O0xsEPHLghvIGHxIv22XBXaZsujJ2+bjBzGZ4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"defusedxml"
|
||||
];
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
setuptools
|
||||
@@ -95,6 +100,18 @@ buildPythonPackage rec {
|
||||
"tests/test_proxy_connect.py"
|
||||
"tests/test_utils_display.py"
|
||||
"tests/test_command_check.py"
|
||||
|
||||
# ConnectionRefusedError: [Errno 111] Connection refused
|
||||
"tests/test_feedexport.py::TestFTPFeedStorage::test_append"
|
||||
"tests/test_feedexport.py::TestFTPFeedStorage::test_append_active_mode"
|
||||
"tests/test_feedexport.py::TestFTPFeedStorage::test_overwrite"
|
||||
"tests/test_feedexport.py::TestFTPFeedStorage::test_overwrite_active_mode"
|
||||
|
||||
# this test is testing that the *first* deprecation warning is a specific one
|
||||
# but for some reason we get other deprecation warnings appearing first
|
||||
# but this isn't a material issue and the deprecation warning is still raised
|
||||
"tests/test_spider_start.py::MainTestCase::test_start_deprecated_super"
|
||||
|
||||
# Don't test the documentation
|
||||
"docs"
|
||||
];
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
@@ -29,13 +30,18 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/emcconville/wand/issues/558
|
||||
"test_forward_fourier_transform"
|
||||
"test_inverse_fourier_transform"
|
||||
# our imagemagick doesn't set MagickReleaseDate
|
||||
"test_configure_options"
|
||||
];
|
||||
disabledTests =
|
||||
[
|
||||
# https://github.com/emcconville/wand/issues/558
|
||||
"test_forward_fourier_transform"
|
||||
"test_inverse_fourier_transform"
|
||||
# our imagemagick doesn't set MagickReleaseDate
|
||||
"test_configure_options"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# AssertionError: assert wand.color.Color('srgb(255,0,1.41553e-14)') == wand.color.Color('srgb(255,0,0)')
|
||||
"test_sparse_color"
|
||||
];
|
||||
|
||||
passthru.imagemagick = imagemagickBig;
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "willow";
|
||||
version = "1.9.0";
|
||||
version = "1.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -25,13 +25,11 @@ buildPythonPackage rec {
|
||||
owner = "wagtail";
|
||||
repo = "Willow";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-H/UXE6gA6x849aqBcUgl3JYZ87OMNpuFyWGSsgqW1Rk=";
|
||||
hash = "sha256-7aVLPSspwQRWQ+aNYbKkOBzwc7uoVzQvAG8vezp8QZY=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
pythonRelaxDeps = [ "defusedxml" ];
|
||||
|
||||
dependencies = [
|
||||
filetype
|
||||
defusedxml
|
||||
@@ -49,16 +47,14 @@ buildPythonPackage rec {
|
||||
wand
|
||||
] ++ optional-dependencies.heif;
|
||||
|
||||
disabledTests = [
|
||||
# ValueError: Invalid quality setting
|
||||
"test_save_avif_lossless"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Python image library that sits on top of Pillow, Wand and OpenCV";
|
||||
homepage = "https://github.com/torchbox/Willow/";
|
||||
changelog = "https://github.com/wagtail/Willow/releases/tag/v${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ desiderius ];
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [
|
||||
desiderius
|
||||
kuflierl
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user