From e891d62a6c91f8bd00947ec9769efdc3806e9c1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:16:48 +0100 Subject: [PATCH] Jailbreak Haskell packages to deal with update of semigroups. --- pkgs/development/libraries/haskell/active/default.nix | 1 + pkgs/development/libraries/haskell/diagrams/core.nix | 1 + pkgs/development/libraries/haskell/diagrams/lib.nix | 1 + pkgs/development/libraries/haskell/dual-tree/default.nix | 1 + pkgs/development/libraries/haskell/lens/default.nix | 3 +++ pkgs/development/libraries/haskell/monoid-extras/default.nix | 1 + 6 files changed, 8 insertions(+) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 5c563ad9cd73..732000e74824 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.2"; sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; + jailbreak = true; meta = { description = "Abstractions for animation"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 3f4942086627..2acf784e8812 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { dualTree MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 472657b2df71..727a7156a9b8 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { active colour dataDefault diagramsCore monoidExtras newtype NumInstances semigroups vectorSpace ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index f1206fd822ee..741fcbce1c9b 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.0"; sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167"; buildDepends = [ monoidExtras newtype semigroups ]; + jailbreak = true; meta = { description = "Rose trees with cached and accumulating monoidal annotations"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index dd9966a0d58d..88ce9fe32cf5 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { parallel semigroups split text transformers unorderedContainers vector ]; + patchPhase = '' + sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal + ''; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index a86bdce38397..4e8a4154ae1e 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2.1"; sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary"; buildDepends = [ semigroups ]; + jailbreak = true; meta = { description = "Various extra monoid-related definitions and utilities"; license = self.stdenv.lib.licenses.bsd3;