Updating from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
This commit is contained in:
Lluís Batlle i Rossell
2009-12-10 14:48:45 +00:00
124 changed files with 1304 additions and 609 deletions
-24
View File
@@ -1,24 +0,0 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://www.daniel-baumann.ch/software/dosfstools/dosfstools-3.0.1.tar.bz2;
sha256 = "7fab0de42391277028071d01ff4da83ff9a399408ccf29958cdee62ffe746d45";
};
buildInputs = [];
configureFlags = [];
makeFlags = " PREFIX=$out ";
});
in with localDefs;
stdenv.mkDerivation rec {
name = "dosfstools-3.01";
builder = writeScript (name + "-builder")
(textClosure localDefs
["doMakeInstall" doForceShare doPropagate]);
meta = {
description = "Dosfstools - utilities for vfat file system.";
homepage = "http://www.daniel-baumann.ch/software/dosfstools/";
inherit src;
};
}
-50
View File
@@ -1,50 +0,0 @@
args : with args;
let localDefs = builderDefs {
src = /* put a fetchurl here */
if args ? src then args.src else fetchcvs {
cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
module = "relfs";
date = "2007-12-01";
sha256 = "39d97d0aa16b8bc953b2ef5f6308e9f9eda300c1de8a7acb6f8c8e5897c0c7b5";
};
buildInputs = [ocaml fuse postgresql pcre
e2fsprogs gnomevfs pkgconfig GConf];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let build = fullDepEntry ("
cd deps
sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
make
cd ../src
sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c
sed -e 's@/usr/local/@'\$out/'@' -i Makefile
sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile
make
mkdir -p \$out/bin
echo '
createuser -A -D \$1
dropdb relfs_\$1 ;
rm -rf /tmp/relfs-\$1-tmp;
mkdir /tmp/relfs-\$1-tmp;
USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp &
sleep 1 &&
kill -15 \${!};
rm -rf /tmp/relfs-\$1-tmp ;
psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1;
ALTER TABLE obj OWNER TO \$1;
ALTER TABLE obj_mimetype OWNER TO \$1;
ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant;
chmod a+x \$out/bin/relfs_grant;
") [minInit doUnpack addInputs];
in
stdenv.mkDerivation rec {
name = "relfs-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs [build doMakeInstall doForceShare doPropagate]);
meta = {
description = "A relational filesystem on top of FUSE";
inherit src;
};
}
-55
View File
@@ -1,55 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
if args ? src then args.src else fetchcvs {
cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
module = "relfs";
date = "2008-03-05";
sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3";
};
buildInputs = [ocaml fuse postgresql pcre
libuuid gnomevfs pkgconfig GConf];
configureFlags = [];
build = builderDefs.stringsWithDeps.fullDepEntry ("
cd deps
sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
make
cd ../src
sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c
sed -e 's@/usr/local/@'\$out/'@' -i Makefile
sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile
make
mkdir -p \$out/bin
echo '
createuser -A -D \$1
dropdb relfs_\$1 ;
rm -rf /tmp/relfs-\$1-tmp;
mkdir /tmp/relfs-\$1-tmp;
USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp &
sleep 1 &&
kill -15 \${!};
rm -rf /tmp/relfs-\$1-tmp ;
psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1;
ALTER TABLE obj OWNER TO \$1;
ALTER TABLE obj_mimetype OWNER TO \$1;
ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant;
chmod a+x \$out/bin/relfs_grant;
") ["minInit" "doUnpack" "addInputs"];
};
in with localDefs;
assert args.libuuid != null;
stdenv.mkDerivation rec {
name = "relfs-2008.03.05";
builder = writeScript (name + "-builder")
(textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]);
meta = {
description = "A relational filesystem on top of FUSE";
inherit src;
maintainers = [args.stdenv.lib.maintainers.raskin];
platforms = args.stdenv.lib.platforms.linux;
};
}
+27 -20
View File
@@ -1,24 +1,31 @@
args: with args; with debPackage;
debBuild ({
src =
fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq";
};
patch = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz;
sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4";
};
patches = [
/* also fixes some other compilation issues (freetype includes) */
./cstring.patch ];
{ stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }:
stdenv.mkDerivation {
name = "ttf-mkfontdir-3.0.9-5.1";
buildInputs = [fontconfig freetype libunwind libtool
flex bison];
src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq";
};
# all the patches up from ttmkfdir-3.0.9/Makefile should be reviewed by someone
# who knows more about C/C++ ..
patches =
[ (fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz;
sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4";
})
./cstring.patch # also fixes some other compilation issues (freetype includes)
];
preInstall = ''
ensureDir $out; makeFlags="DESTDIR=$out BINDIR=/bin"
'';
buildInputs = [freetype fontconfig libunwind libtool flex bison];
meta = {
description = "Create fonts.dir for TTF font directory.";
};
extraReplacements = ''sed -e 's/int isatty(int [^)]*)/& throw()/' '';
omitConfigure = true;
} // args)
}
@@ -1,29 +0,0 @@
args: with args;
stdenv.mkDerivation {
name = "ttf-mkfontdir-3.0.9-5.1";
src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq";
};
# all the patches up from ttmkfdir-3.0.9/Makefile should be reviewed by someone
# who knows more about C/C++ ..
patches = [
(fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz;
sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4";
})
./cstring.patch /* also fixes some other compilation issues (freetype includes) */ ];
preInstall = ''
ensureDir $out; makeFlags="DESTDIR=$out BINDIR=/bin"
'';
buildInputs = [freetype fontconfig libunwind libtool flex bison];
meta = {
description = "Create fonts.dir for TTF font directory.";
};
}