From f7ab1900966a1bf4ef530b9fddcc02c5f5f45d13 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 22 Feb 2018 21:39:50 -0500 Subject: [PATCH] language-c: remove now-unnecessary overrides --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index acd485e332f..39897f82405 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -833,7 +833,7 @@ self: super: { rev = "8b79823c32e234c161baec67fdf7907952ca62b8"; sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz"; }; - }).override { language-c = self.language-c_0_7_2; }; + }); # Needs pginit to function and pgrep to verify. tmp-postgres = overrideCabal super.tmp-postgres (drv: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 3e8ff6b73ea..bd3ad0fe4c6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -112,12 +112,6 @@ self: super: { ## hspec-discover ==2.4.7 hspec-discover = super.hspec-discover_2_4_8; - ## Needs bump to a versioned attribute - ## Ambiguous occurrence ‘<>’ - ## It could refer to either ‘Prelude.<>’, - ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 - language-c = super.language-c_0_7_2; - ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## free ==4.*, template-haskell >=2.4 && <2.13