From 164c81be8467e0935782d4110946c0a73ae10694 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 10:31:29 +0200 Subject: [PATCH] haskell-hscolour: define the bootstap version of this package using 'extension' rather than by passing an additional parameter to it --- pkgs/development/tools/haskell/hscolour/default.nix | 3 +-- pkgs/top-level/haskell-packages.nix | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/hscolour/default.nix b/pkgs/development/tools/haskell/hscolour/default.nix index 88c4545ff6d9..d8bc08b4b33c 100644 --- a/pkgs/development/tools/haskell/hscolour/default.nix +++ b/pkgs/development/tools/haskell/hscolour/default.nix @@ -1,4 +1,4 @@ -{ cabal, hyperlinkSource ? true }: +{ cabal }: cabal.mkDerivation (self: { pname = "hscolour"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs"; isLibrary = true; isExecutable = true; - hyperlinkSource = hyperlinkSource; meta = { homepage = "http://code.haskell.org/~malcolm/hscolour/"; description = "Colourise Haskell code"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9d6fb9080178..f083490ddc6e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2641,7 +2641,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hlint = callPackage ../development/tools/haskell/hlint {}; hscolour = callPackage ../development/tools/haskell/hscolour {}; - hscolourBootstrap = self.hscolour.override { hyperlinkSource = false; }; + hscolourBootstrap = self.hscolour.override { + cabal = self.cabal.override { + extension = self : super : { hyperlinkSource = false; }; + }; + }; hslogger = callPackage ../development/tools/haskell/hslogger {};