git.iko.soy/typeable/cabal2nix
on master help sign in
Fix build with GHC 7.10.1-rc2.
520a413Peter Simons
release.nix+1−1
compare with master
unifiedsplit
@@ -18,7 +18,7 @@ in
18 Cabal = if nativeCabal then null else haskellPackages.Cabal_1_20_0_3;
18 Cabal = if nativeCabal then null else haskellPackages.Cabal_1_20_0_3;
19 hackage-db = haskellPackages.hackage-db.override { Cabal = Cabal; };
19 hackage-db = haskellPackages.hackage-db.override { Cabal = Cabal; };
20 nativePrettyClass = pkgs.stdenv.lib.versionOlder "7.10" haskellPackages.ghc.version;
20 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;
22 in
22 in
23 haskellPackages.mkDerivation {
23 haskellPackages.mkDerivation {
24 pname = "cabal2nix";
24 pname = "cabal2nix";
src/Language/Nix/Identifier.hs+2−2
@@ -2,9 +2,9 @@
2
2
3module Language.Nix.Identifier ( Identifier(..), ident, quote, needsQuoting ) where
3module Language.Nix.Identifier ( Identifier(..), ident, quote, needsQuoting ) where
4
4
5−import Data.Char
6−import Data.Function
7import Control.Lens
5import Control.Lens
6+import Data.Char
7+import Data.Function ( on )
8import Data.String
8import Data.String
9import Distribution.Nixpkgs.Util.PrettyPrinting ( Pretty(..), text )
9import Distribution.Nixpkgs.Util.PrettyPrinting ( Pretty(..), text )
10import Text.Regex.Posix
10import Text.Regex.Posix