Author: simons
Date: Sun Apr 1 19:51:53 2012
New Revision: 33528
URL: https://nixos.org/websvn/nix/?rev=33528&sc=1
Log:
Updated Haskell packages.
- MemoTrie: updated to version 0.4.11
- X11: updated to version 1.6.0
- derive: updated to version 2.5.8
- gloss: updated to version 1.7.1.1
- haskell-src-exts: updated to version 1.13.0
- haskell-src-meta: updated to version 0.5.1.2
- hlint: updated to version 1.8.28
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/1.5.0.1.nix
- copied, changed from r33522,
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/1.6.0.nix
- copied, changed from r33522,
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
- copied, changed from r33522,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix
- copied, changed from r33522,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/derive/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/gloss/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/MemoTrie/default.nix
Sun Apr 1 19:51:53 2012 (r33528)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "MemoTrie";
- version = "0.4.10";
- sha256 = "1hkraq33sai046gwqlabc9nkz6jbl6vgj0c6lc6j4j5h5d8v08kk";
+ version = "0.4.11";
+ sha256 = "0wlrsz9bsb7lkw1ja8x8jbm1v7558fg8npas1rnc5ikgfi0szzw4";
meta = {
homepage = "http://haskell.org/haskellwiki/MemoTrie";;
description = "Trie-based memo functions";
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/1.5.0.1.nix (from r33522,
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/1.6.0.nix (from r33522,
nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/X11/default.nix Sun Apr
1 18:31:28 2012 (r33522, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/X11/1.6.0.nix Sun Apr
1 19:51:53 2012 (r33528)
@@ -1,11 +1,14 @@
-{ cabal, libX11, libXext, libXinerama, syb }:
+{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender, syb
+}:
cabal.mkDerivation (self: {
pname = "X11";
- version = "1.5.0.1";
- sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19";
+ version = "1.6.0";
+ sha256 = "0jjnr4490mkdrmq3lvv7hha7rc9vbwsxlwsvcv56q6zgjx4zwf8j";
buildDepends = [ syb ];
- extraLibraries = [ libX11 libXext libXinerama ];
+ extraLibraries = [
+ libX11 libXext libXinerama libXrandr libXrender
+ ];
meta = {
homepage = "https://github.com/haskell-pkg-janitors/X11";;
description = "A binding to the X11 graphics library";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/derive/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/derive/default.nix Sun Apr
1 19:47:40 2012 (r33527)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/derive/default.nix Sun Apr
1 19:51:53 2012 (r33528)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "derive";
- version = "2.5.7";
- sha256 = "1a6nz0a7axgdghljcb87h4bhisjfsnpxpdbqlrxymw4zqislg9p3";
+ version = "2.5.8";
+ sha256 = "0l11pscya7mrn0502q8ndqn551k5aygbm7pihhs0nz8wwzr82xdv";
isLibrary = true;
isExecutable = true;
buildDepends = [
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/gloss/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/gloss/default.nix Sun Apr
1 19:47:40 2012 (r33527)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gloss/default.nix Sun Apr
1 19:51:53 2012 (r33528)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gloss";
- version = "1.7.0.1";
- sha256 = "1wsgrdkimpmii6iagcixsky5cnd6h0w1ssmrjcc15jlcmw460dfx";
+ version = "1.7.1.1";
+ sha256 = "0fmmcmmdcvc5vj33bm9xzzb2jpnnb7r89ghdqwgg2c5gxjqbcfbd";
buildDepends = [ bmp GLUT OpenGL ];
meta = {
homepage = "http://gloss.ouroborus.net";;
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
(from r33522,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix
(from r33522,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix)
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
Sun Apr 1 18:31:28 2012 (r33522, copy source)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix
Sun Apr 1 19:51:53 2012 (r33528)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskell-src-exts";
- version = "1.11.1";
- sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6";
+ version = "1.13.0";
+ sha256 = "1kkhv8frvrry9jb38p5xmsqij0wrz88gszz5zcndcmbhkr5d4b64";
buildDepends = [ cpphs ];
buildTools = [ happy ];
meta = {
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
Sun Apr 1 19:51:53 2012 (r33528)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskell-src-meta";
- version = "0.5.1.1";
- sha256 = "1v192j47vxjisa5i2zd9lj7l9xa12jsg858yhx5qz624fcq73ggi";
+ version = "0.5.1.2";
+ sha256 = "09if8423dwf4jcr6p7d8j4r9i2n8jc7xxvjn1p1mwjp0ajzk8g9s";
buildDepends = [ haskellSrcExts syb thLift uniplate ];
meta = {
description = "Parse source to template-haskell abstract syntax";
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Sun Apr
1 19:47:40 2012 (r33527)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/hlint/default.nix Sun Apr
1 19:51:53 2012 (r33528)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
- version = "1.8.26";
- sha256 = "001id2853bkxnbh7jc0bvfyq7v9595zn31n7hhma3il0dqim71lp";
+ version = "1.8.28";
+ sha256 = "136arfmlfx15qwxvg3lw6wci8fiva1f9hjrk5qf70k9g84dxsjn8";
isLibrary = true;
isExecutable = true;
buildDepends = [
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Apr 1 19:47:40
2012 (r33527)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Apr 1 19:51:53
2012 (r33528)
@@ -422,7 +422,9 @@
# Haskell libraries.
- Agda = callPackage ../development/libraries/haskell/Agda {};
+ Agda = callPackage ../development/libraries/haskell/Agda {
+ haskellSrcExts = self.haskellSrcExts_1_11_1;
+ };
ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
@@ -793,7 +795,9 @@
haskellSrc_1_0_1_5 = callPackage
../development/libraries/haskell/haskell-src/1.0.1.5.nix {};
haskellSrc = self.haskellSrc_1_0_1_5;
- haskellSrcExts = callPackage
../development/libraries/haskell/haskell-src-exts {};
+ haskellSrcExts_1_11_1 = callPackage
../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};
+ haskellSrcExts_1_13_0 = callPackage
../development/libraries/haskell/haskell-src-exts/1.13.0.nix {};
+ haskellSrcExts = self.haskellSrcExts_1_13_0;
haskellSrcMeta = callPackage
../development/libraries/haskell/haskell-src-meta {};
@@ -1462,7 +1466,9 @@
wxdirect = callPackage
../development/libraries/haskell/wxHaskell/wxdirect.nix {};
- X11 = callPackage ../development/libraries/haskell/X11 {};
+ X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix
{};
+ X11_1_6_0 = callPackage ../development/libraries/haskell/X11/1.6.0.nix {};
+ X11 = self.X11_1_6_0;
X11Xft = callPackage ../development/libraries/haskell/X11-xft {};
@@ -1630,11 +1636,18 @@
parsec = self.parsec3;
};
- xmonad = callPackage ../applications/window-managers/xmonad {};
+ xmonad = callPackage ../applications/window-managers/xmonad {
+ X11 = self.X11_1_5_0_1;
+ };
- xmonadContrib = callPackage
../applications/window-managers/xmonad/xmonad-contrib.nix {};
+ xmonadContrib = callPackage
../applications/window-managers/xmonad/xmonad-contrib.nix {
+ X11 = self.X11_1_5_0_1;
+ X11Xft = self.X11Xft.override { X11 = self.X11_1_5_0_1; };
+ };
- xmonadExtras = callPackage
../applications/window-managers/xmonad/xmonad-extras.nix {};
+ xmonadExtras = callPackage
../applications/window-managers/xmonad/xmonad-extras.nix {
+ X11 = self.X11_1_5_0_1;
+ };
# Tools.
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
