3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2001 commits

Author SHA1 Message Date
Benjamin Staffin 35fdfa8597 Merge pull request #22453 from benley/vim-desktop
vim: Create xdg apps/icons dirs so .desktop items get installed
2017-02-06 17:54:24 -05:00
Gabriel Ebner d77d31b312 vscode: fix download url
Fixes #22465.
2017-02-06 08:29:49 +01:00
Daiderd Jordan b5957eaf2f Merge pull request #22389 from matthewbauer/emacs-new-icons
emacs25Macport: use newer icons
2017-02-05 23:52:26 +01:00
Benjamin Staffin 24716fe954 vim: Create xdg apps/icons dirs so .desktop items get installed
In theory this ought to make gvim show up in the kde/gnome/xfce
application menus.
2017-02-04 21:29:59 -05:00
Michael Alan Dorman 339089fa28 melpa-packages: 2017-02-04 2017-02-04 16:57:43 -05:00
Michael Alan Dorman 04f50f2466 melpa-stable-packages: 2017-02-04 2017-02-04 16:57:42 -05:00
Vladimír Čunát adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
David Terry dbda1c4331 vscode: 1.8.1 -> 1.9.0 2017-02-02 21:31:28 +01:00
Michael Alan Dorman 711a22096c melpa-packages: 2017-02-01
Removals:
  meacupla-theme - removed from melpa
  rustfmt - removed from melpa
  ttrss - removed from melpa
2017-02-02 08:06:43 -05:00
Michael Alan Dorman 89cbe137c3 melpa-stable-packages: 2017-02-01
Removals:
  ttrss - removed from melpa
2017-02-02 08:06:43 -05:00
Michael Alan Dorman 98f8cd6017 elpa-packages: 2017-02-01 2017-02-02 08:06:42 -05:00
Vladimír Čunát a2e7770b51
Merge branch 'master' into staging
There have been some larger security rebuilds on master.
2017-02-01 15:56:35 +01:00
Benjamin Staffin 3dd2a271ef vim: make it possible to build with --enable-gui=gtk3
This doesn't change any defaults; I suspect that dropping gtk2 support
would annoy some people so I didn't want to do that without asking
around first.
2017-01-31 02:17:11 -05:00
Vladimír Čunát 9cd2dbc569
Merge branch 'master' into staging
Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
2017-01-30 18:39:36 +01:00
Franz Pletz f68b7be364
brackets: 1.7 -> 1.8 2017-01-30 01:16:26 +01:00
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
Vladimír Čunát 6973c7739e
Merge branch 'master' into staging
There were some larger rebuilds because of security.
2017-01-26 16:49:41 +01: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
Robin Gloster d7b17e8b1c
edbrowse: mark as broken 2017-01-25 20:12:42 +01: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
Matthew Bauer 516300624e
emacs25Macport: use newer icons 2017-01-23 17:49:39 -06: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