Commit graph

1983 commits

Author SHA1 Message Date
Chris Hodapp 7638578342 RStudio: Optionally allow packages from custom R environment
https://nixos.org/nixpkgs/manual/#r-packages contains a method for
setting up an R environment with a specific set of libraries, and it
creates an R wrapper which points R to those libraries.

The package RStudio relies on the standard R package, which then
cannot access any of the libraries specified in a custom R
environment.  While one may easily use pkgs.rstudio.override to change
rstudio's R dependency to the custom R environment, this accomplishes
nothing because while RStudio runs the correct R wrapper it clears out
the environment variable R_LIBS_SITE - and so it is still unable to
use any of those packages.

In order to work around this problem, these changes allow the user to
optionally modify rstudio's wrapper to set environment variable
R_PROFILE_USER to an R script which sets R's .libPaths(..) to point to
the same libraries; that script is generated from R_LIBS_SITE in the R
wrapper.

By default, this change has no effect.  If R is overridden to
something else, and if useRPackages is changed from its default of
false, then the change described above is made; for instance:

{
  packageOverrides = pkgs: let self = pkgs.pkgs; in
  rec {
    rEnv = pkgs.rWrapper.override {
      packages = with self.rPackages; [
        dplyr ggplot2 e1071 rpart reshape
      ];
    };
    rstudioEnv = pkgs.rstudio.override { R = rEnv; useRPackages = true; };
  };
}
2017-01-27 18:54:50 -05:00
Tim Steinbach cc3426fdaf Merge pull request #22152 from NeQuissimus/atom_1_13_1
atom: 1.13.0 -> 1.13.1
2017-01-26 08:43:45 -05:00
Tim Steinbach d258f054cd
atom: 1.13.0 -> 1.13.1 2017-01-25 17:22:55 -05:00
Michael Alan Dorman 87a651f4e3 melpa-packages: 2017-01-24
Removals:
 - flycheck-google-cpplint: Removed from melpa
2017-01-25 06:54:18 -05:00
Michael Alan Dorman 46cf112619 melpa-stable-packages: 2017-01-24
Removals:
 - evil: tags disappeared in repository move, so no stable version
2017-01-25 06:52:36 -05:00
Michael Alan Dorman aa9da623ff org-packages: 2017-01-24 2017-01-25 06:50:40 -05:00
Jonathan Haddock 654167e17f Updated versions of various Jetbrains applications, including PHPStorm, IntelliJ, PyCharm.
clion                 2016.3   -> 2016.3.2
datagrip	      2016.3.2 -> 2016.3.2
idea-community        2016.3.2 -> 2016.3.3
idea-ultimate         2016.3.2 -> 2016.3.3
pycharm-community     2016.3   -> 2016.3.2
pycharm-professional  2016.3   -> 2016.3.2
phpstorm              2016.3   -> 2016.3.2
ruby-mine              2016.2.5 -> 2016.3.1
webstorm              2016.3.1 -> 2016.3.2
2017-01-22 21:29:11 +00:00
Vladimír Čunát 40003aa2ed
Merge branch 'master' into staging 2017-01-18 15:54:04 +01:00
gnidorah 4a662e5206 nano: add nix syntax hightlight, nano module: provide default (#21912)
this is awesome! thanks.
2017-01-18 12:05:30 +01:00
Michael Alan Dorman 31556f2fab melpa-packages: 2017-01-17
Removals:
 - character-fold+: Removed from melpa
2017-01-17 09:10:26 -05:00
Michael Alan Dorman d119a43321 melpa-stable-packages: 2017-01-17 2017-01-17 09:10:23 -05:00
Michael Alan Dorman c97b7fd640 elpa-packages: 2017-01-17 2017-01-17 09:10:19 -05:00
Jörg Thalheim 489e6eaf4c Merge pull request #21921 from jansuchomel/update-vscode
vscode: 1.8.0 -> 1.8.1
2017-01-16 10:44:53 +01:00
Jan Suchomel a6e183b42e vscode: fix .desktop file 2017-01-16 10:03:47 +01:00
Jan Suchomel 75175a04c3 vscode: 1.8.0 -> 1.8.1 2017-01-16 09:51:08 +01:00
Lancelot SIX 7a4b15020a
ed: 1.13 -> 1.14.1
See http://lists.gnu.org/archive/html/info-gnu/2017-01/msg00004.html
for full release announcement.
2017-01-15 18:27:59 +01:00
Ignat Loskutov 5d89ad0447
datagrip: 2016.3 -> 2016.3.2 2017-01-15 20:11:37 +03:00
Vincent Laporte 503329e050 bluefish: 2.2.7 -> 2.2.9
And fix some missing icons
2017-01-14 16:33:02 +01:00
Michael Raskin fbe3a9c229 Merge pull request #21827 from srp/nvi
nvi: link against libncurses as there is no libcurses
2017-01-13 10:44:47 +00:00
Thomas Tuegel ce26a4d3d4 Merge pull request #21826 from mdorman/emacs-updates
Automated emacs package updates
2017-01-12 06:48:36 -06:00
Scott R. Parish 4c1703786c nvi: fix linking with ncurses 2017-01-11 19:21:18 -08:00
Michael Alan Dorman ac393d299c melpa-packages: 2017-01-11
removals:
 - ctags: repository no longer available
 - latest-clojure-libraries: removed from melpa
 - slamhound: removed from melpa
2017-01-11 20:49:26 -05:00
Michael Alan Dorman 2c4ee516d5 melpa-stable-package: 2017-01-11
removals:
 - ctags: repository no longer available
 - ctags-update: version tags lost when moved to new repository
 - slamhound: removed from melpa
2017-01-11 20:48:21 -05:00
Michael Alan Dorman adbc201147 elpa-packages: 2017-01-11 2017-01-11 20:46:20 -05:00
Tim Steinbach f124cb7611
atom: 1.12.9 -> 1.13.0 2017-01-11 17:18:24 -05:00
Jiří Daněk 0f83aa5167 idea-community: 2016.3 -> 2016.3.2 (#21807) 2017-01-11 16:36:25 +01:00
Graham Christensen acc889f5ed Merge pull request #21462 from phunehehe/android-studio
Fontconfig for Android Studio
2017-01-10 20:05:42 -05:00
Hoang Xuan Phu 4b3f79b3ca android-studio: use a dedicated fontconfig file 2017-01-10 13:36:02 +08:00
Hoang Xuan Phu d849f00af5 android-studio: reindent wrapProgram parameters 2017-01-10 13:35:37 +08:00
Hoang Xuan Phu 1f67c179ac android-studio: rearrange dependencies 2017-01-10 13:35:37 +08:00
Hoang Xuan Phu 4e513cbc9f android-studio: no need for jdk anymore
Android Studio now bundles its own JDK ¯\_(ツ)_/¯
2017-01-10 13:35:36 +08:00
Robert Helgesson 5bf06ac710
eclipse-plugin-checkstyle: 7.2.0 -> 7.3.0 2017-01-09 23:08:10 +01:00
Vladimír Čunát 936bc23b41
ed: avoid the useless rebuild due to #21752 2017-01-08 22:17:18 +01:00
Sebastian Hagen 547b203b9a ed: Add fedoraproject mirror.
The existing URL has gone dark; this commit adds one from fedoraproject.org
that still works. We put the new mirror first since ed is in the bootstrap
path, and 16.09 bootstrap doesn't try later URLs.
2017-01-08 13:46:16 +00:00
Anmol Sethi 3799f9322a neovim: removed unncessary man configuration
Latest neovim uses a rewritten man plugin that does not need
these changes.
2017-01-06 18:31:11 +01:00
Tim Steinbach f2502c9d86
atom: 1.12.8 -> 1.12.9 2017-01-05 19:48:25 -05:00
Tim Steinbach d222761121
atom: 1.12.7 -> 1.12.8 2017-01-04 17:20:00 -05:00
Evan Danaher d4b960550b neovim: Inherit meta into neovim-configured
When adding neovim's configure option to config.nix, builds fail with

  error: attribute ‘platforms’ missing, at
  /nix/store/*/nixos/pkgs/applications/editors/neovim/qt.nix:41:28

Inheriting meta into neovim-configured fixes this, and seems reasonable.
2017-01-04 18:33:26 +01:00
Joachim F 68ab32fbf8 Merge pull request #21644 from mdorman/emacs-updates
Automated Emacs package updates
2017-01-04 17:54:54 +01:00
Michael Alan Dorman 080926b479 melpa-packages: 2017-01-03 2017-01-04 08:29:25 -05:00
Michael Alan Dorman 29472c62e1 melpa-stable-packages: 2017-01-03 2017-01-04 08:29:25 -05:00
Michael Alan Dorman 1b5f9394ed elpa-packages: 2017-01-03 2017-01-04 08:29:25 -05:00
Thomas Tuegel 0723aa8108 Merge pull request #21466 from abbradar/kde-wrapper
Flatten nested kdeWrappers
2017-01-03 08:21:39 -06:00
Nikolay Amiantov e908442693 kdeWrapper: allow wrapping several packages 2017-01-03 02:33:15 +03:00
Karn Kallio f16eda3fb1
eclipse-platform: add Neon 2 Platform 2017-01-02 17:57:32 +01:00
Karn Kallio 2c31127edc
eclipse-sdk-46: 4.6.1 -> 4.6.2 2017-01-02 17:55:13 +01:00
Joachim F 01fdbac60c Merge pull request #21550 from mimadrid/update/nano-2.7.3
nano: 2.7.2 -> 2.7.3
2016-12-31 16:12:10 +01:00
mimadrid ae5c3f6fc5
nano: 2.7.2 -> 2.7.3 2016-12-31 15:37:41 +01:00
Dmitry Kalinkin 9a5e34faca
kakoune: 2016-12-10 -> 2016-12-30, fix on Darwin 2016-12-30 14:27:49 -05:00
Graham Christensen fd826a0b71 Merge pull request #21492 from vdemeester/idea-ultimate_2016_3_2
idea-ultimate: 2016.3.1 -> 2016.3.2
2016-12-29 21:44:35 -05:00