From 315aeb02623bceedcf5ec2f04693375bf3872f1b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 9 Nov 2023 21:23:03 +0100 Subject: [PATCH 1/9] vips: add meta.pkgConfigModules --- pkgs/tools/graphics/vips/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 218014db019e..5a6b40dc731f 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -115,6 +115,7 @@ stdenv.mkDerivation rec { description = "Image processing system for large images"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ kovirobi ]; + pkgConfigModules = [ "vips" ]; platforms = platforms.unix; mainProgram = "vips"; }; From 0f160365c0da6f7ff4765d33077a09ce2dd368cc Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 9 Nov 2023 21:23:34 +0100 Subject: [PATCH 2/9] vips: add passthru.tests.pkg-config --- pkgs/tools/graphics/vips/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 5a6b40dc731f..b9c95da9ca80 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -36,9 +36,10 @@ , openslide , libheif , cgif +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vips"; version = "8.14.5"; @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-fG3DTP+3pO7sbqR/H9egJHU3cLKPU4Jad6qxcQ9evNw="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. @@ -109,14 +110,18 @@ stdenv.mkDerivation rec { ++ lib.optional (imagemagick == null) "-Dmagick=disabled" ; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { - changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog"; homepage = "https://libvips.github.io/libvips/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ kovirobi ]; - pkgConfigModules = [ "vips" ]; + pkgConfigModules = [ "vips" "vips-cpp" ]; platforms = platforms.unix; mainProgram = "vips"; }; -} +}) From 249bd4e707f4e09b5598fe4904e6e494e9531d77 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 9 Nov 2023 21:24:00 +0100 Subject: [PATCH 3/9] vips: fix meta.homepage --- pkgs/tools/graphics/vips/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index b9c95da9ca80..fd28110a3dba 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog"; - homepage = "https://libvips.github.io/libvips/"; + homepage = "https://www.libvips.org/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ kovirobi ]; From 2f953d3cd4357c6783f6045fecbddc93fca7869d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 9 Nov 2023 21:24:10 +0100 Subject: [PATCH 4/9] vips: add anthonyroussel to maintainers --- pkgs/tools/graphics/vips/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index fd28110a3dba..dd0bb3b3f86a 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.libvips.org/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ kovirobi ]; + maintainers = with maintainers; [ kovirobi anthonyroussel ]; pkgConfigModules = [ "vips" "vips-cpp" ]; platforms = platforms.unix; mainProgram = "vips"; From 2f11f0201c11dc96d1d9f4ed3f602ea6633a552d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 9 Nov 2023 21:24:24 +0100 Subject: [PATCH 5/9] python311Packages.pyvips: add disabled --- pkgs/development/python-modules/pyvips/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 71fe7601ce9c..477463e2c08d 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonOlder , fetchFromGitHub , pytestCheckHook , glib @@ -13,6 +14,8 @@ buildPythonPackage rec { pname = "pyvips"; version = "2.2.1"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; From 390190b64e3cb3bde0143ef46bcb6e97cfcd4cc8 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 9 Nov 2023 21:27:34 +0100 Subject: [PATCH 6/9] python311Packages.pyvips: add meta.changelog --- pkgs/development/python-modules/pyvips/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 477463e2c08d..07af9047fe18 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper for libvips"; homepage = "https://github.com/libvips/pyvips"; + changelog = "https://github.com/libvips/pyvips/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ccellado anthonyroussel ]; }; From 40d48a14d2b0424fd5b2b651570d8c548ef07f33 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 11 Nov 2023 14:54:17 +0100 Subject: [PATCH 7/9] vips: add passthru.updateScript --- pkgs/tools/graphics/vips/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index dd0bb3b3f86a..96095bdc5ad5 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -37,6 +37,7 @@ , libheif , cgif , testers +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { @@ -110,8 +111,13 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (imagemagick == null) "-Dmagick=disabled" ; - passthru.tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "v([0-9.]+)" ]; + }; }; meta = with lib; { From 6394c80e2424c7b8d20622f87f3717efa528e899 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 11 Nov 2023 15:03:13 +0100 Subject: [PATCH 8/9] vips: add passthru.tests.version --- pkgs/tools/graphics/vips/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 96095bdc5ad5..9114982742e0 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -112,8 +112,14 @@ stdenv.mkDerivation (finalAttrs: { ; passthru = { - tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; + 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.]+)" ]; From f239544689a46fe9ba7ad6fd9a69b29e691a5662 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 11 Nov 2023 14:55:53 +0100 Subject: [PATCH 9/9] vips: 8.14.5 -> 8.15.0 https://github.com/libvips/libvips/releases/tag/v8.15.0 https://github.com/libvips/libvips/compare/v8.14.5...v8.15.0 --- pkgs/tools/graphics/vips/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 9114982742e0..c16ba635f504 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -18,7 +18,6 @@ , libexif , librsvg , poppler -, libgsf , libtiff , fftw , lcms2 @@ -26,7 +25,6 @@ , libimagequant , imagemagick , pango -, orc , matio , cfitsio , libwebp @@ -36,13 +34,15 @@ , openslide , libheif , cgif +, libarchive +, libhwy , testers , nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.14.5"; + version = "8.15.0"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-fG3DTP+3pO7sbqR/H9egJHU3cLKPU4Jad6qxcQ9evNw="; + hash = "sha256-WfKq+maLcAXyjk1sq66wSU92ALv4MfRDPKe4Mki0KRQ="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { libexif librsvg poppler - libgsf libtiff fftw lcms2 @@ -86,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: { libimagequant imagemagick pango - orc matio cfitsio libwebp @@ -96,6 +94,8 @@ stdenv.mkDerivation (finalAttrs: { openslide libheif cgif + libarchive + libhwy ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ]; # Required by .pc file