From 6e0924ca84ffe4c7ea0a51e85b23edf9baa93ddd Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:08:29 +0200 Subject: [PATCH 1/9] haskell-active: New package in version 0.1.0.2. This package is required by diagrams-lib. Signed-off-by: aszlig Acked-by: Peter Simons --- .../libraries/haskell/active/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/active/default.nix diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix new file mode 100644 index 00000000000..5c563ad9cd7 --- /dev/null +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -0,0 +1,13 @@ +{ cabal, newtype, semigroupoids, semigroups, vectorSpace }: + +cabal.mkDerivation (self: { + pname = "active"; + version = "0.1.0.2"; + sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674"; + buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; + meta = { + description = "Abstractions for animation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d61ee5f28a0..44554b49592 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -397,6 +397,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); accelerateIo = callPackage ../development/libraries/haskell/accelerate-io {}; + active = callPackage ../development/libraries/haskell/active {}; + ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; abstractDeque = callPackage ../development/libraries/haskell/abstract-deque {}; From d12f707f6c471bb04332a4a6e2df4b5fde018109 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:09:44 +0200 Subject: [PATCH 2/9] haskell-newtype: New package in version 0.2. This package is required by diagrams-lib. Signed-off-by: aszlig Acked-by: Peter Simons --- .../libraries/haskell/newtype/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/newtype/default.nix diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix new file mode 100644 index 00000000000..40354c9472c --- /dev/null +++ b/pkgs/development/libraries/haskell/newtype/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "newtype"; + version = "0.2"; + sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p"; + meta = { + description = "A typeclass and set of functions for working with newtypes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 44554b49592..edd21f50a97 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1119,6 +1119,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; + newtype = callPackage ../development/libraries/haskell/newtype {}; + nonNegative = callPackage ../development/libraries/haskell/non-negative {}; numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {}; From cad8a942e1fbe79e42c6897a8012526c89e69fc9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:28:00 +0200 Subject: [PATCH 3/9] haskel-vector-space-points: New package. Starting with version 0.1.1.1, required by diagrams-core. Signed-off-by: aszlig Acked-by: Peter Simons --- .../haskell/vector-space-points/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/vector-space-points/default.nix diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix new file mode 100644 index 00000000000..7497ed59c4f --- /dev/null +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -0,0 +1,13 @@ +{ cabal, newtype, vectorSpace }: + +cabal.mkDerivation (self: { + pname = "vector-space-points"; + version = "0.1.1.1"; + sha256 = "08lar9ydni87w79y86xk2blddsgx5n6gwz3262w8z32dgy9lrmwx"; + buildDepends = [ newtype vectorSpace ]; + meta = { + description = "A type for points, as distinct from vectors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index edd21f50a97..b148cb782d5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1556,6 +1556,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; + vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {}; + void = callPackage ../development/libraries/haskell/void {}; vty = callPackage ../development/libraries/haskell/vty {}; From a7ca54494548fe30612b8cabba4885391bec2077 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:30:28 +0200 Subject: [PATCH 4/9] haskell-diagrams-lib: New package, v0.5.0.1. Signed-off-by: aszlig Acked-by: Peter Simons --- .../haskell/diagrams-lib/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/diagrams-lib/default.nix diff --git a/pkgs/development/libraries/haskell/diagrams-lib/default.nix b/pkgs/development/libraries/haskell/diagrams-lib/default.nix new file mode 100644 index 00000000000..d5c386c1e1f --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams-lib/default.nix @@ -0,0 +1,19 @@ +{ cabal, active, colour, dataDefault, diagramsCore, newtype +, NumInstances, semigroups, vectorSpace +}: + +cabal.mkDerivation (self: { + pname = "diagrams-lib"; + version = "0.5.0.1"; + sha256 = "0spfsllr2z064cxkdqcij02f0ikxxmll2dqj7rfikp4738wj21dy"; + buildDepends = [ + active colour dataDefault diagramsCore newtype NumInstances + semigroups vectorSpace + ]; + 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; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b148cb782d5..b49531d5d72 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; + diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {}; + Diff = callPackage ../development/libraries/haskell/Diff {}; digest = callPackage ../development/libraries/haskell/digest { From e3826e5e9cc63a948cd75c50a3ec61be3d4a9f75 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:31:48 +0200 Subject: [PATCH 5/9] haskell-diagrams-core: New package, v0.5.0.1. Signed-off-by: aszlig Acked-by: Peter Simons --- .../haskell/diagrams-core/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/diagrams-core/default.nix diff --git a/pkgs/development/libraries/haskell/diagrams-core/default.nix b/pkgs/development/libraries/haskell/diagrams-core/default.nix new file mode 100644 index 00000000000..365e2737131 --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams-core/default.nix @@ -0,0 +1,18 @@ +{ cabal, MemoTrie, newtype, semigroups, vectorSpace +, vectorSpacePoints +}: + +cabal.mkDerivation (self: { + pname = "diagrams-core"; + version = "0.5.0.1"; + sha256 = "073fk9cxm1kh92alr51dgwps9wxc5w3470axc6q7w91sk5cskpxy"; + buildDepends = [ + MemoTrie newtype semigroups vectorSpace vectorSpacePoints + ]; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Core libraries for diagrams EDSL"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b49531d5d72..5c2f99c1a7b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; + diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {}; + diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {}; Diff = callPackage ../development/libraries/haskell/Diff {}; From 1763eb518b4b57dd47be792b44fcc830bba35c71 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:32:40 +0200 Subject: [PATCH 6/9] haskell-diagrams-cairo: New package, v0.5.0.2. We use the jailbreak attribute here to avoid splitting off cmdargs and split into directly versioned packages. Signed-off-by: aszlig --- .../haskell/diagrams-cairo/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/diagrams-cairo/default.nix diff --git a/pkgs/development/libraries/haskell/diagrams-cairo/default.nix b/pkgs/development/libraries/haskell/diagrams-cairo/default.nix new file mode 100644 index 00000000000..294a266fef4 --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams-cairo/default.nix @@ -0,0 +1,19 @@ +{ cabal, cairo, cmdargs, diagramsCore, diagramsLib, filepath, gtk +, mtl, split +}: + +cabal.mkDerivation (self: { + pname = "diagrams-cairo"; + version = "0.5.0.2"; + sha256 = "1wwk65c2cx7rkhmai5spms791fjhl3snwhj0w9399q8pgj6g4lj8"; + jailbreak = true; + buildDepends = [ + cairo cmdargs diagramsCore diagramsLib filepath gtk mtl split + ]; + 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; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5c2f99c1a7b..fd56c927371 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; + diagramsCairo = callPackage ../development/libraries/haskell/diagrams-cairo {}; + diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {}; diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {}; From 4c418cd3aa4a8a690f1e939ad09509efa831c8e4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:33:36 +0200 Subject: [PATCH 7/9] haskell-diagrams: New package, v0.5. This is just a metapackage, so the build is going to fail and we need to fix things up next. Signed-off-by: aszlig Acked-by: Peter Simons --- .../libraries/haskell/diagrams/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/diagrams/default.nix diff --git a/pkgs/development/libraries/haskell/diagrams/default.nix b/pkgs/development/libraries/haskell/diagrams/default.nix new file mode 100644 index 00000000000..11feea574f0 --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams/default.nix @@ -0,0 +1,14 @@ +{ cabal, diagramsCairo, diagramsCore, diagramsLib }: + +cabal.mkDerivation (self: { + pname = "diagrams"; + version = "0.5"; + sha256 = "163h2fg3gpmsfm57gjyja2rxh9pl6s3xnzlidfdy201zbk1mzdg5"; + buildDepends = [ diagramsCairo diagramsCore diagramsLib ]; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Embedded domain-specific language for declarative vector graphics"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fd56c927371..9f8808ccb22 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; + diagrams = callPackage ../development/libraries/haskell/diagrams {}; + diagramsCairo = callPackage ../development/libraries/haskell/diagrams-cairo {}; diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {}; From 3e1c9217c4a1f1592d897bbf6903f77d713bce18 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 14:43:12 +0200 Subject: [PATCH 8/9] haskell-diagrams: Don't invoke haddock. This package is only a metapackage and doesn't contain any source files, so we don't need to generate source code documentation at all. Signed-off-by: aszlig Acked-by: Peter Simons --- pkgs/development/libraries/haskell/diagrams/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/diagrams/default.nix b/pkgs/development/libraries/haskell/diagrams/default.nix index 11feea574f0..21c3a7a28f6 100644 --- a/pkgs/development/libraries/haskell/diagrams/default.nix +++ b/pkgs/development/libraries/haskell/diagrams/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.5"; sha256 = "163h2fg3gpmsfm57gjyja2rxh9pl6s3xnzlidfdy201zbk1mzdg5"; buildDepends = [ diagramsCairo diagramsCore diagramsLib ]; + noHaddock = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative vector graphics"; From 5320792ed70da5e07d5b04afb06c9d929d1764fe Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 14:45:19 +0200 Subject: [PATCH 9/9] haskell-diagrams: Move main libs into single dir. That way we have all diagrams specific stuff in one directory, which coulde make it easier for code-reuse in the future. Signed-off-by: aszlig Acked-by: Peter Simons --- .../{diagrams-cairo/default.nix => diagrams/cairo.nix} | 0 .../{diagrams-core/default.nix => diagrams/core.nix} | 0 .../haskell/diagrams/{default.nix => diagrams.nix} | 0 .../{diagrams-lib/default.nix => diagrams/lib.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/{diagrams-cairo/default.nix => diagrams/cairo.nix} (100%) rename pkgs/development/libraries/haskell/{diagrams-core/default.nix => diagrams/core.nix} (100%) rename pkgs/development/libraries/haskell/diagrams/{default.nix => diagrams.nix} (100%) rename pkgs/development/libraries/haskell/{diagrams-lib/default.nix => diagrams/lib.nix} (100%) diff --git a/pkgs/development/libraries/haskell/diagrams-cairo/default.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix similarity index 100% rename from pkgs/development/libraries/haskell/diagrams-cairo/default.nix rename to pkgs/development/libraries/haskell/diagrams/cairo.nix diff --git a/pkgs/development/libraries/haskell/diagrams-core/default.nix b/pkgs/development/libraries/haskell/diagrams/core.nix similarity index 100% rename from pkgs/development/libraries/haskell/diagrams-core/default.nix rename to pkgs/development/libraries/haskell/diagrams/core.nix diff --git a/pkgs/development/libraries/haskell/diagrams/default.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix similarity index 100% rename from pkgs/development/libraries/haskell/diagrams/default.nix rename to pkgs/development/libraries/haskell/diagrams/diagrams.nix diff --git a/pkgs/development/libraries/haskell/diagrams-lib/default.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix similarity index 100% rename from pkgs/development/libraries/haskell/diagrams-lib/default.nix rename to pkgs/development/libraries/haskell/diagrams/lib.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9f8808ccb22..30edecc335d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,13 +625,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; - diagrams = callPackage ../development/libraries/haskell/diagrams {}; + diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {}; - diagramsCairo = callPackage ../development/libraries/haskell/diagrams-cairo {}; + diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {}; - diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {}; + diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {}; - diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {}; + diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {}; Diff = callPackage ../development/libraries/haskell/Diff {};