public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-diagrams-lib: build has been fixed upstream

Browse Source
This commit is contained in:
Peter Simons 2015-04-20 16:52:44 +02:00
parent ee90f707a6
commit cba0f43304
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -186,12 +186,6 @@ self: super: {
prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal"; 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 # https://github.com/mokus0/misfortune/pull/1
misfortune = appendPatch super.misfortune (pkgs.fetchpatch { misfortune = appendPatch super.misfortune (pkgs.fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/mokus0/misfortune/pull/1.patch"; url = "https://patch-diff.githubusercontent.com/raw/mokus0/misfortune/pull/1.patch";

11
pkgs/development/haskell-modules/diagrams-lib-flexible-contexts.patch
View File

@ -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 #-}
-----------------------------------------------------------------------------
-- |