vips: 8.15.3 -> 8.15.5 (#351503)

pkgs/by-name/vi/vips/package.nix

@@ -0,0 +1,169 @@
+{
+  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
+  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.5";
+
+  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-Lwe4lu3kS1WxgbM0eRfrMf/UIpDebvooHKvyVv7lq24=";
+    # Remove unicode file names which leads to different checksums on HFS+
+    # vs. other filesystems because of unicode normalisation.
+    postFetch = ''
+      rm -r $out/test/test-suite/images/
+    '';
+  };
+
+  nativeBuildInputs =
+    [
+      docbook-xsl-nons
+      gobject-introspection
+      meson
+      ninja
+      pkg-config
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      gtk-doc
+    ];
+
+  buildInputs =
+    [
+      glib
+      libxml2
+      expat
+      (python3.withPackages (p: [ p.pycairo ]))
+
+      # Optional dependencies
+      cfitsio
+      cgif
+      fftw
+      imagemagick
+      lcms2
+      libarchive
+      libexif
+      libheif
+      libhwy
+      libimagequant
+      libjpeg
+      libjxl
+      librsvg
+      libspng
+      libtiff
+      libwebp
+      matio
+      openexr
+      openjpeg
+      openslide
+      pango
+      poppler
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      ApplicationServices
+      Foundation
+    ];
+
+  # Required by .pc file
+  propagatedBuildInputs = [
+    glib
+  ];
+
+  mesonFlags =
+    [
+      (lib.mesonEnable "pdfium" false)
+      (lib.mesonEnable "nifti" false)
+    ]
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) (lib.mesonBool "gtk_doc" true)
+    ++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false);
+
+  passthru = {
+    tests = {
+      pkg-config = testers.hasPkgConfigModules {
+        package = finalAttrs.finalPackage;
+      };
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        command = "vips --version";
+      };
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v([0-9.]+)"
+      ];
+    };
+  };
+
+  meta = with lib; {
+    changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog";
+    homepage = "https://www.libvips.org/";
+    description = "Image processing system for large images";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [
+      kovirobi
+      anthonyroussel
+    ];
+    pkgConfigModules = [
+      "vips"
+      "vips-cpp"
+    ];
+    platforms = platforms.unix;
+    mainProgram = "vips";
+  };
+})

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

@@ -1,33 +1,33 @@
 {
+  lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
-  fetchFromGitHub,
-  pytestCheckHook,
-  glib,
-  vips,
   cffi,
-  pkgconfig, # from pythonPackages
+  fetchFromGitHub,
+  glib,
   pkg-config, # from pkgs
-  lib,
+  pkgconfig, # from pythonPackages
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  vips,
 }:
 
 buildPythonPackage rec {
   pname = "pyvips";
-  version = "2.2.1";
+  version = "2.2.3";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "pyvips";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    hash = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc=";
+    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/tools/graphics/vips/default.nix

@@ -1,139 +0,0 @@
-{ lib
-, stdenv
-, pkg-config
-, glib
-, libxml2
-, expat
-, ApplicationServices
-, Foundation
-, python3
-, fetchFromGitHub
-, meson
-, ninja
-, gtk-doc
-, docbook-xsl-nons
-, gobject-introspection
-  # 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
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "vips";
-  version = "8.15.3";
-
-  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=";
-    # Remove unicode file names which leads to different checksums on HFS+
-    # vs. other filesystems because of unicode normalisation.
-    postFetch = ''
-      rm -r $out/test/test-suite/images/
-    '';
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    meson
-    ninja
-    docbook-xsl-nons
-    gobject-introspection
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    gtk-doc
-  ];
-
-  buildInputs = [
-    glib
-    libxml2
-    expat
-    (python3.withPackages (p: [ p.pycairo ]))
-    # Optional dependencies
-    libjpeg
-    libexif
-    librsvg
-    poppler
-    libtiff
-    fftw
-    lcms2
-    libspng
-    libimagequant
-    imagemagick
-    pango
-    matio
-    cfitsio
-    libwebp
-    openexr
-    openjpeg
-    libjxl
-    openslide
-    libheif
-    cgif
-    libarchive
-    libhwy
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ];
-
-  # Required by .pc file
-  propagatedBuildInputs = [
-    glib
-  ];
-
-  mesonFlags = [
-    "-Dpdfium=disabled"
-    "-Dnifti=disabled"
-  ]
-  ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-Dgtk_doc=true"
-  ++ lib.optional (imagemagick == null) "-Dmagick=disabled"
-  ;
-
-  passthru = {
-    tests = {
-      pkg-config = testers.hasPkgConfigModules {
-        package = finalAttrs.finalPackage;
-      };
-      version = testers.testVersion {
-        package = finalAttrs.finalPackage;
-        command = "vips --version";
-      };
-    };
-    updateScript = nix-update-script {
-      extraArgs = [ "--version-regex" "v([0-9.]+)" ];
-    };
-  };
-
-  meta = with lib; {
-    changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog";
-    homepage = "https://www.libvips.org/";
-    description = "Image processing system for large images";
-    license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ kovirobi anthonyroussel ];
-    pkgConfigModules = [ "vips" "vips-cpp" ];
-    platforms = platforms.unix;
-    mainProgram = "vips";
-  };
-})

pkgs/top-level/all-packages.nix

@@ -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;
   };