summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorAndres Löh <mail@andres-loeh.de>2012-06-05 08:09:10 +0000
committerAndres Löh <mail@andres-loeh.de>2012-06-05 08:09:10 +0000
commitcfdf9cafaab69ea7fe58766ca973ab97749de1a7 (patch)
treee415430ca8234d0858ae5e0e62de89f0bc910d83 /pkgs/top-level
parent8cf7f46ea0abed6a84c2460aacf6c83552061bdd (diff)
downloadnixlib-cfdf9cafaab69ea7fe58766ca973ab97749de1a7.tar
nixlib-cfdf9cafaab69ea7fe58766ca973ab97749de1a7.tar.gz
nixlib-cfdf9cafaab69ea7fe58766ca973ab97749de1a7.tar.bz2
nixlib-cfdf9cafaab69ea7fe58766ca973ab97749de1a7.tar.lz
nixlib-cfdf9cafaab69ea7fe58766ca973ab97749de1a7.tar.xz
nixlib-cfdf9cafaab69ea7fe58766ca973ab97749de1a7.tar.zst
nixlib-cfdf9cafaab69ea7fe58766ca973ab97749de1a7.zip
Setting GHC default version to 7.4.1, default platform to 2012.2.0.0.
svn path=/nixpkgs/trunk/; revision=34355
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b89c56e841d..9ed8bfd6d7ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2203,8 +2203,8 @@ let
   # particularly in connection with Hydra builds for all these packages.
   # So we enable it for selected versions only.
 
-  # Current default version: 7.0.4.
-  haskellPackages = haskellPackages_ghc704;
+  # Current default version: 7.4.1.
+  haskellPackages = haskellPackages_ghc741;
   # Current Haskell platform.
   haskellPlatform = haskellPackages.haskellPlatform;
 
@@ -2215,16 +2215,16 @@ let
   haskellPackages_ghc701              =                   haskell.packages_ghc701;
   haskellPackages_ghc702              =                   haskell.packages_ghc702;
   haskellPackages_ghc703              =                   haskell.packages_ghc703;
+  haskellPackages_ghc704              = recurseIntoAttrs (haskell.packages_ghc704);
+  haskellPackages_ghc721              =                   haskell.packages_ghc721;
+  haskellPackages_ghc722              =                   haskell.packages_ghc722;
   # For the default version, we build profiling versions of the libraries, too.
   # The following three lines achieve that: the first two make Hydra build explicit
   # profiling and non-profiling versions; the final respects the user-configured
   # default setting.
-  haskellPackages_ghc704_no_profiling = recurseIntoAttrs (haskell.packages_ghc704.noProfiling);
-  haskellPackages_ghc704_profiling    = recurseIntoAttrs (haskell.packages_ghc704.profiling);
-  haskellPackages_ghc704              =                   haskell.packages_ghc704.highPrio;
-  haskellPackages_ghc721              =                   haskell.packages_ghc721;
-  haskellPackages_ghc722              =                   haskell.packages_ghc722;
-  haskellPackages_ghc741              = recurseIntoAttrs (haskell.packages_ghc741);
+  haskellPackages_ghc741_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling);
+  haskellPackages_ghc741_profiling    = recurseIntoAttrs (haskell.packages_ghc741.profiling);
+  haskellPackages_ghc741              = recurseIntoAttrs (haskell.packages_ghc741.highPrio);
   # Stable branch snapshot.
   haskellPackages_ghc742              = recurseIntoAttrs (haskell.packages_ghc742);
   # Reasonably current HEAD snapshot.