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 {};