diff options
author | Andres Löh <mail@andres-loeh.de> | 2012-05-25 16:19:52 +0000 |
---|---|---|
committer | Andres Löh <mail@andres-loeh.de> | 2012-05-25 16:19:52 +0000 |
commit | 3ff236c739c9e7973ea9d94f64582997761e0254 (patch) | |
tree | 15fcf735b60ac79e08bd98b7fb3a1a2c63c64a36 | |
parent | 44b2d2121210c8fe3bbd9aa2d3242b39d14e1449 (diff) |
Latest change (or reverse change) for the upcoming Haskell Platform.
svn path=/nixpkgs/trunk/; revision=34245
-rw-r--r-- | pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal | 2 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal index e5838c4f9eeb..264d636f9942 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal @@ -56,7 +56,7 @@ library -- Note: newer versions of cgi need monad-catchio. cgi ==3001.1.7.4, fgl ==5.4.2.4, - GLUT ==2.1.2.2, + GLUT ==2.1.2.1, haskell-src ==1.0.1.5, html ==1.0.1.2, HTTP ==4000.2.3, diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1acb09f46522..5dd355994685 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_2; # 7.4.1 ok + GLUT = self.GLUT_2_1_2_1; # 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 |