From c7639f4e5605d84fa9ffb24ef99516f31370fda2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 Jun 2016 17:48:35 +0200 Subject: [PATCH] haskell-esqueleto: remove broken overrides These overrides didn't work, because they created a mixture of different versions of 'persistent' in the build tree. Furthermore, we cannot pin specific versions like that in configuration-common.nix because this breaks builds in other package sets, i.e. the LTS variants. --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 08df6545550..5c3c5cb3504 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1013,12 +1013,4 @@ self: super: { cairo = addBuildTool super.cairo self.gtk2hs-buildtools; pango = addBuildTool super.pango self.gtk2hs-buildtools; - # esqueleto requires an older version of the persistent library, and - # corresponding versions of -template and -sqlite for for its test - # suite. - esqueleto = super.esqueleto.overrideScope (self: super: { - persistent-template = super.persistent-template_2_1_8_1; - persistent-sqlite = super.persistent-sqlite_2_2_1; - persistent = super.persistent_2_2_4_1; - }); }