From 7e13db278039f568a977b7b269832f6eb0eecce4 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 31 Jan 2008 13:50:53 +0000 Subject: [PATCH] Removed duplicated ghc68_extra_libs (introduced by incorrect trunk merge) svn path=/nixpkgs/branches/stdenv-updates/; revision=10434 --- pkgs/top-level/all-packages.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 251c7171f18..ac8bbbc1041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1061,22 +1061,6 @@ rec { # using nvs to be able to use mtl-1.1.0.0 as name in lib.nvs "mtl-1.1.0.0" (deriv "mtl-1.1.0.0" "cd libraries/mtl" [ (__getAttr "base-3.0.1.0" ghc.core_libs) ]); - # this will change in the future - ghc68_extra_libs = - ghc : let - deriv = name : goSrcDir : deps : - let bd = builderDefs { - goSrcDir = "ghc-* /libraries"; - src = ghc.extra_src; - } null; in - stdenv.mkDerivation rec { - inherit name; - builder = bd.writeScript (name + "-builder") - (bd.textClosure [builderDefs.haskellBuilderDefs]); - }; - # using nvs to be able to use mtl-1.1.0.0 as name - in lib.nvs "mtl-1.1.0.0" (deriv "mtl-1.1.0.0" "libraries/mtl" [ (__getAttr "base-3.0.1.0" ghc.core_libs) ]); - # the wrappers basically does one thing: It defines GHC_PACKAGE_PATH before calling ghc{i,-pkg} # So you can have different wrappers with different library combinations # So installing ghc libraries isn't done by nix-env -i package but by adding the lib to the libraries list below