diff --git a/pkgs/by-name/fo/fortune/package.nix b/pkgs/by-name/fo/fortune/package.nix index faf4fb964527..b98527cc59bc 100644 --- a/pkgs/by-name/fo/fortune/package.nix +++ b/pkgs/by-name/fo/fortune/package.nix @@ -7,24 +7,31 @@ perl, rinutils, fortune, + libxslt, + docbook-xsl-nons, withOffensive ? false, }: stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.24.0"; + version = "3.26.0"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/fortune-mod-${version}/fortune-mod-${version}.tar.xz"; - sha256 = "sha256-Hzh4dyVOleq2H5NyV7QmCfKbmU7wVxUxZVu/w6KsdKw="; + sha256 = "sha256-rE0UhsrJuZkEkQcTa5QQb+mKSurADsY1sUTEN2S//kw="; }; nativeBuildInputs = [ cmake - perl + (perl.withPackages (p: [ + p.PathTiny + p.AppXMLDocBookBuilder + ])) rinutils + libxslt + docbook-xsl-nons ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ # "strfile" must be in PATH for cross-compiling builds. diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c8b4a2eee9b7..4886e9aa6060 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1393,6 +1393,28 @@ with self; }; }; + AppXMLDocBookBuilder = buildPerlPackage { + pname = "docmake"; + version = "0.1101"; + + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/App-XML-DocBook-Builder-0.1101.tar.gz"; + hash = "sha256-oa8C24OsbeaNdLIssSz/KH3MNFr0WuQJ67govyhxmqQ="; + }; + + buildInputs = [ + ClassXSAccessor + TestTrap + FileShouldUpdate + ]; + + meta = { + description = "automated builder from DocBook/XML to its output formats (e.g XHTML5 or PDF)"; + homepage = "https://github.com/shlomif/docmake"; + license = lib.licenses.mit; + }; + }; + ArchiveAnyLite = buildPerlPackage { pname = "Archive-Any-Lite"; version = "0.11"; @@ -13918,6 +13940,26 @@ with self; }; }; + FileShouldUpdate = buildPerlModule { + pname = "File-ShouldUpdate"; + version = "0.2.1"; + + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-ShouldUpdate-0.2.1.tar.gz"; + hash = "sha256-r1k1mNBvHCG63TrnQb8LRQbOJl7ImVDGCj8+cQbes+I="; + }; + + buildInputs = [ + PathTiny + ]; + + meta = { + description = "an be used to determine if files should be updated based on the mtime timestamps of their dependencies"; + homepage = "https://github.com/shlomif/perl-File-ShouldUpdate"; + license = lib.licenses.mit; + }; + }; + FilesysDf = buildPerlPackage { pname = "Filesys-Df"; version = "0.92";