diff options
| author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2014-09-15 14:11:01 +0200 |
|---|---|---|
| committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2014-09-15 14:11:01 +0200 |
| commit | 5ebc6ac4f1106ab4564534ab25cfcc65dd37ac77 (patch) | |
| tree | 8400b717ce5f4a9c065b884dc57eb92421d862e7 | |
| parent | 81e1828137ac187a96173ebd905d9ddb996bdf04 (diff) | |
| parent | 0e27763fe5e1df104c4714cc620541bb1e561f9d (diff) | |
| download | stylish-haskell-5ebc6ac4f1106ab4564534ab25cfcc65dd37ac77.tar.gz | |
Merge pull request #73 from sopvop/haskell-src-exts-16
Fix for haskell-src-exts 0.16 release
| -rw-r--r-- | src/Language/Haskell/Stylish/Step/Imports.hs | 2 | ||||
| -rw-r--r-- | stylish-haskell.cabal | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Language/Haskell/Stylish/Step/Imports.hs b/src/Language/Haskell/Stylish/Step/Imports.hs index e27a946..486fba7 100644 --- a/src/Language/Haskell/Stylish/Step/Imports.hs +++ b/src/Language/Haskell/Stylish/Step/Imports.hs @@ -59,7 +59,7 @@ compareImportSpecs :: H.ImportSpec l -> H.ImportSpec l -> Ordering compareImportSpecs = comparing key where key :: H.ImportSpec l -> (Int, Int, String) - key (H.IVar _ x) = let n = nameToString x in (1, operator n, n) + key (H.IVar _ _ x) = let n = nameToString x in (1, operator n, n) key (H.IAbs _ x) = (0, 0, nameToString x) key (H.IThingAll _ x) = (0, 0, nameToString x) key (H.IThingWith _ x _) = (0, 0, nameToString x) diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal index a81fc52..bcc6a18 100644 --- a/stylish-haskell.cabal +++ b/stylish-haskell.cabal @@ -52,7 +52,7 @@ Library containers >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, filepath >= 1.1 && < 1.4, - haskell-src-exts >= 1.14 && < 1.16, + haskell-src-exts == 1.16.*, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.5, yaml >= 0.7 && < 0.9 @@ -73,7 +73,7 @@ Executable stylish-haskell containers >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, filepath >= 1.1 && < 1.4, - haskell-src-exts >= 1.14 && < 1.16, + haskell-src-exts == 1.16.*, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.5, yaml >= 0.7 && < 0.9 @@ -106,7 +106,7 @@ Test-suite stylish-haskell-tests containers >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, filepath >= 1.1 && < 1.4, - haskell-src-exts >= 1.14 && < 1.16, + haskell-src-exts == 1.16.*, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.5, yaml >= 0.7 && < 0.9 |