From 5320792ed70da5e07d5b04afb06c9d929d1764fe Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 14:45:19 +0200
Subject: [PATCH] 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 <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
---
 .../{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 {};