diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 05bafe72ba92..28f6558e306a 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -12,32 +12,38 @@ vips, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyvips"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; - tag = "v${version}"; - hash = "sha256-BPQFndikPSsKU4HPauTAewab32IumckG/y3lhUUNbMU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-N98UR6WC9ICQyBuAVejR8yrzZEBaE92EO7jY65SnaKg="; }; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - glib - vips - ]; + postPatch = '' + substituteInPlace pyvips/__init__.py \ + --replace 'libvips.so.42' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \ + --replace 'libvips.42.dylib' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \ + --replace 'libgobject-2.0.so.0' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \ + --replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' + ''; build-system = [ pkgconfig setuptools ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + glib + vips + ]; + dependencies = [ cffi ]; env = lib.optionalAttrs stdenv.cc.isClang { @@ -46,14 +52,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyvips/__init__.py \ - --replace 'libvips.so.42' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \ - --replace 'libvips.42.dylib' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \ - --replace 'libgobject-2.0.so.0' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \ - --replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' - ''; - disabledTests = [ # flaky due to a race condition # https://github.com/libvips/pyvips/issues/566 @@ -69,10 +67,8 @@ buildPythonPackage rec { meta = { description = "Python wrapper for libvips"; homepage = "https://github.com/libvips/pyvips"; - changelog = "https://github.com/libvips/pyvips/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/libvips/pyvips/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - anthonyroussel - ]; + maintainers = with lib.maintainers; [ anthonyroussel ]; }; -} +})