public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70515 from peti/t/update-to-gfortran8

Browse Source 
gfortran: use version 8 by default to match our C and C++ compiler
This commit is contained in:
Peter Simons 2019-10-09 10:52:26 +02:00 committed by GitHub
commit 5384da4e69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -7749,7 +7749,8 @@ in
isl = isl_0_17; isl = isl_0_17;
})); }));
gfortran = gfortran7; # Version 8.x is marked broken on Darwin: https://gist.github.com/GrahamcOfBorg/bef0231b7129681950f03c4ac06781c8.
gfortran = if stdenv.isDarwin then gfortran7 else gfortran8;
gfortran48 = wrapCC (gcc48.cc.override { gfortran48 = wrapCC (gcc48.cc.override {
name = "gfortran"; name = "gfortran";
@ -14503,7 +14504,6 @@ in
### DEVELOPMENT / R MODULES ### DEVELOPMENT / R MODULES
R = callPackage ../applications/science/math/R { R = callPackage ../applications/science/math/R {
gfortran = gfortran8;
# TODO: split docs into a separate output # TODO: split docs into a separate output
texLive = texlive.combine { texLive = texlive.combine {
inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super; inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super;