about summary refs log tree commit diff
path: root/pkgs/development/perl-modules
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/perl-modules')
-rw-r--r--pkgs/development/perl-modules/Bio-BigFile/default.nix2
-rw-r--r--pkgs/development/perl-modules/ImageExifTool/default.nix28
-rw-r--r--pkgs/development/perl-modules/Po4a/default.nix85
-rw-r--r--pkgs/development/perl-modules/Tirex/default.nix11
-rw-r--r--pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix2
-rw-r--r--pkgs/development/perl-modules/ham/default.nix2
-rw-r--r--pkgs/development/perl-modules/strip-nondeterminism/default.nix2
7 files changed, 92 insertions, 40 deletions
diff --git a/pkgs/development/perl-modules/Bio-BigFile/default.nix b/pkgs/development/perl-modules/Bio-BigFile/default.nix
index 516b6d014c5a4..3c360c2396a8d 100644
--- a/pkgs/development/perl-modules/Bio-BigFile/default.nix
+++ b/pkgs/development/perl-modules/Bio-BigFile/default.nix
@@ -3,14 +3,12 @@
  IOString,
  buildPerlModule,
  fetchFromGitHub,
- fetchpatch,
  fetchurl,
  kent,
  lib,
  libmysqlclient,
  libpng,
  openssl,
- perl
 }:
 
 buildPerlModule rec {
diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix
index 5ca983f32c050..08d207e3bbac1 100644
--- a/pkgs/development/perl-modules/ImageExifTool/default.nix
+++ b/pkgs/development/perl-modules/ImageExifTool/default.nix
@@ -1,23 +1,25 @@
-{ lib
-, stdenv
-, buildPerlPackage
-, exiftool
-, fetchurl
-, gitUpdater
-, shortenPerlShebang
-, testers
+{
+  buildPerlPackage,
+  exiftool,
+  fetchurl,
+  gitUpdater,
+  lib,
+  shortenPerlShebang,
+  stdenv,
+  testers,
 }:
 
 buildPerlPackage rec {
   pname = "Image-ExifTool";
-  version = "12.82";
+  version = "12.84";
 
   src = fetchurl {
     url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
-    hash = "sha256-1MfWz0AR+SaM2Ar7gAfLs38OJhOnP4cRekpe1uSjDD4=";
+    hash = "sha256-sfSnx5bS7vI0KIhBOpB5VYzP6g8oi0rR7mUTxxNWEA0=";
   };
 
   nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
+
   postInstall = lib.optionalString stdenv.isDarwin ''
     shortenPerlShebang $out/bin/exiftool
   '';
@@ -28,13 +30,11 @@ buildPerlPackage rec {
       command = "${lib.getExe exiftool} -ver";
       package = exiftool;
     };
-    updateScript = gitUpdater {
-      url = "https://github.com/exiftool/exiftool.git";
-    };
+    updateScript = gitUpdater { url = "https://github.com/exiftool/exiftool.git"; };
   };
 
   meta = {
-    description = "A tool to read, write and edit EXIF meta information";
+    description = "Tool to read, write and edit EXIF meta information";
     longDescription = ''
       ExifTool is a platform-independent Perl library plus a command-line
       application for reading, writing and editing meta information in a wide
diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix
index 38569204f5a80..042d9a3a7d7f6 100644
--- a/pkgs/development/perl-modules/Po4a/default.nix
+++ b/pkgs/development/perl-modules/Po4a/default.nix
@@ -1,44 +1,87 @@
-{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, opensp, bash
-, perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny
-, fetchpatch, writeShellScriptBin
+{ stdenv
+, lib
+, fetchurl
+, docbook_xsl
+, docbook_xsl_ns
+, gettext
+, libxslt
+, glibcLocales
+, docbook_xml_dtd_45
+, docbook_sgml_dtd_41
+, opensp
+, bash
+, perl
+, buildPerlPackage
+, ModuleBuild
+, TextWrapI18N
+, LocaleGettext
+, SGMLSpm
+, UnicodeLineBreak
+, PodParser
+, YAMLTiny
+, SyntaxKeywordTry
+, writeShellScriptBin
 }:
 
 buildPerlPackage rec {
   pname = "po4a";
-  version = "0.62";
+  version = "0.71";
+
   src = fetchurl {
     url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz";
-    sha256 = "0eb510a66f59de68cf7a205342036cc9fc08b39334b91f1456421a5f3359e68b";
+    hash = "sha256-xXJAHknMEXV8bTBgkW/ftagzJR7R1K65ibZnBLzyg/k=";
   };
-  patches = [
-    (fetchpatch {
-      # make devdoc output reproducible
-      # https://github.com/mquinson/po4a/pull/387
-      url = "https://github.com/mquinson/po4a/commit/df7433b58f6570558d44b6aac885c2a8f7862e51.patch";
-      sha256 = "9MVkYiItR2P3PBCUc4OhEOUHQuLqTWUYtYlZ3L8miC8=";
-    })
-  ];
 
   strictDeps = true;
+
   nativeBuildInputs =
     # the tests for the tex-format use kpsewhich -- texlive's file finding utility.
     # We don't want to depend on texlive here, so we replace it with a minimal
     # shellscript that suffices for the tests in t/fmt/tex/, i.e. it looks up
     # article.cls to an existing file, but doesn't find article-wrong.cls.
-    let kpsewhich-stub = writeShellScriptBin "kpsewhich"
-      ''[[ $1 = "article.cls" ]] && echo /dev/null'';
+    let
+      kpsewhich-stub = writeShellScriptBin "kpsewhich"
+        ''[[ $1 = "article.cls" ]] && echo /dev/null'';
     in
-    [ gettext libxslt docbook_xsl docbook_xsl_ns ModuleBuild docbook_xml_dtd_412 docbook_sgml_dtd_41 opensp kpsewhich-stub glibcLocales ];
-  propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isMusl) TextWrapI18N ++ [ LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ];
+    [
+      gettext
+      libxslt
+      docbook_xsl
+      docbook_xsl_ns
+      ModuleBuild
+      docbook_xml_dtd_45
+      docbook_sgml_dtd_41
+      opensp
+      kpsewhich-stub
+      glibcLocales
+    ];
+
   # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build
+  propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [
+    TextWrapI18N
+  ] ++ [
+    LocaleGettext
+    SGMLSpm
+    UnicodeLineBreak
+    PodParser
+    YAMLTiny
+    SyntaxKeywordTry
+  ];
+
   buildInputs = [ bash ];
+
   LC_ALL = "en_US.UTF-8";
-  SGML_CATALOG_FILES = "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml";
+  SGML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
+
   preConfigure = ''
     touch Makefile.PL
     export PERL_MB_OPT="--install_base=$out --prefix=$out"
   '';
-  buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build";
+
+  buildPhase = ''
+    perl Build.PL --install_base=$out --install_path="lib=$out/${perl.libPrefix}"
+    ./Build build
+  '';
 
   # Disabling tests on musl
   # Void linux package have investigated the failure and tracked it down to differences in gettext behavior. They decided to disable tests.
@@ -53,15 +96,17 @@ buildPerlPackage rec {
     export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat
     ./Build test
   '';
+
   installPhase = ''
     ./Build install
     for f in $out/bin/*; do
       substituteInPlace $f --replace "#! /usr/bin/env perl" "#!${perl}/bin/perl"
     done
   '';
+
   meta = {
     description = "Tools for helping translation of documentation";
     homepage = "https://po4a.org";
-    license = with lib.licenses; [ gpl2Only ];
+    license = with lib.licenses; [ gpl2Plus ];
   };
 }
diff --git a/pkgs/development/perl-modules/Tirex/default.nix b/pkgs/development/perl-modules/Tirex/default.nix
index 655610e898f27..48e63bb5932c4 100644
--- a/pkgs/development/perl-modules/Tirex/default.nix
+++ b/pkgs/development/perl-modules/Tirex/default.nix
@@ -7,6 +7,7 @@
 , JSON
 , LWP
 , mapnik
+, boost
 , nix-update-script
 }:
 
@@ -22,11 +23,18 @@ buildPerlPackage rec {
   };
 
   patches = [
+    # Support Mapnik >= v4.0.0 (`mapnik/box2d.hpp` -> `mapnik/geometry/box2d.hpp`)
     # https://github.com/openstreetmap/tirex/pull/54
     (fetchpatch {
-      url = "https://github.com/openstreetmap/tirex/commit/da0c5db926bc0939c53dd902a969b689ccf9edde.patch";
+      url = "https://github.com/openstreetmap/tirex/commit/5f131231c9c12e88793afba471b150ca8af8d587.patch";
       hash = "sha256-bnL1ZGy8ZNSZuCRbZn59qRVLg3TL0GjFYnhRKroeVO0=";
     })
+    # Support Mapnik >= v4.0.0 (boost:filesystem no longer indirectly linked)
+    # https://github.com/openstreetmap/tirex/pull/59
+    (fetchpatch {
+      url = "https://github.com/openstreetmap/tirex/commit/137903be9b7b35dde4c7010e65faa16bcf6ad476.patch";
+      hash = "sha256-JDqwWVnzExPwLpzv4LbSmGYah956uko+Zdicahua9oQ=";
+    })
   ];
 
   buildInputs = [
@@ -35,6 +43,7 @@ buildPerlPackage rec {
     JSON
     LWP
     mapnik
+    boost
   ] ++ mapnik.buildInputs;
 
   installPhase = ''
diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
index 6ab6233fc7006..4916c9619c617 100644
--- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
+++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
@@ -23,7 +23,7 @@ buildPerlPackage rec {
   '';
 
   meta = with lib; {
-    description = "A lightweight application for searching and streaming videos from YouTube";
+    description = "Lightweight application for searching and streaming videos from YouTube";
     homepage = "https://github.com/trizen/youtube-viewer";
     license = with licenses; [ artistic2 ];
     maintainers = with maintainers; [ woffs ];
diff --git a/pkgs/development/perl-modules/ham/default.nix b/pkgs/development/perl-modules/ham/default.nix
index 8d1fce1ab8979..b25adff4c800d 100644
--- a/pkgs/development/perl-modules/ham/default.nix
+++ b/pkgs/development/perl-modules/ham/default.nix
@@ -39,7 +39,7 @@ buildPerlPackage {
   '';
 
   meta = with lib; {
-    description = "A tool to manage big projects consisting of multiple loosely-coupled git repositories";
+    description = "Tool to manage big projects consisting of multiple loosely-coupled git repositories";
     homepage = "https://github.com/kernkonzept/ham";
     license = licenses.bsd2;
     maintainers = with maintainers; [ aw ];
diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix
index 31b3fad47b456..e50d61b878980 100644
--- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix
+++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix
@@ -60,7 +60,7 @@ buildPerlPackage rec {
   doInstallCheck = true;
 
   meta = with lib; {
-    description = "A Perl module for stripping bits of non-deterministic information";
+    description = "Perl module for stripping bits of non-deterministic information";
     mainProgram = "strip-nondeterminism";
     homepage = "https://reproducible-builds.org/";
     license = licenses.gpl3Only;