From a329900977f2ec818baa667b47d8b4ceb0e1ed64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 21:09:14 +0200
Subject: [PATCH] Move r-packages.nix into the r-modules directory.

---
 .../r-packages.nix => development/r-modules/cran-packages.nix}  | 2 +-
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{top-level/r-packages.nix => development/r-modules/cran-packages.nix} (99%)

diff --git a/pkgs/top-level/r-packages.nix b/pkgs/development/r-modules/cran-packages.nix
similarity index 99%
rename from pkgs/top-level/r-packages.nix
rename to pkgs/development/r-modules/cran-packages.nix
index 3a1647621389..9dd1a1691ebf 100644
--- a/pkgs/top-level/r-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -39,7 +39,7 @@ let
 
   inherit (pkgs) R fetchurl stdenv;
 
-  buildRPackage = import ../development/r-modules/generic R;
+  buildRPackage = import ./generic R;
 
   derive = { name, version, sha256, depends ? [] }: buildRPackage {
     name = "${name}-${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae9e46a5183d..23ba066967a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6437,7 +6437,7 @@ let
     packages = [];
   };
 
-  rPackages = recurseIntoAttrs (import ./r-packages.nix {
+  rPackages = recurseIntoAttrs (import ../development/r-modules/cran-packages.nix {
     inherit pkgs;
     overrides = (config.rPackageOverrides or (p: {})) pkgs;
   });