From 4ee0cd2bbba5d6306af531f8f9216e7644485975 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 May 2014 12:31:43 +0200 Subject: [PATCH] haskell-gloss: Revert "update to version 1.8.2.1" This reverts commit 37df971a49b6264894df2584c45a65a358f5fade. The new version doesn't compile. --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 65a46bf016a..223a72ec381 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.8.2.1"; - sha256 = "0wnrss7j7zf4lbmr5rryx7m5qb4pqh7vvz11ksbsfn3d3hf285y2"; + version = "1.8.1.2"; + sha256 = "1ky1gckvyww855dy3fzllf1ixbmc3jpdvz85hx719pcygy7qh71m"; buildDepends = [ bmp GLUT OpenGL ]; jailbreak = true; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 947e571dafd..1e7a7297758 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1245,10 +1245,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; - gloss = callPackage ../development/libraries/haskell/gloss { - OpenGL = self.OpenGL_2_9_1_0; - GLUT = self.GLUT_2_5_1_0; - }; + gloss = callPackage ../development/libraries/haskell/gloss {}; glossAccelerate = callPackage ../development/libraries/haskell/gloss-accelerate {};