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

Commits on Jan 19, 2018

  1. rPackages.data_table: OpenMP support on Darwin

    @mnacamura
    mnacamura committed Jan 19, 2018
    Copy the full SHA
    2533720 View commit details

  2. Merge pull request #34041 from mnacamura/r-datatable-openmp 

    rPackages.data_table: OpenMP support on Darwin
    @peti
    peti authored Jan 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f88720e 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
@@ -246,6 +246,7 @@ let
ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
cit = [ pkgs.gsl_1 ];
curl = [ pkgs.curl.dev ];
data_table = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ];
diversitree = [ pkgs.gsl_1 pkgs.fftw ];
EMCluster = [ pkgs.liblapack ];
@@ -744,6 +745,11 @@ let
patchPhase = "patchShebangs configure";
});

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

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