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: c364c6f09f0f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6bd0704542c8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 31, 2019

  1. rPackages.ModelMetrics: fix darwin build 

    This fixes the error:

	auc_.cpp:2:10: fatal error: 'omp.h' file not found
	#include <omp.h>
    @nkpart
    nkpart committed Oct 31, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f21ac0e View commit details

  2. Merge pull request #72338 from nkpart/nkpart/fix-rPackages-ModelMetrics 

    rPackages.ModelMetrics: fix darwin build
    @peti
    peti authored Oct 31, 2019
    Copy the full SHA
    6bd0704 View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/development/r-modules/default.nix
6 changes: 6 additions & 0 deletions pkgs/development/r-modules/default.nix
View file
Original file line number Diff line number Diff line change
@@ -277,6 +277,7 @@ let
KFKSDS = [ pkgs.gsl_1 ];
kza = [ pkgs.fftw.dev ];
magick = [ pkgs.imagemagick.dev ];
ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
mvabund = [ pkgs.gsl_1 ];
mwaved = [ pkgs.fftw.dev ];
ncdf4 = [ pkgs.netcdf ];
@@ -735,6 +736,11 @@ let
+ lib.optionalString stdenv.isDarwin " -fopenmp";
});

ModelMetrics = old.ModelMetrics.overrideDerivation (attrs: {
NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE
+ lib.optionalString stdenv.isDarwin " -fopenmp";
});

rpf = old.rpf.overrideDerivation (attrs: {
patchPhase = "patchShebangs configure";
});