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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=26303
This commit is contained in:
Eelco Dolstra 2011-03-14 18:26:46 +00:00
commit 3e3eac2e30
172 changed files with 1290 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maintainers/scripts/gnu/gnupdate
View File

@ -527,6 +527,8 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
"gcc43"
"gcc44"
"gcc45"
"gcc45_real"
"gcc45_realCross"
"glibc25"
"glibc27"
"glibc29"
@ -575,6 +577,7 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
(define (ftp-server/directory project)
(define quirks
'(("commoncpp2" "ftp.gnu.org" "/gnu/commoncpp" #f)
("ucommon" "ftp.gnu.org" "/gnu/commoncpp" #f)
("libzrtpcpp" "ftp.gnu.org" "/gnu/ccrtp" #f)
("libosip2" "ftp.gnu.org" "/gnu/osip" #f)
("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t)

35
pkgs/applications/audio/gmu/default.nix Normal file
View File

@ -0,0 +1,35 @@
{stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod
, speex
, keymap ? "newdefault"
, conf ? "unknown"
}:
stdenv.mkDerivation rec {
name = "gmu-0.7.2";
src = fetchurl {
url = http://wejp.k.vu/files/gmu-0.7.2.tar.gz;
sha256 = "0gvhwhhlj64lc425wqch4g6v59ldd5i3rxll3zdcrdgk2vkh8nys";
};
buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ];
NIX_LDFLAGS = "-lgcc_s";
preBuild = ''
makeFlags="$makeFlags PREFIX=$out"
'';
postInstall = ''
cp ${keymap}.keymap $out/share/gmu/default.keymap
cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf
ensureDir $out/etc/gmu
cp gmu.${conf}.conf $out/etc/gmu/gmu.conf
'';
meta = {
homepage = http://wejp.k.vu/projects/gmu;
description = "Open source music player for portable gaming consoles and handhelds";
license = "GPLv2";
};
}

10
pkgs/applications/editors/emacs-23/default.nix
View File

@ -8,13 +8,13 @@ assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
stdenv.mkDerivation rec {
name = "emacs-23.2";
name = "emacs-23.3";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.bz2";
sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z";
sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a";
};
buildInputs =
@ -25,7 +25,11 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isLinux dbus;
configureFlags =
stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ];
stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"]
# On NixOS, help Emacs find `crt*.o'.
++ stdenv.lib.optional (stdenv ? glibc)
[ "--with-crt-dir=${stdenv.glibc}/lib" ];
doCheck = true;

6
pkgs/applications/editors/texmacs/default.nix
View File

@ -9,7 +9,7 @@
let
pname = "TeXmacs";
version = "1.0.7.9";
version = "1.0.7.10";
extraFontsSrc = fetchurl {
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz";
sha256 = "081ysqvka6m2vy2n9q89mmprsb0vkvxgjil0cqv9c2syvn79z4cm";
sha256 = "02gqalr775r4xyfy4bq3qq1h3pkarsxjb6ami7lgxfgmyg6ca5kn";
};
buildInputs = [ guile libX11 libXext makeWrapper ];
buildInputs = [ guile libX11 libXext makeWrapper ghostscriptX ];
patchPhase = (if tex == null then ''
gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)

4
pkgs/applications/editors/zile/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, ncurses, help2man }:
stdenv.mkDerivation rec {
name = "zile-2.3.21";
name = "zile-2.3.22";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
sha256 = "1cmw98khpyk0yv3fn94506fm7589adfbs57czrdsm4q8xf2xrj4i";
sha256 = "0zkmym5vpb653c5gmzic8588v4ksidnhh33s4pjvr24n7vgj9biy";
};
buildInputs = [ ncurses ];

4
pkgs/applications/graphics/djview/default.nix
View File

@ -9,6 +9,10 @@ stdenv.mkDerivation {
buildInputs = [djvulibre qt4];
passthru = {
mozillaPlugin = "/lib/netscape/plugins";
};
meta = {
homepage = http://djvu.sourceforge.net/djview4.html;
description = "A new portable DjVu viewer and browser plugin";

4
pkgs/applications/misc/k3b/default.nix
View File

@ -5,10 +5,10 @@
}:
stdenv.mkDerivation rec {
name = "k3b-2.0.1";
name = "k3b-2.0.2";
src = fetchurl {
url = "mirror://sourceforge/k3b/${name}.tar.bz2";
sha256 = "1dyd3i2hqd5xs9rz4f8k74zca91j9sp72lhl0zws2cvqc474ccc6";
sha256 = "1kdpylz3w9bg02jg4mjhqz8bq1yb4xi4fqfl9139qcyjq4lny5xg";
};
buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib

4
pkgs/applications/misc/lyx/default.nix
View File

@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
version = "1.6.5";
version = "1.6.9";
name = "lyx-${version}";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${name}.tar.bz2";
sha256 = "0xxj37l4ghaa2ij5nfxlg90rfw0znipigjlh271mfmwjw9ykcw1n";
sha256 = "c5b3602c58db385be5c52ba958f52239c5fd090320ec99d79b7eb861c1597709";
};
buildInputs = [texLive qt python makeWrapper ];

6
pkgs/applications/networking/browsers/firefox/3.6.nix
View File

@ -12,14 +12,14 @@
rec {
firefoxVersion = "3.6.14";
firefoxVersion = "3.6.15";
xulVersion = "1.9.2.14"; # this attribute is used by other packages
xulVersion = "1.9.2.15"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "8f4e221951f74366619473bd46e04b4c81606ef0";
sha1 = "bfb69ae49b2def7482543d4d982fa58993a458e9";
};

4
pkgs/applications/networking/browsers/icecat-3/default.nix
View File

@ -9,13 +9,13 @@
# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
#assert stdenv.isLinux -> (wirelesstools != null);
let version = "3.6.13"; in
let version = "3.6.15"; in
stdenv.mkDerivation {
name = "icecat-${version}";
src = fetchurl {
url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
sha256 = "0lnpny34sryi55clwcnn80ya7124ips11y18ba36bc2sqwiniigb";
sha256 = "1px018bd81c81a4hbz0qgf89pkshkbhg4abwq1d26dwy8128cxwg";
};
buildInputs =

4
pkgs/applications/version-management/darcs/darcs-2.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self : {
pname = "darcs";
name = self.fname;
version = "2.5";
sha256 = "0i99z3wsfc1hhr0a0ax7254gj3i69yg8cb9lhp55wl6lfqvpzcnh";
version = "2.5.1";
sha256 = "0h7i2nw1fkmdrvwgzccqvbbfx8bdhn0h9d5rd98ayjs207dnvrj8";
propagatedBuildInputs = [
curl html parsec regexCompat haskeline hashedStorage zlib tar text

9
pkgs/applications/window-managers/xmonad/default.nix
View File

@ -1,11 +1,12 @@
{cabal, X11, mtl, xmessage}:
{cabal, X11, mtl, xmessage, syb}:
cabal.mkDerivation (self : {
pname = "xmonad";
name = "${self.fname}";
version = "0.9.1";
sha256 = "014201200e8a521ee3a0d8c0727392916a7549207b91064fb456f8c660609927";
propagatedBuildInputs = [X11 mtl];
version = "0.9.2";
sha256 = "07w5k3pqmybjn0zh2nr1glp69685xg2fhj3z9zxb37x5nzss7kdd";
noHaddock = true;
propagatedBuildInputs = [X11 mtl syb];
meta = {
description = "xmonad is a tiling window manager for X";
homepage = http://xmonad.org/;

5
pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
View File

@ -2,9 +2,8 @@
cabal.mkDerivation (self : {
pname = "xmonad-contrib";
name = "${self.fname}";
version = "0.9.1";
sha256 = "b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47";
version = "0.9.2";
sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p";
propagatedBuildInputs = [X11 xmonad utf8String X11Xft];
meta = {
description = "a huge extension library for xmonad";

35
pkgs/development/compilers/flapjax/default.nix
View File

@ -1,25 +1,30 @@
args:
args.stdenv.mkDerivation {
name = "flapjax-source-20070514";
{cabal, fetchurl, unzip, xhtml, WebBits, WebBitsHtml, JsContracts}:
src = args.fetchurl {
url = http://www.flapjax-lang.org/download/20070514/flapjax-source.tar.gz;
sha256 = "188dafpggbfdyciqhrjaq12q0q01z1rp3mpm2iixb0mvrci14flc";
cabal.mkDerivation ( self: {
pname = "flapjax";
version = "2.1";
src = fetchurl {
url = https://github.com/brownplt/flapjax/zipball/Flapjax-2.1;
name = "flapjax-2.1.zip";
sha256 = "1cp9g570528a813ljnvd1lb389iz0i6511xynf6kzryv8ckc1n7v";
};
phases = "unpackPhase buildPhase";
# The Makefile copies some files to update the flapjax website into
# missing directories; the -p is to avoid these errors.
preConfigure = ''
cd fx
sed -i 's/mkdir/mkdir -p/' Makefile
make
cd ../compiler
'';
buildPhase = "
ensureDir \$out/bin
cd compiler;
ghc --make Fjc.hs -o \$out/bin/fjc
";
buildInputs =(with args; [ghc] ++ libs);
extraBuildInputs = [ unzip JsContracts ];
propagatedBuildInputs = [ xhtml WebBits WebBitsHtml ];
meta = {
description = "programming language designed around the demands of modern, client-based Web applications";
homepage = http://www.flapjax-lang.org/;
license = "BSD";
};
}
})

4
pkgs/development/libraries/gnutls/default.nix
View File

@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
name = "gnutls-2.10.4";
name = "gnutls-2.10.5";
src = fetchurl {
url = "mirror://gnu/gnutls/${name}.tar.bz2";
sha256 = "1j2zfjipvzqfamyygndckjksizb5dd7f9wazvfciwrzya1jf7gxq";
sha256 = "1jfrxd1h4f5kkfzrwx8yx6a2dwrgqr6imbxnil1jfi7hdr1db1n0";
};
configurePhase = ''

10
pkgs/development/libraries/haskell/Agda/default.nix
View File

@ -1,13 +1,15 @@
{cabal, QuickCheck, binary, haskeline, haskellSrc, mtl, utf8String, xhtml, zlib,
{cabal, QuickCheck, binary, haskeline, haskellSrcExts, mtl, utf8String,
syb, xhtml, zlib,
happy, alex}:
cabal.mkDerivation (self : {
pname = "Agda";
version = "2.2.8";
sha256 = "06j2s7x3h5lanygd6mhhxkzjf4c0m8pw6c0s7gbmwlxqrkz9firg";
version = "2.2.10";
sha256 = "1bh96g5c6b6jzaf3m9gm0vr64avgi86kb45p8i1vg1jbfjdbdlsw";
extraBuildInputs = [happy alex];
propagatedBuildInputs =
[QuickCheck binary haskeline haskellSrc mtl utf8String xhtml zlib];
[QuickCheck binary haskeline haskellSrcExts mtl utf8String
syb xhtml zlib];
meta = {
description = "A dependently typed functional language and proof assistant";
maintainers = [self.stdenv.lib.maintainers.andres];

0
pkgs/development/libraries/haskell/GLUT/default.nix → pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
View File

4
pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "GLUT";
version = "2.1.2.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
sha256 = "0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264";
version = "2.1.2.1"; # Haskell Platform 2010.1.0.0, 2010.2.0.0, 2011.2.0.0
sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02";
propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa];
meta = {
description = "A binding for the OpenGL Utility Toolkit";

25
pkgs/development/libraries/haskell/HAppS/HAppS-Data.nix
View File

@ -1,25 +0,0 @@
{cabal, mtl, sybWithClass, HaXml, HAppSUtil, bytestring, binary}:
cabal.mkDerivation (self : {
pname = "HAppS-Data";
version = "0.9.3";
sha256 = "b23c6f4a949927194e47f9781edc3b7d38513210de4a24987859d68b375bc335";
propagatedBuildInputs = [mtl sybWithClass HaXml HAppSUtil bytestring binary];
meta = {
description = ''HAppS data manipulation libraries'';
longDescription = ''
This package provides libraries for:
* Deriving instances for your datatypes.
* Producing default values of Haskell datatypes.
* Normalizing values of Haskell datatypes.
* Marshalling Haskell values to and from XML.
* Marshalling Haskell values to and from HTML forms.
'';
license = "free";
};
})

12
pkgs/development/libraries/haskell/HAppS/HAppS-IxSet.nix
View File

@ -1,12 +0,0 @@
{cabal, mtl, hslogger, HAppSUtil, HAppSState, HAppSData, sybWithClass}:
cabal.mkDerivation (self : {
pname = "HAppS-IxSet";
version = "0.9.3";
sha256 = "ebacd72e153bbcafb18bf4fa607550de98f8a991e9cfd8314b572cacf155a372";
propagatedBuildInputs = [mtl hslogger HAppSUtil HAppSState HAppSData sybWithClass];
meta = {
longDescription = ''Web framework'';
license = "free";
};
})

13
pkgs/development/libraries/haskell/HAppS/HAppS-Server.nix
View File

@ -1,13 +0,0 @@
{cabal, HaXml, parsec, mtl, network, hslogger, HAppSData, HAppSUtil, HAppSState, HAppSIxSet, HTTP, xhtml, html, bytestring}:
cabal.mkDerivation (self : {
pname = "HAppS-Server";
version = "0.9.3.1";
sha256 = "b03129f332c35cd558b0f32bc626321dcfa2647dd7ddf67f3403eca8c4c52038";
propagatedBuildInputs = [HaXml parsec mtl network hslogger HAppSData HAppSUtil HAppSState HAppSIxSet HTTP xhtml html bytestring];
meta = {
description = ''Web related tools and services.'';
longDescription = ''Web framework'';
license = "free";
};
})

13
pkgs/development/libraries/haskell/HAppS/HAppS-State.nix
View File

@ -1,13 +0,0 @@
{cabal, HaXml, mtl, network, stm, hslogger, HAppSUtil, HAppSData, bytestring, binary, hspread}:
cabal.mkDerivation (self : {
pname = "HAppS-State";
version = "0.9.3";
sha256 = "5099e635f8fcf56f775947a241a24e1aab6eb6d9fee0406e6a2169c4c8b331e4";
propagatedBuildInputs = [HaXml mtl network stm hslogger HAppSUtil HAppSData bytestring binary hspread];
meta = {
description = ''Event-based distributed state.'';
longDescription = ''Web framework'';
license = "free";
};
})

12
pkgs/development/libraries/haskell/HAppS/HAppS-Util.nix
View File

@ -1,12 +0,0 @@
{cabal, mtl, hslogger, bytestring}:
cabal.mkDerivation (self : {
pname = "HAppS-Util";
version = "0.9.3";
sha256 = "f9120d256e37111b6203dfc4eb598dd438c87e53bb9eb37258c999dd49b8e655";
propagatedBuildInputs = [mtl hslogger bytestring];
meta = {
description = ''Web framework'';
license = "free";
};
})

8
pkgs/development/libraries/haskell/HStringTemplate/default.nix
View File

@ -1,10 +1,10 @@
{cabal, parsec, time, text, utf8String, parallel}:
{cabal, parsec, time, text, utf8String, parallel, syb}:
cabal.mkDerivation (self : {
pname = "HStringTemplate";
version = "0.6.5";
sha256 = "e40b69e22900f381ca7fb080ea6e70d623e52e909bd7b896bc24e15c8e43252c";
propagatedBuildInputs = [parsec time text utf8String parallel];
version = "0.6.6";
sha256 = "1ian79az5q6m08pwb5fks52ffs4h2mq02kkcwmr6jb7i0ha2k2si";
propagatedBuildInputs = [parsec time text utf8String parallel syb];
meta = {
description = "StringTemplate implementation in Haskell";
};

0
pkgs/development/libraries/haskell/HTTP/3001.nix → pkgs/development/libraries/haskell/HTTP/3001.1.5.nix
View File

0
pkgs/development/libraries/haskell/HTTP/default.nix → pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
View File

12
pkgs/development/libraries/haskell/HTTP/4000.1.1.nix Normal file
View File

@ -0,0 +1,12 @@
{cabal, mtl, network, parsec}:
cabal.mkDerivation (self : {
pname = "HTTP";
version = "4000.1.1"; # Haskell Platform 2011.2.0.0
sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3";
propagatedBuildInputs = [mtl network parsec];
meta = {
description = "a Haskell library for client-side HTTP";
};
})

0
pkgs/development/libraries/haskell/HUnit/default.nix → pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
View File

11
pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix Normal file
View File

@ -0,0 +1,11 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "HUnit";
version = "1.2.2.3"; # Haskell Platform 2011.2.0.0
sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz";
meta = {
description = "A unit testing framework for Haskell";
};
})

0
pkgs/development/libraries/haskell/HaXml/default.nix → pkgs/development/libraries/haskell/HaXml/1.20.2.nix
View File

13
pkgs/development/libraries/haskell/JsContracts/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal, WebBits, WebBitsHtml}:
cabal.mkDerivation (self : {
pname = "JsContracts";
version = "0.5.3";
sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
propagatedBuildInputs = [ WebBits WebBitsHtml ];
meta = {
description = "Design-by-contract for JavaScript.";
};
})

12
pkgs/development/libraries/haskell/ListLike/default.nix Normal file
View File

@ -0,0 +1,12 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "ListLike";
version = "3.0.1";
sha256 = "1366ipy33fphjjk583c62rsyfwh36i5lbnip1v8r089c9glvwkxf";
meta = {
description = "Generic support for list-like structures";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

0
pkgs/development/libraries/haskell/OpenGL/default.nix → pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
View File

4
pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "OpenGL";
version = "2.2.3.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
sha256 = "a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502";
version = "2.2.3.0"; # Haskell Platform 2010.1.0.0, 2010.2.0.0, 2011.2.0.0
sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57";
propagatedBuildInputs = [mesa libX11];
meta = {
description = "A binding for the OpenGL graphics system";

0
pkgs/development/libraries/haskell/QuickCheck/default.nix → pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
View File

11
pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix Normal file
View File

@ -0,0 +1,11 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "QuickCheck";
version = "1.2.0.1"; # version of QuickCheck1 compatible with base-4
sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
meta = {
description = "Automatic testing of Haskell programs";
};
})

0
pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix → pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
View File

14
pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix Normal file
View File

@ -0,0 +1,14 @@
{cabal, mtl}:
cabal.mkDerivation (self : {
pname = "QuickCheck";
version = "2.4.0.1"; # Haskell Platform 2011.2.0.0
sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r";
propagatedBuildInputs = [mtl];
meta = {
description = "Automatic testing of Haskell programs";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

4
pkgs/development/libraries/haskell/SHA/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "SHA";
version = "1.4.1.1";
sha256 = "8ecdc91679d1aa1d4050e1124cf5af79ae2ece66aee3b907e1078d71bf03169a";
version = "1.4.1.3";
sha256 = "1sx68mvzb2y3dq9hk769fzp8vw4jf4hk5v45i0a9a8b31imlicf0";
propagatedBuildInputs = [binary];
meta = {
description = "Implementations of the SHA suite of message digest functions";

13
pkgs/development/libraries/haskell/WebBits-Html/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal, WebBits}:
cabal.mkDerivation (self : {
pname = "WebBits-Html";
version = "1.0.1";
sha256 = "134rmm5ccfsjdr0pdwn2mf81l81rgxapa3wjjfjkxrkxq6hav35n";
propagatedBuildInputs = [ WebBits ];
meta = {
description = "WebBits is a collection of libraries for working with JavaScript embeded in HTML files.";
};
})

13
pkgs/development/libraries/haskell/WebBits/1.0.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal, mtl, parsec, syb}:
cabal.mkDerivation (self : {
pname = "WebBits";
version = "1.0";
sha256 = "1xqk4ajywlaq9nb9a02i7c25na5p2qbpc2k9zw93gbapppjiapsc";
propagatedBuildInputs = [ mtl parsec syb ];
meta = {
description = "WebBits is a collection of libraries for working with JavaScript.";
};
})

13
pkgs/development/libraries/haskell/WebBits/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal, mtl, parsec, syb}:
cabal.mkDerivation (self : {
pname = "WebBits";
version = "2.0";
sha256 = "14a1rqlq925f6rdbi8yx44xszj5pvskcmw1gi1bj8hbilgmlwi7f";
propagatedBuildInputs = [ mtl parsec syb ];
meta = {
description = "WebBits is a collection of libraries for working with JavaScript.";
};
})

4
pkgs/development/libraries/haskell/X11/default.nix
View File

@ -1,4 +1,4 @@
{cabal, libX11, xineramaSupport ? true, libXinerama ? null, libXext ? null}:
{cabal, syb, libX11, xineramaSupport ? true, libXinerama ? null, libXext ? null}:
assert xineramaSupport -> (libXinerama != null && libXext != null);
@ -6,7 +6,7 @@ cabal.mkDerivation (self : {
pname = "X11";
version = "1.5.0.0";
sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f";
propagatedBuildInputs = [libX11] ++ (if xineramaSupport then [libXinerama libXext] else []);
propagatedBuildInputs = [libX11 syb] ++ (if xineramaSupport then [libXinerama libXext] else []);
meta = {
description = "A Haskell binding to the X11 graphics library";
};

4
pkgs/development/libraries/haskell/blaze-builder/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "blaze-builder";
version = "0.1";
sha256 = "dc4c542a39cf9e82b6a7ca99d6f460d6fa8dc4c8f648224368eac3fe054127c5";
version = "0.2.1.4";
sha256 = "0r0lj2whwa1v99gx59l56af06w704qvv1vhkxlca86h7iri4b262";
propagatedBuildInputs = [text];
meta = {
description = "Builder to efficiently append text";

8
pkgs/development/libraries/haskell/blaze-html/default.nix
View File

@ -1,10 +1,10 @@
{cabal, text}:
{cabal, text, blazeBuilder}:
cabal.mkDerivation (self : {
pname = "blaze-html";
version = "0.1.2";
sha256 = "c1e65e3d23e90a3830ceee69ecfac65c7a8a045da06443fb7690609a59480f5f";
propagatedBuildInputs = [text];
version = "0.4.1.0";
sha256 = "0a39wzfsb8lsr0z8c0s90n6pwmhjg6lihbxigk2c02vn5marzc4f";
propagatedBuildInputs = [text blazeBuilder];
meta = {
description = "A blazingly fast HTML combinator library";
license = "BSD";

10
pkgs/development/libraries/haskell/cabal/cabal.nix
View File

@ -3,9 +3,9 @@
{stdenv, fetchurl, lib, ghc, enableLibraryProfiling ? false} :
{
mkDerivation =
transform :
let dtransform =
self : {
args : # arguments for the individual package, can modify the defaults
let defaults =
self : { # self is the final version of the attribute set
# pname should be defined by the client to be the package basename
# version should be defined by the client to be the package version
@ -77,7 +77,7 @@
./Setup build
export GHC_PACKAGE_PATH=$(ghc-packages)
[ -n "$noHadock" ] || ./Setup haddock
[ -n "$noHaddock" ] || ./Setup haddock
eval "$postBuild"
'';
@ -115,5 +115,5 @@
# in Cabal derivations.
inherit stdenv ghc;
};
in stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f);
in stdenv.mkDerivation ((rec { f = defaults f // args f; }).f);
}

4
pkgs/development/libraries/haskell/cairo/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "cairo";
version = "0.11.1";
sha256 = "6d7209bcdb92b09437980c51646c324f501edd2893393e48aa185462dfc07b58";
version = "0.12.0";
sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9";
extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools];
propagatedBuildInputs = [mtl];
meta = {

0
pkgs/development/libraries/haskell/cgi/default.nix → pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
View File

12
pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix Normal file
View File

@ -0,0 +1,12 @@
{cabal, mtl, network, parsec, xhtml}:
cabal.mkDerivation (self : {
pname = "cgi";
version = "3001.1.7.4"; # Haskell Platform 2011.2.0.0
sha256 = "1fiild4djzhyz683kwwb0k4wvhd89ihbn6vncjl270xvwj5xmrbd";
propagatedBuildInputs = [mtl network parsec xhtml];
meta = {
description = "A library for writing CGI programs";
};
})

13
pkgs/development/libraries/haskell/citeproc-hs/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal, json, mtl, pandocTypes, parsec, syb, utf8String, xml}:
cabal.mkDerivation (self : {
pname = "citeproc-hs";
version = "0.3.2";
sha256 = "04lq0w1yjasn4i9siqpw41ia9f67xlv7vqwhs2a87hr1jnr09pgf";
propagatedBuildInputs =
[json mtl pandocTypes parsec syb utf8String xml];
meta = {
description = "A Citation Style Language implementation in Haskell";
};
})

9
pkgs/development/libraries/haskell/criterion/default.nix
View File

@ -1,18 +1,15 @@
{cabal, deepseq, mtl, parallel, parsec, vector, vectorAlgorithms,
mwcRandom, statistics, Chart, dataAccessor}:
mwcRandom, statistics}:
cabal.mkDerivation (self : {
pname = "criterion";
version = "0.5.0.5";
sha256 = "1b1g7a2ip07j0554cj4d0413859fbdkaxpcgq2znjz7wh8z5aabn";
version = "0.5.0.7";
sha256 = "1f1vpc3cwvc6wjy7fras5kp1iap8abh6ap3w6pf75qpkbdrcd3dq";
propagatedBuildInputs = [
deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics
Chart dataAccessor
];
configureFlags = "-fchart";
meta = {
homepage = "http://bitbucket.org/bos/criterion";
description = "Robust, reliable performance measurement and analysis";

2
pkgs/development/libraries/haskell/datetime/default.nix
View File

@ -3,7 +3,7 @@
cabal.mkDerivation (self : {
pname = "datetime";
version = "0.1";
sha256 = "931acc70cb45922c95f2c3225d04619e19fd9c5947a66ae69e96d6e693195048";
sha256 = "0j2h369ydmlnkvk6m9j7b6fgs6cyc425s8n3yaajr4j5rdqcq6lk";
propagatedBuildInputs = [QuickCheck time];
meta = {
description = "Utilities to make Data.Time.* easier to use";

0
pkgs/development/libraries/haskell/deepseq/default.nix → pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
View File

11
pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix Normal file
View File

@ -0,0 +1,11 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "deepseq";
version = "1.1.0.2"; # Haskell Platform 2011.2.0.0
sha256 = "1iqk8lc2an2rd1j9lcr76yabiz18h10lazlmdg5c528yssyd6135";
meta = {
description = "Provides a deep version of seq, for fully evaluating data structures";
};
})

4
pkgs/development/libraries/haskell/digest/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "digest";
version = "0.0.0.5";
sha256 = "dddfcdd325dc7d4fb1ce4772c1f5618cb20504b28dba8a78682011cba1341efd";
version = "0.0.0.9";
sha256 = "15gj3iq3jm4lnkc6hnj9v8p8ia3yzbsajwf9by3b1kpl449k2h29";
propagatedBuildInputs = [zlib];
meta = {
description = "Various cryptographic hashes for bytestrings: CRC32 and Adler32 for now";

14
pkgs/development/libraries/haskell/dlist/default.nix Normal file
View File

@ -0,0 +1,14 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "dlist";
version = "0.5";
sha256 = "1shr5wlpha68h82gwpndr5441847l01gh3j7szyvnmgzkr0fb027";
propagatedBuildInputs = [];
meta = {
description = "Differences lists";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

4
pkgs/development/libraries/haskell/feed/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "feed";
version = "0.3.7";
sha256 = "c2d539f763cdce1b1498f1fd0707b12078337aff690f01e41db0b6e3569c08aa";
version = "0.3.8";
sha256 = "1yvigcvb8cvxfa8vb2i11xkrylqw57jwzkaji6m1wp03k80zf576";
propagatedBuildInputs = [utf8String xml];
meta = {
description = "Interfacing with RSS and Atom feeds";

0
pkgs/development/libraries/haskell/fgl/default.nix → pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
View File

4
pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "fgl";
version = "5.4.2.3"; # Haskell Platform 2010.2.0.0
sha256 = "e72142b555a5ab6c5cdced317b42e8cafdbb54b7e2e46ed14e6ca18d71d486b8";
version = "5.4.2.3"; # Haskell Platform 2010.2.0.0 and 2011.2.0.0
sha256 = "1f46siqqv8bc9v8nxr72nxabpzfax117ncgdvif6rax5ansl48g7";
propagatedBuildInputs = [mtl];
meta = {
description = "Martin Erwig's Functional Graph Library";

4
pkgs/development/libraries/haskell/filestore/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "filestore";
version = "0.3.4.1";
sha256 = "ad04333fae938ae7de747457a6bdee30c6e4b700733265dbd1f4f8ee363c8230";
version = "0.4.0.3";
sha256 = "098z9niavzxfzwk40xabah3x06vdzprvsjkyx99wlmapi5rynfz3";
propagatedBuildInputs = [datetime parsec regexPosix split time utf8String xml Diff];
meta = {
description = "Interface for versioning file stores";

3
pkgs/development/libraries/haskell/ghc-events/default.nix
View File

@ -5,6 +5,9 @@ cabal.mkDerivation (self : {
version = "0.2.0.1";
sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6";
propagatedBuildInputs = [binary mtl];
preConfigure = ''
sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal
'';
meta = {
description = "Library and tool for parsing .eventlog files from GHC";
license = "BSD";

10
pkgs/development/libraries/haskell/gitit/default.nix
View File

@ -2,20 +2,20 @@
SHA, cgi, datetime,
filestore, highlightingKate, safe, mtl, network, pandoc, parsec,
recaptcha, utf8String, xhtml, zlib, ConfigFile, url,
cautiousFile, feed}:
cautiousFile, feed, xssSanitize}:
cabal.mkDerivation (self : {
pname = "gitit";
version = "0.7.3.8";
sha256 = "356c82604dcfe2eec4faeb36ee46546ea3e26738780723f457366b2e35f6211a";
version = "0.7.3.12";
sha256 = "1z5cbkgfvwc9h6jciw7ghlj9ra6xph5z4lmliwkdnf38wfparxja";
propagatedBuildInputs = [
HStringTemplate happstackServer happstackUtil HTTP SHA cgi datetime
filestore highlightingKate safe
mtl network pandoc parsec recaptcha utf8String xhtml zlib ConfigFile
url cautiousFile feed
url cautiousFile feed xssSanitize
];
meta = {
description = "Wiki using HAppS, git or darcs, and pandoc";
description = "Wiki using happstack, git or darcs, and pandoc";
license = "GPL";
maintainers = [self.stdenv.lib.maintainers.andres];
};

4
pkgs/development/libraries/haskell/glade/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "glade";
version = "0.11.1";
sha256 = "0d96a8576f89a81aa1ecdaf172e42e9eb1e7b40ce1b23cff36ab473165832c6a";
version = "0.12.0";
sha256 = "0h7l1kp9y17xqyz16kv0dvwgblph9r70wimyl8aq9gi1r4is5lmq";
extraBuildInputs = [pkgconfig gtk2hsBuildtools gnome.libglade gnome.gtk glibc];
propagatedBuildInputs = [cairo glib gtk mtl pango];
meta = {

4
pkgs/development/libraries/haskell/glib/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "glib";
version = "0.11.2";
sha256 = "e0fb5f3c22701807db364dff86d55f2a33a57d8a4e58d37a80d367bca50b3dbb";
version = "0.12.0";
sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19";
extraBuildInputs = [pkgconfig glib glibc gtk2hsBuildtools];
meta = {
description = "Binding to the GLIB library for Gtk2Hs";

4
pkgs/development/libraries/haskell/gtk/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "gtk";
version = "0.11.2";
sha256 = "c9de86278780badbd874fb75ef01ca12a70364a9985b75f98957ba940df27aa6";
version = "0.12.0";
sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2";
extraBuildInputs = [pkgconfig gtk2hsBuildtools gtk glibc];
propagatedBuildInputs = [cairo glib mtl pango];
meta = {

4
pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "gtk2hs-buildtools";
version = "0.11.2";
sha256 = "330c52830358966bcff308f58a570e84bb0b4d6004b6f01107d55dd88faa54ad";
version = "0.12.0";
sha256 = "1czlmyr9zhzc0h1j0z3chv06ma77cibq2yc6h1slfphb1lkv66a8";
extraBuildInputs = [alex happy];
meta = {
description = "Tools to build the Gtk2Hs suite of User Interface libraries";

44
pkgs/development/libraries/haskell/gtk2hs/default.nix
View File

@ -1,44 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gnome, cairo, ghc, mtl }:
stdenv.mkDerivation rec {
pname = "gtk2hs";
version = "0.10.0";
fname = "${pname}-${version}";
name = "haskell-${pname}-ghc${ghc.ghc.version}-${version}";
src = fetchurl {
url = http://nixos.org/tarballs/gtk2hs-0.10.0-20090419.tar.gz;
sha256 = "18a7cfph83yvv91ks37nrgqrn21fvww8bhb8nd8xy1mgb8lnfds1";
};
propagatedBuildInputs = [mtl];
buildInputs = [
pkgconfig cairo ghc gnome.glib gnome.gtk gnome.libglade
gnome.GConf gnome.gtksourceview gnome.librsvg
];
preConfigure =
''
sed -i gio/gio.package.conf.in -e 's|@GIO_LIBDIR_CQ@|"${gnome.glib}/lib", "${gnome.glib}/lib64", @GIO_LIBDIR_CQ@|'
sed -i gtk/gtk.package.conf.in -e 's|@GTK_LIBDIR_CQ@|"${gnome.glib}/lib", "${gnome.glib}/lib64", @GTK_LIBDIR_CQ@|'
'';
configureFlags = ["--without-pkgreg"];
postInstall =
''
local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version}
local installedPkgConf=$confDir/${fname}.installedconf
ensureDir $out/bin # necessary to get it added to PATH
ensureDir $confDir
echo $installedPkgConf
echo '[]' > $installedPkgConf
for pkgConf in $out/lib/gtk2hs/*.conf; do
cp $pkgConf $confDir/
GHC_PACKAGE_PATH=$installedPkgConf ghc-pkg --global register $pkgConf --force
done
''; # */
passthru = { inherit (gnome) gtksourceview; };
}

4
pkgs/development/libraries/haskell/gtksourceview2/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "gtksourceview2";
version = "0.11.1";
sha256 = "1skb13ssp6sd06jb3nshv97wjqvwa0mnzcxgmrxwd5l21r6k1m2v";
version = "0.12.2";
sha256 = "0l9y48kmzqzps6k54fgf0dkmmv0ppxx8amggfdswwk86zsf8j81r";
extraBuildInputs = [pkgconfig gtksourceview gtkC glibc gtk2hsBuildtools];
propagatedBuildInputs = [glib gtk];
meta = {

10
pkgs/development/libraries/haskell/hakyll/default.nix
View File

@ -1,10 +1,12 @@
{cabal, binary, hamlet, mtl, network, pandoc, regexBase, regexTDFA, time}:
{cabal, binary, blazeHtml, hamlet, mtl, network, pandoc, regexBase,
regexTDFA}:
cabal.mkDerivation (self : {
pname = "hakyll";
version = "2.3";
sha256 = "40e57c5cf5be3c6fdc270d00ff765a2b3e11ba7e302f40146d83048aa4436116";
propagatedBuildInputs = [hamlet mtl network pandoc regexBase regexTDFA time];
version = "2.4.3";
sha256 = "1n1hibwhg22l9p126d10zwhvaab46svcri2rkvd78f4vhmwpvkbs";
propagatedBuildInputs =
[binary blazeHtml hamlet mtl network pandoc regexBase regexTDFA];
meta = {
description = "A simple static site generator library";
license = "BSD";

11
pkgs/development/libraries/haskell/hamlet/default.nix
View File

@ -1,12 +1,11 @@
{cabal, blazeHtml, blazeBuilder, parsec, utf8String, failure, neither}:
{cabal, blazeBuilder, failure, parsec, text}:
cabal.mkDerivation (self : {
pname = "hamlet";
version = "0.5.0";
sha256 = "92d8e099fa63fe218e2c8c4da56ac86b0b0bb49139467b8f12595c4436d1ad0b";
propagatedBuildInputs = [
blazeHtml blazeBuilder parsec utf8String failure neither
];
version = "0.6.1.2";
sha256 = "0aqrjdbqb99nz3snnsrgkd6bnaj1m3bdm8kj9agd3qgv8lv90knn";
propagatedBuildInputs =
[blazeBuilder failure parsec text];
meta = {
description = "Haml-like template files that are compile-time checked";
license = "BSD";

8
pkgs/development/libraries/haskell/happstack/happstack-data.nix
View File

@ -1,12 +1,12 @@
{cabal, mtl, sybWithClass, sybWithClassInstancesText, HaXml,
{cabal, mtl, syb, sybWithClass, sybWithClassInstancesText, HaXml,
happstackUtil, binary, text}:
cabal.mkDerivation (self : {
pname = "happstack-data";
version = "0.5.0.2";
sha256 = "03795c24acc2268f39d38f18dd6cbfb92893f7de88b0443219d582a1eabdacd5";
version = "0.5.0.3";
sha256 = "0zjsb9n1iawg2jv6i5q52awifly7yi6w0ilndivwp168qvi25awn";
propagatedBuildInputs = [
mtl sybWithClass sybWithClassInstancesText HaXml
mtl syb sybWithClass sybWithClassInstancesText HaXml
happstackUtil binary text
];
meta = {

4
pkgs/development/libraries/haskell/happstack/happstack-server.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "happstack-server";
version = "0.5.0.2";
sha256 = "0184c835958bf9f29009a5aedd2c913bb1ad6ab60b80d9750849381c172dd6b6";
version = "0.5.0.4";
sha256 = "1iyjrlg5x6rlx8bfhn62a0ckjap0zv22hb6yazqph53jx6vn9b7q";
propagatedBuildInputs = [
HUnit HaXml MaybeT happstackData happstackUtil hslogger html
mtl network parsec sendfile utf8String xhtml zlib

4
pkgs/development/libraries/haskell/happstack/happstack-util.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self : {
pname = "happstack-util";
version = "0.5.0.2";
sha256 = "b6a84a55d6f7aec51095121a240bd6096b0df3c61c6fd25963d91190fcca4657";
version = "0.5.0.3";
sha256 = "1ipr09d0s1d0dffc1g3js8infhybw9rimabrl96a2vw7app3ys44";
propagatedBuildInputs = [
mtl hslogger HUnit QuickCheck strictConcurrency unixCompat
SMTPClient

4
pkgs/development/libraries/haskell/hashed-storage/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "hashed-storage";
version = "0.5.3";
sha256 = "0ql8hgsaazs0wxvr920vm2s2iljcnh6lnivcy3vgd5wjaw6lkd00";
version = "0.5.5";
sha256 = "03wx21kgnvkny8b6fz86wg85pr2sxbm15ndznnpqjg5gf126n842";
propagatedBuildInputs = [mtl zlib mmap binary dataenc];
meta = {
description = "Hashed file storage support code";

4
pkgs/development/libraries/haskell/haskeline/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "haskeline";
version = "0.6.2.2";
sha256 = "b6307563258802453d65c7e7bd1ef1c6635fefea17af3e01449192b52075b25b";
version = "0.6.3.2";
sha256 = "0ragimzrilsk5r8n0fbq3lyjww28bmc1r1vgjf9pb4kpfpbz0cq8";
propagatedBuildInputs = [extensibleExceptions mtl utf8String];
meta = {
description = "A command-line interface for user input, written in Haskell";

6
pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
View File

@ -1,6 +1,7 @@
{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline,
haskellSrc, html, parallel, regexBase, regexCompat, regexPosix,
stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}:
stm, time, xhtml, zlib, parsec, network,
cabalInstall, alex, happy, haddock, ghc}:
cabal.mkDerivation (self : {
pname = "haskell-platform";
@ -12,7 +13,8 @@ cabal.mkDerivation (self : {
propagatedBuildInputs = [
GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
haskellSrc html parallel regexBase regexCompat regexPosix
stm time xhtml zlib cabalInstall alex happy ghc
stm time xhtml zlib parsec network
cabalInstall alex happy ghc
];
meta = {
description = "Haskell Platform meta package";

6
pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
View File

@ -1,6 +1,7 @@
{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix,
stm, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}:
stm, xhtml, zlib, parsec,
cabalInstall, alex, happy, haddock, ghc}:
cabal.mkDerivation (self : {
pname = "haskell-platform";
@ -12,7 +13,8 @@ cabal.mkDerivation (self : {
propagatedBuildInputs = [
GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
haskellSrc html network parallel regexBase regexCompat regexPosix
stm xhtml zlib cabalInstall alex happy ghc haddock
stm xhtml zlib parsec
cabalInstall alex happy ghc haddock
];
meta = {
description = "Haskell Platform meta package";

6
pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
View File

@ -1,6 +1,7 @@
{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix,
stm, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}:
stm, xhtml, zlib, mtl, parsec, deepseq,
cabalInstall, alex, happy, haddock, ghc}:
cabal.mkDerivation (self : {
pname = "haskell-platform";
@ -12,7 +13,8 @@ cabal.mkDerivation (self : {
propagatedBuildInputs = [
GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
haskellSrc html network parallel regexBase regexCompat regexPosix
stm xhtml zlib cabalInstall alex happy ghc haddock
stm xhtml zlib mtl parsec deepseq
cabalInstall alex happy ghc haddock
];
meta = {
description = "Haskell Platform meta package";

26
pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix Normal file
View File

@ -0,0 +1,26 @@
{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
stm, syb, deepseq, text, transformers, mtl, xhtml, zlib,
cabalInstall, alex, happy, haddock, ghc}:
cabal.mkDerivation (self : {
pname = "haskell-platform";
version = "2011.2.0.0";
src = fetchurl {
# url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
url = "http://lambda.haskell.org/hp-tmp/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
sha256 = "01ppv8jdyvbngml9vgvrvnani6fj1nbk8mqmrkd8c508l7q9g6vb";
};
propagatedBuildInputs = [
GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
haskellSrc html network parallel parsec regexBase regexCompat regexPosix
stm syb deepseq text transformers mtl xhtml zlib
cabalInstall alex happy ghc haddock
];
noHaddock = true;
meta = {
description = "Haskell Platform meta package";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

4
pkgs/development/libraries/haskell/haskell-src-exts/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "haskell-src-exts";
version = "1.9.0";
sha256 = "dedb529217dfe393f75f26b735f7dd09eea50006481f60d06e169de6f328d1da";
version = "1.9.6";
sha256 = "1bdbjwhzms962ncwiszp82a8m6jkgz6d9cns5585kipy9n224d3h";
extraBuildInputs = [happy];
propagatedBuildInputs = [cpphs];
meta = {

0
pkgs/development/libraries/haskell/haskell-src/default.nix → pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
View File

13
pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal, happy, syb}:
cabal.mkDerivation (self : {
pname = "haskell-src";
version = "1.0.1.4"; # Haskell Platform 2011.2.0.0
sha256 = "02h33d7970641p9vi62sgcxb5v4yaz8xx9vf2yxyvxs3hglm7f0j";
extraBuildInputs = [happy];
propagatedBuildInputs = [syb];
meta = {
description = "Manipulating Haskell source code";
};
})

4
pkgs/development/libraries/haskell/highlighting-kate/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "highlighting-kate";
version = "0.2.7.1";
sha256 = "330c5fdc6b5dae62c12ee2455892319df12723346aa75401aea05ea0b24cf5ed";
version = "0.2.9";
sha256 = "0mk8m01mqw6vnjldr5idc6611475j4m292cm18kn3wa83000mbgk";
propagatedBuildInputs = [parsec pcreLight xhtml];
meta = {
description = "Syntax highlighting";

4
pkgs/development/libraries/haskell/hscolour/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "hscolour";
version = "1.17";
sha256 = "b645cdde1b7827dae1519a4423031b4c6bed82a8edb52aa295bea86478ce24b0";
version = "1.17"; # Haskell Platform 2011.2.0.0
sha256 = "1c14rrw69a5yjni2mdgdm21fsssc3c1j6i4sa7hxl9vq3ggcsidn";
meta = {
description = "Colourise Haskell code";
};

2
pkgs/development/libraries/haskell/html/default.nix → pkgs/development/libraries/haskell/html/1.0.1.2.nix
View File

@ -2,7 +2,7 @@
cabal.mkDerivation (self : {
pname = "html";
version = "1.0.1.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0
version = "1.0.1.2"; # Haskell Platform 2009.0.0, 2010.1.0.0, 2010.2.0.0, 2011.2.0.0
sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061";
meta = {
description = "HTML combinator library";

7
pkgs/development/libraries/haskell/json/default.nix
View File

@ -1,10 +1,13 @@
{cabal, mtl}:
# syb isn't listed by the HackageDB web interface, but is
# a dependency for Text.JSON.Generic which is only exposed
# if syb is available.
{cabal, mtl, syb}:
cabal.mkDerivation (self : {
pname = "json";
version = "0.4.4";
sha256 = "102qmz55b2mgcca3q1c2pkcr6hz7kmpldad3f6blhmp1cz15f081";
propagatedBuildInputs = [mtl];
propagatedBuildInputs = [mtl syb];
meta = {
description = "Support for serialising Haskell to and from JSON";
};

13
pkgs/development/libraries/haskell/monad-peel/default.nix Normal file
View File

@ -0,0 +1,13 @@
{cabal, transformers}:
cabal.mkDerivation (self : {
pname = "monad-peel";
version = "0.1";
sha256 = "0q56hdjgbj7ykpjx5z8qlqqkngmgm5wzm9vwcd7v675k2ywcl3ys";
propagatedBuildInputs = [transformers];
meta = {
description = "Lift control operations like exception catching through monad transformers";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

0
pkgs/development/libraries/haskell/mtl/default.nix → pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
View File

11
pkgs/development/libraries/haskell/mtl/1.1.1.1.nix Normal file
View File

@ -0,0 +1,11 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "mtl";
version = "1.1.1.1"; # version of mtl1 compatible with ghc7
sha256 = "157gbrgrg0l9r72nq45dkach53yncysif4qglsaql28g37djc4x6";
meta = {
description = "Monad transformer library";
};
})

12
pkgs/development/libraries/haskell/mtl/2.0.1.0.nix Normal file
View File

@ -0,0 +1,12 @@
{cabal, transformers}:
cabal.mkDerivation (self : {
pname = "mtl";
version = "2.0.1.0"; # Haskell Platform 2011.2.0.0
sha256 = "1w6jpzyl08mringnd6gxwcl3y9q506r240vm1sv0aacml1hy8szk";
propagatedBuildInputs = [transformers];
meta = {
description = "Monad transformer library";
};
})

5
pkgs/development/libraries/haskell/multirec/default.nix
View File

@ -2,8 +2,9 @@
cabal.mkDerivation (self : {
pname = "multirec";
version = "0.4";
sha256 = "ad7a6ae90e1880b3fd79686ce8012e531b738f8f1d10ba836550fc91cfe3695e";
version = "0.5";
sha256 = "1nrfbiy5g51cpaqqi1adrr32x74wjjvplyyrphvzf4rxhnhj3xpw";
noHaddock = true; # don't know why Haddock causes an error
meta = {
description = "Generic programming with systems of recursive datatypes";
};

4
pkgs/development/libraries/haskell/mwc-random/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "mwc-random";
version = "0.8.0.2";
sha256 = "1lry31abyz6wh3x8ipclgkfc889azs7mw2ppp9kpdlx41wbzhdj6";
version = "0.8.0.3";
sha256 = "1sjjayfhfkfixcwdp21cfqld9pjikdsvlb956c1a7hcs82b68xp3";
propagatedBuildInputs = [primitive vector];
meta = {
description = "Fast, high quality pseudo random number generation";

8
pkgs/development/libraries/haskell/neither/default.nix
View File

@ -1,11 +1,11 @@
{cabal, failure, mtl, transformers, MonadCatchIOMtl, MonadCatchIOTransformers}:
{cabal, failure, monadPeel, transformers}:
cabal.mkDerivation (self : {
pname = "neither";
version = "0.0.2";
sha256 = "1e1b934d9d1918bd762bb8d6cde35c56883543c2d0c165a661f096c2ce5ab139";
version = "0.2.0";
sha256 = "0a2lyx3dvgzj4g6p69x1fma4rmwxrykji3hc4diqgc4hx02p16jh";
propagatedBuildInputs = [
failure mtl transformers MonadCatchIOMtl MonadCatchIOTransformers
failure monadPeel transformers
];
meta = {
description = "A simple type class for success/failure computations";

0
pkgs/development/libraries/haskell/network/default.nix → pkgs/development/libraries/haskell/network/2.2.1.4.nix
View File

12
pkgs/development/libraries/haskell/network/2.3.0.2.nix Normal file
View File

@ -0,0 +1,12 @@
{cabal, parsec}:
cabal.mkDerivation (self : {
pname = "network";
version = "2.3.0.2"; # Haskell Platform 2011.2.0.0
sha256 = "1s4hm0ilsd67ircrl0h5b72kwrw1imb3cj5z52h99bv7qjdbag03";
propagatedBuildInputs = [parsec];
meta = {
description = "Networking-related facilities";
};
})

11
pkgs/development/libraries/haskell/pandoc-types/default.nix Normal file
View File

@ -0,0 +1,11 @@
{cabal, syb}:
cabal.mkDerivation (self : {
pname = "pandoc-types";
version = "1.8";
sha256 = "1ikr1dmmdag31hgcswrnhzqacv4kl7z6dc8za2cjdq0cpd2mla98";
propagatedBuildInputs = [syb];
meta = {
description = "Types for representing a structured document";
};
})

12
pkgs/development/libraries/haskell/pandoc/default.nix
View File

@ -1,13 +1,11 @@
{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml,
texmath, random ? null}:
{cabal, HTTP, citeprocHs, dlist, tagsoup, texmath, xhtml, zipArchive}:
cabal.mkDerivation (self : {
pname = "pandoc";
version = "1.6";
sha256 = "9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b";
propagatedBuildInputs = [
mtl network parsec utf8String xhtml zipArchive HTTP xml texmath
] ++ (if random != null then [random] else []);
version = "1.8.1.1";
sha256 = "0g680j8x3v19wcb9k2dxgrdrjr48w0vhvlspfzgw0sgzrgfmaqsj";
propagatedBuildInputs =
[HTTP citeprocHs dlist tagsoup texmath xhtml zipArchive];
meta = {
description = "Conversion between markup formats";
};

4
pkgs/development/libraries/haskell/pango/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "pango";
version = "0.11.2";
sha256 = "fb7f5dc303d3d49a330aaa3acf29560f78746edb9c67f6191756baa1b08fb504";
version = "0.12.0";
sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb";
extraBuildInputs = [pkgconfig gtk2hsBuildtools pango glibc];
propagatedBuildInputs = [cairo glib mtl];
meta = {

0
pkgs/development/libraries/haskell/parallel/default.nix → pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
View File

12
pkgs/development/libraries/haskell/parallel/3.1.0.1.nix Normal file
View File

@ -0,0 +1,12 @@
{cabal, deepseq}:
cabal.mkDerivation (self : {
pname = "parallel";
version = "3.1.0.1"; # Haskell Platform 2011.2.0.0
sha256 = "0j03i5467iyz98fl4fnzlwrr93j2as733kbrxnlcgyh455kb89ns";
propagatedBuildInputs = [deepseq];
meta = {
description = "parallel programming library";
};
})

Some files were not shown because too many files have changed in this diff Show More