Author: simons
Date: Tue Aug 23 11:00:05 2011
New Revision: 28774
URL: https://svn.nixos.org/websvn/nix/?rev=28774&sc=1
Log:
haskell-packages: normalize all lists to state their elements in alphabetical
order
Modified:
nixpkgs/trunk/pkgs/development/compilers/epic/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/epic/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/epic/default.nix Tue Aug 23
10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/compilers/epic/default.nix Tue Aug 23
11:00:05 2011 (r28774)
@@ -8,7 +8,7 @@
isExecutable = true;
buildDepends = [ mtl ];
buildTools = [ happy ];
- extraLibraries = [ gmp boehmgc ];
+ extraLibraries = [ boehmgc gmp ];
noHaddock = true;
meta = {
homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -5,7 +5,7 @@
version = "2.1.1.2";
sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb";
buildDepends = [ OpenGL ];
- extraLibraries = [ glut libSM libICE libXmu libXi mesa ];
+ extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A binding for the OpenGL Utility Toolkit";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -5,7 +5,7 @@
version = "2.1.2.1";
sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02";
buildDepends = [ OpenGL ];
- extraLibraries = [ glut libSM libICE libXmu libXi mesa ];
+ extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A binding for the OpenGL Utility Toolkit";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -7,7 +7,7 @@
version = "2.2.2.0";
sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx";
buildDepends = [ OpenGL StateVar Tensor ];
- extraLibraries = [ glut libSM libICE libXmu libXi mesa glut ];
+ extraLibraries = [ glut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A binding for the OpenGL Utility Toolkit";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -4,7 +4,7 @@
pname = "OpenGL";
version = "2.2.1.1";
sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792";
- extraLibraries = [ mesa libX11 ];
+ extraLibraries = [ libX11 mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A binding for the OpenGL graphics system";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -4,7 +4,7 @@
pname = "OpenGL";
version = "2.2.3.0";
sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57";
- extraLibraries = [ mesa libX11 ];
+ extraLibraries = [ libX11 mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A binding for the OpenGL graphics system";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -7,7 +7,7 @@
version = "2.4.0.1";
sha256 = "0xdclf0m7qxp4157053cbsybpy7fqiiiak0g2kyf8awr7a5736n5";
buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
- extraLibraries = [ mesa libX11 ];
+ extraLibraries = [ libX11 mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";;
description = "A binding for the OpenGL graphics system";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cairo/default.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -6,7 +6,7 @@
sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9";
buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ pkgconfig glibc cairo zlib ];
+ extraLibraries = [ cairo glibc pkgconfig zlib ];
pkgconfigDepends = [ cairo ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/glade/default.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -8,7 +8,7 @@
sha256 = "0h7l1kp9y17xqyz16kv0dvwgblph9r70wimyl8aq9gi1r4is5lmq";
buildDepends = [ cairo glib gtk mtl pango ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ pkgconfig glibc ];
+ extraLibraries = [ glibc pkgconfig ];
pkgconfigDepends = [ gtkC libglade ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/glib/default.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -5,7 +5,7 @@
version = "0.12.0";
sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19";
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ pkgconfig glibc ];
+ extraLibraries = [ glibc pkgconfig ];
pkgconfigDepends = [ glib ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gtk/default.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -8,7 +8,7 @@
sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2";
buildDepends = [ cairo glib mtl pango ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ pkgconfig glibc ];
+ extraLibraries = [ glibc pkgconfig ];
pkgconfigDepends = [ glib gtk ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
Tue Aug 23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
Tue Aug 23 11:00:05 2011 (r28774)
@@ -8,7 +8,7 @@
sha256 = "0l9y48kmzqzps6k54fgf0dkmmv0ppxx8amggfdswwk86zsf8j81r";
buildDepends = [ glib gtk mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ pkgconfig glibc ];
+ extraLibraries = [ glibc pkgconfig ];
pkgconfigDepends = [ gtksourceview ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
Tue Aug 23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hmatrix/default.nix
Tue Aug 23 11:00:05 2011 (r28774)
@@ -9,7 +9,7 @@
buildDepends = [
binary HUnit QuickCheck random storableComplex vector
];
- extraLibraries = [ gsl liblapack blas ];
+ extraLibraries = [ blas gsl liblapack ];
meta = {
homepage = "http://perception.inf.um.es/hmatrix";;
description = "Linear algebra and numerical computation";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix Tue Aug
23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pango/default.nix Tue Aug
23 11:00:05 2011 (r28774)
@@ -8,7 +8,7 @@
sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb";
buildDepends = [ cairo glib mtl ];
buildTools = [ gtk2hsBuildtools ];
- extraLibraries = [ pkgconfig glibc ];
+ extraLibraries = [ glibc pkgconfig ];
pkgconfigDepends = [ cairo pango ];
meta = {
homepage = "http://www.haskell.org/gtk2hs/";;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
Tue Aug 23 10:35:53 2011 (r28773)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
Tue Aug 23 11:00:05 2011 (r28774)
@@ -5,7 +5,7 @@
version = "0.12.1.7";
sha256 = "12vs449xg2xjp503ywjwxadan3v7dq38ph66292szwj1vmhl07v4";
buildDepends = [ parsec stm time wxdirect ];
- extraLibraries = [ wxGTK mesa libX11 ];
+ extraLibraries = [ libX11 mesa wxGTK ];
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";;
description = "wxHaskell core";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
