From 19afbea136ee52d928c0a3f2a7d462370af18f10 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Thu, 25 Jun 2015 17:56:07 +0200
Subject: gnu: Replace versioned gfortran inputs with just "gfortran".

* gnu/packages/julia.scm (julia)[inputs]: Replace "gfortran-4.8" with
  "gfortran".
* gnu/packages/machine-learning.scm (randomjungle)[native-inputs]: Likewise.
* gnu/packages/maths.scm (arpack-ng, lapack, petsc, superlu)
   (superlu-dist, openblas, openspecfun, atlas)[inputs]: Likewise.
   (octave)[native-inputs]: Likewise.
   (gmsh)[propagated-inputs]: Likewise.
* gnu/packages/mpi.scm (openmpi)[inputs]: Likewise.
* gnu/packages/python.scm (python-numpy-bootstrap)[native-inputs]: Likewise.
* gnu/packages/python.scm (python-scipy)[native-inputs]: Likewise.
* gnu/packages/statistics.scm (r)[inputs]: Replace "gfortran-4.9" with
  "gfortran".
---
 gnu/packages/maths.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'gnu/packages/maths.scm')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 421baf5e5b..4e0b1eee9c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -265,7 +265,7 @@ (define-public arpack-ng
     (home-page "https://github.com/opencollab/arpack-ng")
     (inputs
      `(("lapack" ,lapack)
-       ("fortran" ,gfortran-4.8)))
+       ("fortran" ,gfortran)))
     (synopsis "Fortran subroutines for solving eigenvalue problems")
     (description
      "ARPACK-NG is a collection of Fortran77 subroutines designed to solve
@@ -287,7 +287,7 @@ (define-public lapack
         "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"))))
     (build-system cmake-build-system)
     (home-page "http://www.netlib.org/lapack/")
-    (inputs `(("fortran" ,gfortran-4.8)
+    (inputs `(("fortran" ,gfortran)
               ("python" ,python-2)))
     (arguments
      `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES")
@@ -400,7 +400,7 @@ (define-public octave
        ("glu" ,glu)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("gfortran" ,gfortran-4.8)
+     `(("gfortran" ,gfortran)
        ("pkg-config" ,pkg-config)
        ("perl" ,perl)
        ;; The following inputs are not actually used in the build process.
@@ -445,7 +445,7 @@ (define-public gmsh
     (build-system cmake-build-system)
     (propagated-inputs
      `(("fltk" ,fltk)
-       ("gfortran" ,gfortran-4.8)
+       ("gfortran" ,gfortran)
        ("gmp" ,gmp)
        ("hdf5" ,hdf5)
        ("lapack" ,lapack)
@@ -487,7 +487,7 @@ (define-public petsc
      `(("python" ,python-2)
        ("perl" ,perl)))
     (inputs
-     `(("gfortran" ,gfortran-4.8)
+     `(("gfortran" ,gfortran)
        ("lapack" ,lapack)
        ("superlu" ,superlu)
        ;; leaving out hdf5 and fftw, as petsc expects them to be built with mpi
@@ -615,7 +615,7 @@ (define-public superlu
      `(("tcsh" ,tcsh)))
     (inputs
      `(("lapack" ,lapack)
-       ("gfortran" ,gfortran-4.8)))
+       ("gfortran" ,gfortran)))
     (arguments
      `(#:parallel-build? #f
        #:tests? #f                      ;tests are run as part of `make all`
@@ -697,7 +697,7 @@ (define-public superlu-dist
     (native-inputs
      `(("tcsh" ,tcsh)))
     (inputs
-     `(("gfortran" ,gfortran-4.8)))
+     `(("gfortran" ,gfortran)))
     (propagated-inputs
      `(("openmpi" ,openmpi)             ;headers include MPI heades
        ("lapack" ,lapack)               ;required to link with output library
@@ -1103,7 +1103,7 @@ (define-public openblas
        ;; no configure script
        #:phases (alist-delete 'configure %standard-phases)))
     (inputs
-     `(("fortran" ,gfortran-4.8)))
+     `(("fortran" ,gfortran)))
     (native-inputs
      `(("cunit" ,cunit)
        ("perl" ,perl)))
@@ -1171,7 +1171,7 @@ (define-public openspecfun
        ;; no configure script
        #:phases (alist-delete 'configure %standard-phases)))
     (inputs
-     `(("fortran" ,gfortran-4.8)))
+     `(("fortran" ,gfortran)))
     (home-page "https://github.com/JuliaLang/openspecfun")
     (synopsis "Collection of special mathematical functions")
     (description
@@ -1254,7 +1254,7 @@ (define-public atlas
                 "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars"))))
     (build-system gnu-build-system)
     (home-page "http://math-atlas.sourceforge.net/")
-    (inputs `(("gfortran" ,gfortran-4.8)
+    (inputs `(("gfortran" ,gfortran)
               ("lapack-tar" ,(package-source lapack))))
     (outputs '("out" "doc"))
     ;; For the moment we drop support for MIPS at it fails to compile. See
-- 
cgit v1.2.3