From 1a534e0aabf64c704c044504790c789493d63220 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Tue, 24 Jan 2017 18:29:22 +0100 Subject: [PATCH] diagrams: Fix the 1.4.* versions of the ecosystem The affected packages now depend on: diagrams-core ==1.4.* diagrams-lib ==1.4.* optparse-applicative ==0.13.* --- .../haskell-modules/configuration-common.nix | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fdb04681b2c7..06bfab9e0fe7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -675,8 +675,38 @@ self: super: { ''; })); - # Requires optparse-applicative 0.13.0.0 + # Packages of the diagrams ecosystem that require: + # diagrams-core ==1.4.* + # diagrams-lib ==1.4.* + # optparse-applicative ==0.13.* + diagrams_1_4 = super.diagrams_1_4.overrideScope (self: super: { + diagrams-contrib = self.diagrams-contrib_1_4_0_1; + diagrams-core = self.diagrams-core_1_4; + diagrams-lib = self.diagrams-lib_1_4_0_1; + diagrams-svg = self.diagrams-svg_1_4_1; + optparse-applicative = self.optparse-applicative_0_13_0_0; + }); + diagrams-contrib_1_4_0_1 = super.diagrams-contrib_1_4_0_1.overrideScope (self: super: { + diagrams-core = self.diagrams-core_1_4; + diagrams-lib = self.diagrams-lib_1_4_0_1; + }); + diagrams-lib_1_4_0_1 = super.diagrams-lib_1_4_0_1.overrideScope (self: super: { + diagrams-core = self.diagrams-core_1_4; + optparse-applicative = self.optparse-applicative_0_13_0_0; + }); diagrams-pgf = super.diagrams-pgf.overrideScope (self: super: { + diagrams-core = self.diagrams-core_1_4; + diagrams-lib = self.diagrams-lib_1_4_0_1; + optparse-applicative = self.optparse-applicative_0_13_0_0; + }); + diagrams-rasterific_1_4 = super.diagrams-rasterific_1_4.overrideScope (self: super: { + diagrams-core = self.diagrams-core_1_4; + diagrams-lib = self.diagrams-lib_1_4_0_1; + optparse-applicative = self.optparse-applicative_0_13_0_0; + }); + diagrams-svg_1_4_1 = super.diagrams-svg_1_4_1.overrideScope (self: super: { + diagrams-core = self.diagrams-core_1_4; + diagrams-lib = self.diagrams-lib_1_4_0_1; optparse-applicative = self.optparse-applicative_0_13_0_0; });