vips: 8.15.3 -> 8.15.5 (#351503) (ff77e454) · Commits · nix / nixpkgs

pkgs/tools/graphics/vips/default.nix→pkgs/by-name/vi/vips/package.nix

+169 −0

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, pkg-config
		, glib
		, libxml2
		, expat
		, ApplicationServices
		, Foundation
		, python3
		, fetchFromGitHub
		, meson
		, ninja
		, gtk-doc
		, docbook-xsl-nons
		, gobject-introspection
		{
		lib,
		stdenv,
		fetchFromGitHub,

		# Native build inputs
		docbook-xsl-nons,
		gobject-introspection,
		gtk-doc,
		meson,
		ninja,
		pkg-config,

		# Build inputs
		ApplicationServices,
		expat,
		Foundation,
		glib,
		libxml2,
		python3,

		# Optional dependencies
		, libjpeg
		, libexif
		, librsvg
		, poppler
		, libtiff
		, fftw
		, lcms2
		, libspng
		, libimagequant
		, imagemagick
		, pango
		, matio
		, cfitsio
		, libwebp
		, openexr
		, openjpeg
		, libjxl
		, openslide
		, libheif
		, cgif
		, libarchive
		, libhwy
		, testers
		, nix-update-script
		cfitsio,
		cgif,
		fftw,
		imagemagick,
		lcms2,
		libarchive,
		libexif,
		libheif,
		libhwy,
		libimagequant,
		libjpeg,
		libjxl,
		librsvg,
		libspng,
		libtiff,
		libwebp,
		matio,
		openexr,
		openjpeg,
		openslide,
		pango,
		poppler,

		# passthru
		testers,
		nix-update-script,
		}:

		stdenv.mkDerivation (finalAttrs: {
		pname = "vips";
		version = "8.15.3";
		version = "8.15.5";

		outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ];
		outputs = [
		"bin"
		"out"
		"man"
		"dev"
		] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ];

		src = fetchFromGitHub {
		owner = "libvips";
		repo = "libvips";
		rev = "refs/tags/v${finalAttrs.version}";
		hash = "sha256-VQtHHitEpxv63wC41TtRWLLCKHDAK7fbrS+cByeWxT0=";
		hash = "sha256-Lwe4lu3kS1WxgbM0eRfrMf/UIpDebvooHKvyVv7lq24=";
		# Remove unicode file names which leads to different checksums on HFS+
		# vs. other filesystems because of unicode normalisation.
		postFetch = ''
		@@ -58,58 +71,66 @@ stdenv.mkDerivation (finalAttrs: {
		'';
		};

		nativeBuildInputs = [
		pkg-config
		meson
		ninja
		nativeBuildInputs =
		[
		docbook-xsl-nons
		gobject-introspection
		] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
		meson
		ninja
		pkg-config
		]
		++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
		gtk-doc
		];

		buildInputs = [
		buildInputs =
		[
		glib
		libxml2
		expat
		(python3.withPackages (p: [ p.pycairo ]))

		# Optional dependencies
		libjpeg
		libexif
		librsvg
		poppler
		libtiff
		cfitsio
		cgif
		fftw
		imagemagick
		lcms2
		libspng
		libarchive
		libexif
		libheif
		libhwy
		libimagequant
		imagemagick
		pango
		matio
		cfitsio
		libjpeg
		libjxl
		librsvg
		libspng
		libtiff
		libwebp
		matio
		openexr
		openjpeg
		libjxl
		openslide
		libheif
		cgif
		libarchive
		libhwy
		] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ];
		pango
		poppler
		]
		++ lib.optionals stdenv.hostPlatform.isDarwin [
		ApplicationServices
		Foundation
		];

		# Required by .pc file
		propagatedBuildInputs = [
		glib
		];

		mesonFlags = [
		"-Dpdfium=disabled"
		"-Dnifti=disabled"
		mesonFlags =
		[
		(lib.mesonEnable "pdfium" false)
		(lib.mesonEnable "nifti" false)
		]
		++ lib.optional (!stdenv.hostPlatform.isDarwin) "-Dgtk_doc=true"
		++ lib.optional (imagemagick == null) "-Dmagick=disabled"
		;
		++ lib.optional (!stdenv.hostPlatform.isDarwin) (lib.mesonBool "gtk_doc" true)
		++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false);

		passthru = {
		tests = {
		@@ -122,7 +143,10 @@ stdenv.mkDerivation (finalAttrs: {
		};
		};
		updateScript = nix-update-script {
		extraArgs = [ "--version-regex" "v([0-9.]+)" ];
		extraArgs = [
		"--version-regex"
		"v([0-9.]+)"
		];
		};
		};

		@@ -131,8 +155,14 @@ stdenv.mkDerivation (finalAttrs: {
		homepage = "https://www.libvips.org/";
		description = "Image processing system for large images";
		license = licenses.lgpl2Plus;
		maintainers = with maintainers; [ kovirobi anthonyroussel ];
		pkgConfigModules = [ "vips" "vips-cpp" ];
		maintainers = with maintainers; [
		kovirobi
		anthonyroussel
		];
		pkgConfigModules = [
		"vips"
		"vips-cpp"
		];
		platforms = platforms.unix;
		mainProgram = "vips";
		};

pkgs/development/python-modules/pyvips/default.nix

+17 −12

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		buildPythonPackage,
		pythonOlder,
		cffi,
		fetchFromGitHub,
		pytestCheckHook,
		glib,
		vips,
		cffi,
		pkgconfig, # from pythonPackages
		pkg-config, # from pkgs
		lib,
		pkgconfig, # from pythonPackages
		pytestCheckHook,
		pythonOlder,
		setuptools,
		vips,
		}:

		buildPythonPackage rec {
		pname = "pyvips";
		version = "2.2.1";
		format = "setuptools";
		version = "2.2.3";
		pyproject = true;

		disabled = pythonOlder "3.7";

		src = fetchFromGitHub {
		owner = "libvips";
		repo = "pyvips";
		rev = "v${version}";
		hash = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc=";
		rev = "refs/tags/v${version}";
		hash = "sha256-EGB1cOR1pVCXGjRj1NLj4Mk3kIy8luRqk3gGJqVNs7U=";
		};

		nativeBuildInputs = [
		pkgconfig
		pkg-config
		];

		@@ -36,7 +36,12 @@ buildPythonPackage rec {
		vips
		];

		propagatedBuildInputs = [ cffi ];
		build-system = [
		pkgconfig
		setuptools
		];

		dependencies = [ cffi ];

		env = lib.optionalAttrs stdenv.cc.isClang {
		NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";

pkgs/top-level/all-packages.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -37832,7 +37832,7 @@ with pkgs;
		vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { };
		vimb = wrapFirefox vimb-unwrapped { };

		vips = callPackage ../tools/graphics/vips {
		vips = callPackage ../by-name/vi/vips/package.nix {
		inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
		};

Admin message