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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=32024
This commit is contained in:
Yury G. Kudryashov
2012-02-03 21:33:28 +00:00
parent df037ddafd 2286dd1f51
commit a810d44d81
34 changed files with 341 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/graphicsmagick/1.3.7.nix
+1
View File
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
homepage = http://www.graphicsmagick.org;
description = "Swiss army knife of image processing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
}
pkgs/applications/graphics/graphicsmagick/default.nix
+1
View File
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
homepage = http://www.graphicsmagick.org;
description = "Swiss army knife of image processing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
}
pkgs/applications/networking/remote/rdesktop/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation (rec {
pname = "rdesktop";
version = "1.7.0";
version = "1.7.1";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "0x2hnzvm0smnanin28n4mvzx9chpj2qnjfrxy307x21mgw6l5q1v";
sha256 = "0yc4xz95w40m8ailpjgqp9h7bkc758vp0dlq4nj1pvr3xfnl7sni";
};
buildInputs = [openssl libX11];
pkgs/applications/office/hledger-interest/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hledger-interest";
version = "1.3";
sha256 = "1sgnl3vv38cmgxv3xag3c78j1955xxwdmr5xr3f8rc78np6d0wnz";
version = "1.4";
sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg";
isLibrary = false;
isExecutable = true;
buildDepends = [ hledgerLib mtl time ];
pkgs/development/compilers/ghc/7.4.1.nix
+44
View File
@@ -0,0 +1,44 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
stdenv.mkDerivation rec {
version = "7.4.1";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j";
};
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
'';
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'';
configureFlags=[
"--with-gcc=${stdenv.gcc}/bin/gcc"
];
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags=["-S" "--keep-file-symbols"];
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
};
}
pkgs/development/compilers/idris/default.nix
+3 -3
View File
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.0";
sha256 = "03zbdcl3v90zv0ibzq9fa8z2qrrdsilh5m509mczwrcmlzbzsmrl";
version = "0.9.1";
sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr";
isLibrary = false;
isExecutable = true;
buildDepends = [ binary epic haskeline mtl parsec transformers ];
@@ -12,7 +12,7 @@ cabal.mkDerivation (self: {
noHaddock = true;
meta = {
homepage = "http://www.idris-lang.org/";
description = "Dependently Typed Functional Programming Language";
description = "Functional Programming Language with Dependent Types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
pkgs/development/interpreters/racket/default.nix
+2 -2
View File
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "racket";
version = "5.2";
version = "5.2.1";
name = "${pname}-${version}";
src = fetchurl {
url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
sha256 = "1viz2hq1q1wyw9jmnssg5sbgglh05fwqkhyhfbak9lb6nfbhlg5w";
sha256 = "1v5kvp7vfi4a4bn08jlaga441amlfxpjw9dm6vc1fazwzd72m539";
};
# Various racket executables do run-time searches for these.
pkgs/development/libraries/haskell/binary/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "binary";
version = "0.5.0.2";
sha256 = "02qkybh11psmggkqcs7f8kh4izfj44gq1wk23xhv3jbxc7gdxhp0";
version = "0.5.1.0";
sha256 = "18si0f021447b1kqshar224zyh02gc65z7v82waxcn4igss7gm1a";
meta = {
homepage = "http://code.haskell.org/binary/";
description = "Binary serialisation for Haskell values using lazy ByteStrings";
pkgs/development/libraries/haskell/bitarray/default.nix
+17
View File
@@ -0,0 +1,17 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "bitarray";
version = "0.0.1";
sha256 = "01ijysisw70zaw70hx851axw48agfamdqj21rzzhdqd2ww6bwchb";
meta = {
homepage = "http://code.haskell.org/~bkomuves/";
description = "Mutable and immutable bit arrays";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+3 -3
View File
@@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "bytestring-lexing";
version = "0.3.0";
sha256 = "1jrhmljy7m84imcmvsarv74i3hcm60ja9pl1ww3lm0zgi0rrddqd";
version = "0.4.0";
sha256 = "1lww38rab9k8drndqkg306kiq6663i89sq6l1bvjv6cs13acc8wr";
buildTools = [ alex ];
meta = {
homepage = "http://code.haskell.org/~wren/";
description = "Parse literals efficiently from strict or lazy bytestrings";
description = "Parse and produce literals efficiently from strict or lazy bytestrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
pkgs/development/libraries/haskell/cabal-file-th/default.nix
+1
View File
@@ -4,6 +4,7 @@ cabal.mkDerivation (self: {
pname = "cabal-file-th";
version = "0.2.1";
sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
patchPhase = "sed -i cabal-file-th.cabal -e 's|Cabal >= 1.10 && < 1.13|Cabal|'";
meta = {
homepage = "http://github.com/nkpart/cabal-file-th";
description = "Template Haskell expressions for reading fields from a project's cabal file";
pkgs/development/libraries/haskell/containers-deepseq/default.nix
+17
View File
@@ -0,0 +1,17 @@
{ cabal, deepseq }:
cabal.mkDerivation (self: {
pname = "containers-deepseq";
version = "0.1.0.1";
sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
buildDepends = [ deepseq ];
meta = {
description = "Provide orphan NFData instances for containers as needed. (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix
+16
View File
@@ -0,0 +1,16 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "deepseq";
version = "1.3.0.0";
sha256 = "0z2k1rda67nmhv62irjfd642iarj1i9m55l6p47j4cysrszhvqgy";
meta = {
description = "Deep evaluation of data structures";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix
+16
View File
@@ -0,0 +1,16 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "extensible-exceptions";
version = "0.1.1.4";
sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
meta = {
description = "Extensible exceptions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
pkgs/development/libraries/haskell/filepath/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "filepath";
version = "1.2.0.1";
sha256 = "1fq62kxf68y2952qhipllz049cq52yc3wm4i31v2lg5hdcwbw152";
version = "1.3.0.0";
sha256 = "1v5affq82b4fypm49d5sradcx4ymgmkac563vfx483pmyl73i5jl";
meta = {
homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/";
description = "Library for manipulating FilePaths in a cross platform way";
pkgs/development/libraries/haskell/gd/default.nix
+19
View File
@@ -0,0 +1,19 @@
{ cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }:
cabal.mkDerivation (self: {
pname = "gd";
version = "3000.7.1";
sha256 = "07rb02jfmz6bw853b6snw1inby9qgaygdmlsid35snc2xn2ylb50";
extraLibraries = [
expat fontconfig freetype gd libjpeg libpng zlib
];
meta = {
description = "A Haskell binding to a subset of the GD graphics library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
pkgs/development/libraries/haskell/hackage-db/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hackage-db";
version = "1.0";
sha256 = "0y769ssr9jlyzcdr0l8wh5s3ivc3zbp9mf7xy7vnq6mr9hjh7lcw";
version = "1.2";
sha256 = "1dsm8mp8f6z7jqqgx39xfvl5kql6bbwxk25k435rsb685q9hzpxq";
buildDepends = [ tar ];
meta = {
homepage = "http://github.com/peti/hackage-db";
pkgs/development/libraries/haskell/hastache/default.nix
+4 -4
View File
@@ -1,10 +1,10 @@
{ cabal, blazeBuilder, mtl, syb, text, utf8String }:
{ cabal, blazeBuilder, ieee754, mtl, syb, text, utf8String }:
cabal.mkDerivation (self: {
pname = "hastache";
version = "0.2.4";
sha256 = "0881sh3vp5v8kk3rnz9dg2bnis6qy4gx5sr0sqj6xl162sbhf3yv";
buildDepends = [ blazeBuilder mtl syb text utf8String ];
version = "0.3.3";
sha256 = "18ayrfwi3jn3q650m5dm9wx9c7djwc2miz3mxlscd9gzlnrfi772";
buildDepends = [ blazeBuilder ieee754 mtl syb text utf8String ];
meta = {
homepage = "http://github.com/lymar/hastache";
description = "Haskell implementation of Mustache templates";
pkgs/development/libraries/haskell/hjsmin/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hjsmin";
version = "0.0.14";
sha256 = "16053hnxnr9vsqvasbibjwjdg0jpsl5fwzgy54ac1xkh4rhp3a5i";
version = "0.0.15";
sha256 = "1bik3bvaz4zjhyx8nyghhs61l14zm71hndfhj4k0xvkw3h6hlj9k";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeBuilder languageJavascript text ];
pkgs/development/libraries/haskell/http-conduit/default.nix
+6 -6
View File
@@ -1,19 +1,19 @@
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
, monadControl, network, text, time, tls, tlsExtra, transformers
, transformersBase, utf8String, zlibConduit
, monadControl, network, socks, text, time, tls, tlsExtra
, transformers, transformersBase, utf8String, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.2.0";
sha256 = "1s3qrvglhymwvr0cp32mi95dijic40lphhsfr4hm63qjphfc8dpi";
version = "1.2.3";
sha256 = "0kygmbcvv0j020ml9jgmg3yzda3k066s2h8g3c135cmad6jc8hnd";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cprngAes
dataDefault failure httpTypes liftedBase monadControl network text
time tls tlsExtra transformers transformersBase utf8String
dataDefault failure httpTypes liftedBase monadControl network socks
text time tls tlsExtra transformers transformersBase utf8String
zlibConduit
];
meta = {
pkgs/development/libraries/haskell/ieee754/default.nix
+17
View File
@@ -0,0 +1,17 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "ieee754";
version = "0.7.3";
sha256 = "0gq747h15inxbxbgmzmchb9a8p57rhv3bmj69idx5arh0d3whgv0";
meta = {
homepage = "http://github.com/patperry/hs-ieee754";
description = "Utilities for dealing with IEEE floating point numbers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
pkgs/development/libraries/haskell/language-javascript/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "language-javascript";
version = "0.4.6";
sha256 = "1rqbb44cyvj6iyipi4bzrdd59lk9q1vxh0zvilvc54kqg97y07v6";
version = "0.4.7";
sha256 = "029ncc7hdw3pi9fbnxd0knz7wy3jpj5wcfqsxzyk5dkwji6d95x1";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl utf8Light ];
pkgs/development/libraries/haskell/network/2.3.0.10.nix
+18
View File
@@ -0,0 +1,18 @@
{ cabal, parsec }:
cabal.mkDerivation (self: {
pname = "network";
version = "2.3.0.10";
sha256 = "1f1z7wggxl2rzix1r4bhvcdl0fmx2mzkn70iy3w5yl54vmym21bm";
buildDepends = [ parsec ];
meta = {
homepage = "http://github.com/haskell/network";
description = "Low-level networking interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
pkgs/development/libraries/haskell/nixos-types/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "nixos-types";
version = "1.2";
sha256 = "140qk6wqq87qfk471cnhrg135fnqv0vfmfxh8kj14ar2kxvzrr8w";
version = "1.3";
sha256 = "0kdi3q316c9irrzwl1vx764f958i5d61v2vc03356sfyy13d19sk";
buildDepends = [ regexPosix ];
meta = {
homepage = "http://github.com/haskell4nix/nixos-types";
pkgs/development/libraries/haskell/socks/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "socks";
version = "0.4.0";
sha256 = "0181qyxn7n47i7dqzw9yymbf73yr5v91iqjq01iyy43b4vab2ha8";
version = "0.4.1";
sha256 = "0kapic4rf1cwbqy5f229b69kr1mg9blpr5p5jna8sx5ds2b8jdjn";
buildDepends = [ cereal network ];
meta = {
homepage = "http://github.com/vincenthz/hs-socks";
pkgs/development/libraries/haskell/vty/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "vty";
version = "4.7.0.8";
sha256 = "1wh94m2i0ivdkf8hhl9qrsfs7z3mk0xrzgwdfgqw7lhq321i2bnm";
version = "4.7.0.10";
sha256 = "03cvr4z0fvxfyrikgf89777cp1xqhy22yj83p0dysp0i5ds6cd9v";
buildDepends = [
deepseq mtl parallel parsec terminfo utf8String vector
];
pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
+17
View File
@@ -0,0 +1,17 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "xhtml";
version = "3000.2.0.5";
sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v";
meta = {
homepage = "https://github.com/haskell/xhtml";
description = "An XHTML combinator library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
pkgs/development/libraries/lzo/default.nix
+18 -4
View File
@@ -1,18 +1,32 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "lzo-2.03";
name = "lzo-2.06";
src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz";
sha256 = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591";
sha256 = "0wryshs446s7cclrbjykyj766znhcpnr7s3cxy33ybfn6vwfcygz";
};
configureFlags = "--enable-shared";
configureFlags = [ "--enable-shared" ];
doCheck = true;
meta = {
description = "A data compresion library suitable for real-time data de-/compression";
longDescription =
'' LZO is a data compression library which is suitable for data
de-/compression in real-time. This means it favours speed over
compression ratio.
LZO is written in ANSI C. Both the source code and the compressed
data format are designed to be portable across platforms.
'';
homepage = http://www.oberhumer.com/opensource/lzo;
license = "GPLv2+";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}
pkgs/development/tools/haskell/cabal2nix/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.24";
sha256 = "1k0dqj64z08n1kgdjgdk3ra3l8xw1bg7yh0s8s4pv5g2ajwj2f83";
version = "1.25";
sha256 = "12csiw7j51vlf8l0prhjj06l7sqii12qy5ryl5n8vrgp8vch2kvl";
isLibrary = false;
isExecutable = true;
buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
pkgs/os-specific/linux/broadcom-sta/default.nix
+7 -7
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, kernel }:
let version = "5_100_82_38";
let version = "5_100_82_112";
bits = if stdenv.system == "i686-linux" then "32" else
assert stdenv.system == "x86_64-linux"; "64";
in
@@ -10,15 +10,15 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz";
sha256 = if bits == "32"
then "0dzvnk0vmi5dlbsi9k2agvs5xsqn07mv66g9v1jzn1gsl8fsydpp"
else "19rm9m949yqahgii7wr14lj451sd84s72mqj15yd0dnpm4k5n5hw";
then "1rvhw9ngw0djxyyjx5m01c0js89zs3xiwmra03al6f9q7cbf7d45"
else "1qsarnry10f5m8a73wbr9cg2ifs00sqg6x0ay59l72vl9hb2zlww";
};
buildInputs = [ kernel ];
patches = [ ./makefile.patch ]
++ stdenv.lib.optional
(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
[ ./mutex-sema.patch ];
patches = [ ./makefile.patch ];
#++ stdenv.lib.optional
#(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
#[ ./mutex-sema.patch ];
makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
pkgs/servers/nosql/redis/default.nix
+22
View File
@@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "redis";
version = "2.4.7";
name = "${pname}-${version}";
src = fetchurl {
url = "http://redis.googlecode.com/files/redis-2.4.7.tar.gz";
sha256 = "f91956377b7ff23cc23e0c8758e0b873032f36545c61d88436ebb741bf4dd5e1";
};
makeFlags = "PREFIX=$(out)";
meta = {
homepage = http://redis.io;
description = "An open source, advanced key-value store";
license = "BSD";
platforms = stdenv.lib.platforms.unix;
};
}
pkgs/servers/sql/mysql55/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwinInstallNameToolUtility perl ];
cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin";
cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes";
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
pkgs/top-level/all-packages.nix
+12 -6
View File
@@ -2274,16 +2274,20 @@ let
(x : x.ghc704Prefs) false false (x : x);
haskellPackages_ghc721 =
recurseIntoAttrs
(haskellPackagesFun ../development/compilers/ghc/7.2.1.nix
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(x : x.ghc721Prefs) false false lowPrio);
haskellPackagesFun ../development/compilers/ghc/7.2.1.nix
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(x : x.ghc721Prefs) false false lowPrio;
haskellPackages_ghc722 =
haskellPackagesFun ../development/compilers/ghc/7.2.2.nix
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(x : x.ghc722Prefs) false false lowPrio;
haskellPackages_ghc741 =
recurseIntoAttrs
(haskellPackagesFun ../development/compilers/ghc/7.2.2.nix
(haskellPackagesFun ../development/compilers/ghc/7.4.1.nix
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(x : x.ghc722Prefs) false false lowPrio);
(x : x.ghc741Prefs) false false lowPrio);
# Reasonably current HEAD snapshot. Should *always* be lowPrio.
haskellPackages_ghcHEAD =
@@ -5187,6 +5191,8 @@ let
radius = callPackage ../servers/radius { };
redis = callPackage ../servers/nosql/redis { };
redstore = callPackage ../servers/http/redstore { };
samba = callPackage ../servers/samba { };
pkgs/top-level/haskell-packages.nix
+57 -39
View File
@@ -90,6 +90,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_4_0_0 super; # link
ghc721Prefs = super : super // super.haskellPlatformDefaults_future super;
ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; #link
ghc741Prefs = super : super // super.haskellPlatformDefaults_HEAD super;
ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super;
# GHC and its wrapper
@@ -134,34 +135,33 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellPlatformArgs_future = self : {
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4; # 7.2 ok, 7.3 ok
fgl = self.fgl_5_4_2_4; # 7.2 ok, 7.3 ok
GLUT = self.GLUT_2_1_2_1; # 7.2 ok, 7.3 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.2 fails, 7.3 fails
html = self.html_1_0_1_2; # 7.2 ok, 7.3 ok
HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok
network = self.network_2_3_0_8; # 7.2 ok, 7.3 ok
OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok
parallel = self.parallel_3_2_0_2; # 7.2 ok, 7.3 ok
parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok
QuickCheck = self.QuickCheck_2_4_2; # 7.2 ok, 7.3 ok
regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok
regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok
regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok
stm = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok
syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok
xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
text = self.text_0_11_1_13; # 7.2 ok, 7.3 ok
transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok
mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok
random = self.random_1_0_1_1; # 7.2 ok, 7.3 ok
cabalInstall = self.cabalInstall_0_10_2; # 7.2 fails, 7.3 fails
alex = self.alex_3_0_1; # 7.2 ok, 7.3 ok
happy = self.happy_1_18_8; # 7.2 ok, 7.3 ok
haddock = self.haddock_2_9_2; # 7.2 fails, 7.3 fails
cgi = self.cgi_3001_1_7_4; # 7.4.1 ok
fgl = self.fgl_5_4_2_4; # 7.4.1 ok
GLUT = self.GLUT_2_1_2_1; # 7.4.1 fails
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 fails
html = self.html_1_0_1_2; # 7.4.1 ok
HUnit = self.HUnit_1_2_2_3; # 7.4.1 ok
network = self.network_2_3_0_10; # 7.4.1 ok
OpenGL = self.OpenGL_2_2_3_0; # 7.4.1 fails
parallel = self.parallel_3_2_0_2; # 7.4.1 ok
parsec = self.parsec_3_1_2; # 7.4.1 ok
QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok
regexBase = self.regexBase_0_93_2; # 7.4.1 ok
regexCompat = self.regexCompat_0_93_1; # 7.4.1 ok
regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok
stm = self.stm_2_2_0_1; # 7.4.1 ok
syb = self.syb_0_3_6; # 7.4.1 ok
xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok
zlib = self.zlib_0_5_3_1; # 7.4.1 ok
HTTP = self.HTTP_4000_2_2; # 7.4.1 ok
text = self.text_0_11_1_13; # 7.4.1 ok
transformers = self.transformers_0_2_2_0; # 7.4.1 ok
mtl = self.mtl_2_0_1_0; # 7.4.1 ok
random = self.random_1_0_1_1; # 7.4.1 ok
cabalInstall = self.cabalInstall_0_10_2; # 7.4.1 fails
alex = self.alex_3_0_1; # 7.4.1 ok
happy = self.happy_1_18_8; # 7.4.1 fails
haddock = self.haddock_2_9_2; # 7.4.1 fails
};
haskellPlatformDefaults_future =
@@ -171,7 +171,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellPlatformDefaults_HEAD =
self : self.haskellPlatformDefaults_future self // {
deepseq = null; # apparently a core library in ghc-7.3
};
haskellPlatformArgs_2011_4_0_0 = self : {
@@ -371,6 +370,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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
deepseq = self.deepseq_1_1_0_2;
# deviating from Haskell platform here, to make some packages (notably statistics) compile
};
haskellPlatform_2010_1_0_0 =
@@ -410,13 +411,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
text = self.text_0_11_0_6;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
deepseq = self.deepseq_1_1_0_2;
# deviating from Haskell platform here, to make some packages (notably statistics) compile
};
haskellPlatform_2009_2_0_2 =
callPackage ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix
(self.haskellPlatformArgs_2009_2_0_2 self);
# Haskell libraries.
Agda = callPackage ../development/libraries/haskell/Agda {};
@@ -465,6 +467,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
bitarray = callPackage ../development/libraries/haskell/bitarray {};
bitmap = callPackage ../development/libraries/haskell/bitmap {};
bktrees = callPackage ../development/libraries/haskell/bktrees {};
@@ -539,6 +543,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
containersDeepseq = callPackage ../development/libraries/haskell/containers-deepseq {};
controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {};
convertible = callPackage ../development/libraries/haskell/convertible {
@@ -597,7 +603,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {};
deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {};
deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {};
deepseq = self.deepseq_1_1_0_0;
deepseq_1_3_0_0 = callPackage ../development/libraries/haskell/deepseq/1.3.0.0.nix {};
deepseq = null; # a core package in recent GHCs
deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {};
@@ -648,6 +655,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {};
extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {};
extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {};
extensibleExceptions_0_1_1_4 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {};
extensibleExceptions = null; # a core package in recent GHCs
failure = callPackage ../development/libraries/haskell/failure {};
@@ -677,6 +685,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
gamma = callPackage ../development/libraries/haskell/gamma {};
gd = callPackage ../development/libraries/haskell/gd {
inherit (pkgs) gd zlib;
};
gdiff = callPackage ../development/libraries/haskell/gdiff {};
genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {};
@@ -891,6 +903,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {};
ieee754 = callPackage ../development/libraries/haskell/ieee754 {};
instantGenerics = callPackage ../development/libraries/haskell/instant-generics {};
ioStorage = callPackage ../development/libraries/haskell/io-storage {};
@@ -1012,7 +1026,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
network_2_3_0_8 = callPackage ../development/libraries/haskell/network/2.3.0.8.nix {};
network = self.network_2_3_0_8;
network_2_3_0_10 = callPackage ../development/libraries/haskell/network/2.3.0.10.nix {};
network = self.network_2_3_0_10;
nixosTypes = callPackage ../development/libraries/haskell/nixos-types {};
@@ -1144,7 +1159,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {};
regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {};
regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {};
regexBase = self.regexBase_0_72_0_2;
regexBase = self.regexBase_0_93_2;
regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {};
regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {};
@@ -1156,11 +1171,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
regexCompat = self.regexCompat_0_71_0_1;
regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {};
regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {};
regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {};
regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {};
regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {};
regexPosix = self.regexPosix_0_72_0_3;
regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {};
regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {};
regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {};
regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {
regexBase = self.regexBase_0_93_2;
};
regexPosix = self.regexPosix_0_95_1;
regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {};
regexTdfa = self.regexTDFA;
@@ -1445,7 +1462,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {};
xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {};
xhtml = self.xhtml_3000_2_0_1;
xhtml_3000_2_0_5 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.5.nix {};
xhtml = self.xhtml_3000_2_0_5;
xml = callPackage ../development/libraries/haskell/xml {};