Fix build with GHC 7.10.1-rc2.
commit520a413b074178389dea6fa60a04a7b36a09da92
authorPeter Simons <simons@cryp.to>
dateTue 3 Feb 2015, 19:46 (12 years ago)
parentdea071a
release.nix+1−1
@@ -18,7 +18,7 @@ in
1818 Cabal = if nativeCabal then null else haskellPackages.Cabal_1_20_0_3;
1919 hackage-db = haskellPackages.hackage-db.override { Cabal = Cabal; };
2020 nativePrettyClass = pkgs.stdenv.lib.versionOlder "7.10" haskellPackages.ghc.version;
21− prettyclass = if nativePrettyClass then null else haskellPackages.pretty-class;
21+ prettyclass = if nativePrettyClass then null else haskellPackages.prettyclass;
2222 in
2323 haskellPackages.mkDerivation {
2424 pname = "cabal2nix";
src/Language/Nix/Identifier.hs+2−2
@@ -2,9 +2,9 @@
22
33module Language.Nix.Identifier ( Identifier(..), ident, quote, needsQuoting ) where
44
5−import Data.Char
6−import Data.Function
75import Control.Lens
6+import Data.Char
7+import Data.Function ( on )
88import Data.String
99import Distribution.Nixpkgs.Util.PrettyPrinting ( Pretty(..), text )
1010import Text.Regex.Posix