From 0afc44be9a2b6d712f6a4e0f5381403cc8c10ffc Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 11 Apr 2023 22:53:17 +0100 Subject: [PATCH 1/3] ghostscript: 9.56.1 -> 10.01.1 --- pkgs/misc/ghostscript/default.nix | 49 +++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 922941c55e8d..65f19cfc6024 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,8 +1,31 @@ -{ config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf -, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec -, libiconv, ijs, lcms2, callPackage, bash, buildPackages, openjpeg -, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups -, x11Support ? cupsSupport, xorg # with CUPS, X11 only adds very little +{ config +, stdenv +, lib +, fetchurl +, pkg-config +, zlib +, expat +, openssl +, autoconf +, libjpeg +, libpng +, libtiff +, freetype +, fontconfig +, libpaper +, jbig2dec +, libiconv +, ijs +, lcms2 +, callPackage +, bash +, buildPackages +, openjpeg +, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin) +, cups +, x11Support ? cupsSupport +, xorg # with CUPS, X11 only adds very little +, dynamicDrivers ? true }: let @@ -30,11 +53,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString (x11Support) "-with-X"}"; - version = "9.56.1"; + version = "10.01.1"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/ghostscript-${version}.tar.xz"; - sha512 = "22ysgdprh960rxmxyk2fy2my47cdrhfhbrwar1955hvad54iw79l916drp92wh3qzbxw6z40i70wk00vz8bn2ryig7qgpc1q01m2npy"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; + hash = "sha512-2US+norvaNEXbWTEDbb6htVdDJ4wBH8hR8AoBqthz+msLLANTlshj/PFHMbtR87/4brE3Z1MwXYLeXTzDGwnNQ=="; }; patches = [ @@ -77,11 +100,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-system-libtiff" - "--enable-dynamic" "--without-tesseract" - ] - ++ lib.optional x11Support "--with-x" - ++ lib.optionals cupsSupport [ + ] ++ lib.optionals dynamicDrivers [ + "--enable-dynamic" + "--disable-hidden-visibility" + ] ++ lib.optional x11Support [ + "--with-x" + ] ++ lib.optionals cupsSupport [ "--enable-cups" ]; From a0878852ff60e2deacb3c2b6cee8ddaacc94b6d3 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 11 Apr 2023 23:53:49 +0100 Subject: [PATCH 2/3] ghostscript: add some key reverse-dependencies to passthru.tests --- pkgs/misc/ghostscript/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 65f19cfc6024..2588e7e9140a 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -26,6 +26,14 @@ , x11Support ? cupsSupport , xorg # with CUPS, X11 only adds very little , dynamicDrivers ? true + +# for passthru.tests +, graphicsmagick +, imagemagick +, libspectre +, lilypond +, pstoedit +, python3 }: let @@ -158,7 +166,11 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - passthru.tests.test-corpus-render = callPackage ./test-corpus-render.nix {}; + passthru.tests = { + test-corpus-render = callPackage ./test-corpus-render.nix {}; + inherit graphicsmagick imagemagick libspectre lilypond pstoedit; + inherit (python3.pkgs) matplotlib; + }; meta = { homepage = "https://www.ghostscript.com/"; From bcf58d9125926e68af5b3eb3f6e85a75cfbfe206 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 12 Apr 2023 23:05:04 +0100 Subject: [PATCH 3/3] ghostscript.tests.test-corpus-render: unstable-2020-02-19 -> unstable-2022-12-01 --- pkgs/misc/ghostscript/test-corpus-render.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/ghostscript/test-corpus-render.nix b/pkgs/misc/ghostscript/test-corpus-render.nix index 97a2a834232c..26cad916e209 100644 --- a/pkgs/misc/ghostscript/test-corpus-render.nix +++ b/pkgs/misc/ghostscript/test-corpus-render.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation { pname = "ghostscript-test-corpus-render"; - version = "unstable-2020-02-19"; + version = "unstable-2022-12-01"; src = fetchgit { url = "git://git.ghostscript.com/tests.git"; - rev = "efdd224340d9a407ed3ec22afa1cb127c8fee73c"; - sha256 = "1v1iqz897zzrwa8ng22zcf3y61ab5798jdwidgv10w1r9mjrl7ax"; + rev = "e81c3a1d7c679aab8230e9152165d8cffb687242"; + hash = "sha256-h+UHpCHASYOhf4xG6gkVJK9TEG85kE3jNx5cD1I3LQg="; }; dontConfigure = true;