diff options
| author | Peter Simons <simons@cryp.to> | 2012-05-29 20:16:16 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-05-29 20:16:16 +0000 |
| commit | 6050e8749c95ec743a6c5a9b79de88ab59cf340a (patch) | |
| tree | 4b93d0b5342453b6447bd49163dcbea290c5c1ed /pkgs/top-level | |
| parent | e70b655b3c28d0d88ad59f6b2d81f8eccf547414 (diff) | |
| download | nixlib-6050e8749c95ec743a6c5a9b79de88ab59cf340a.tar nixlib-6050e8749c95ec743a6c5a9b79de88ab59cf340a.tar.gz nixlib-6050e8749c95ec743a6c5a9b79de88ab59cf340a.tar.bz2 nixlib-6050e8749c95ec743a6c5a9b79de88ab59cf340a.tar.lz nixlib-6050e8749c95ec743a6c5a9b79de88ab59cf340a.tar.xz nixlib-6050e8749c95ec743a6c5a9b79de88ab59cf340a.tar.zst nixlib-6050e8749c95ec743a6c5a9b79de88ab59cf340a.zip | |
haskell-defaults.nix: dropped 'packages_ghc741_pedantic' variant, it's identical to 'packages_ghc741' now
svn path=/nixpkgs/trunk/; revision=34284
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 559c1b73e86e..ddf64847d407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2221,7 +2221,6 @@ let haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc722 = haskell.packages_ghc722; haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); - haskellPackages_ghc741_pedantic = haskell.packages_ghc741_pedantic; # Stable branch snapshot. haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); # Reasonably current HEAD snapshot. diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 42f0980c637d..96744b4ee301 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -17,17 +17,13 @@ ghcHEADPrefs = ghc741Prefs; - ghc741Prefs_pedantic = + ghc741Prefs = self : self.haskellPlatformArgs_future self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok binary = null; # now a core package }; - ghc741Prefs = - self : ghc741Prefs_pedantic self // { - }; - ghc722Prefs = ghc741Prefs; ghc721Prefs = ghc741Prefs; @@ -245,10 +241,6 @@ prefFun = ghc741Prefs; }; - # More strictly adhering to the probable future Haskell Platform. - packages_ghc741_pedantic = - packages_ghc741.override { prefFun = ghc741Prefs_pedantic; }; - # Stable branch snapshot. packages_ghc742 = packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; |