From 1702b6ec8d74a07f21ab33ece3d2a07ca619ea5f Mon Sep 17 00:00:00 2001 From: Stig Brautaset Date: Wed, 5 Jul 2023 12:52:57 +0100 Subject: [PATCH 1/5] perlPackages.FileLoadLines: 1.01 -> 1.021 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4439ec722fd8..3f423a06e865 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9475,10 +9475,10 @@ with self; { FileLoadLines = buildPerlPackage { pname = "File-LoadLines"; - version = "1.01"; + version = "1.021"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/File-LoadLines-1.01.tar.gz"; - hash = "sha256-boxuaqSffLmY+r+5ZqSZK7DGLxzT49chNaMRVoNGWdE="; + url = "mirror://cpan/authors/id/J/JV/JV/File-LoadLines-1.021.tar.gz"; + hash = "sha256-mOQS98aSYRNPNLh4W926sxVrj0UlU9u1tWytaDuG//A="; }; buildInputs = [ TestException ]; meta = { From a7057bdc2722ed7f7c59fea4bf54d1af56a43727 Mon Sep 17 00:00:00 2001 From: Stig Brautaset Date: Wed, 5 Jul 2023 12:53:42 +0100 Subject: [PATCH 2/5] perlPackages.PDFAPI2: 2.042 -> 2.044 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3f423a06e865..c32f83a27148 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19384,10 +19384,10 @@ with self; { PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.042"; + version = "2.044"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.042.tar.gz"; - hash = "sha256-q5kpQVAGAdwxoaL65s3hD3VTGogKKjEAyZ1VYKzVPF0="; + url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.044.tar.gz"; + hash = "sha256-stFVeeQnI9jX+bct6G0NNc3jTx63cTRWuirTX7PL6n4="; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; From e7f255145107c7f20cb29edafa5ece6724ddb3a4 Mon Sep 17 00:00:00 2001 From: Stig Brautaset Date: Wed, 5 Jul 2023 12:54:10 +0100 Subject: [PATCH 3/5] perlPackages.StringInterpolateNamed: 1.00 -> 1.03 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c32f83a27148..60794a736e22 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22273,10 +22273,10 @@ with self; { StringInterpolateNamed = buildPerlPackage { pname = "String-Interpolate-Named"; - version = "1.00"; + version = "1.03"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/String-Interpolate-Named-1.00.tar.gz"; - hash = "sha256-cnKZ+mkli2BHcOBZ7E2pBr/ecYYf3R4+ieMGdzccWoA="; + url = "mirror://cpan/authors/id/J/JV/JV/String-Interpolate-Named-1.03.tar.gz"; + hash = "sha256-on13VgcnX2jtkqQT85SsAJLn3hzZPWJHnUf7pwF6Jtw="; }; meta = { description = "Interpolated named arguments in string"; From 3039c8311da9e4f14429fd222c696fb300251886 Mon Sep 17 00:00:00 2001 From: Stig Brautaset Date: Wed, 5 Jul 2023 12:54:55 +0100 Subject: [PATCH 4/5] perlPackages.TextLayout: 0.019 -> 0.031 Also added missing IOString dependency. --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 60794a736e22..8e6594c67908 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25543,12 +25543,12 @@ with self; { TextLayout = buildPerlPackage { pname = "Text-Layout"; - version = "0.019"; + version = "0.031"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/Text-Layout-0.019.tar.gz"; - hash = "sha256-oEPyqJ4ROynFI6nvpx+oOY7XXt1IIZOQGzjQjdSkEI4="; + url = "mirror://cpan/authors/id/J/JV/JV/Text-Layout-0.031.tar.gz"; + hash = "sha256-EQ4ObbzKIFhKcckNpxBYAdRrXXYd+QmsTfYQbDM3B34="; }; - buildInputs = [ PDFAPI2 ]; + buildInputs = [ IOString PDFAPI2 ]; meta = { description = "Pango style markup formatting"; license = with lib.licenses; [ artistic1 gpl1Plus ]; From bfeb5a3b2979471d047c40b5c2c378ba38f81fe9 Mon Sep 17 00:00:00 2001 From: Stig Brautaset Date: Wed, 5 Jul 2023 12:55:37 +0100 Subject: [PATCH 5/5] perlPackages.AppMusicChordPro: 0.977 -> 6.010 Added missing dependency on perl536packages.FileHomeDir. --- pkgs/top-level/perl-packages.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e6594c67908..91cd59b042a9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -862,15 +862,22 @@ with self; { AppMusicChordPro = buildPerlPackage { pname = "App-Music-ChordPro"; - version = "0.977"; + version = "6.010"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-0.977.tar.gz"; - hash = "sha256-EPOVabK2KSct2zQIUxdb0E3YTHEHLOqzcSW2xga58T0="; + url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-6.010.tar.gz"; + hash = "sha256-SqTkbR2bWIMcU5gSRf2WW6s1ckHtJVPkxj/bBO9X4kM="; }; buildInputs = [ PodParser ]; - propagatedBuildInputs = [ AppPackager FileLoadLines IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] + propagatedBuildInputs = [ AppPackager FileLoadLines FileHomeDir IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] ++ lib.optionals (!stdenv.isDarwin) [ Wx ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + + # Delete tests that fail when version env var is set, see + # https://github.com/ChordPro/chordpro/issues/293 + patchPhase = '' + rm t/320_subst.t t/321_subst.t t/322_subst.t + ''; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/chordpro rm $out/bin/wxchordpro # Wx not supported on darwin