public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless

Browse Source 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
This commit is contained in:
Eelco Dolstra
2012-01-18 20:16:00 +00:00
parent f7159c195a
commit c556a6ea46
629 changed files with 931 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/6.10.2-binary.nix
+2 -2
View File
@@ -70,11 +70,11 @@ stdenv.mkDerivation rec {
postInstall =
(if stdenv.isDarwin then
''
ensureDir $out/frameworks/GMP.framework/Versions/A
mkdir -p $out/frameworks/GMP.framework/Versions/A
ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
# !!! fix this
ensureDir $out/frameworks/GNUeditline.framework/Versions/A
mkdir -p $out/frameworks/GNUeditline.framework/Versions/A
ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/GNUeditline
ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/Versions/A/GNUeditline
pkgs/development/compilers/ghc/6.12.1-binary.nix
+1 -1
View File
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
postInstall =
(if stdenv.isDarwin then
''
ensureDir $out/frameworks/GMP.framework/Versions/A
mkdir -p $out/frameworks/GMP.framework/Versions/A
ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
# !!! fix this
pkgs/development/compilers/ghc/6.4.2-binary.nix
+2 -2
View File
@@ -49,10 +49,10 @@ stdenv.mkDerivation {
# that the executables work with no special setup.
postInstall = if stdenv.isDarwin then ''
ensureDir $out/frameworks/GMP.framework/Versions/A
mkdir -p $out/frameworks/GMP.framework/Versions/A
ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
ensureDir $out/frameworks/GNUreadline.framework/Versions/A
mkdir -p $out/frameworks/GNUreadline.framework/Versions/A
ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/GNUreadline
ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/Versions/A/GNUreadline
pkgs/development/compilers/ghc/6.6.1.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
};
postInstall = ''
ensureDir "$out/nix-support"
mkdir -p "$out/nix-support"
echo "# Path to the GHC compiler directory in the store" > $out/nix-support/setup-hook
echo "ghc=$out" >> $out/nix-support/setup-hook
echo "" >> $out/nix-support/setup-hook
pkgs/development/compilers/ghc/with-packages.nix
+3 -3
View File
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
linkedTopDir="$out/lib"
linkedPkgDir="$linkedTopDir/package.conf.d"
ensureDir $out/bin
ensureDir $linkedTopDir
ensureDir $linkedPkgDir
mkdir -p $out/bin
mkdir -p $linkedTopDir
mkdir -p $linkedPkgDir
echo "Linking GHC core libraries:"
pkgs/development/compilers/ghc/wrapper.nix
+2 -2
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
unpackPhase = "true";
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp $GHCGetPackages $out/bin/ghc-get-packages.sh
chmod 755 $out/bin/ghc-get-packages.sh
for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
done
EOF
chmod +x $out/bin/ghc-packages
ensureDir $out/nix-support
mkdir -p $out/nix-support
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
'';