From b8c0748a3d835dd2756bca014603532dbfbe7e8e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 23 Oct 2024 22:58:55 -0400 Subject: [PATCH 1/2] openslide: apply nixfmt --- .../libraries/openslide/default.nix | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/openslide/default.nix b/pkgs/development/libraries/openslide/default.nix index cc0b5ed98c61..73345e6c51ae 100644 --- a/pkgs/development/libraries/openslide/default.nix +++ b/pkgs/development/libraries/openslide/default.nix @@ -1,6 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook -, pkg-config, cairo, glib, gdk-pixbuf, libjpeg -, libpng, libtiff, libxml2, openjpeg, sqlite, zlib +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + cairo, + glib, + gdk-pixbuf, + libjpeg, + libpng, + libtiff, + libxml2, + openjpeg, + sqlite, + zlib, }: stdenv.mkDerivation rec { @@ -14,9 +27,23 @@ stdenv.mkDerivation rec { sha256 = "1g4hhjr4cbx754cwi9wl84k33bkg232w8ajic7aqhzm8x182hszp"; }; - buildInputs = [ cairo glib gdk-pixbuf libjpeg libpng libtiff libxml2 openjpeg sqlite zlib ]; + buildInputs = [ + cairo + glib + gdk-pixbuf + libjpeg + libpng + libtiff + libxml2 + openjpeg + sqlite + zlib + ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; meta = with lib; { homepage = "https://openslide.org"; From 246ad67e665487a17e654751aedb74165cb1a951 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 23 Oct 2024 23:17:09 -0400 Subject: [PATCH 2/2] openslide: 3.4.1 -> 4.0.0 --- .../libraries/openslide/default.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/openslide/default.nix b/pkgs/development/libraries/openslide/default.nix index 73345e6c51ae..799896f50f8f 100644 --- a/pkgs/development/libraries/openslide/default.nix +++ b/pkgs/development/libraries/openslide/default.nix @@ -2,11 +2,14 @@ lib, stdenv, fetchFromGitHub, - autoreconfHook, + meson, + ninja, pkg-config, cairo, + doxygen, glib, gdk-pixbuf, + libdicom, libjpeg, libpng, libtiff, @@ -14,23 +17,32 @@ openjpeg, sqlite, zlib, + zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openslide"; - version = "3.4.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "openslide"; repo = "openslide"; - rev = "v${version}"; - sha256 = "1g4hhjr4cbx754cwi9wl84k33bkg232w8ajic7aqhzm8x182hszp"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-9LvQ7FG/0E0WpFyIUyrL4Fvn60iYWejjbgdKHMVOFdI="; }; + nativeBuildInputs = [ + meson + ninja + pkg-config + doxygen + ]; + buildInputs = [ cairo glib gdk-pixbuf + libdicom libjpeg libpng libtiff @@ -38,18 +50,16 @@ stdenv.mkDerivation rec { openjpeg sqlite zlib - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config + zstd ]; meta = with lib; { homepage = "https://openslide.org"; description = "C library that provides a simple interface to read whole-slide images"; license = licenses.lgpl21; + changelog = "https://github.com/openslide/openslide/releases/tag/v${finalAttrs.version}"; platforms = platforms.unix; maintainers = with maintainers; [ lromor ]; + mainProgram = "slidetool"; }; -} +})