swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

haskell-packages.nix: removed more obsolete manual overrides

Browse source 
svn path=/nixpkgs/trunk/; revision=29042
This commit is contained in:
Peter Simons 2011-09-05 19:45:49 +00:00
parent 72ae88b019
commit bbc00bd0e7
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/haskell/GLURaw/default.nix
View file

@ -1,11 +1,11 @@
{ cabal, GLU, OpenGLRaw }:
{ cabal, freeglut, OpenGLRaw }:
cabal.mkDerivation (self: {
pname = "GLURaw";
version = "1.1.0.0";
sha256 = "03lsskqxh2q7kbnw8hbxz5wp7zq55nwbibsb9maj4y3xpc1vprac";
buildDepends = [ OpenGLRaw ];
extraLibraries = [ GLU ];
extraLibraries = [ freeglut ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
description = "A raw binding for the OpenGL graphics system";

19
pkgs/top-level/haskell-packages.nix
View file

@ -478,9 +478,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
criterion = callPackage ../development/libraries/haskell/criterion {
parsec = self.parsec3;
};
criterion = callPackage ../development/libraries/haskell/criterion {};
Crypto = callPackage ../development/libraries/haskell/Crypto {};
@ -574,9 +572,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
ghcEvents = callPackage ../development/libraries/haskell/ghc-events {
mtl = self.mtl1;
};
ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
@ -599,9 +595,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
GLURaw = callPackage ../development/libraries/haskell/GLURaw {
GLU = pkgs.freeglut;
};
GLURaw = callPackage ../development/libraries/haskell/GLURaw {};
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 {};
@ -645,9 +639,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskeline = callPackage ../development/libraries/haskell/haskeline {};
haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {
mtl = self.mtl1;
};
haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};
haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {};
@ -1263,15 +1255,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix {
inherit (pkgs) zlib;
};
zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix {
inherit (pkgs) zlib;
};
zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix {
inherit (pkgs) zlib;
};
zlib = self.zlib_0_5_0_0;
zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};