summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell/diagrams
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/haskell/diagrams')
-rw-r--r--pkgs/development/libraries/haskell/diagrams/builder/default.nix26
-rw-r--r--pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix53
-rw-r--r--pkgs/development/libraries/haskell/diagrams/cairo.nix5
-rw-r--r--pkgs/development/libraries/haskell/diagrams/contrib.nix5
-rw-r--r--pkgs/development/libraries/haskell/diagrams/core.nix5
-rw-r--r--pkgs/development/libraries/haskell/diagrams/gtk.nix16
-rw-r--r--pkgs/development/libraries/haskell/diagrams/lib.nix11
-rw-r--r--pkgs/development/libraries/haskell/diagrams/postscript.nix5
-rw-r--r--pkgs/development/libraries/haskell/diagrams/rasterific.nix25
-rw-r--r--pkgs/development/libraries/haskell/diagrams/svg.nix5
10 files changed, 141 insertions, 15 deletions
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/default.nix b/pkgs/development/libraries/haskell/diagrams/builder/default.nix
new file mode 100644
index 00000000000..40e1cf45796
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/builder/default.nix
@@ -0,0 +1,26 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, blazeSvg, cmdargs, diagramsCairo, diagramsLib
+, diagramsPostscript, diagramsSvg, exceptions, filepath, hashable
+, haskellSrcExts, hint, lens, mtl, split, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-builder";
+  version = "0.6.0.2";
+  sha256 = "18avlhwywhrxlf1cyp9fdiy0i3gy12k4i28cymllmmyx78fv59q5";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeSvg cmdargs diagramsCairo diagramsLib diagramsPostscript
+    diagramsSvg exceptions filepath hashable haskellSrcExts hint lens
+    mtl split transformers
+  ];
+  configureFlags = "-fcairo -fsvg -fps -frasterific";
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams";
+    description = "hint-based build service for the diagrams graphics EDSL";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
new file mode 100644
index 00000000000..8d175398414
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
@@ -0,0 +1,53 @@
+/*
+  If user need access to more haskell package for building his
+  diagrams, he simply has to pass these package through the
+  extra packages function as follow in `config.nix`:
+  
+  ~~~
+  diagramBuilderWrapper.override {
+    extraPackages = self : [myHaskellPackage];
+  }
+  ­~~~
+
+  WARNING:
+  Note that this solution works well but however, as this is a 
+  non-cabal derivation, user should be carefull to never put this
+  package inside the listing passed as argument to `ghcWithPackages`
+  as it will silently disregard the package. This silent disregard
+  should be regarded as an issue for `ghcWithPackages`. It should
+  rather raise an error instead when a non-cabal dirivation is
+  directly passed to it. The alternative would have been to
+  use a fake cabal file in order to make this a cabal derivation
+  such as what `yiCustom` package did.
+*/
+
+{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper, 
+  extraPackages ? (self: []) }:
+let
+  # Used same technique as for the yiCustom package.
+  w = ghcWithPackages 
+    (self: [ diagramsBuilder ] ++ extraPackages self);
+  wrappedGhc = w.override { ignoreCollisions = true; };
+in
+stdenv.mkDerivation {
+  name = diagramsBuilder.name + "-wrapper";
+  buildInputs = [ makeWrapper ];
+  buildCommand = ''
+    makeWrapper \
+    "${diagramsBuilder}/bin/diagrams-builder-svg" "$out/bin/diagrams-builder-svg" \
+      --set NIX_GHC ${wrappedGhc}/bin/ghc \
+      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
+
+    makeWrapper \
+    "${diagramsBuilder}/bin/diagrams-builder-cairo" "$out/bin/diagrams-builder-cairo" \
+      --set NIX_GHC ${wrappedGhc}/bin/ghc \
+      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
+
+    makeWrapper \
+    "${diagramsBuilder}/bin/diagrams-builder-ps" "$out/bin/diagrams-builder-ps" \
+    --set NIX_GHC ${wrappedGhc}/bin/ghc \
+    --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
+  '';
+  preferLocalBuild = true;
+  meta = diagramsBuilder.meta;
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index 3a695fa8203..24c26e052d9 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -7,13 +7,14 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.2.0.1";
-  sha256 = "0y7llxxs34i814nc3c79ykv75znplzqq7njvq7a5fyxl81ji0z4c";
+  version = "1.2.0.4";
+  sha256 = "1yg6ja5jha499b6j5fsgdl4f3l2ff1gp6cl7ixzj9y26m7a10bqq";
   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";
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index f1044870f3a..78ed983650f 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.1";
-  sha256 = "05jsqc9wm87hpnaclzfa376m5z8lnp4qgll6lqnfa5m49cqcabki";
+  version = "1.1.2.4";
+  sha256 = "0iq5psy5wjm664hqsaprynba0b7x3ijxngh7mbk6hkh004vsna1w";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
@@ -20,6 +20,7 @@ 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";
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index 18f362e0c21..518b5594cb6 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -6,12 +6,13 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "1.2.0.2";
-  sha256 = "10glkp05pnxx7c7f33654rjcvahslxx010v36wf6zsa8nscdrccn";
+  version = "1.2.0.4";
+  sha256 = "1axkgprqs4jvzh5vfr118nzr1h0m48axr5jfiqqrqvy5xyjcagkq";
   buildDepends = [
     dualTree lens 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/gtk.nix b/pkgs/development/libraries/haskell/diagrams/gtk.nix
new file mode 100644
index 00000000000..c169c9e0e48
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/gtk.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cairo, diagramsCairo, diagramsLib, gtk }:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-gtk";
+  version = "1.0.1.3";
+  sha256 = "1bcgplmg01sp7iwhgx7ircbn9bj15m42w6vkh539sd65y01z3hc8";
+  buildDepends = [ cairo diagramsCairo diagramsLib gtk ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams/";
+    description = "Backend for rendering diagrams directly to GTK windows";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index b15f05dbf27..d2e25254f67 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -2,20 +2,21 @@
 
 { cabal, active, colour, dataDefaultClass, diagramsCore, dualTree
 , filepath, fingertree, hashable, intervals, JuicyPixels, lens
-, MemoTrie, monoidExtras, optparseApplicative, safe, semigroups
-, tagged, vectorSpace, vectorSpacePoints
+, MemoTrie, monoidExtras, optparseApplicative, semigroups, tagged
+, vectorSpace, vectorSpacePoints
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.2.0.2";
-  sha256 = "0ylrsldq7nmqvprgwbw7bkwp31zhgbyxjx462lcayk0lbhqb5k5p";
+  version = "1.2.0.7";
+  sha256 = "12ddlipp47j2mifwhi0ilb2fjdh2whk24s4d5h6ais2znj3hh99a";
   buildDepends = [
     active colour dataDefaultClass diagramsCore dualTree filepath
     fingertree hashable intervals JuicyPixels lens MemoTrie
-    monoidExtras optparseApplicative safe semigroups tagged vectorSpace
+    monoidExtras optparseApplicative semigroups tagged vectorSpace
     vectorSpacePoints
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative graphics";
diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index 557aae73db5..841487305ef 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -7,12 +7,13 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-postscript";
-  version = "1.1.0.1";
-  sha256 = "03747g5y33kzf76hs4y0ak9q6b79r92z130b03bcc2892na62ad6";
+  version = "1.1.0.3";
+  sha256 = "172r7q9jzhy2kv5bsbakakwv6gpvy308gvp8xpirbch9mrvnjxhz";
   buildDepends = [
     dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
     lens monoidExtras mtl semigroups split vectorSpace
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "Postscript backend for diagrams drawing EDSL";
diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
new file mode 100644
index 00000000000..8e494241f74
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dataDefaultClass, diagramsCore, diagramsLib, filepath
+, FontyFruity, JuicyPixels, lens, mtl, optparseApplicative
+, Rasterific, split, statestack, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-rasterific";
+  version = "0.1.0.5";
+  sha256 = "1a95l8g55jsmqhbv9flk5kfkfa40z93axbjfz6xb74lyvl6xccwr";
+  buildDepends = [
+    dataDefaultClass diagramsCore diagramsLib filepath FontyFruity
+    JuicyPixels lens mtl optparseApplicative Rasterific split
+    statestack time
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams/";
+    description = "Rasterific backend for diagrams";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 8393d7c6f98..1994905c1d4 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -7,13 +7,14 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.1.0.1";
-  sha256 = "02krwy1v7rhcgg0ps7kd8ym50kh48dcfqm2xz3k6hr32jzqa5hlw";
+  version = "1.1.0.3";
+  sha256 = "0byqxwz9h1hi2yrq2vz32gv0az9q3l94qa2q3nl3j8sa64qmpdwq";
   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";