From b5d2c81514f2c0542128a3c631d23057d0c71bad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 May 2017 11:39:08 +0200 Subject: Remove broken haskell-tools overrides. These overrides no longer evaluate correctly and as a result break Nixpkgs evaluation. ping @shlevy --- .../haskell-modules/configuration-common.nix | 32 +--------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b54a5b72235d..d277d5dbed44 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -860,34 +860,4 @@ self: super: { # https://github.com/danidiaz/tailfile-hinotify/issues/2 tailfile-hinotify = dontCheck super.tailfile-hinotify; -} // (let scope' = self: super: { - haskell-tools-ast = super.haskell-tools-ast_0_6_0_0; - haskell-tools-backend-ghc = super.haskell-tools-backend-ghc_0_6_0_0; - haskell-tools-cli = super.haskell-tools-cli_0_6_0_0; - haskell-tools-daemon = super.haskell-tools-daemon_0_6_0_0; - haskell-tools-debug = super.haskell-tools-debug_0_6_0_0; - haskell-tools-demo = super.haskell-tools-demo_0_6_0_0; - haskell-tools-prettyprint = super.haskell-tools-prettyprint_0_6_0_0; - haskell-tools-refactor = super.haskell-tools-refactor_0_6_0_0; - haskell-tools-rewrite = super.haskell-tools-rewrite_0_6_0_0; - }; - in { - haskell-tools-ast_0_6_0_0 = - super.haskell-tools-ast_0_6_0_0.overrideScope scope'; - haskell-tools-backend-ghc_0_6_0_0 = - super.haskell-tools-backend-ghc_0_6_0_0.overrideScope scope'; - haskell-tools-cli_0_6_0_0 = - dontCheck (super.haskell-tools-cli_0_6_0_0.overrideScope scope'); - haskell-tools-daemon_0_6_0_0 = - dontCheck (super.haskell-tools-daemon_0_6_0_0.overrideScope scope'); - haskell-tools-debug_0_6_0_0 = - super.haskell-tools-debug_0_6_0_0.overrideScope scope'; - haskell-tools-demo_0_6_0_0 = - super.haskell-tools-demo_0_6_0_0.overrideScope scope'; - haskell-tools-prettyprint_0_6_0_0 = - super.haskell-tools-prettyprint_0_6_0_0.overrideScope scope'; - haskell-tools-refactor_0_6_0_0 = - super.haskell-tools-refactor_0_6_0_0.overrideScope scope'; - haskell-tools-rewrite_0_6_0_0 = - super.haskell-tools-rewrite_0_6_0_0.overrideScope scope'; - }) +} -- cgit 1.4.1