diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-10-14 09:24:21 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-10-14 09:24:21 +0200 |
commit | 027efec8798547c0e8cff7861680f9b95732c12d (patch) | |
tree | d7925d2d5946f88fad4800d3c13295cfccad026d /pkgs/tools | |
parent | e0210d7cbff0f2c0a1308bc3cb762e552234d0e1 (diff) | |
parent | 3eec7ea3f0306ee4246ea85d4170dd64d89eb6ba (diff) | |
download | nixpkgs-027efec8798547c0e8cff7861680f9b95732c12d.tar nixpkgs-027efec8798547c0e8cff7861680f9b95732c12d.tar.gz nixpkgs-027efec8798547c0e8cff7861680f9b95732c12d.tar.bz2 nixpkgs-027efec8798547c0e8cff7861680f9b95732c12d.tar.lz nixpkgs-027efec8798547c0e8cff7861680f9b95732c12d.tar.xz nixpkgs-027efec8798547c0e8cff7861680f9b95732c12d.tar.zst nixpkgs-027efec8798547c0e8cff7861680f9b95732c12d.zip |
Merge staging without python splitting for now
The split needs more time to finish rebuilding, but the rest seems OK and there are security fixes.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/man-db/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/animatedot.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/dot2pdf.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/dot2ps.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/lhs2tex.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/run-latex.sh | 4 |
7 files changed, 15 insertions, 16 deletions
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index b049e0706e9..9c1dabc7584 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }: +{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff, makeWrapper }: stdenv.mkDerivation rec { name = "man-db-2.7.5"; @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ libpipeline db groff ]; - troff="${groff}/bin/groff"; postPatch = '' substituteInPlace src/man_db.conf.in \ @@ -27,14 +26,14 @@ stdenv.mkDerivation rec { # Don't try /etc/man_db.conf by default, so we avoid error messages. "--with-config-file=\${out}/etc/man_db.conf" "--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d" - "--with-eqn=${groff}/bin/eqn" - "--with-neqn=${groff}/bin/neqn" - "--with-nroff=${groff}/bin/nroff" - "--with-pic=${groff}/bin/pic" - "--with-refer=${groff}/bin/refer" - "--with-tbl=${groff}/bin/tbl" ]; + postInstall = '' + for i in "$out/bin/"*; do + wrapProgram "$i" --prefix PATH : "${groff}/bin" + done + ''; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/tools/typesetting/tex/nix/animatedot.sh b/pkgs/tools/typesetting/tex/nix/animatedot.sh index 46a2c515e03..f038b83ff7a 100644 --- a/pkgs/tools/typesetting/tex/nix/animatedot.sh +++ b/pkgs/tools/typesetting/tex/nix/animatedot.sh @@ -4,6 +4,6 @@ mkdir -p $out for ((i = 1; i <= $nrFrames; i++)); do echo "producing frame $i..."; - targetName=$out/$(basename $(stripHash $dotGraph; echo $strippedName) .dot)-f-$i.dot + targetName=$out/$(basename $(stripHash $dotGraph) .dot)-f-$i.dot cpp -DFRAME=$i < $dotGraph > $targetName done diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index ce5c025475a..0566e511870 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -185,7 +185,7 @@ rec { if test -d $postscript; then input=$(ls $postscript/*.ps) else - input=$(stripHash $postscript; echo $strippedName) + input=$(stripHash $postscript) ln -s $postscript $input fi diff --git a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh index c416bf235a1..71cf601dfac 100644 --- a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh @@ -4,7 +4,7 @@ mkdir -p $out dot2pdf() { sourceFile=$1 - targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .dot).pdf + targetName=$out/$(basename $(stripHash $sourceFile) .dot).pdf echo "converting $sourceFile to $targetName..." export FONTCONFIG_FILE=$fontsConf dot -Tpdf $sourceFile > $targetName diff --git a/pkgs/tools/typesetting/tex/nix/dot2ps.sh b/pkgs/tools/typesetting/tex/nix/dot2ps.sh index c70e76ce4c7..dd8de4a23db 100644 --- a/pkgs/tools/typesetting/tex/nix/dot2ps.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2ps.sh @@ -4,7 +4,7 @@ mkdir -p $out dot2ps() { sourceFile=$1 - targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .dot).ps + targetName=$out/$(basename $(stripHash $sourceFile) .dot).ps echo "converting $sourceFile to $targetName..." dot -Tps $sourceFile > $targetName } diff --git a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh index f34b3944c8e..bfef3df6b0e 100644 --- a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh +++ b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh @@ -10,7 +10,7 @@ cd $startDir lhstex() { sourceFile=$1 - targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .lhs).tex + targetName=$out/$(basename $(stripHash $sourceFile) .lhs).tex echo "converting $sourceFile to $targetName..." lhs2TeX -o "$targetName" $flags "$sourceFile" } diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh index fa27520d11c..3941fdcac4a 100644 --- a/pkgs/tools/typesetting/tex/nix/run-latex.sh +++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh @@ -16,11 +16,11 @@ for i in $extraFiles; do if test -d $i; then ln -s $i/* . else - ln -s $i $(stripHash $i; echo $strippedName) + ln -s $i $(stripHash $i) fi done -rootName=$(basename $(stripHash "$rootFile"; echo $strippedName)) +rootName=$(basename $(stripHash "$rootFile")) rootNameBase=$(echo "$rootName" | sed 's/\..*//') |