From 103f51c4da15a7b69b642b414778b9b2276bdc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 1 May 2010 10:55:05 +0000 Subject: [PATCH] Making the latest haskell expressions appear on 'nix-env -qa'. More than one person had trouble not finding ghc 6.12 on 'nix-env -qa '*'' svn path=/nixpkgs/trunk/; revision=21477 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17cdbd9352a6..2ccbd091bbe9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2305,23 +2305,23 @@ let */ # Helper functions to abstract away from repetitive instantiations. - haskellPackagesFun610 = ghcPath : profDefault : import ./haskell-packages.nix { + haskellPackagesFun610 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix { inherit pkgs; enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; ghc = import ghcPath { inherit fetchurl stdenv perl ncurses gmp libedit; ghc = ghc6101Binary; }; - }; + }); - haskellPackagesFun612 = ghcPath : profDefault : import ./haskell-packages.nix { + haskellPackagesFun612 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix { inherit pkgs; enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; ghc = import ghcPath { inherit fetchurl stdenv perl ncurses gmp; ghc = ghc6101Binary; }; - }; + }); # Currently active GHC versions. haskellPackages_ghc6101 =