diff options
author | Peter Simons <simons@cryp.to> | 2014-05-07 12:31:43 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-05-07 19:13:06 +0200 |
commit | 4ee0cd2bbba5d6306af531f8f9216e7644485975 (patch) | |
tree | 781489e1720f29d29d2c94e4f24e41a70f5c6150 | |
parent | ee1a03577c0cec7a64f198e3924d116812f6d31c (diff) | |
download | nixpkgs-4ee0cd2bbba5d6306af531f8f9216e7644485975.tar nixpkgs-4ee0cd2bbba5d6306af531f8f9216e7644485975.tar.gz nixpkgs-4ee0cd2bbba5d6306af531f8f9216e7644485975.tar.bz2 nixpkgs-4ee0cd2bbba5d6306af531f8f9216e7644485975.tar.lz nixpkgs-4ee0cd2bbba5d6306af531f8f9216e7644485975.tar.xz nixpkgs-4ee0cd2bbba5d6306af531f8f9216e7644485975.tar.zst nixpkgs-4ee0cd2bbba5d6306af531f8f9216e7644485975.zip |
haskell-gloss: Revert "update to version 1.8.2.1"
This reverts commit 37df971a49b6264894df2584c45a65a358f5fade. The new version doesn't compile.
-rw-r--r-- | pkgs/development/libraries/haskell/gloss/default.nix | 4 | ||||
-rw-r--r-- | 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 {}; |