From 1486fee1d3acc6f7e4dfa6c921042414cf20a671 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Jun 2018 12:07:51 +0200 Subject: [PATCH] haskell-Cabal: drop obsolete override to fix Setup dependencies This is now handled by cabal2nix: - https://github.com/NixOS/cabal2nix/commit/7ccbd668d1f9f8154a1fbc1ba48d7a483f37a2a7. - https://github.com/NixOS/nixpkgs/pull/41939 --- .../haskell-modules/configuration-common.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0fd1a03f316..20a908858e9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1075,14 +1075,3 @@ self: super: { in { inherit amazonka amazonka-core amazonka-test; }) - -// - -# The actual Cabal library gets built while building its `Setup.hs`. -(let - inherit (pkgs.lib) filterAttrs flip mapAttrs hasPrefix; - cabals = filterAttrs (n: v: hasPrefix "Cabal_" n) super; - fixCabal = n: v: addSetupDepends v [ self.mtl self.parsec ]; -in - mapAttrs fixCabal cabals -)