diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:45:06 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 18:34:53 +0100 |
commit | 9443129b08b37a6f4267d257cd8d42dd92a2539c (patch) | |
tree | aec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/top-level/r-packages.nix | |
parent | f78534ca0f8ec63d79370eb2367605579efba088 (diff) | |
parent | f6d51f7717cffd8b220ce02498db8b8359b5964c (diff) | |
download | nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2 nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip |
Merge master into stdenv-updates
Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/top-level/r-packages.nix')
-rw-r--r-- | pkgs/top-level/r-packages.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/top-level/r-packages.nix b/pkgs/top-level/r-packages.nix index 8280b6c2d53c..f3759c14baac 100644 --- a/pkgs/top-level/r-packages.nix +++ b/pkgs/top-level/r-packages.nix @@ -1,15 +1,13 @@ /* This file defines the composition for CRAN (R) packages. */ -{pkgs, __overrides}: +{pkgs, overrides}: -rec { +let self = _self // overrides; _self = with self; { inherit (pkgs) buildRPackage fetchurl stdenv R; inherit (stdenv.lib) maintainers; - inherit __overrides; - abind = buildRPackage rec { name = "abind-1.4-0"; src = fetchurl { @@ -243,4 +241,4 @@ rec { }; propagatedBuildInputs = [ DBI gsubfn proto chron RSQLite RSQLiteExtfuns ]; }; -} +}; in self |