Merged with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
This commit is contained in:
Yury G. Kudryashov
2008-01-15 00:55:21 +00:00
parent e17a21b820
commit a7703662a4
125 changed files with 2379 additions and 487 deletions

View File

@@ -1,26 +0,0 @@
source $stdenv/setup
# Setup isolated package management
postInstall()
{
ensureDir "$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
cat $setupHook >> $out/nix-support/setup-hook
}
postInstall=postInstall
configureFlags="--with-gmp-libraries=$gmp/lib --with-readline-libraries=\"$readline/lib\""
preConfigure()
{
chmod u+x rts/gmp/configure
# still requires a hack for ncurses
sed -i "s|^\(library-dirs.*$\)|\1 \"$ncurses/lib\"|" libraries/readline/package.conf.in
}
preConfigure=preConfigure
# Standard configure/make/make install
genericBuild

View File

@@ -1,6 +1,6 @@
{stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses}:
stdenv.mkDerivation {
stdenv.mkDerivation (rec {
name = "ghc-6.6.1";
src = map fetchurl [
@@ -12,15 +12,34 @@ stdenv.mkDerivation {
}
];
builder = ./builder.sh;
buildInputs = [ghc readline perl m4];
buildInputs = [ghc readline perl m4 gmp];
setupHook = ./setup-hook.sh;
meta = {
description = "The Glasgow Haskell Compiler v6.6.1";
description = "The Glasgow Haskell Compiler";
};
postInstall = ''
ensureDir "$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
cat $setupHook >> $out/nix-support/setup-hook
'';
configureFlags=[
"--with-gmp-libraries=${gmp}/lib"
"--with-readline-libraries=${readline}/lib"
"--with-gmp-includes=${gmp}/include"
"--with-gcc=${gcc}/bin/gcc"
];
preConfigure = ''
# still requires a hack for ncurses
sed -i "s|^\(library-dirs.*$\)|\1 \"${ncurses}/lib\"|" libraries/readline/package.conf.in
'';
inherit (stdenv) gcc;
inherit readline gmp ncurses;
}
})

View File

@@ -1,26 +0,0 @@
source $stdenv/setup
# Setup isolated package management
postInstall()
{
ensureDir "$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
cat $setupHook >> $out/nix-support/setup-hook
}
postInstall=postInstall
configureFlags="--with-gmp-libraries=$gmp/lib --with-readline-libraries=\"$readline/lib\""
preConfigure()
{
chmod u+x rts/gmp/configure
# still requires a hack for ncurses
sed -i "s|^\(library-dirs.*$\)|\1 \"$ncurses/lib\"|" libraries/readline/package.conf.in
}
preConfigure=preConfigure
# Standard configure/make/make install
genericBuild

View File

@@ -1,45 +1,40 @@
args: with args;
stdenv.mkDerivation (rec {
name = "ghc-6.8.1";
name = "ghc-6.8.2";
homepage = "http://www.haskell.org/ghc";
src = map fetchurl [
{ url = "${homepage}/dist/stable/dist/${name}-src.tar.bz2";
sha256 = "16gr19bwyjv0fmjdrsj79vqpaxxg5hasni94nwv9d6c85n5myivz";
md5 = "745c6b7d4370610244419cbfec4b2f84";
}
{ url = "${homepage}/dist/stable/dist/${name}-src-extralibs.tar.bz2";
sha256 = "1h3nc6x4g838mdcirymadmv3fsmp1wh062syb3a8aqv6f468akvm";
md5 = "d199c50814188fb77355d41058b8613c";
}
];
buildInputs = [ghc readline perl m4 pkgconfig gtk];
patchPhase = "
sed -e s@/bin/cat@\$(type -p cat)@ -i configure
" +
(if (stdenv.system == "x86_64-linx") then "patch -p2 < $patch64" else "");
buildInputs = [ghc readline perl m4 gmp];
setupHook = ./setup-hook.sh;
meta = {
description = "The Glasgow Haskell Compiler v6.8.1";
description = "The Glasgow Haskell Compiler";
};
postInstall = "
ensureDir \"$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
cat $setupHook >> $out/nix-support/setup-hook
";
postInstall = ''
ensureDir "$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
cat $setupHook >> $out/nix-support/setup-hook
'';
patch64 = ./x86_64-linux_patch;
# the presence of this file makes Cabal cry for happy while generating makefiles ...
preConfigure = "
echo 'GhcThreaded=NO' > mk/build.mk
rm libraries/haskell-src/Language/Haskell/Parser.ly
# still requires a hack for ncurses
sed -i \"s|^\\\(ld-options.*$\\\)|\\\1 -L${ncurses}/lib|\" libraries/readline/readline.buildinfo.in
";
dontStrip = 1;
inherit (stdenv) gcc;
inherit readline gmp ncurses;
})

View File

@@ -1,5 +1,5 @@
# Support dir for isolating GHC
ghc_support=$TMPDIR/ghc-6.6-nix-support
ghc_support=$TMPDIR/ghc-6.8-nix-support
mkdir -p $ghc_support
# Create isolated package config

View File

@@ -1,21 +1,56 @@
{stdenv, fetchurl, perl, readline, ncurses, gmp}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation {
name = "ghc-6.4.2";
builder = ./boot.sh;
src = if stdenv.system == "i686-linux" then
(fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
md5 = "092fe2e25dab22b926babe97cc77db1f";
}) else
(fetchurl {
url = http://haskell.org/ghc/dist/6.4.2/ghc-6.4.2-x86_64-unknown-linux.tar.bz2;
md5 = "8f5fe48798f715cd05214a10987bf6d5";
});
name = if stdenv.system == "i686-darwin" then "ghc-6.6.1" else "ghc-6.4.2";
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
md5 = "092fe2e25dab22b926babe97cc77db1f";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://haskell.org/ghc/dist/6.4.2/ghc-6.4.2-x86_64-unknown-linux.tar.bz2;
md5 = "8f5fe48798f715cd05214a10987bf6d5";
}
else if stdenv.system == "i686-darwin" then
fetchurl {
url = http://www.haskell.org/ghc/dist/6.6.1/ghc-6.6.1-i386-apple-darwin.tar.bz2;
sha256 = "1drbsicanr6jlykvs4vs6gbi2q9ac1bcaxz2vzwh3pfv3lfibwia";
}
else throw "cannot bootstrap GHC on this platform";
buildInputs = [perl];
propagatedBuildInputs = [readline ncurses gmp];
dontStrip = 1;
inherit readline ncurses gmp;
# On Linux, use patchelf to modify the executables so that they can
# find readline/gmp.
postBuild = if stdenv.isLinux then "
find . -type f -perm +100 \\
-exec patchelf --interpreter \"$(cat $NIX_GCC/nix-support/dynamic-linker)\" \\
--set-rpath \"${readline}/lib:${ncurses}/lib:${gmp}/lib\" {} \\;
" else "";
# The binaries for Darwin use frameworks, so fake those frameworks,
# and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so
# that the executables work with no special setup.
postInstall = if stdenv.isDarwin then "
ensureDir $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
ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/GNUreadline
ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/Versions/A/GNUreadline
mv $out/bin $out/bin-orig
mkdir $out/bin
for i in $(cd $out/bin-orig && ls); do
echo \"#! $SHELL -e\" >> $out/bin/$i
echo \"DYLD_FRAMEWORK_PATH=$out/frameworks exec $out/bin-orig/$i -framework-path $out/frameworks \\\"\\$@\\\"\" >> $out/bin/$i
chmod +x $out/bin/$i
done
" else "";
}

View File

@@ -1,10 +0,0 @@
source $stdenv/setup
postBuild=postBuild
postBuild () {
find . -type f -perm +100 \
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "$readline/lib:$ncurses/lib:$gmp/lib" {} \;
}
genericBuild

View File

@@ -1,9 +1,9 @@
args: with args;
stdenv.mkDerivation {
name = "guile-1.6.7";
name = "guile-1.8.3";
src = fetchurl {
url = ftp://ftp.gnu.org/gnu/guile/guile-1.8.2.tar.gz;
sha256 = "03kn1ia4s7l24zl2sfbrns6fs3nc9cw2pzsqx8y7wwr80b1nfxhz";
url = ftp://ftp.gnu.org/gnu/guile/guile-1.8.3.tar.gz;
sha256 = "2ab59099cf2d46f57cf5421c9b84aa85f61961640046e8066c6b321257517796";
};
propagatedBuildInputs = [readline libtool gmp];

View File

@@ -1,3 +1,15 @@
/* TODO check security issues such as :
+--------------------------------------------------------------------+
| *** WARNING *** |
| |
| You will be compiling the CGI version of PHP without any |
| redirection checking. By putting this cgi binary somewhere in |
| your web space, users may be able to circumvent existing .htaccess |
| security by loading files directly through the parser. See |
| http://www.php.net/manual/security.php for more details. |
*/
args:
( args.mkDerivationByConfiguration {
flagConfig = {
@@ -394,7 +406,7 @@ args:
# SAPI modules:
apxs2 = { cfgOption = "--with-apxs2=\$apacheHttpd/bin/apxs";
pass = { inherit (args) apacheHttpd; }; };
pass = "apacheHttpd"; };
# Extensions
@@ -425,6 +437,22 @@ args:
If unspecified, the default locations are searched
*/
/*
Building xdebug withing php to be able to add the parameters to the ini file.. Ther should be a better way
meta = {
description = "debugging support for PHP";
homepage = http://xdebug.org;
license = "based on the PHP license - as is";
};
*/
xdebug = { buildInputs = [ "automake" "autoconf" ];
pass = { xdebug_src = args.fetchurl {
name = "xdebug-2.0.2.tar.gz";
url = "http://xdebug.org/link.php?url=xdebug202";
sha256 = "1h0bxvf8krr203fmk1k7izrrr81gz537xmd3pqh4vslwdlbhrvic";
};};};
};
defaults = [ "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
@@ -436,19 +464,43 @@ args:
extraAttrs = co : {
name = "php_configurable-5.2.4";
buildInputs = ( args.lib.getAttr [ "phpIncludes" ] [] args );
buildInputs = ( args.lib.getAttr [ "phpIncludes" ] [] args ) ++ co.buildInputs;
configurePhase =
"
iniFile=\$out/etc/\$name.ini
[[ -z \"\$libxml2\" ]] || export PATH=\$PATH:\$libxml2/bin
./configure --with-config-file-path=\$iniFile --prefix=\$out " + co.configureFlags;
./configure --with-config-file-scan-dir=/etc --with-config-file-path=\$iniFile --prefix=\$out " + co.configureFlags + "
echo configurePhase end
";
installPhase = "
unset installPhase; installPhase;
cp php.ini-recommended $\iniFile
echo \"include_path=.\$PATH_DELIMITER\$out/lib/php\$PATH_DELIMITER\$PHP_INCLUDES\" > \$iniFile
# Now Let's build xdebug if flag has been given
# TODO I think there are better paths than the given below
if [ -n \$flag_set_xdebug ]; then
PATH=\$PATH:\$out/bin
tar xfz \$xdebug_src;
cd xdebug*
phpize
./configure --prefix=\$out
make
ensureDir \$out/lib; cp modules/xdebug.so $out/lib
cat >> $iniFile << EOF
zend_extension=\"\$out/lib/xdebug.so\"
zend_extension_ts=\"\$out/lib/xdebug.so\"
zend_extension_debug=\"\$out/lib/xdebug.so\"
xdebug.remote_enable=true
xdebug.remote_host=127.0.0.1
xdebug.remote_port=9000
xdebug.remote_handler=dbgp
xdebug.profiler_enable=0
xdebug.profiler_output_dir=\"/tmp/xdebug\"
xdebug.remote_mode=req
EOF
fi
";
src = args.fetchurl {

View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "tcl-8.4.13";
name = "tcl-8.4.16";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/tcl/tcl8.4.13-src.tar.gz;
md5 = "c6b655ad5db095ee73227113220c0523";
url = mirror://sourceforge/tcl/tcl8.4.16-src.tar.gz;
sha256 = "0v9mh53kdvfm4kxgsw8gfxsfl8kvbnnp22bpwyyg5sa4jyjjbs93";
};
}

View File

@@ -0,0 +1,222 @@
diff -u -U3 -r acl-2.2.45-orig/aclocal.m4 acl-2.2.45-mod/aclocal.m4
--- acl-2.2.45-orig/aclocal.m4 2007-12-23 16:16:11.000000000 +0300
+++ acl-2.2.45-mod/aclocal.m4 2007-12-23 18:09:04.000000000 +0300
@@ -228,32 +228,32 @@
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(MAKE, gmake,,)
fi
if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, make,, /usr/bin)
+ AC_PATH_PROG(MAKE, make,, )
fi
make=$MAKE
AC_SUBST(make)
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
+ AC_PATH_PROG(LIBTOOL, glibtool,, )
fi
if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(LIBTOOL, libtool,, )
fi
libtool=$LIBTOOL
AC_SUBST(libtool)
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
if test -z "$TAR"; then
- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
+ AC_PATH_PROG(TAR, tar,, )
fi
tar=$TAR
AC_SUBST(tar)
if test -z "$ZIP"; then
- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(ZIP, gzip,, )
fi
zip=$ZIP
@@ -266,25 +266,25 @@
AC_SUBST(makedepend)
if test -z "$AWK"; then
- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
+ AC_PATH_PROG(AWK, awk,, )
fi
awk=$AWK
AC_SUBST(awk)
if test -z "$SED"; then
- AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
+ AC_PATH_PROG(SED, sed,, )
fi
sed=$SED
AC_SUBST(sed)
if test -z "$ECHO"; then
- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
+ AC_PATH_PROG(ECHO, echo,, )
fi
echo=$ECHO
AC_SUBST(echo)
if test -z "$SORT"; then
- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
+ AC_PATH_PROG(SORT, sort,, )
fi
sort=$SORT
AC_SUBST(sort)
@@ -294,21 +294,21 @@
if test "$enable_gettext" = yes; then
if test -z "$MSGFMT"; then
- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(MSGFMT, msgfmt,, )
fi
msgfmt=$MSGFMT
AC_SUBST(msgfmt)
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
if test -z "$MSGMERGE"; then
- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(MSGMERGE, msgmerge,, )
fi
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
if test -z "$XGETTEXT"; then
- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(XGETTEXT, xgettext,, )
fi
xgettext=$XGETTEXT
AC_SUBST(xgettext)
@@ -316,7 +316,7 @@
fi
if test -z "$RPM"; then
- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
+ AC_PATH_PROG(RPM, rpm,, )
fi
rpm=$RPM
AC_SUBST(rpm)
ôÏÌØËÏ × acl-2.2.45-orig/: configure
diff -u -U3 -r acl-2.2.45-orig/m4/package_utilies.m4 acl-2.2.45-mod/m4/package_utilies.m4
--- acl-2.2.45-orig/m4/package_utilies.m4 2007-12-23 16:16:11.000000000 +0300
+++ acl-2.2.45-mod/m4/package_utilies.m4 2007-12-23 18:01:28.000000000 +0300
@@ -23,32 +23,26 @@
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, make,, /usr/bin)
fi
make=$MAKE
AC_SUBST(make)
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
fi
if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
libtool=$LIBTOOL
AC_SUBST(libtool)
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
if test -z "$TAR"; then
- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
fi
tar=$TAR
AC_SUBST(tar)
if test -z "$ZIP"; then
- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
zip=$ZIP
@@ -61,25 +55,21 @@
AC_SUBST(makedepend)
if test -z "$AWK"; then
- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
fi
awk=$AWK
AC_SUBST(awk)
if test -z "$SED"; then
- AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
fi
sed=$SED
AC_SUBST(sed)
if test -z "$ECHO"; then
- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
fi
echo=$ECHO
AC_SUBST(echo)
if test -z "$SORT"; then
- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
fi
sort=$SORT
AC_SUBST(sort)
@@ -89,21 +79,18 @@
if test "$enable_gettext" = yes; then
if test -z "$MSGFMT"; then
- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
msgfmt=$MSGFMT
AC_SUBST(msgfmt)
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
if test -z "$MSGMERGE"; then
- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
if test -z "$XGETTEXT"; then
- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
xgettext=$XGETTEXT
AC_SUBST(xgettext)
@@ -111,7 +98,6 @@
fi
if test -z "$RPM"; then
- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
fi
rpm=$RPM
AC_SUBST(rpm)
diff -u -U3 -r acl-2.2.45-orig/Makefile acl-2.2.45-mod/Makefile
--- acl-2.2.45-orig/Makefile 2007-12-23 16:16:11.000000000 +0300
+++ acl-2.2.45-mod/Makefile 2007-12-23 18:01:28.000000000 +0300
@@ -33,19 +33,6 @@
endif
$(CONFIGURE):
- autoconf
- ./configure \
- --prefix=/ \
- --exec-prefix=/ \
- --sbindir=/bin \
- --bindir=/usr/bin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --enable-lib64=yes \
- --includedir=/usr/include \
- --mandir=/usr/share/man \
- --datadir=/usr/share \
- $$LOCAL_CONFIGURE_OPTIONS
touch .census
aclocal.m4::

View File

@@ -0,0 +1,12 @@
source $stdenv/setup
preConfigure() {
rm configure
autoconf
}
preConfigure=preConfigure
installFlags='install-lib install-dev'
genericBuild

View File

@@ -0,0 +1,14 @@
args: with args;
stdenv.mkDerivation {
name = "acl-2.2.45";
builder = ./builder.sh;
src =
fetchurl {
url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.45-1.tar.gz;
sha256 = "1bb2k5br494yk863w27k1h8gkdkq4kzakvajhj844hl1cixhhf1a";
};
buildInputs = [autoconf libtool gettext attr];
patches = [ ./acl-2.2.45-patch ];
}

View File

@@ -6,4 +6,6 @@ preConfigure() {
preConfigure=preConfigure
installFlags='install-lib install-dev'
genericBuild

View File

@@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "audiofile-0.2.3";
name = "audiofile-0.2.6";
src = fetchurl {
url = http://www.68k.org/~michael/audiofile/audiofile-0.2.5.tar.gz;
md5 = "fd07c62a17ceafa317929e55e51e26c5";
url = http://www.68k.org/~michael/audiofile/audiofile-0.2.6.tar.gz;
sha256 = "1a921w6jwcnkmx3vm091qrj7109jzri6kw4ygjq6ym91dssnfqab";
};
}

View File

@@ -1,9 +1,13 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "boehm-gc-6.8";
name = "boehm-gc-7.0";
src = fetchurl {
url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.8.tar.gz;
md5 = "418d38bd9c66398386a372ec0435250e";
url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.0.tar.gz;
sha256 = "0nqy0462ainp79fjmx5lgr89s2d433fggr3n9d1p09xq77lwc2nj";
};
meta = {
description = "A garbage collector for C and C++";
homepage = http://www.hpl.hp.com/personal/Hans_Boehm/gc/;
};
}

View File

@@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "coredumper-0.2";
name = "coredumper-1.1";
src = fetchurl {
url = mirror://sourceforge/goog-coredumper/coredumper-0.2.tar.gz;
md5 = "024f8e4afe73c4cc4f4a0b0ef585e9b7";
url = http://google-coredumper.googlecode.com/files/coredumper-1.1.tar.gz;
sha256 = "1phl1zg2n17rp595dyzz9iw01gfdpsdh0l6wy2hfb5shi71h63rx";
};
}

View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "cracklib-2.8.9";
name = "cracklib-2.8.12";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/cracklib/cracklib-2.8.9.tar.gz;
md5 = "9a8c9eb26b48787c84024ac779f64bb2";
url = mirror://sourceforge/cracklib/cracklib-2.8.12.tar.gz;
sha256 = "0l9kar7h80kkvs394dyzbn02jkd8hzynh9kxyqrlacj1wp35rmah";
};
dicts = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/cracklib-words.gz;

View File

@@ -4,7 +4,10 @@ stdenv.mkDerivation ({
name = "db4-4.4.20";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/db-4.4.20.NC.tar.gz;
urls = [
http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz
http://nix.cs.uu.nl/dist/tarballs/db-4.4.20.NC.tar.gz
];
md5 = "afd9243ea353bbaa04421488d3b37900";
};
configureFlags = [

View File

@@ -1,7 +1,7 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
name = "expat-2.0.0";
name = "expat-2.0.1";
src = fetchurl {
url = mirror://sourceforge/expat/expat-2.0.0.tar.gz;
md5 = "d945df7f1c0868c5c73cf66ba9596f3f";
url = mirror://sourceforge/expat/expat-2.0.1.tar.gz;
sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4";
};
}

View File

@@ -5,7 +5,8 @@ stdenv.mkDerivation {
src = fetchsvn {
url = svn://svn.mplayerhq.hu/ffmpeg/trunk ;
rev = "11164";
sha256 = "95658455e466aeab5a302ddd6e7b2f79f620d4495012add46028a548e6c364b2";
#sha256 = "95658455e466aeab5a302ddd6e7b2f79f620d4495012add46028a548e6c364b2";
sha256 = "c97b0cd791f8408cfc69452ff7afbf00d34b367e493dfbcae830fba99c229189";
};
/*fetchurl {
url = http://ffmpeg.mplayerhq.hu/ffmpeg-export-snapshot.tar.bz2;

View File

@@ -0,0 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "giflib-4.1.6";
src = fetchurl {
url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2;
sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1";
};
}

View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libungif-4.1.4";
src = fetchurl {
url = mirror://sourceforge/libungif/libungif-4.1.4.tar.gz;
url = mirror://sourceforge/giflib/libungif-4.1.4.tar.gz;
md5 = "efdfcf8e32e35740288a8c5625a70ccb";
};
}

View File

@@ -1,11 +1,20 @@
{stdenv, fetchurl, m4}:
stdenv.mkDerivation {
name = "gmp-4.2.1";
name = "gmp-4.2.2";
src = fetchurl {
url = mirror://gnu/gmp/gmp-4.2.1.tar.bz2;
md5 = "091c56e0e1cca6b09b17b69d47ef18e3";
url = mirror://gnu/gmp/gmp-4.2.2.tar.bz2;
sha256 = "0yv593sk62ypn21gg2x570g955lmsi4i6f2bc3s43p52myn0lb1b";
};
buildInputs = [m4];
doCheck = true;
meta = {
description = "A free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers";
homepage = http://gmplib.org/;
license = "LGPL";
};
}

View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, ncurses}:
stdenv.mkDerivation {
name = "libcaca-0.99-beta11";
name = "libcaca-0.99-beta13b";
src = fetchurl {
url = http://libcaca.zoy.org/files/libcaca-0.99.beta11.tar.gz;
sha256 = "1kj0rkfbmq8kc3pi3p323ifx5yp9pcmbnxln7phxj5k4v7ngyld7";
url = http://libcaca.zoy.org/files/libcaca-0.99.beta13b.tar.gz;
sha256 = "0xy8pcnljnj5la97bzbwwyzyqa7dr3v9cyw8gdjzdfgqywvac1vg";
};
configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
propagatedBuildInputs = [ncurses];

View File

@@ -0,0 +1,30 @@
args:
let edf = args.lib.enableDisableFeature; in
( args.mkDerivationByConfiguration {
flagConfig = { }
# TODO! implement flags
# I want to get kino and cinelerra working. That's why I don't spend more time on this now
// edf "libtool_lock" "libtool_lock" { } #avoid locking (might break parallel builds)
// edf "asm" "asm" { } #disable use of architecture specific assembly code
// edf "sdl" "sdl" { } #enable use of SDL for display
// edf "gtk" "gtk" { } #disable use of gtk for display
// edf "xv" "xv" { } #disable use of XVideo extension for display
// edf "gprof" "gprof" { } #enable compiler options for gprof profiling
;
extraAttrs = co : {
name = "libdv-1.0.0";
src = args.fetchurl {
url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
};
meta = {
description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
homepage = http://sourceforge.net/projects/libdv/;
# you can choose one of the following licenses:
license = [];
};
};
} ) args

View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, flex, bison}:
stdenv.mkDerivation {
name = "libpcap-0.9.5";
name = "libpcap-0.9.8";
src = fetchurl {
url = http://www.tcpdump.org/release/libpcap-0.9.5.tar.gz;
md5 = "b0626ad59004fe5767ddd2ce743a2271";
url = http://www.tcpdump.org/release/libpcap-0.9.8.tar.gz;
sha256 = "1yb2hg8jd1bzq3lbrff1sps4757krvj2c9pm2ixn44a4vsc865f4";
};
buildInputs = [flex bison];
configureFlags = "

View File

@@ -3,10 +3,10 @@
assert zlib != null;
stdenv.mkDerivation {
name = "libpng-1.2.18";
name = "libpng-1.2.24";
src = fetchurl {
url = mirror://sourceforge/libpng/libpng-1.2.18.tar.bz2;
sha256 = "0qhcy8r0r8280wahs91xi4p79gm2cb021x9bcww1r5bywvwn5kkg";
url = mirror://sourceforge/libpng/libpng-1.2.24.tar.bz2;
sha256 = "0kd0qkakc5zh2inrzw5r0h02761v1s9q223lv7za7iaxyl4byash";
};
propagatedBuildInputs = [zlib];
inherit zlib;

View File

@@ -0,0 +1,17 @@
args:
args.stdenv.mkDerivation {
name = "libraw1394-1.2.0";
src = args.fetchurl {
url = "mirror://sourceforge/libraw1394/libraw1394-1.2.0.tar.gz";
sha256 = "1b9zqqzyz0ihyfvhn135y3wc6vmym5yz21jxj9dp0f09b96gmp0z";
};
buildInputs =(with args; []);
meta = {
description = "library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
homepage = "http://wiki.linux1394.org/";
license = ["GPL" "LGPL"];
};
}

View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, libogg, libvorbis}:
stdenv.mkDerivation {
name = "libtheora-1.0alpha7";
name = "libtheora-1.0beta2";
src = fetchurl {
url = http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.bz2;
md5 = "1bc851e39e4b16977131d5e5f769f48b";
url = http://downloads.xiph.org/releases/theora/libtheora-1.0beta2.tar.gz;
sha256 = "0iwwprpi4s9y37c5yvlb572wd5gb2s635pxrkz5589266g1j1dcg";
};
propagatedBuildInputs = [libogg libvorbis];
}

View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, libogg}:
stdenv.mkDerivation {
name = "libvorbis-1.1.2";
name = "libvorbis-1.2.0";
src = fetchurl {
url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.1.2.tar.gz;
md5 = "37847626b8e1b53ae79a34714c7b3211";
url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.bz2;
sha256 = "0nq62b8y2rhhgxxyiw6b4wchic61q5v649fdl8dd7090nxxcbx4y";
};
buildInputs = [libogg];
}

View File

@@ -1,9 +1,9 @@
args: with args;
stdenv.mkDerivation {
name = "libwpd-0.8.5";
name = "libwpd-0.8.13";
src = fetchurl {
url = mirror://sourceforge/libwpd/libwpd-0.8.5.tar.gz;
md5 = "6b679e205a2805c3d23f41c65b35e266";
url = mirror://sourceforge/libwpd/libwpd-0.8.13.tar.gz;
sha256 = "08mb8bp0d3387l1snii4c0ighfhkby7qx2b3wymqb4a0l76rlzfn";
};
buildInputs = [pkgconfig glib libgsf libxml2 bzip2];
}

View File

@@ -5,7 +5,10 @@ assert gettext != null;
stdenv.mkDerivation {
name = "popt-1.7";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz;
urls = [
ftp://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/popt-1.7.tar.gz
http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz
];
md5 = "5988e7aeb0ae4dac8d83561265984cc9";
};
buildInputs = [gettext];

View File

@@ -7,4 +7,5 @@ stdenv.mkDerivation {
md5 = "e39331f32ad14009b9ff49cc10c5e751";
};
propagatedBuildInputs = [ncurses];
patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
}

View File

@@ -0,0 +1,11 @@
--- a/support/shobj-conf.orig 2006-04-11 06:15:43.000000000 -0700
+++ b/support/shobj-conf 2007-11-08 01:15:43.000000000 -0800
@@ -171,7 +171,7 @@
SHLIB_LIBSUFF='dylib'
case "${host_os}" in
- darwin[78]*) SHOBJ_LDFLAGS=''
+ darwin[789]*) SHOBJ_LDFLAGS=''
SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
;;
*) SHOBJ_LDFLAGS='-dynamic'

View File

@@ -1,10 +1,10 @@
args: with args;
stdenv.mkDerivation {
name = "speex-1.2beta2";
name = "speex-1.2beta3";
src = fetchurl {
url = http://downloads.us.xiph.org/releases/speex/speex-1.2beta2.tar.gz;
sha256 = "1np34q5i7yswkgknb8pa6ngqb4l4jv84c9yqnn0215vncbl76xg5";
url = http://downloads.us.xiph.org/releases/speex/speex-1.2beta3.tar.gz;
sha256 = "1az7kiwa8mzi1x7j01gcakx854qcbm4g67n0c4s56bvny6dn18vp";
};
buildInputs = [libogg];
}

View File

@@ -1,11 +1,12 @@
{stdenv, fetchurl, x11, libXaw}:
{stdenv, fetchurl, x11, libXaw, libXpm}:
stdenv.mkDerivation {
name = "t1lib-5.1.0";
src = fetchurl {
url = ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.0.tar.gz;
md5 = "a05bed4aa63637052e60690ccde70421";
url = ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.1.tar.gz;
sha256 = "0r1wb94kjd8jwym9na2k2snikizrnyc4cf4mf92v89r4yy0apph8";
};
buildInputs = [x11 libXaw];
buildInputs = [x11 libXaw libXpm];
buildFlags = "without_doc";
}

View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, tcl, x11}:
stdenv.mkDerivation {
name = "tk-8.4.13";
name = "tk-8.4.16";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/tcl/tk8.4.13-src.tar.gz;
md5 = "0a16d4d9398e43cbb85784c85fb807a4";
url = mirror://sourceforge/tcl/tk8.4.16-src.tar.gz;
sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb";
};
buildInputs = [tcl x11];
inherit tcl;

View File

@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
args: with args;
stdenv.mkDerivation {
name = "elfutils-0.127";
name = "elfutils-"+version;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/elfutils-0.127.tar.gz;
sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv";

View File

@@ -0,0 +1,9 @@
args: with args;
stdenv.mkDerivation {
name = "elfutils-"+version;
src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.131.orig.tar.gz;
sha256 = "0vqfjpcv81m3q0gsk78qykakhz9rbfwd65i4zsi03xr2lrk9ayll";
};
}

View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "strace-4.5.15";
name = "strace-4.5.16";
src = fetchurl {
url = mirror://sourceforge/strace/strace-4.5.15.tar.gz;
sha256 = "07n62yv53p2hsb59srfaxb0kk8b6p6iq77drmf65pq8jpa50s9ip";
url = mirror://sourceforge/strace/strace-4.5.16.tar.bz2;
sha256 = "15ks9i1gv7mbyiwnzbjls2xy0pyv5x4j9a5ca2x0258fq8lxwdhp";
};
}

View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
builder = ./builder.sh;
src = fetchurl {
url = "mirror://sourceforge/swig/swig-1.3.33.tar.gz";
url = mirror://sourceforge/swig/swig-1.3.33.tar.gz;
sha256 = "02rz31i642sbsngny7k98d9hxlkcb9snvbzlnz3sh0qiyr3ciggv";
};

View File

@@ -1,16 +1,17 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "valgrind-3.2.3";
name = "valgrind-3.3.0";
src = fetchurl {
url = http://valgrind.org/downloads/valgrind-3.2.3.tar.bz2;
sha256 = "0hf48y13mm1c1zg59bvkbr0lzcwng5mb33lgiv3d0gzl4w2r5jhv";
url = http://valgrind.org/downloads/valgrind-3.3.0.tar.bz2;
sha256 = "0yllx5a2f5bx18gqz74aikr27zxwpblswn65lqvm9rbzswlq5w2s";
};
configureFlags =
if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else [];
meta = {
homepage = http://www.valgrind.org/;
description = "Award-winning suite of tools for debugging and profiling Linux programs";
};
}

View File

@@ -0,0 +1,23 @@
{stdenv, fetchurl, ghc, perl}:
stdenv.mkDerivation {
name = "alex-2.1.0";
src = fetchurl {
url = http://www.haskell.org/alex/dist/2.1.0/alex-2.1.0.tar.gz;
sha1 = "37599b7be5249d639b3a5a3fdc61907dc4dad660";
};
buildInputs = [ghc perl];
configurePhase = "
ghc --make Setup.lhs
./Setup configure --prefix=\"\${out}\"
";
buildPhase = "
./Setup build
";
installPhase = "
./Setup install
";
}

View File

@@ -5,7 +5,9 @@ assert m4 != null;
stdenv.mkDerivation {
name = "bison-1.875";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2;
urls = [ http://nix.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2
ftp://ftp.gnu.org/pub/gnu/bison/bison-1.875.tar.bz2
];
md5 = "b7f8027b249ebd4dd0cc948943a71af0";
};
buildInputs = [m4];

View File

@@ -5,7 +5,7 @@ assert yacc != null;
stdenv.mkDerivation {
name = "flex-2.5.4a";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/flex-2.5.4a.tar.gz;
url = mirror://sourceforge/flex/flex-2.5.4a.tar.gz;
md5 = "bd8753d0b22e1f4ec87a553a73021adf";
};
buildInputs = [yacc];