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

haskell-defaults.nix: dropped 'packages_ghc741_pedantic' variant, it's identical to 'packages_ghc741' now 

svn path=/nixpkgs/trunk/; revision=34284
This commit is contained in:
Peter Simons 2012-05-29 20:16:16 +00:00
parent e70b655b3c
commit 6050e8749c
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/top-level/all-packages.nix
View File

@ -2221,7 +2221,6 @@ let
haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc721 = haskell.packages_ghc721;
haskellPackages_ghc722 = haskell.packages_ghc722; haskellPackages_ghc722 = haskell.packages_ghc722;
haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741);
haskellPackages_ghc741_pedantic = haskell.packages_ghc741_pedantic;
# Stable branch snapshot. # Stable branch snapshot.
haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742);
# Reasonably current HEAD snapshot. # Reasonably current HEAD snapshot.

10
pkgs/top-level/haskell-defaults.nix
View File

@ -17,17 +17,13 @@
ghcHEADPrefs = ghc741Prefs; ghcHEADPrefs = ghc741Prefs;
ghc741Prefs_pedantic = ghc741Prefs =
self : self.haskellPlatformArgs_future self // { self : self.haskellPlatformArgs_future self // {
haskellPlatform = self.haskellPlatform_2012_2_0_0; haskellPlatform = self.haskellPlatform_2012_2_0_0;
mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok
binary = null; # now a core package binary = null; # now a core package
}; };
ghc741Prefs =
self : ghc741Prefs_pedantic self // {
};
ghc722Prefs = ghc741Prefs; ghc722Prefs = ghc741Prefs;
ghc721Prefs = ghc741Prefs; ghc721Prefs = ghc741Prefs;
@ -245,10 +241,6 @@
prefFun = ghc741Prefs; prefFun = ghc741Prefs;
}; };
# More strictly adhering to the probable future Haskell Platform.
packages_ghc741_pedantic =
packages_ghc741.override { prefFun = ghc741Prefs_pedantic; };
# Stable branch snapshot. # Stable branch snapshot.
packages_ghc742 = packages_ghc742 =
packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; packages { ghcPath = ../development/compilers/ghc/7.4.2.nix;