summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorAndres Löh <mail@andres-loeh.de>2012-05-22 06:14:35 +0000
committerAndres Löh <mail@andres-loeh.de>2012-05-22 06:14:35 +0000
commitf0e99eca2aab97f818736c98cdf23f07e919ef66 (patch)
tree8fc5b3f1833782fdb7d3ed5b28ca8dca6657fca7 /pkgs/top-level
parent6bf4d9522a2f9aa587815dd3eb5bc971b20a985f (diff)
downloadnixlib-f0e99eca2aab97f818736c98cdf23f07e919ef66.tar
nixlib-f0e99eca2aab97f818736c98cdf23f07e919ef66.tar.gz
nixlib-f0e99eca2aab97f818736c98cdf23f07e919ef66.tar.bz2
nixlib-f0e99eca2aab97f818736c98cdf23f07e919ef66.tar.lz
nixlib-f0e99eca2aab97f818736c98cdf23f07e919ef66.tar.xz
nixlib-f0e99eca2aab97f818736c98cdf23f07e919ef66.tar.zst
nixlib-f0e99eca2aab97f818736c98cdf23f07e919ef66.zip
Updated the Haskell Platform prerelease.
svn path=/nixpkgs/trunk/; revision=34206
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/haskell-packages.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 96f23ac57406..1acb09f46522 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -125,7 +125,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     inherit (self) cabal ghc;
     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 ok
+    GLUT         = self.GLUT_2_1_2_2;           # 7.4.1 ok
     haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.4.1 ok
     html         = self.html_1_0_1_2;           # 7.4.1 ok
     HUnit        = self.HUnit_1_2_4_2;          # 7.4.1 ok
@@ -709,6 +709,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {};
   GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {};
+  GLUT_2_1_2_2 = callPackage ../development/libraries/haskell/GLUT/2.1.2.2.nix {};
   GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix {
     OpenGL = self.OpenGL_2_4_0_2;
   };