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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/modular-python/; revision=26678
This commit is contained in:
Eelco Dolstra
2011-04-04 13:36:05 +00:00
parent f1c1bd7bbf 4eab75bb92
commit f99c0dd302
64 changed files with 2068 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
pkgs/top-level/all-packages.nix
View File

@@ -490,6 +490,8 @@ let
usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
cloog = callPackage ../development/libraries/cloog { };
cloogppl = callPackage ../development/libraries/cloog-ppl { };
convmv = callPackage ../tools/misc/convmv { };
@@ -652,6 +654,8 @@ let
fuppes = callPackage ../tools/networking/fuppes {};
fsfs = callPackage ../tools/filesystems/fsfs { };
dos2unix = callPackage ../tools/text/dos2unix { };
unix2dos = callPackage ../tools/text/unix2dos { };
@@ -749,6 +753,7 @@ let
};
grub2 = callPackage ../tools/misc/grub/1.9x.nix { };
grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };
gssdp = callPackage ../development/libraries/gssdp {
@@ -819,6 +824,8 @@ let
ised = callPackage ../tools/misc/ised {};
isl = callPackage ../development/libraries/isl { };
isync = callPackage ../tools/networking/isync { };
jdiskreport = callPackage ../tools/misc/jdiskreport { };
@@ -1636,6 +1643,8 @@ let
gcc45 = gcc45_real;
gcc46 = gcc46_real;
gcc45_realCross = lib.addMetaAttrs { platforms = []; }
(makeOverridable (import ../development/compilers/gcc-4.5) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
@@ -1648,6 +1657,19 @@ let
cross = assert crossSystem != null; crossSystem;
});
gcc46_realCross = lib.addMetaAttrs { platforms = []; }
(makeOverridable (import ../development/compilers/gcc-4.6) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
cloog gettext which noSysDirs;
ppl = callPackage ../development/libraries/ppl/0.11.nix { };
binutilsCross = binutilsCross;
libcCross = libcCross;
profiledCompiler = false;
enableMultilib = false;
crossStageStatic = false;
cross = assert crossSystem != null; crossSystem;
});
gcc_realCross = gcc45_realCross;
gccCrossStageStatic = let
@@ -1709,6 +1731,16 @@ let
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
}));
gcc46_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.6) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl
cloog gettext which noSysDirs;
ppl = callPackage ../development/libraries/ppl/0.11.nix { };
# bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
}));
gccApple =
wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc-apple else import ../development/compilers/gcc-apple64) {
inherit fetchurl stdenv noSysDirs;
@@ -1768,6 +1800,14 @@ let
profiledCompiler = false;
});
gfortran46 = wrapGCC (gcc46_real.gcc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gcj = gcj45;
gcj44 = wrapGCC (gcc44.gcc.override {
@@ -1798,6 +1838,20 @@ let
libXrandr xproto renderproto xextproto inputproto randrproto;
});
gcj46 = wrapGCC (gcc46.gcc.override {
name = "gcj";
langJava = true;
langFortran = false;
langCC = true;
langC = false;
profiledCompiler = false;
inherit zip unzip zlib boehmgc gettext pkgconfig perl;
inherit (gtkLibs) gtk;
inherit (gnome) libart_lgpl;
inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
libXrandr xproto renderproto xextproto inputproto randrproto;
});
gnat = gnat45;
gnat44 = wrapGCC (gcc44.gcc.override {
@@ -1826,10 +1880,33 @@ let
ppl = null;
});
gnat46 = wrapGCC (gcc46_real.gcc.override {
name = "gnat";
langCC = false;
langC = true;
langAda = true;
profiledCompiler = false;
gnatboot = gnat45;
# We can't use the ppl stuff, because we would have
# libstdc++ problems.
cloogppl = null;
ppl = null;
cloog = null;
});
gnatboot = wrapGCC (import ../development/compilers/gnatboot {
inherit fetchurl stdenv;
});
gccgo = gccgo46;
gccgo46 = wrapGCC (gcc46_real.gcc.override {
name = "gccgo";
langCC = true; #required for go
langC = true;
langGo = true;
});
ghdl = wrapGCC (import ../development/compilers/gcc-4.3 {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat;
name = "ghdl";
@@ -1927,6 +2004,11 @@ let
haskellPackages_ghc702 =
haskellPackagesFun ../development/compilers/ghc/7.0.2.nix (x : x.ghc702Prefs) false (x : x);
# Can become default after a short testing phase. There's also a minor platform
# release planned based on 703. Please keep at lowPrio until then.
haskellPackages_ghc703 =
haskellPackagesFun ../development/compilers/ghc/7.0.3.nix (x : x.ghc703Prefs) false lowPrio;
haskellPackages_ghcHEAD =
haskellPackagesFun ../development/compilers/ghc/head.nix (x : x.ghcHEADPrefs) false lowPrio;
@@ -2548,6 +2630,8 @@ let
ired = callPackage ../development/tools/analysis/radare/ired.nix { };
jam = callPackage ../development/tools/build-managers/jam { };
jikespg = callPackage ../development/tools/parsing/jikespg { };
lcov = callPackage ../development/tools/analysis/lcov { };
@@ -3782,6 +3866,10 @@ let
muparser = callPackage ../development/libraries/muparser { };
mygui = callPackage ../development/libraries/mygui {};
myguiSvn = callPackage ../development/libraries/mygui/svn.nix {};
ncurses = makeOverridable (import ../development/libraries/ncurses) {
inherit fetchurl stdenv;
unicode = system != "i686-cygwin";
@@ -5033,12 +5121,16 @@ let
aufs2 = callPackage ../os-specific/linux/aufs2 { };
aufs2_1 = callPackage ../os-specific/linux/aufs2.1 { };
aufs2_1 = if kernel.features ? aufs2_1 then
callPackage ../os-specific/linux/aufs2.1 { }
else null;
aufs2_1_util = if kernel.features ? aufs2_1 then
callPackage ../os-specific/linux/aufs2.1-util { }
else null;
aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
aufs2_1_util = callPackage ../os-specific/linux/aufs2.1-util { };
blcr = callPackage ../os-specific/linux/blcr {
#libtool = libtool_1_5; # libtool 2 causes a fork bomb
};
@@ -6620,7 +6712,7 @@ let
teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
taskJuggler = callPackage ../applications/misc/taskjuggler {
taskjuggler = callPackage ../applications/misc/taskjuggler {
qt = qt3;
# KDE support is not working yet.
@@ -6787,6 +6879,8 @@ let
xcompmgr = callPackage ../applications/window-managers/xcompmgr { };
xdaliclock = callPackage ../tools/misc/xdaliclock {};
xdg_utils = callPackage ../tools/X11/xdg-utils { };
xen = callPackage ../applications/virtualization/xen { };
@@ -7009,6 +7103,10 @@ let
racer = callPackage ../games/racer { };
rigsofrods = callPackage ../games/rigsofrods {
mygui = myguiSvn;
};
rogue = callPackage ../games/rogue { };
sauerbraten = callPackage ../games/sauerbraten {};
@@ -7062,12 +7160,20 @@ let
tremulous = callPackage ../games/tremulous { };
speed_dreams = callPackage ../games/speed-dreams {
# Torcs wants to make shared libraries linked with plib libraries (it provides static).
# i686 is the only platform I know than can do that linking without plib built with -fPIC
plib = plib.override { enablePIC = if stdenv.isi686 then false else true; };
};
torcs = callPackage ../games/torcs {
# Torcs wants to make shared libraries linked with plib libraries (it provides static).
# i686 is the only platform I know than can do that linking without plib built with -fPIC
plib = plib.override { enablePIC = if stdenv.isi686 then false else true; };
};
trigger = callPackage ../games/trigger { };
ufoai = callPackage ../games/ufoai {
inherit (gnome) gtksourceview gtkglext;
};

80
pkgs/top-level/haskell-packages.nix
View File

@@ -86,7 +86,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ghc6123Prefs = super : super // super.haskellPlatformDefaults_2010_2_0_0 super;
ghc701Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; # link
ghc702Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super;
ghcHEADPrefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; # link
ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super;
ghcHEADPrefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link
# GHC and its wrapper
#
@@ -117,6 +118,49 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
# versions explicitly.
haskellPlatform = self.haskellPlatform_2011_2_0_0; # global platform default
# NOTE: 2011.2.0.0 is the current default. 2011.2.0.1 is not yet released
# and provided for testing purposes.
haskellPlatformArgs_2011_2_0_1 = self : {
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4;
fgl = self.fgl_5_4_2_3;
GLUT = self.GLUT_2_1_2_1;
haskellSrc = self.haskellSrc_1_0_1_4;
html = self.html_1_0_1_2;
HUnit = self.HUnit_1_2_2_3;
network = self.network_2_3_0_2;
OpenGL = self.OpenGL_2_2_3_0;
parallel = self.parallel_3_1_0_1;
parsec = self.parsec_3_1_1;
QuickCheck = self.QuickCheck_2_4_0_1;
regexBase = self.regexBase_0_93_2;
regexCompat = self.regexCompat_0_93_1;
regexPosix = self.regexPosix_0_94_4;
stm = self.stm_2_2_0_1;
syb = self.syb_0_3;
xhtml = self.xhtml_3000_2_0_1;
zlib = self.zlib_0_5_3_1;
HTTP = self.HTTP_4000_1_1;
deepseq = self.deepseq_1_1_0_2;
text = self.text_0_11_0_6;
transformers = self.transformers_0_2_2_0;
mtl = self.mtl_2_0_1_0;
cabalInstall = self.cabalInstall_0_10_2;
alex = self.alex_2_3_5;
happy = self.happy_1_18_6;
haddock = self.haddock_2_9_2;
};
haskellPlatformDefaults_2011_2_0_1 =
self : self.haskellPlatformArgs_2011_2_0_1 self // {
haskellPlatform = self.haskellPlatform_2011_2_0_1;
mtl1 = self.mtl_1_1_1_1;
};
haskellPlatform_2011_2_0_1 =
callPackage ../development/libraries/haskell/haskell-platform/2011.2.0.1.nix
(self.haskellPlatformArgs_2011_2_0_1 self);
haskellPlatformArgs_2011_2_0_0 = self : {
inherit (self) cabal ghc;
@@ -286,6 +330,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
AspectAG = callPackage ../development/libraries/haskell/AspectAG {};
attoparsec = callPackage ../development/libraries/haskell/attoparsec {};
attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {};
benchpress = callPackage ../development/libraries/haskell/benchpress {};
bimap = callPackage ../development/libraries/haskell/bimap {};
@@ -298,15 +346,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {};
blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
bktrees = callPackage ../development/libraries/haskell/bktrees {};
Boolean = callPackage ../development/libraries/haskell/Boolean {};
bytestring = callPackage ../development/libraries/haskell/bytestring {};
networkBytestring = callPackage ../development/libraries/haskell/network-bytestring {};
bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};
cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib;
@@ -377,6 +425,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
inherit (pkgs) zlib;
};
directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
dlist = callPackage ../development/libraries/haskell/dlist {};
dotgen = callPackage ../development/libraries/haskell/dotgen {};
@@ -385,6 +435,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
inherit (pkgs) libedit;
};
enumerator = callPackage ../development/libraries/haskell/enumerator {};
erf = callPackage ../development/libraries/haskell/erf {};
filepath = callPackage ../development/libraries/haskell/filepath {};
@@ -542,6 +594,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
inherit (pkgs) gsl liblapack/* lapack library */ blas;
};
hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
hscolour = callPackage ../development/libraries/haskell/hscolour {};
hsemail = callPackage ../development/libraries/haskell/hsemail {};
@@ -576,6 +630,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
json_0_3_6 = callPackage ../development/libraries/haskell/json/0.3.6.nix {};
jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {};
jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {
network = self.network_2_2_1_7;
};
@@ -629,6 +687,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
multiset = callPackage ../development/libraries/haskell/multiset {};
murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
neither = callPackage ../development/libraries/haskell/neither {};
@@ -642,6 +702,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
OneTuple = callPackage ../development/libraries/haskell/OneTuple {};
OpenAL = callPackage ../development/libraries/haskell/OpenAL {
inherit (pkgs) openal;
};
@@ -700,6 +762,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {};
PSQueue = callPackage ../development/libraries/haskell/PSQueue {};
pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {};
QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {};
@@ -745,6 +809,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {};
regexPCRE = callPackage ../development/libraries/haskell/regex-pcre {};
regular = callPackage ../development/libraries/haskell/regular {};
safe = callPackage ../development/libraries/haskell/safe {};
@@ -757,6 +823,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
sendfile = callPackage ../development/libraries/haskell/sendfile {};
snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
stateref = callPackage ../development/libraries/haskell/stateref {};
statistics = callPackage ../development/libraries/haskell/statistics {};
@@ -828,6 +897,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
texmath = callPackage ../development/libraries/haskell/texmath {};
text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {};
text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {};
text = self.text_0_11_0_5;
threadmanager = callPackage ../development/libraries/haskell/threadmanager {};
@@ -842,6 +912,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
transformers = self.transformers_0_2_2_0;
tuple = callPackage ../development/libraries/haskell/tuple {};
uniplate = callPackage ../development/libraries/haskell/uniplate {};
uniqueid = callPackage ../development/libraries/haskell/uniqueid {};