6 files changed, 19 insertions, 22 deletions

diff --git a/packages/glpk/hmatrix-glpk.cabal b/packages/glpk/hmatrix-glpk.cabal
index b01f704..ca93775 100644
--- a/packages/glpk/hmatrix-glpk.cabal
+++ b/packages/glpk/hmatrix-glpk.cabal
@@ -1,6 +1,6 @@
 Name:               hmatrix-glpk
 Version:            0.19.0.0
-License:            GPL
+License:            GPL-3
 License-file:       LICENSE
 Author:             Alberto Ruiz
 Maintainer:         Alberto Ruiz <aruiz@um.es>
diff --git a/packages/gsl/hmatrix-gsl.cabal b/packages/gsl/hmatrix-gsl.cabal
index 6ec7960..76db835 100644
--- a/packages/gsl/hmatrix-gsl.cabal
+++ b/packages/gsl/hmatrix-gsl.cabal
@@ -1,21 +1,18 @@
 Name:               hmatrix-gsl
 Version:            0.19.0.0
-License:            GPL
-License-file:       LICENSE
-Author:             Alberto Ruiz
-Maintainer:         Alberto Ruiz <aruiz@um.es>
-Stability:          provisional
-Homepage:           https://github.com/albertoruiz/hmatrix
 Synopsis:           Numerical computation
 Description:        Purely functional interface to selected numerical computations,
                     internally implemented using GSL.
-
+Homepage:           https://github.com/albertoruiz/hmatrix
+license:            GPL-3
+license-file:       LICENSE
+Author:             Alberto Ruiz
+Maintainer:         Alberto Ruiz <aruiz@um.es>
+Stability:          provisional
 Category:           Math
-tested-with:        GHC ==7.8
-
-cabal-version:      >=1.8
-
 build-type:         Simple
+cabal-version:      >=1.18
+
 
 extra-source-files: src/Numeric/GSL/gsl-ode.c
 
@@ -33,9 +30,6 @@ library
     Build-Depends:      base<5, hmatrix>=0.18, array, vector,
                         process, random
 
-
-    Extensions:         ForeignFunctionInterface
-
     hs-source-dirs:     src
     Exposed-modules:    Numeric.GSL.Differentiation,
                         Numeric.GSL.Integration,
@@ -98,6 +92,8 @@ library
     else
       pkgconfig-depends: gsl
 
+    default-language:    Haskell2010
+
 
 source-repository head
     type:     git
diff --git a/packages/gsl/src/Numeric/GSL/Internal.hs b/packages/gsl/src/Numeric/GSL/Internal.hs
index 1217162..e1f8d95 100644
--- a/packages/gsl/src/Numeric/GSL/Internal.hs
+++ b/packages/gsl/src/Numeric/GSL/Internal.hs
@@ -131,8 +131,7 @@ type TVM = TV (TM Res)
 ww2 w1 o1 w2 o2 f = w1 o1 $ \a1 -> w2 o2 $ \a2 -> f a1 a2
 
 vec x f = unsafeWith x $ \p -> do
-    let v g = do
-        g (fi $ V.length x) p
+    let v g = g (fi $ V.length x) p
     f v
 {-# INLINE vec #-}
 
diff --git a/packages/sparse/hmatrix-sparse.cabal b/packages/sparse/hmatrix-sparse.cabal
index c3b6f65..4399b72 100644
--- a/packages/sparse/hmatrix-sparse.cabal
+++ b/packages/sparse/hmatrix-sparse.cabal
@@ -19,7 +19,7 @@ build-type:         Simple
 
 
 library
-    Build-Depends:      base, hmatrix>=0.16
+    Build-Depends:      base<5, hmatrix>=0.16
 
     hs-source-dirs:     src
 
diff --git a/packages/special/hmatrix-special.cabal b/packages/special/hmatrix-special.cabal
index cf504e1..0890bc7 100644
--- a/packages/special/hmatrix-special.cabal
+++ b/packages/special/hmatrix-special.cabal
@@ -1,6 +1,6 @@
 Name:               hmatrix-special
 Version:            0.19.0.0
-License:            GPL
+License:            GPL-3
 License-file:       LICENSE
 Author:             Alberto Ruiz
 Maintainer:         Alberto Ruiz <aruiz@um.es>
diff --git a/packages/sundials/hmatrix-sundials.cabal b/packages/sundials/hmatrix-sundials.cabal
index 354f142..388f1db 100644
--- a/packages/sundials/hmatrix-sundials.cabal
+++ b/packages/sundials/hmatrix-sundials.cabal
@@ -1,7 +1,10 @@
 name:                hmatrix-sundials
 version:             0.19.0.0
 synopsis:            hmatrix interface to sundials
-description:         Foo bar baz
+description:         An interface to the solving suite SUNDIALS. Currently, it
+                     mimics the solving interface in hmstrix-gsl but
+                     provides more diagnostic information and the
+                     Butcher Tableaux (for Runge-Kutta methods).
 homepage:            https://github.com/idontgetoutmuch/hmatrix/tree/sundials
 license:             BSD3
 license-file:        LICENSE
@@ -12,7 +15,7 @@ category:            Math
 build-type:          Simple
 extra-source-files:  ChangeLog.md, README.md, diagrams/*.png
 extra-doc-files:     diagrams/*.png
-cabal-version:       >=1.10
+cabal-version:       >=1.18
 
 
 library
@@ -49,7 +52,6 @@ test-suite hmatrix-sundials-testsuite
                        lens,
                        hspec
   hs-source-dirs:      src
-  default-language:    Haskell2010
   extra-libraries:     sundials_arkode
   c-sources:           src/helpers.c src/helpers.h
   default-language:    Haskell2010