synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=29870
This commit is contained in:
Peter Simons 2011-10-18 08:47:36 +00:00
commit 7edf0e8eaf
16 changed files with 129 additions and 89 deletions

View file

@ -0,0 +1,41 @@
{stdenv, fetchurl }:
let
version = "936";
pname = "picosat";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "http://fmv.jku.at/picosat/${name}.tar.gz";
sha256 = "02hq68fmfjs085216wsj13ff6i1rhc652yscl16w9jzpfqzly91n";
};
dontAddPrefix = true;
# configureFlags = "--shared"; the ./configure file is broken and doesn't accept this parameter :(
patchPhase = ''
sed -e 's/^shared=no/shared=yes/' -i configure
'';
installPhase = ''
ensureDir "$out"/bin
cp picomus "$out"/bin
cp picosat "$out"/bin
ensureDir "$out"/lib
cp libpicosat.a "$out"/lib
cp libpicosat.so "$out"/lib
ensureDir "$out"/include/picosat
cp picosat.h "$out"/include/picosat
'';
meta = {
homepage = http://fmv.jku.at/picosat/;
description = "SAT solver with proof and core support";
license = "MIT";
maintainers = [ stdenv.lib.maintainers.roconnor ];
};
}

View file

@ -33,7 +33,8 @@ rec {
enableParallelBuilding = true;
} // (removeAttrs a [ "meta" "name" ]));
# kdeMonoPkg wrapper for modules splitted upstream. Used in TODO
# kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
# API.
kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
# Build subdirectory ${subdir} of tarball ${module}-${release}.tar.bz2

View file

@ -3,6 +3,16 @@ compiling with `-O0' (as is done with coverage analysis) since there may
be many false references held on the stack, leading to the failure of
such tests.
--- a/test-suite/tests/gc.test
+++ b/test-suite/tests/gc.test
@@ -67,6 +67,7 @@
(with-test-prefix "gc"
(pass-if "Unused modules are removed"
+ (throw 'unresolved)
(let* ((guard (make-guardian))
(total 1000))
--- a/test-suite/tests/threads.test
+++ b/test-suite/tests/threads.test
@@ -366,6 +366,7 @@

View file

@ -1,57 +1,31 @@
args :
let
lib = args.lib;
fetchurl = args.fetchurl;
fullDepEntry = args.fullDepEntry;
doPatchShebangs = args.doPatchShebangs;
{ stdenv, fetchurl, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses,
freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile, libxml2,
freeglut, libsamplerate, pcre, libevent, libedit, yajl,
python, openssl, glfw
}:
version = lib.attrByPath ["version"] "2008.03.30" args;
buildInputs = with args; [
zlib sqlite gmp libffi cairo ncurses freetype mesa
stdenv.mkDerivation {
name = "io-2011.09.12";
src = fetchurl {
url = http://github.com/stevedekorte/io/tarball/2011.09.12;
name = "io-2011.09.12.tar.gz";
sha256 = "14nhk5vkk74pbf36jsfaxqh2ihi5d7jby79yf1ibbax319xbjk3v";
};
buildInputs = [
cmake zlib sqlite gmp libffi cairo ncurses freetype mesa
libpng libtiff libjpeg readline libsndfile libxml2
freeglut e2fsprogs libsamplerate pcre libevent libedit
freeglut libsamplerate pcre libevent libedit yajl
];
in
rec {
src = /* Here a fetchurl expression goes */
fetchurl {
url = "http://github.com/stevedekorte/io/tarball/${version}";
name = "io-${version}.tar.gz";
sha256 = "1i1hcidcf93145jj1vwwa2jvp8lb25pn2kg0cb56a059narrqxlv";
};
inherit buildInputs;
configureFlags = [];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=release" ];
makeFlags = ["INSTALL_PREFIX=$out"];
/* doConfigure should be specified separately */
phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples")
(doPatchShebangs "$out/lib/io")];
preBuild = fullDepEntry (''
for i in $pkgs ${
if args.stdenv ? glibc then args.stdenv.glibc else ""
} ${
if args ? libffi && args.libffi != null then "$(echo ${args.libffi}/lib/*/include/..)" else ""
}; do
echo "Path: $i"
sed -i build/AddonBuilder.io -e '/"\/sw"/asearchPrefixes append("'"$i"'"); '
sed -i addons/Flux/io/Flux.io -e 's@/usr/local/@'"$out/"'@g'
done
'') ["minInit" "addInputs" "doUnpack"];
postInstall = fullDepEntry (''
ensureDir $out/share/io
ln -s $out/lib/io/addons $out/share/io
cp -r samples $out/share/io
'') ["minInit" "doUnpack" "defEnsureDir" "doMakeInstall"];
name = "io-" + version;
meta = {
description = "Io programming language";
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [
raskin
z77z
];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "certificate";
version = "0.9.4";
sha256 = "0apv2paxlp12ksn28bn4lb1mg05cs7sjygfarxacwmz43jy6ld9v";
version = "0.9.5";
sha256 = "0nc50x4pqsrm8q6n4xjp79q4dmmglrqd8rbryza8jmcml8fchvbz";
isLibrary = true;
isExecutable = true;
buildDepends = [ asn1Data base64Bytestring mtl time ];

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "3.2.0.9";
sha256 = "1gb10bvzlm8qn6ap7cxykscbhbs2jsfqgsw53r8vd8k5bfgm5jv6";
version = "3.2.0.10";
sha256 = "1hdivw1smfkxza5jl8gm84gnzb5a9sgc2lcas3hikv968p9c1yry";
buildDepends = [
binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase
regexPcre snapCore snapServer tagsoup time

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskeline";
version = "0.6.4.3";
sha256 = "1dlrsazprvn6xcd12k5ln536rv9sljjccrjgpq6jj6b9ziadwiwr";
version = "0.6.4.4";
sha256 = "03cnhidnpnz7fh34c7x0rpl15zi6hkh9khganrdhwa59srxzbxqb";
buildDepends = [ extensibleExceptions mtl terminfo utf8String ];
meta = {
homepage = "http://trac.haskell.org/haskeline";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskell-src-meta";
version = "0.5";
sha256 = "0403j2ks2as61rfl049v4h43xpgx06bm739y80vada6jc85rfinr";
version = "0.5.0.2";
sha256 = "059zvr91bnajql19c76vwivvy6sbca83ky8ja91bf8xv1p3jfz3w";
buildDepends = [ haskellSrcExts syb thLift ];
meta = {
description = "Parse source to template-haskell abstract syntax";

View file

@ -1,18 +1,19 @@
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
, bytestringMmap, bytestringNums, caseInsensitive, deepseq, dlist
, enumerator, MonadCatchIOTransformers, mtl, text, time
, transformers, unixCompat, vector, zlib
, blazeBuilderEnumerator, bytestringMmap, bytestringNums
, caseInsensitive, deepseq, dlist, enumerator
, MonadCatchIOTransformers, mtl, text, time, transformers
, unixCompat, vector, zlibEnum
}:
cabal.mkDerivation (self: {
pname = "snap-core";
version = "0.5.4";
sha256 = "0v6lsb60s3w96rqpp9ky8nd660zja8asw02vx1562nvd19k65jbb";
version = "0.5.5";
sha256 = "1md9n3f11ki87774fh3p7d6bykfdwcqz6b2yrjci4mwf1b1xppkj";
buildDepends = [
attoparsec attoparsecEnumerator blazeBuilder bytestringMmap
bytestringNums caseInsensitive deepseq dlist enumerator
MonadCatchIOTransformers mtl text time transformers unixCompat
vector zlib
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
bytestringMmap bytestringNums caseInsensitive deepseq dlist
enumerator MonadCatchIOTransformers mtl text time transformers
unixCompat vector zlibEnum
];
meta = {
homepage = "http://snapframework.com/";

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "snap-server";
version = "0.5.4";
sha256 = "1kzhmn8pg2lzpqz6319lcy5lk27jcl7jlxq96x1bhnxss8k0idix";
version = "0.5.5";
sha256 = "10b4y5sfgr1bxs48b78nv6hs68v6qhg008rj9qnwwdp8lxgl4hi8";
buildDepends = [
attoparsec attoparsecEnumerator binary blazeBuilder
blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, ruby}:
{stdenv, fetchurl, cmake, ruby, darwinInstallNameToolUtility}:
stdenv.mkDerivation {
name = "yajl-2.0.1";
@ -9,7 +9,8 @@ stdenv.mkDerivation {
sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2";
};
buildInputs = [ cmake ruby ];
buildInputs = [ cmake ruby ]
++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
meta = {
description = "Yet Another JSON Library";
@ -19,7 +20,7 @@ stdenv.mkDerivation {
'';
homepage = http://lloyd.github.com/yajl/;
license = stdenv.lib.license.isc;
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; [ linux darwin ];
maintainers = with stdenv.lib.maintainers; [
z77z
];

View file

@ -3,11 +3,11 @@
assert stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
name = "dwarf-fortress-0.31.16";
name = "dwarf-fortress-0.31.25";
src = fetchurl {
url = "http://www.bay12games.com/dwarves/df_31_16_linux.tar.bz2";
sha256 = "04pyxyigrrclbpxdx3wryisgy5xraz0s7rsxr2kp4i136479f2r4";
url = "http://www.bay12games.com/dwarves/df_31_25_linux.tar.bz2";
sha256 = "0d3klvf5n99j38pdhx9mak78px65aw47smck82jb92la97drmcg3";
};
phases = "unpackPhase patchPhase installPhase";

View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, buildPythonPackage, pythonPackages }:
buildPythonPackage {
name = "ipython-0.10.1";
buildPythonPackage rec {
name = "ipython-0.11";
namePrefix = "";
src = fetchurl {
url = "http://ipython.scipy.org/dist/0.10.1/ipython-0.10.1.tar.gz";
sha256 = "18zwrg25zn72w4rmcwxzcw11ibgp001fawm2sz189zv86z70fxi2";
url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
md5 = "efc899e752a4a4a67a99575cea1719ef";
};
propagatedBuildInputs = [ pythonPackages.readline ];
propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 ];
doCheck = false;

View file

@ -2504,11 +2504,7 @@ let
guile = guile_2_0;
io = builderDefsPackage (import ../development/interpreters/io) {
inherit sqlite zlib gmp libffi cairo ncurses freetype mesa
libpng libtiff libjpeg readline libsndfile libxml2
freeglut e2fsprogs libsamplerate pcre libevent libedit;
};
io = callPackage ../development/interpreters/io { };
j = callPackage ../development/interpreters/j {};

View file

@ -194,7 +194,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellPlatform = self.haskellPlatform_2011_2_0_1;
mtl1 = self.mtl_1_1_1_1;
text = self.text_0_11_1_5;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
};
haskellPlatform_2011_2_0_1 =
@ -236,7 +236,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
self : self.haskellPlatformArgs_2011_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2011_2_0_0;
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
};
haskellPlatform_2011_2_0_0 =
@ -274,7 +274,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellPlatformDefaults_2010_2_0_0 =
self : self.haskellPlatformArgs_2010_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_2_0_0;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
};
haskellPlatform_2010_2_0_0 =
@ -311,7 +311,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
self : self.haskellPlatformArgs_2010_1_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_1_0_0;
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
};
haskellPlatform_2010_1_0_0 =
@ -349,7 +349,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
self : self.haskellPlatformArgs_2009_2_0_2 self // {
haskellPlatform = self.haskellPlatform_2009_2_0_2;
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
};
haskellPlatform_2009_2_0_2 =

View file

@ -1963,6 +1963,22 @@ let pythonPackages = python.modules // rec {
};
};
virtualenv = buildPythonPackage rec {
name = "virtualenv-1.6.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz";
md5 = "1072b66d53c24e019a8f1304ac9d9fc5";
};
doCheck = false;
meta = with stdenv.lib; {
description = "a tool to create isolated Python environments";
homepage = http://www.virtualenv.org;
license = licenses.mit;
maintainers = [ maintainers.goibhniu ];
};
};
vnc2flv = buildPythonPackage rec {
name = "vnc2flv-20100207";