diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/vm/default.nix | 3 | ||||
-rw-r--r-- | pkgs/data/fonts/droid/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/stdenv/generic/setup.sh | 11 | ||||
-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 |
10 files changed, 14 insertions, 19 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 3753668bcbfb..82cb72cb67ea 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -531,7 +531,8 @@ rec { # Hacky: RPM looks for <basename>.spec inside the tarball, so # strip off the hash. - srcName=$(baseHash "$src") + stripHash "$src" + srcName="$strippedName" cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root export HOME=/tmp/home diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index f78c8240809b..784dfe710078 100644 --- a/pkgs/data/fonts/droid/default.nix +++ b/pkgs/data/fonts/droid/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sourceRoot = "./"; unpackCmd = '' - ttfName=$(baseHash $curSrc) + ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) cp $curSrc ./$ttfName ''; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh index 5504c9f3299c..70fd729297c0 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh @@ -3,4 +3,5 @@ source $stdenv/setup mkdir -p $out/xml/dtd/docbook-ebnf cd $out/xml/dtd/docbook-ebnf cp -p $dtd dbebnf.dtd -cp -p $catalog $(baseHash $catalog) +stripHash $catalog +cp -p $catalog $strippedName diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 88300db35bcd..85e74461d2a4 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -484,7 +484,8 @@ dumpVars() { } -# DEPRECATED, use baseHash - 2016-06-23 +# Utility function: return the base name of the given path, with the +# prefix `HASH-' removed, if present. stripHash() { strippedName=$(basename $1); if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then @@ -492,14 +493,6 @@ stripHash() { fi } -# Print NAME with any leading directory components and hash removed. -# If specified, also remove a trailing SUFFIX. -# -# Usage: baseHash NAME [SUFFIX] -# Usage: baseName -a [-s SUFFIX] NAME... -baseHash() { - basename "$@" | sed -s 's/^[a-z0-9]\{32\}-//g' -} unpackCmdHooks+=(_defaultUnpack) _defaultUnpack() { diff --git a/pkgs/tools/typesetting/tex/nix/animatedot.sh b/pkgs/tools/typesetting/tex/nix/animatedot.sh index 1b5b2ce50795..46a2c515e03a 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/$(baseHash $dotGraph .dot)-f-$i.dot + targetName=$out/$(basename $(stripHash $dotGraph; echo $strippedName) .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 0d68f1e85f1f..ce5c025475a0 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=$(baseHash $postscript) + input=$(stripHash $postscript; echo $strippedName) ln -s $postscript $input fi diff --git a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh index 93ea9099ad1b..c416bf235a14 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/$(baseHash $sourceFile .dot).pdf + targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .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 81debb09228d..c70e76ce4c73 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/$(baseHash $sourceFile .dot).ps + targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .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 789d100959b1..f34b3944c8ef 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/$(baseHash $sourceFile .lhs).tex + targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .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 97079c476fbc..fa27520d11cd 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 $(baseHash $i) + ln -s $i $(stripHash $i; echo $strippedName) fi done -rootName=$(baseHash "$rootFile") +rootName=$(basename $(stripHash "$rootFile"; echo $strippedName)) rootNameBase=$(echo "$rootName" | sed 's/\..*//') |