From ceef0be7afe2292905e48e4a055e13cc2de70b2b Mon Sep 17 00:00:00 2001
From: Dominic Steinitz <dominic@steinitz.org>
Date: Sun, 22 Apr 2018 13:36:19 +0100
Subject: Fix hackage upload errors

---
 packages/gsl/hmatrix-gsl.cabal | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'packages/gsl')

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
-- 
cgit v1.2.3


From dcfc8c84184ffd76680d5e7ef050a814dfff3966 Mon Sep 17 00:00:00 2001
From: Dominic Steinitz <dominic@steinitz.org>
Date: Sun, 22 Apr 2018 14:05:00 +0100
Subject: Really fix the offside

---
 packages/gsl/src/Numeric/GSL/Internal.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'packages/gsl')

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 #-}
 
-- 
cgit v1.2.3