From 834679ddab2a6be07d19524fbc1d47216ed1e4c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 20:51:30 +0200
Subject: [PATCH] all-packages.nix: move all R-related attributes into one
 place

---
 pkgs/top-level/all-packages.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6db0c86478a..ae9e46a5183 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 {