Commit graph

2018 commits

Author SHA1 Message Date
Peter Hoeg
5e0dbfe931 Merge branch 'master' into f/nvim-qt 2017-02-11 11:46:37 +08:00
Thomas Tuegel
dc75530f26
Merge branch 'emacs-packages' 2017-02-10 13:12:12 -06:00
Thomas Tuegel
ae160b582c
melpa-packages: init w3m at 20170203.647 2017-02-10 13:11:45 -06:00
Thomas Tuegel
cc79f1808c
melpa-stable-packages 2017-02-10 2017-02-10 12:47:51 -06:00
Peter Hoeg
f0d0e21a5e neovim-qt: clean up 2017-02-11 02:39:15 +08:00
Thomas Tuegel
8bddf6d6ab Merge pull request #22514 from peterhoeg/f/emacs
emacs: make gtk3 default
2017-02-10 11:48:50 -06:00
Thomas Tuegel
c2a369b809 Merge pull request #22531 from ambrop72/kdevplatform-fix1
kdevplatform: Add patch to fix build with newer KF5.
2017-02-10 11:46:20 -06:00
Thomas Tuegel
9fbb76c14f
melpa-packages 2017-02-10 2017-02-10 11:29:22 -06:00
Thomas Tuegel
2ead5dfe85
elpa-packages 2017-02-10 2017-02-10 11:26:25 -06:00
Frederik Rietdijk
c9f4d714fe Merge pull request #22417 from edanaher/move-neovim-remote
neovim-remote: move from python-packages to /neovim/neovim-remote.
2017-02-10 17:47:25 +01:00
Evan Danaher
ee4f732633 neovim-remote: add meta section.
Also add myself to maintainers; it's time to admit I'm not leaving
anytime soon ;)
2017-02-10 11:43:42 -05:00
Tim Steinbach
96d07508bf Merge pull request #22608 from NeQuissimus/atom_1_14_1
atom: 1.13.1 -> 1.14.1
2017-02-09 18:23:57 -05:00
Tim Steinbach
efa0efa796
atom: 1.13.1 -> 1.14.1 2017-02-09 18:22:55 -05:00
David Terry
bf92c77001 vscode: 1.9.0 -> 1.9.1 2017-02-09 21:35:02 +01:00
Ambroz Bizjak
3801ecb0d9 kdevplatform: Add patch to fix build with newer KF5. 2017-02-07 19:54:03 +01:00
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
Peter Hoeg
bc6b917100 emacs: make gtk3 default 2017-02-06 14:32:36 +08: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
Evan Danaher
b2fb95a6cf neovim-remote: move from python-packages to /neovim/neovim-remote. 2017-02-03 16:58:22 -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