Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e904777dc9b2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5384da4e69b3
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 8, 2019

  1. gfortran: use version 8 by default to match our C and C++ compiler 

    We recently updated to gcc 8.x, but our default Fortran compiler is still at
version 7.x. This causes trouble for all packages that mix C++ and Fortran
code, like R does.

Unfortunately, gfortran8 is marked broken on Darwin, so we cannot switch on
that platform yet:

 | $ nix-instantiate --arg nixpkg '{ outPath = ./.; revCount = 999999; shortRev = "peti"; }' ./pkgs/top-level/release.nix -A unstable --show-trace
 | [...]
 | while evaluating the attribute 'handled' at /home/simons/src/nixpkgs/pkgs/stdenv/generic/check-meta.nix:251:7:
 | while evaluating 'handleEvalIssue' at /home/simons/src/nixpkgs/pkgs/stdenv/generic/check-meta.nix:147:38, called from /home/simons/src/nixpkgs/pkgs/stdenv/generic/check-meta.nix:252:14:
 | Failed to evaluate gfortran-wrapper-8.3.0: «broken»: is marked as broken
    @peti
    peti committed Oct 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    callahad Dan Callahan
    GPG key ID: 8D6DD713E9EBA7FD
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    982d859 View commit details

  2. R: drop redundant gfortran8 override

    @peti
    peti committed Oct 8, 2019
    Copy the full SHA
    75711a1 View commit details

Commits on Oct 9, 2019

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

    gfortran: use version 8 by default to match our C and C++ compiler
    @peti
    peti authored Oct 9, 2019
    Copy the full SHA
    5384da4 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7749,7 +7749,8 @@ in
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 {
name = "gfortran";
@@ -14503,7 +14504,6 @@ in
### DEVELOPMENT / R MODULES

R = callPackage ../applications/science/math/R {
gfortran = gfortran8;
# TODO: split docs into a separate output
texLive = texlive.combine {
inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super;