From a24775bf22dbdb4f9c21db3a15703d7e6e2c4016 Mon Sep 17 00:00:00 2001 From: Daniel Bergey Date: Sat, 23 Aug 2014 02:05:39 +0000 Subject: [PATCH] haskell Diagrams libraries latest versions support lens-4.4 - fix broken builds add bergey as maintainer --- lib/maintainers.nix | 1 + pkgs/development/libraries/haskell/diagrams/cairo.nix | 6 +++--- pkgs/development/libraries/haskell/diagrams/contrib.nix | 6 +++--- pkgs/development/libraries/haskell/diagrams/core.nix | 6 +++--- pkgs/development/libraries/haskell/diagrams/lib.nix | 6 +++--- pkgs/development/libraries/haskell/diagrams/postscript.nix | 7 +++---- pkgs/development/libraries/haskell/diagrams/svg.nix | 6 +++--- .../development/libraries/haskell/force-layout/default.nix | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 184fd7036a0f..78f0d619cb0e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -22,6 +22,7 @@ bbenoist = "Baptist BENOIST "; bennofs = "Benno Fünfstück "; berdario = "Dario Bertini "; + bergey = "Daniel Bergey "; bjg = "Brian Gough "; bjornfor = "Bjørn Forsman "; bluescreen303 = "Mathijs Kwik "; diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index c0f678311b9a..c8763ca0a453 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -7,18 +7,18 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.2"; - sha256 = "0vzjp1i5hk971r7f55gpdl0jibrjg9j4ny7p408kb8zl2ynlxv6l"; + version = "1.2.0.1"; + sha256 = "0y7llxxs34i814nc3c79ykv75znplzqq7njvq7a5fyxl81ji0z4c"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative pango split statestack time transformers vector ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 2dcc86d5c9b4..7c9e797e3057 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.1.2"; - sha256 = "1gljmzlhc6vck5lcsq9lhf2k4dik5pp62k85y2kkxgq0mxnmqf0g"; + version = "1.1.2.1"; + sha256 = "05jsqc9wm87hpnaclzfa376m5z8lnp4qgll6lqnfa5m49cqcabki"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec @@ -20,11 +20,11 @@ cabal.mkDerivation (self: { diagramsLib HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 9a1245d04d0a..c7459972c394 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -6,17 +6,17 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.2.0.1"; - sha256 = "01rzd2zdg0pv7b299z6s6i6l6xggiszb2qs00vh5dbss295n1sps"; + version = "1.2.0.2"; + sha256 = "10glkp05pnxx7c7f33654rjcvahslxx010v36wf6zsa8nscdrccn"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 77047d982917..75ee478ac3fc 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -8,19 +8,19 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2.0.1"; - sha256 = "0p7rq97hnal90dciq1nln1s16kdb1xk9rrwaxhkxqr6kjjr2njf4"; + version = "1.2.0.2"; + sha256 = "0ylrsldq7nmqvprgwbw7bkwp31zhgbyxjx462lcayk0lbhqb5k5p"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie monoidExtras optparseApplicative safe semigroups tagged vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 6ecd2dd4a410..c79f637c73f6 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.1"; - sha256 = "0l077libp6h8ka9ygkmajvzdymndlhx60nb5f6jaqvp7yx80hz3m"; + version = "1.1.0.1"; + sha256 = "03747g5y33kzf76hs4y0ak9q6b79r92z130b03bcc2892na62ad6"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { description = "Postscript backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index f982f427863b..fcd08ffce63a 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -7,18 +7,18 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.1"; - sha256 = "0b34rh35pay4x8dg0i06xvr3d865hbxzj2x77jly9l1j7sa1qaj1"; + version = "1.1.0.1"; + sha256 = "02krwy1v7rhcgg0ps7kd8ym50kh48dcfqm2xz3k6hr32jzqa5hlw"; buildDepends = [ base64Bytestring blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl split time vectorSpace ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 77259cc1e401..f0f8ae1399db 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.6"; - sha256 = "0qmzz9gbzf1jdk08w3nhnw7l3n5bq5sw5k4r0mdc5y11m38xpgm4"; + version = "0.3.0.7"; + sha256 = "1kq6fg90yj735rpipspykvkmzs2cnwyib6pkph58523bvahgi2dy"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { description = "Simple force-directed layout"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; })