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

Move r-packages.nix into the r-modules directory.

This commit is contained in:
Peter Simons 2014-05-04 21:09:14 +02:00
parent ac6bcc7836
commit a329900977
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/r-packages.nix → pkgs/development/r-modules/cran-packages.nix
View File

@ -39,7 +39,7 @@ let
inherit (pkgs) R fetchurl stdenv; inherit (pkgs) R fetchurl stdenv;
buildRPackage = import ../development/r-modules/generic R; buildRPackage = import ./generic R;
derive = { name, version, sha256, depends ? [] }: buildRPackage { derive = { name, version, sha256, depends ? [] }: buildRPackage {
name = "${name}-${version}"; name = "${name}-${version}";

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

@ -6437,7 +6437,7 @@ let
packages = []; packages = [];
}; };
rPackages = recurseIntoAttrs (import ./r-packages.nix { rPackages = recurseIntoAttrs (import ../development/r-modules/cran-packages.nix {
inherit pkgs; inherit pkgs;
overrides = (config.rPackageOverrides or (p: {})) pkgs; overrides = (config.rPackageOverrides or (p: {})) pkgs;
}); });