diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/typesetting')
18 files changed, 96 insertions, 217 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix index c518ddeaf39d..391c78814e77 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.4.0"; + version = "2.4.2"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "1bp26x5mhbl25s9djlq6yani1vaqrgbi5mjljhwhj97iapwsd0yb"; + sha256 = "1b4ivyzpg9p3idk48nfvgpz18qlxyycswkaab31j3dp1mniwvjla"; }; nativeBuildInputs = [ makeWrapper ]; @@ -19,13 +19,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = '' - AsciidoctorJ is the official library for running Asciidoctor on the JVM. - ''; + description = "Official library for running Asciidoctor on the JVM"; longDescription = '' - AsciidoctorJ is the official library for running Asciidoctor on the JVM. - Using AsciidoctorJ, you can convert AsciiDoc content or analyze the - structure of a parsed AsciiDoc document from Java and other JVM + AsciidoctorJ is the official library for running Asciidoctor on the JVM. + Using AsciidoctorJ, you can convert AsciiDoc content or analyze the + structure of a parsed AsciiDoc document from Java and other JVM languages. ''; homepage = "https://asciidoctor.org/docs/asciidoctorj/"; @@ -33,4 +31,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; }; -} +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix index 709e94005346..1067386c2f8d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix @@ -42,6 +42,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { + broken = true; # download links got removed description = "Convert documents to .mobi for use with Amazon Kindle"; homepage = "https://www.amazon.com/gp/feature.html?docId=1000765211"; license = licenses.unfree; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch deleted file mode 100644 index 8e1d9dfc1914..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3fdabb0..378621a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,6 +59,12 @@ include_directories(${FONTFORGE_INCLUDE_DIRS}) - link_directories(${FONTFORGE_LIBRARY_DIRS}) - set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES}) - -+# add glib dependency -+pkg_check_modules(GLIB REQUIRED glib-2.0) -+include_directories(${GLIB_INCLUDE_DIRS}) -+link_directories(${GLIB_INCLUDE_DIRS}) -+set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${GLIB_LIBRARIES}) -+ - # debug build flags (overwrite default cmake debug flags) - set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg") - set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pg") diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix deleted file mode 100644 index dee6ec3c6fff..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig -, poppler, xorg, pcre, python, glib, fontforge, cairo, pango, openjdk8 - -}: - -stdenv.mkDerivation { - name = "pdf2htmlEX-0.14.6"; - - src = fetchFromGitHub { - repo = "pdf2htmlEX"; - owner = "coolwanglu"; - rev = "v0.14.6"; - sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78"; - }; - - patches = [ ./add-glib-cmake.patch ]; - - cmakeFlags = [ "-DENABLE_SVG=ON" ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - cmake - pkgconfig - ]; - - buildInputs = [ - xorg.libpthreadstubs - xorg.libXdmcp - pcre - python - glib - cairo - pango - poppler - fontforge - openjdk8 - ]; - - meta = with stdenv.lib; { - description = "Render PDF files to beautiful HTML"; - homepage = "https://github.com/coolwanglu/pdf2htmlEX"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.taktoa ]; - platforms = with platforms; linux; - broken = true; # 2018-09-08 - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix index b30d6269c347..25fc794b0558 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitLab, gradle_5, jre, perl, writeText, runtimeShell }: +{ stdenv, fetchFromGitLab, gradle, jre, perl, writeText, runtimeShell }: let pname = "pdftk"; - version = "3.0.8"; + version = "3.2.1"; src = fetchFromGitLab { owner = "pdftk-java"; repo = "pdftk"; rev = "v${version}"; - sha256 = "1bj4a9g5mbxd859mmawzs0mpm0jw7ap4n1imcwkwz142r9x1g6rk"; + sha256 = "056db8rjczdfkq7fm3bv5g15y042rc9hb4zh5qccjrdw630vk9y4"; }; deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - nativeBuildInputs = [ gradle_5 perl ]; + nativeBuildInputs = [ gradle perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -32,7 +32,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "12b7lw1zpj69pv4bpbrm6pi0ip02ay3dfj3vcy2jyikfbwdb3qcz"; + outputHash = "0p59myc5m3ds7fh0zdz3n7l7hx6dj8bpyqxzlhdrqybsyxwpw4w3"; }; # Point to our local deps repo @@ -65,7 +65,7 @@ let in stdenv.mkDerivation rec { inherit pname version src; - nativeBuildInputs = [ gradle_5 ]; + nativeBuildInputs = [ gradle ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -74,22 +74,23 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,share/pdftk,share/man/man1} - cp build/libs/pdftk.jar $out/share/pdftk + cp build/libs/pdftk-all.jar $out/share/pdftk cat << EOF > $out/bin/pdftk #!${runtimeShell} - exec ${jre}/bin/java -jar "$out/share/pdftk/pdftk.jar" "\$@" + exec ${jre}/bin/java -jar "$out/share/pdftk/pdftk-all.jar" "\$@" EOF chmod a+x "$out/bin/pdftk" cp ${src}/pdftk.1 $out/share/man/man1 ''; - meta = { + meta = with stdenv.lib; { description = "Command-line tool for working with PDFs"; homepage = "https://gitlab.com/pdftk-java/pdftk"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ raskin averelld ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin averelld ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix index b3edd7d54507..5caafa054cf9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [raskin]; platforms = with stdenv.lib.platforms; linux; + broken = true; # Broken on Hydra since 2020-08-24 }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/rubber/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/rubber/default.nix index a9ac2690b66d..f3f036ce50eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/rubber/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/rubber/default.nix @@ -9,18 +9,18 @@ python3Packages.buildPythonApplication rec { sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p"; }; - nativeBuildInputs = [ texinfo ]; - - # I couldn't figure out how to pass the proper parameter to disable pdf generation, so we - # use sed to change the default - preBuild = '' - sed -i -r 's/pdf\s+= True/pdf = False/g' setup.py + # I'm sure there is a better way to pass these parameters to the build script... + postPatch = '' + substituteInPlace setup.py \ + --replace 'pdf = True' 'pdf = False' \ + --replace '$base/man' 'share/man' \ + --replace '$base/info' 'share/info' \ + --replace '$base/share' 'share' ''; - # the check scripts forces python2. If we need to use python3 at some point, we should use - # the correct python + nativeBuildInputs = [ texinfo ]; + checkPhase = '' - sed -i 's|python=python3|python=${python3Packages.python.interpreter}|' tests/run.sh cd tests && ${stdenv.shell} run.sh ''; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix index 5b6cf5e22f21..ddff50ea0e83 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "scdoc"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "17cjh3lcfppyl2mzpanylla93gdgdv5spc8jldshvayzizhfghwa"; + sha256 = "007pm3gspvya58cwb12wpnrm9dq5p28max2s0b2y9rq80nqgqag5"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix index 813a464b7703..0e90e1cf614c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, gettext -, guile, guile-reader, guile-lib -, ploticus, imagemagick -, ghostscript, transfig +{ stdenv +, fetchurl +, pkgconfig +, gettext +, guile +, guile-reader +, guile-lib +, ploticus +, imagemagick +, ghostscript +, transfig , enableEmacs ? false, emacs ? null , enableLout ? true, lout ? null , enableTex ? true, tex ? null -, makeWrapper }: - -with stdenv.lib; -stdenv.mkDerivation rec { +, makeWrapper +}: +let pname = "skribilo"; - version = "0.9.4"; + version = "0.9.5"; + inherit (stdenv.lib) optional; +in stdenv.mkDerivation { + inherit pname version; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz"; - sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf"; + sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk="; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -33,7 +42,7 @@ stdenv.mkDerivation rec { --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" ''; - meta = { + meta = with stdenv.lib;{ description = "The Ultimate Document Programming Framework"; longDescription = '' Skribilo is a free document production tool that takes a diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index db976e90225a..965624a50987 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -3,22 +3,27 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.1.17"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - sha256 = "VHhvdIBFPE5CkWVQ4tzMionUnAkZTucVXl5zp5prgok="; + sha256 = "yJzfymA4elyyeVR8FzTJe8wgs+vm3RWwcOh7IlmBYPE="; }; - cargoSha256 = "/f/suiI5XzI0+lCscsqLZTWU6slHdXgR+5epYpxyU1w="; + cargoSha256 = "7zqr54H6GemiM/xuHOH6+s669IG2orj1neoqAH+wnV4="; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontconfig harfbuzz openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); + postInstall = stdenv.lib.optionalString stdenv.isLinux '' + install -D dist/appimage/tectonic.desktop -t $out/share/applications/ + install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ + ''; + doCheck = true; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix index 25e9dce242f3..6d7ef3348613 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ]; meta = with stdenv.lib; { - description = "Ted, an easy rich text processor"; + description = "An easy rich text processor"; longDescription = '' Ted is a text processor running under X Windows on Unix/Linux systems. Ted was developed as a standard easy light weight word processor, having diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix index ccb5dcc51907..38a333132492 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, emacs, texlive, ghostscript }: let auctex = stdenv.mkDerivation ( rec { - version = "12.2"; + version = "12.3"; # Make this a valid tex(live-new) package; # the pkgs attribute is provided with a hack below. @@ -13,7 +13,7 @@ let auctex = stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "14vqs08mkfzc91jg7kabs9sdn74vywj8a29gyrfa3ivnm9c7jrsr"; + sha256 = "1pd99hbhci3l1n0lmzn803svqwl47kld6172gwkwjmwlnqqgxm1g"; }; buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh index 7a5767f9c063..3f8a16580ea5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh @@ -41,7 +41,11 @@ showError() { exit 1 } +pass=0 + runLaTeX() { + ((pass=pass+1)) + echo "PASS $pass..." if ! $latex $latexFlags $rootName >$tmpFile 2>&1; then showError; fi runNeeded= if fgrep -q \ @@ -51,6 +55,7 @@ runLaTeX() { "$tmpFile"; then runNeeded=1 fi + echo } echo @@ -61,10 +66,7 @@ if test -n "$copySources"; then fi -echo "PASS 1..." runLaTeX -echo - for auxFile in $(find . -name "*.aux"); do # Run bibtex to process all bibliographies. There may be several @@ -89,11 +91,8 @@ for auxFile in $(find . -name "*.aux"); do fi done - if test "$runNeeded"; then - echo "PASS 2..." runLaTeX - echo fi @@ -105,20 +104,18 @@ if test -f $rootNameBase.idx; then makeindex $makeindexFlags $rootNameBase.idx runNeeded=1 echo -fi - +fi -if test "$runNeeded"; then - echo "PASS 3..." +# We check that pass is less than 2 to catch situations where the document is +# simple enough (no bibtex, etc.) so that it would otherwise require only one +# pass but also contains a ToC. +# In essence this check ensures that we do at least two passes on all documents. +if test "$runNeeded" = 1 -o "$pass" -lt 2 ; then runLaTeX - echo fi - if test "$runNeeded"; then - echo "PASS 4..." runLaTeX - echo fi diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index c0d797dbeaa8..030ac1b43aae 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -2,9 +2,9 @@ , texlive , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext -, perl, perlPackages, python2Packages, pkgconfig, autoreconfHook +, perl, perlPackages, python2Packages, pkgconfig , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr -, cairo, pixman, xorg, clisp, biber, xxHash +, brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang }: @@ -34,10 +34,6 @@ let cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc ''; - # remove when removing synctex-missing-header.patch - preAutoreconf = "pushd texk/web2c"; - postAutoreconf = "popd"; - configureFlags = [ "--with-banner-add=/NixOS.org" "--disable-missing" "--disable-native-texlive-build" @@ -71,11 +67,11 @@ core = stdenv.mkDerivation rec { pname = "texlive-bin"; inherit version; - inherit (common) src prePatch preAutoreconf postAutoreconf; + inherit (common) src prePatch; outputs = [ "out" "doc" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ /*teckit*/ zziplib poppler mpfr gmp pixman gd freetype libpng libpaper zlib @@ -161,7 +157,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex pname = "texlive-core-big.bin"; inherit version; - inherit (common) src prePatch preAutoreconf postAutoreconf; + inherit (common) src prePatch; hardeningDisable = [ "format" ]; @@ -249,20 +245,20 @@ chktex = stdenv.mkDerivation { }; -dvisvgm = stdenv.mkDerivation { +dvisvgm = stdenv.mkDerivation rec { pname = "texlive-dvisvgm.bin"; - inherit version; - - inherit (common) src; + version = "2.11"; + # TODO: dvisvgm was switched to build from upstream sources + # to address https://github.com/NixOS/nixpkgs/issues/104847 + # We might want to consider reverting that change in the future. + + src = fetchurl { + url = "https://github.com/mgieseki/dvisvgm/releases/download/${version}/dvisvgm-${version}.tar.gz"; + sha256 = "12b6h0h8rc487yjh3sq9zsdabm9cs2vqcrb0znnfi8277f87zf3j"; + }; nativeBuildInputs = [ pkgconfig ]; - # TODO: dvisvgm still uses vendored dependencies - buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype /*potrace xxHash*/ ]; - - preConfigure = "cd texk/dvisvgm"; - - configureFlags = common.configureFlags - ++ [ "--with-system-kpathsea" ]; + buildInputs = [ core/*kpathsea*/ brotli ghostscript zlib freetype woff2 potrace xxHash ]; enableParallelBuilding = true; }; @@ -429,7 +425,7 @@ xdvi = stdenv.mkDerivation { } # un-indented -// stdenv.lib.optionalAttrs (!stdenv.isDarwin) # see #20062 +// stdenv.lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062) { xindy = stdenv.mkDerivation { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index fb3e6668a47c..891495c46cac 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -31,13 +31,7 @@ let ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby; }; - # TODO: replace by buitin once it exists - fastUnique = comparator: list: with lib; - let un_adj = l: if length l < 2 then l - else optional (head l != elemAt l 1) (head l) ++ un_adj (tail l); - in un_adj (lib.sort comparator list); - - uniqueStrings = fastUnique (a: b: a < b); + uniqueStrings = list: lib.sort (a: b: a < b) (lib.unique list); mkUniqueOutPaths = pkgs: uniqueStrings (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs)); diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch deleted file mode 100644 index 0e927e24fd0e..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/dvisvgm-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp ---- a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp -+++ b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp -@@ -107,8 +107,7 @@ const char *PSInterpreter::PSDEFS = - "dmode sysexec<</Normal 0/Compatible 0/Multiply 1/Screen 2/Overlay 3/SoftLight " - "4/HardLight 5/ColorDodge 6/ColorBurn 7/Darken 8/Lighten 9/Difference 10/Exclus" - "ion 11/Hue 12/Saturation 13/Color 14/Luminosity 15/CompatibleOverprint 16>>exc" --"h get 1(setblendmode)prcmd}def/@pdfpagecount{GS_PDF_ProcSet begin pdfdict begi" --"n(r)file pdfopen begin pdfpagecount currentdict pdfclose end end end}def/@pdfp" --"agebox{GS_PDF_ProcSet begin pdfdict begin(r)file pdfopen begin dup dup 1 lt ex" --"ch pdfpagecount gt or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse curre" --"ntdict pdfclose end end end}def DELAYBIND{.bindnow}if "; -+"h get 1(setblendmode)prcmd}def/@pdfpagecount{(r)file runpdfbegin pdfpagecount " -+"runpdfend}def/@pdfpagebox{(r)file runpdfbegin dup dup 1 lt exch pdfpagecount g" -+"t or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse runpdfend}def DELAYBIN" -+"D{.bindnow}if "; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/poppler84.patch b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/poppler84.patch deleted file mode 100644 index 02dc9e2413d3..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/poppler84.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001 -From: Mikle Kolyada <zlogene@gentoo.org> -Date: Tue, 31 Dec 2019 11:29:30 +0300 -Subject: [PATCH] poppler-0.84 compat - -Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html - -Signed-off-by: Mikle Kolyada <zlogene@gentoo.org> ---- - texk/web2c/pdftexdir/utils.c | 1 - - texk/web2c/xetexdir/XeTeX_ext.c | 3 +++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c -index c93a8781..6f866e76 100644 ---- a/texk/web2c/pdftexdir/utils.c -+++ b/texk/web2c/pdftexdir/utils.c -@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. - #include "ptexlib.h" - #include <png.h> - #ifdef POPPLER_VERSION --#include <poppler-config.h> - #define xpdfVersion POPPLER_VERSION - #define xpdfString "poppler" - #else -diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c -index 4968ee41..0aee4ee3 100644 ---- a/texk/web2c/xetexdir/XeTeX_ext.c -+++ b/texk/web2c/xetexdir/XeTeX_ext.c -@@ -38,7 +38,10 @@ authorization from the copyright holders. - - #include <w2c/config.h> - -+#ifndef POPPLER_VERSION - #include <poppler-config.h> -+#endif -+ - #include <png.h> - #include <zlib.h> - #include <graphite2/Font.h> --- -2.24.1 - diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix index f37bfb7c133b..31b260d846c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix @@ -3,9 +3,10 @@ , bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.28"; + pname = "xmlto"; + version = "0.0.28"; src = fetchurl { - url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0xhj8b2pwp4vhl9y16v3dpxpsakkflfamr191mprzsspg4xdyc0i"; }; |