From cba0f433045aa3b278d9fe3d84926083d122f6f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Apr 2015 16:52:44 +0200 Subject: [PATCH] haskell-diagrams-lib: build has been fixed upstream --- .../haskell-modules/configuration-ghc-7.10.x.nix | 6 ------ .../diagrams-lib-flexible-contexts.patch | 11 ----------- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/haskell-modules/diagrams-lib-flexible-contexts.patch diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index adbab46fd11a..85e4fe80c65d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -186,12 +186,6 @@ self: super: { prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal"; }); - # diagrams/diagrams-core#83 - diagrams-lib = overrideCabal super.diagrams-lib (drv: { - prePatch = "sed -i 's|4\.8|4.9|' diagrams-lib.cabal"; - patches = [ ./diagrams-lib-flexible-contexts.patch ]; - }); - # https://github.com/mokus0/misfortune/pull/1 misfortune = appendPatch super.misfortune (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/mokus0/misfortune/pull/1.patch"; diff --git a/pkgs/development/haskell-modules/diagrams-lib-flexible-contexts.patch b/pkgs/development/haskell-modules/diagrams-lib-flexible-contexts.patch deleted file mode 100644 index 385bc75b5823..000000000000 --- a/pkgs/development/haskell-modules/diagrams-lib-flexible-contexts.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur diagrams-lib-1.2.0.9-orig/src/Diagrams/TwoD/Polygons.hs diagrams-lib-1.2.0.9/src/Diagrams/TwoD/Polygons.hs ---- diagrams-lib-1.2.0.9-orig/src/Diagrams/TwoD/Polygons.hs 2015-04-02 22:13:26.000000000 -0400 -+++ diagrams-lib-1.2.0.9/src/Diagrams/TwoD/Polygons.hs 2015-04-11 18:17:28.095156620 -0400 -@@ -4,6 +4,7 @@ - {-# LANGUAGE TemplateHaskell #-} - {-# LANGUAGE TypeFamilies #-} - {-# LANGUAGE ViewPatterns #-} -+{-# LANGUAGE FlexibleContexts #-} - - ----------------------------------------------------------------------------- - -- |