From 9faf34d0a8f8994a2fb75a72e056863848da777a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Apr 2013 11:56:50 +0200
Subject: pkgs/top-level/release-haskell.nix: cosmetic

---
 pkgs/top-level/release-haskell.nix | 72 +++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 6d55b79c62b6..291f87f5074b 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -12,7 +12,7 @@ let
   ghc742  = "ghc742";
   ghc763  = "ghc763";
   default = [ ghc742 ];
-  defaultOrLater = default ++ [ ghc763 ];
+  latest  = [ ghc763 ];
   all     = [ ghc6104 ghc6123 ghc704 ghc742 ghc763 ];
 
   allBut = platform: pkgs.lib.filter (x: platform != x) all;
@@ -55,7 +55,7 @@ mapHaskellTestOn {
   ansiWlPprint = default;
   asn1Data = default;
   AspectAG = default;
-  async = defaultOrLater;
+  async = default ++ latest;
   attempt = default;
   attoparsecEnumerator = default;
   attoparsec = default;
@@ -73,7 +73,7 @@ mapHaskellTestOn {
   blazeTextual = default;
   bloomfilter = default;
   bmp = default;
-  BNFC = defaultOrLater;
+  BNFC = default ++ latest;
   BNFCMeta = default;
   Boolean = default;
   bytestringMmap = default;
@@ -81,8 +81,8 @@ mapHaskellTestOn {
   bytestringTrie = default;
   cabal2Ghci = default;
   cabal2nix = allBut ghc6104;
-  cabalDev = defaultOrLater;
-  cabalGhci = defaultOrLater;
+  cabalDev = default ++ latest;
+  cabalGhci = default ++ latest;
   cabalInstall = all;
   cairo = default;
   caseInsensitive = default;
@@ -94,7 +94,7 @@ mapHaskellTestOn {
   citeprocHs = default;
   clientsession = default;
   cmdargs = default;
-  cmdlib = defaultOrLater;
+  cmdlib = default ++ latest;
   colorizeHaskell = default;
   colour = default;
   comonadsFd = default;
@@ -106,7 +106,7 @@ mapHaskellTestOn {
   cookie = default;
   cpphs = default;
   cprngAes = default;
-  criterion = defaultOrLater;
+  criterion = default ++ latest;
   cryptoApi = default;
   cryptocipher = default;
   Crypto = default;
@@ -128,13 +128,13 @@ mapHaskellTestOn {
   digest = default;
   digestiveFunctorsHeist = default;
   digestiveFunctorsSnap = default;
-  dimensional = defaultOrLater;
-  dimensionalTf = defaultOrLater;
+  dimensional = default ++ latest;
+  dimensionalTf = default ++ latest;
   directoryTree = default;
   distributedProcess = default;
   dlist = default;
   dns = default;
-  doctest = defaultOrLater;
+  doctest = default ++ latest;
   dotgen = default;
   doubleConversion = default;
   Ebnf2ps = default;
@@ -158,7 +158,7 @@ mapHaskellTestOn {
   gdiff = default;
   ghcEvents = default;
   ghc = default;
-  ghcMod = defaultOrLater;
+  ghcMod = default ++ latest;
   ghcMtl = default;
   ghcPaths = default;
   ghcSybUtils = default;
@@ -171,10 +171,10 @@ mapHaskellTestOn {
   gloss = default;
   GLUT = all;
   gnutls = default;
-  graphviz = defaultOrLater;
+  graphviz = default ++ latest;
   gtk = default;
   gtksourceview2 = default;
-  hackageDb = defaultOrLater;
+  hackageDb = default ++ latest;
   haddock = all;
   hakyll = default;
   hamlet = default;
@@ -200,14 +200,14 @@ mapHaskellTestOn {
   hinotify = default;
   hint = default;
   Hipmunk = default;
-  hledger = defaultOrLater;
-  hledgerInterest = defaultOrLater;
-  hledgerLib = defaultOrLater;
+  hledger = default ++ latest;
+  hledgerInterest = default ++ latest;
+  hledgerLib = default ++ latest;
   hledgerWeb = default;
-  hlint = defaultOrLater;
-  HList = defaultOrLater;
+  hlint = default ++ latest;
+  HList = default ++ latest;
   hmatrix = default;
-  hoogle = defaultOrLater;
+  hoogle = default ++ latest;
   hopenssl = all;
   hostname = default;
   hp2anyCore = default;
@@ -218,10 +218,10 @@ mapHaskellTestOn {
   hsemail = allBut ghc6104;
   hslogger = default;
   hsloggerTemplate = default;
-  hspec = defaultOrLater;
+  hspec = default ++ latest;
   hspread = default;
   HsSyck = default;
-  HStringTemplate = defaultOrLater;
+  HStringTemplate = default ++ latest;
   hsyslog = all;
   html = all;
   httpConduit = default;
@@ -260,7 +260,7 @@ mapHaskellTestOn {
   MonadCatchIOTransformers = default;
   monadControl = default;
   monadLoops = default;
-  monadPar = defaultOrLater;
+  monadPar = default ++ latest;
   monadPeel = default;
   MonadPrompt = default;
   MonadRandom = default;
@@ -288,7 +288,7 @@ mapHaskellTestOn {
   OpenAL = all;
   optparseApplicative = allBut ghc6104;
   packunused = default;
-  pandoc = defaultOrLater;
+  pandoc = default ++ latest;
   pandocTypes = default;
   pango = default;
   parallel = all;
@@ -299,7 +299,7 @@ mapHaskellTestOn {
   pathPieces = default;
   pathtype = default;
   pcreLight = default;
-  permutation = defaultOrLater;
+  permutation = default ++ latest;
   persistent = default;
   persistentPostgresql = default;
   persistentSqlite = default;
@@ -314,7 +314,7 @@ mapHaskellTestOn {
   QuickCheck2 = default;
   QuickCheck = all;
   randomFu = default;
-  random = defaultOrLater;
+  random = default ++ latest;
   randomShuffle = default;
   randomSource = default;
   RangedSets = default;
@@ -343,13 +343,13 @@ mapHaskellTestOn {
   Shellac = default;
   shelly = default;
   simpleSendfile = default;
-  smallcheck = defaultOrLater;
+  smallcheck = default ++ latest;
   SMTPClient = default;
   snapCore = default;
   snap = default;
   snapLoaderStatic = default;
   snapServer = default;
-  split = defaultOrLater;
+  split = default ++ latest;
   srcloc = default;
   stateref = default;
   StateVar = default;
@@ -369,11 +369,11 @@ mapHaskellTestOn {
   tabular = default;
   tagged = default;
   tagsoup = default;
-  tar = defaultOrLater;
+  tar = default ++ latest;
   Tensor = default;
   terminfo = default;
-  testFramework = defaultOrLater;
-  testFrameworkHunit = defaultOrLater;
+  testFramework = default ++ latest;
+  testFrameworkHunit = default ++ latest;
   texmath = default;
   text = all;
   thLift = default;
@@ -395,7 +395,7 @@ mapHaskellTestOn {
   utilityHt = default;
   uuagc = default;
   uuid = default;
-  uulib = defaultOrLater;
+  uulib = default ++ latest;
   uuParsinglib = default;
   vacuumCairo = default;
   vacuum = default;
@@ -411,7 +411,7 @@ mapHaskellTestOn {
   waiLogger = default;
   warp = default;
   wlPprintExtras = default;
-  wlPprint = defaultOrLater;
+  wlPprint = default ++ latest;
   wlPprintTerminfo = default;
   wxcore = default;
   wxdirect = default;
@@ -422,10 +422,10 @@ mapHaskellTestOn {
   xml = default;
   xmlHamlet = default;
   xmlTypes = default;
-  xmobar = defaultOrLater;
-  xmonadContrib = defaultOrLater;
-  xmonadExtras = defaultOrLater;
-  xmonad = defaultOrLater;
+  xmobar = default ++ latest;
+  xmonadContrib = default ++ latest;
+  xmonadExtras = default ++ latest;
+  xmonad = default ++ latest;
   xssSanitize = default;
   yesodAuth = default;
   yesodCore = default;
-- 
cgit 1.4.1