From 8d8acebfbb31ca90880d99ab3dbdb00607bbff58 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 20 Oct 2014 19:17:12 -0500 Subject: [PATCH] Extra: rename directory to Extra-lib This is needed because not everyone uses a case-sensitive filesystem (namely, OS X), which causes the Extra and extra packages to collide. Since extra is more recently maintained (by the author of Shake and Hoogle), I've renamed Extra to just Extra-lib, keeping everything else the same. --- .../libraries/haskell/{Extra => Extra-lib}/default.nix | 0 pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/libraries/haskell/{Extra => Extra-lib}/default.nix (100%) diff --git a/pkgs/development/libraries/haskell/Extra/default.nix b/pkgs/development/libraries/haskell/Extra-lib/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/Extra/default.nix rename to pkgs/development/libraries/haskell/Extra-lib/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bd3b914ff26..576f4332251 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -790,7 +790,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in executablePath = callPackage ../development/libraries/haskell/executable-path {}; - Extra = callPackage ../development/libraries/haskell/Extra {}; + Extra = callPackage ../development/libraries/haskell/Extra-lib {}; fay = callPackage ../development/libraries/haskell/fay {};