all-packages.nix: move all R-related attributes into one place

This commit is contained in:
Peter Simons 2014-05-04 20:51:30 +02:00
parent 0d264c1761
commit 834679ddab

View file

@ -6428,17 +6428,20 @@ let
### DEVELOPMENT / R MODULES
buildRPackage = import ../development/r-modules/generic R;
R = callPackage ../applications/science/math/R {
inherit (xlibs) libX11 libXt;
texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
};
rWrapper = callPackage ../development/r-modules/generic/wrapper.nix {
packages = [];
};
rPackages = recurseIntoAttrs (import ./r-packages.nix {
inherit pkgs;
overrides = (config.rPackageOverrides or (p: {})) pkgs;
});
rWrapper = callPackage ../development/r-modules/generic/wrapper.nix {
packages = [];
};
### SERVERS
rdf4store = callPackage ../servers/http/4store { };
@ -10450,11 +10453,6 @@ let
inherit (gnome) libglade gtksourceview;
};
R = callPackage ../applications/science/math/R {
inherit (xlibs) libX11 libXt;
texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
};
singular = callPackage ../applications/science/math/singular {};
scilab = callPackage ../applications/science/math/scilab {