diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-18 15:29:38 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-18 15:29:38 +0200 |
| commit | 6969c4de445a390eaa05de22bc5a537a76a76169 (patch) | |
| tree | 9df3bdde497fdce705ae4eb66972f93a9ae111d9 /gnu/packages/maths.scm | |
| parent | 73d18915b597f2a386d6ae42930b49a13c8813b0 (diff) | |
| parent | 32eb44240db23b2320a68a3ab17370531945587f (diff) | |
| download | guix-6969c4de445a390eaa05de22bc5a537a76a76169.tar guix-6969c4de445a390eaa05de22bc5a537a76a76169.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2111cd1b7b..a644468627 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -294,14 +294,14 @@ semiconductors.") (define-public gsl (package (name "gsl") - (version "2.4") + (version "2.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gsl/gsl-" version ".tar.gz")) (sha256 (base32 - "16yfs5n444s03np1naj6yp1fsysd42kdscxzkg0k2yvfjixx0ijd")) + "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04")) (patches (search-patches "gsl-test-i686.patch")))) (build-system gnu-build-system) (arguments @@ -3372,7 +3372,8 @@ in finite element programs.") version "-src.zip")) (sha256 (base32 - "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz")))) + "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz")) + (patches (search-patches "flann-cmake-3.11.patch")))) (build-system cmake-build-system) (outputs '("out" "octave")) ;46 MiB .mex file that pulls Octave |