JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell-packages.nix: removed lots of explicit argument assignments that have become obsolete

Browse Source 
svn path=/nixpkgs/trunk/; revision=29038
This commit is contained in:
Peter Simons 2011-09-05 19:24:12 +00:00
parent f67cf46ddc
commit 65c90e5d01
6 changed files with 38 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
View File

@ -1,11 +1,11 @@
{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "GLUT"; pname = "GLUT";
version = "2.1.1.2"; version = "2.1.1.2";
sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb"; sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb";
buildDepends = [ OpenGL ]; buildDepends = [ OpenGL ];
extraLibraries = [ glut libICE libSM libXi libXmu mesa ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = { meta = {
homepage = "http://www.haskell.org/HOpenGL/"; homepage = "http://www.haskell.org/HOpenGL/";
description = "A binding for the OpenGL Utility Toolkit"; description = "A binding for the OpenGL Utility Toolkit";

4
pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
View File

@ -1,11 +1,11 @@
{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "GLUT"; pname = "GLUT";
version = "2.1.2.1"; version = "2.1.2.1";
sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02"; sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02";
buildDepends = [ OpenGL ]; buildDepends = [ OpenGL ];
extraLibraries = [ glut libICE libSM libXi libXmu mesa ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = { meta = {
homepage = "http://www.haskell.org/HOpenGL/"; homepage = "http://www.haskell.org/HOpenGL/";
description = "A binding for the OpenGL Utility Toolkit"; description = "A binding for the OpenGL Utility Toolkit";

6
pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
View File

@ -1,5 +1,5 @@
{ cabal, glut, libICE, libSM, libXi, libXmu, mesa, OpenGL, StateVar { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
, Tensor , StateVar, Tensor
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
version = "2.2.2.0"; version = "2.2.2.0";
sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx"; sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx";
buildDepends = [ OpenGL StateVar Tensor ]; buildDepends = [ OpenGL StateVar Tensor ];
extraLibraries = [ glut libICE libSM libXi libXmu mesa ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = { meta = {
homepage = "http://www.haskell.org/HOpenGL/"; homepage = "http://www.haskell.org/HOpenGL/";
description = "A binding for the OpenGL Utility Toolkit"; description = "A binding for the OpenGL Utility Toolkit";

4
pkgs/development/libraries/haskell/OpenGLRaw/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, GL }: { cabal, mesa }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "OpenGLRaw"; pname = "OpenGLRaw";
version = "1.1.0.1"; version = "1.1.0.1";
sha256 = "0v6zcy4xvjj5g137rwjsh6hs0ni9dfkvsqynxv4bl5s78amppqnf"; sha256 = "0v6zcy4xvjj5g137rwjsh6hs0ni9dfkvsqynxv4bl5s78amppqnf";
extraLibraries = [ GL ]; extraLibraries = [ mesa ];
meta = { meta = {
homepage = "http://www.haskell.org/HOpenGL/"; homepage = "http://www.haskell.org/HOpenGL/";
description = "A raw binding for the OpenGL graphics system"; description = "A raw binding for the OpenGL graphics system";

4
pkgs/development/libraries/haskell/hp2any-graph/default.nix
View File

@ -1,4 +1,4 @@
{ cabal, GLUT, glut, hp2anyCore, network, OpenGL, parseargs }: { cabal, freeglut, GLUT, hp2anyCore, network, OpenGL, parseargs }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "hp2any-graph"; pname = "hp2any-graph";
@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ GLUT hp2anyCore network OpenGL parseargs ]; buildDepends = [ GLUT hp2anyCore network OpenGL parseargs ];
extraLibraries = [ glut ]; extraLibraries = [ freeglut ];
meta = { meta = {
homepage = "http://www.haskell.org/haskellwiki/Hp2any"; homepage = "http://www.haskell.org/haskellwiki/Hp2any";
description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";

122
pkgs/top-level/haskell-packages.nix
View File

@ -528,9 +528,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; doubleConversion = callPackage ../development/libraries/haskell/double-conversion {};
editline = callPackage ../development/libraries/haskell/editline { editline = callPackage ../development/libraries/haskell/editline {};
inherit (pkgs) libedit;
};
emailValidate = callPackage ../development/libraries/haskell/email-validate {}; emailValidate = callPackage ../development/libraries/haskell/email-validate {};
@ -594,13 +592,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
gitit = callPackage ../development/libraries/haskell/gitit {}; gitit = callPackage ../development/libraries/haskell/gitit {};
glade = callPackage ../development/libraries/haskell/glade { glade = callPackage ../development/libraries/haskell/glade {
inherit (pkgs) pkgconfig glibc;
inherit (pkgs.gnome) libglade; inherit (pkgs.gnome) libglade;
gtkC = pkgs.gnome.gtk; gtkC = pkgs.gnome.gtk;
}; };
glib = callPackage ../development/libraries/haskell/glib { glib = callPackage ../development/libraries/haskell/glib {
inherit (pkgs) pkgconfig glib glibc; glib = pkgs.glib;
}; };
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
@ -609,26 +606,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
GLU = pkgs.freeglut; GLU = pkgs.freeglut;
}; };
GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix { GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {};
glut = pkgs.freeglut; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {};
inherit (pkgs) mesa;
inherit (pkgs.xlibs) libSM libICE libXmu libXi;
};
GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {
glut = pkgs.freeglut;
inherit (pkgs) mesa;
inherit (pkgs.xlibs) libSM libICE libXmu libXi;
};
GLUT_2_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix { GLUT_2_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix {
glut = pkgs.freeglut;
OpenGL = self.OpenGL_2_4_0_1; OpenGL = self.OpenGL_2_4_0_1;
inherit (pkgs) mesa;
inherit (pkgs.xlibs) libSM libICE libXmu libXi;
}; };
GLUT = self.GLUT_2_1_1_2; GLUT = self.GLUT_2_1_1_2;
gtk = callPackage ../development/libraries/haskell/gtk { gtk = callPackage ../development/libraries/haskell/gtk {
inherit (pkgs) pkgconfig glibc;
inherit (pkgs.gtkLibs) gtk; inherit (pkgs.gtkLibs) gtk;
}; };
@ -636,7 +621,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
gtk2hsC2hs = self.gtk2hsBuildtools; gtk2hsC2hs = self.gtk2hsBuildtools;
gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 {
inherit (pkgs) pkgconfig glibc;
inherit (pkgs.gnome) gtksourceview; inherit (pkgs.gnome) gtksourceview;
}; };
@ -704,25 +688,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
odbc = pkgs.unixODBC; odbc = pkgs.unixODBC;
}; };
HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix { HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix {};
inherit (pkgs) postgresql;
};
HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix { HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {};
inherit (pkgs) sqlite;
};
HFuse = callPackage ../development/libraries/haskell/hfuse { HFuse = callPackage ../development/libraries/haskell/hfuse {};
inherit (pkgs) fuse;
};
HGL = callPackage ../development/libraries/haskell/HGL {}; HGL = callPackage ../development/libraries/haskell/HGL {};
highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {}; highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {};
hint = callPackage ../development/libraries/haskell/hint { hint = callPackage ../development/libraries/haskell/hint {};
ghcPaths = self.ghcPaths_0_1_0_6;
};
Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {}; Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {};
@ -730,17 +706,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
hledger = callPackage ../development/libraries/haskell/hledger {}; hledger = callPackage ../development/libraries/haskell/hledger {};
hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
hledgerVty = callPackage ../development/libraries/haskell/hledger-vty { hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {};
vty = self.vty_4_6_0_4;
};
hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {}; hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {};
hledgerInterest = callPackage ../applications/office/hledger-interest {}; hledgerInterest = callPackage ../applications/office/hledger-interest {};
HList = callPackage ../development/libraries/haskell/HList {}; HList = callPackage ../development/libraries/haskell/HList {};
hmatrix = callPackage ../development/libraries/haskell/hmatrix { hmatrix = callPackage ../development/libraries/haskell/hmatrix {};
inherit (pkgs) gsl liblapack/* lapack library */ blas;
};
hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
@ -748,9 +720,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
hp2anyCore = callPackage ../development/libraries/haskell/hp2any-core {}; hp2anyCore = callPackage ../development/libraries/haskell/hp2any-core {};
hp2anyGraph = callPackage ../development/libraries/haskell/hp2any-graph { hp2anyGraph = callPackage ../development/libraries/haskell/hp2any-graph {};
glut = pkgs.freeglut;
};
hS3 = callPackage ../development/libraries/haskell/hS3 {}; hS3 = callPackage ../development/libraries/haskell/hS3 {};
@ -758,9 +728,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
hscolour = callPackage ../development/libraries/haskell/hscolour {}; hscolour = callPackage ../development/libraries/haskell/hscolour {};
hsdns = callPackage ../development/libraries/haskell/hsdns { hsdns = callPackage ../development/libraries/haskell/hsdns {};
inherit (pkgs) adns;
};
hsemail = callPackage ../development/libraries/haskell/hsemail {}; hsemail = callPackage ../development/libraries/haskell/hsemail {};
@ -902,27 +870,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; ObjectName = callPackage ../development/libraries/haskell/ObjectName {};
OpenAL = callPackage ../development/libraries/haskell/OpenAL { OpenAL = callPackage ../development/libraries/haskell/OpenAL {};
inherit (pkgs) openal;
};
OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix { OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {};
inherit (pkgs) mesa; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {};
inherit (pkgs.xlibs) libX11; OpenGL_2_4_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.1.nix {};
};
OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {
inherit (pkgs) mesa;
inherit (pkgs.xlibs) libX11;
};
OpenGL_2_4_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.1.nix {
inherit (pkgs) mesa;
inherit (pkgs.xlibs) libX11;
};
OpenGL = self.OpenGL_2_2_1_1; OpenGL = self.OpenGL_2_2_1_1;
OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw { OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
GL = pkgs.mesa;
};
pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
@ -931,7 +886,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};
pango = callPackage ../development/libraries/haskell/pango { pango = callPackage ../development/libraries/haskell/pango {
inherit (pkgs) pkgconfig glibc;
inherit (pkgs.gtkLibs) pango; inherit (pkgs.gtkLibs) pango;
}; };
@ -952,9 +906,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
pathtype = callPackage ../development/libraries/haskell/pathtype {}; pathtype = callPackage ../development/libraries/haskell/pathtype {};
pcreLight = callPackage ../development/libraries/haskell/pcre-light { pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
inherit (pkgs) pcre;
};
persistent = callPackage ../development/libraries/haskell/persistent {}; persistent = callPackage ../development/libraries/haskell/persistent {};
@ -1009,7 +961,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
rvar = callPackage ../development/libraries/haskell/rvar {}; rvar = callPackage ../development/libraries/haskell/rvar {};
readline = callPackage ../development/libraries/haskell/readline { readline = callPackage ../development/libraries/haskell/readline {
inherit (pkgs) readline ncurses; inherit (pkgs) readline;
}; };
recaptcha = callPackage ../development/libraries/haskell/recaptcha {}; recaptcha = callPackage ../development/libraries/haskell/recaptcha {};
@ -1099,17 +1051,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
sybWithClassInstancesText = callPackage ../development/libraries/haskell/syb/syb-with-class-instances-text.nix {}; sybWithClassInstancesText = callPackage ../development/libraries/haskell/syb/syb-with-class-instances-text.nix {};
SDLImage = callPackage ../development/libraries/haskell/SDL-image { SDLImage = callPackage ../development/libraries/haskell/SDL-image {};
inherit (pkgs) SDL_image;
};
SDLMixer = callPackage ../development/libraries/haskell/SDL-mixer { SDLMixer = callPackage ../development/libraries/haskell/SDL-mixer {};
inherit (pkgs) SDL_mixer;
};
SDLTtf = callPackage ../development/libraries/haskell/SDL-ttf { SDLTtf = callPackage ../development/libraries/haskell/SDL-ttf {};
inherit (pkgs) SDL_ttf;
};
SDL = callPackage ../development/libraries/haskell/SDL { SDL = callPackage ../development/libraries/haskell/SDL {
inherit (pkgs) SDL; inherit (pkgs) SDL;
@ -1156,9 +1102,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
Tensor = callPackage ../development/libraries/haskell/Tensor {}; Tensor = callPackage ../development/libraries/haskell/Tensor {};
terminfo = callPackage ../development/libraries/haskell/terminfo { terminfo = callPackage ../development/libraries/haskell/terminfo {};
inherit (pkgs) ncurses;
};
testFramework = callPackage ../development/libraries/haskell/test-framework {}; testFramework = callPackage ../development/libraries/haskell/test-framework {};
@ -1277,18 +1221,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix { wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix {
wxGTK = pkgs.wxGTK28; wxGTK = pkgs.wxGTK28;
inherit (pkgs) mesa;
inherit (pkgs.xlibs) libX11;
}; };
wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {};
X11 = callPackage ../development/libraries/haskell/X11 {}; X11 = callPackage ../development/libraries/haskell/X11 {};
X11Xft = callPackage ../development/libraries/haskell/X11-xft { X11Xft = callPackage ../development/libraries/haskell/X11-xft {};
inherit (pkgs) pkgconfig freetype fontconfig;
inherit (pkgs.xlibs) libXft;
};
xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {};
xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {}; xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {};
@ -1348,9 +1287,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
AgdaExecutable = callPackage ../development/compilers/Agda-executable {}; AgdaExecutable = callPackage ../development/compilers/Agda-executable {};
ehc = callPackage ../development/compilers/ehc { ehc = callPackage ../development/compilers/ehc {};
inherit (pkgs) fetchsvn stdenv coreutils glibc m4 libtool llvm;
};
epic = callPackage ../development/compilers/epic {}; epic = callPackage ../development/compilers/epic {};
@ -1417,18 +1354,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
# Applications. # Applications.
darcs = callPackage ../applications/version-management/darcs { darcs = callPackage ../applications/version-management/darcs {};
inherit (pkgs) curl;
parsec = self.parsec2;
};
leksah = callPackage ../applications/editors/leksah {}; leksah = callPackage ../applications/editors/leksah {};
xmobar = callPackage ../applications/misc/xmobar {}; xmobar = callPackage ../applications/misc/xmobar {};
xmonad = callPackage ../applications/window-managers/xmonad { xmonad = callPackage ../applications/window-managers/xmonad {};
inherit (pkgs.xlibs) xmessage;
};
xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {}; xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {};