From d751367d70931bd706fae390a08000cc3dee9aaa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Apr 2015 21:23:40 +0200 Subject: [PATCH] haskell-gloss: keep old version around for GHC 7.8.x --- .../haskell-modules/configuration-ghc-7.8.x.nix | 3 +++ .../haskell-modules/hackage-packages.nix | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 209ddc8c8132..e9bdec89bd02 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -109,4 +109,7 @@ self: super: { wai-middleware-preprocessor = dontCheck super.wai-middleware-preprocessor; incremental-computing = dontCheck super.incremental-computing; + # Newer versions require base > 4.7 + gloss = super.gloss_1_9_2_1; + } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b5b2c3b20299..2feb9f0326bc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -51631,6 +51631,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gloss_1_9_2_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.9.2.1"; + sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l"; + buildDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + jailbreak = true; + homepage = "http://gloss.ouroborus.net"; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + }) {}; + "gloss" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim , gloss-rendering, GLUT, OpenGL