JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,275 Commits 2 Branches 0 Tags 13 GiB
580bdde06c
Commit Graph

2042 Commits

Author SHA1 Message Date
Parnell Springmeyer
6777e6f812
Merging with upstream 2017-01-29 05:54:01 -06:00
Parnell Springmeyer
4aa0923009
Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
Parnell Springmeyer
e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08: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
Parnell Springmeyer
a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy 2017-01-26 02:00:04 -08: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
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08: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
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
Vincent Demeester
37632cbf5f
idea-ultimate: 2016.3.1 -> 2016.3.2 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-29 10:31:22 +01:00
Michael Alan Dorman
49992887e5 melpa-packages: 2016-12-27 2016-12-28 08:12:18 -05:00
Michael Alan Dorman
7ccd91b067 melpa-stable-packages: 2016-12-27 2016-12-28 08:12:18 -05:00
Michael Alan Dorman
4de8a35225 org-packages: 2016-12-27 2016-12-28 08:12:18 -05:00
Michael Alan Dorman
060c8493c7 elpa-packages: 2016-12-27 2016-12-28 08:12:18 -05:00
Peter Simons
06f51e17fa Merge pull request #21362 from lverns/rstudio-add-desktop-file 
Rstudio add desktop file
 2016-12-23 10:26:39 +01:00
Laverne Schrock
9872e65037 rstudio: make mkDerivation recursive 
Needed since we want to access desktopItem from postInstall.
 2016-12-22 08:16:49 -06:00
Laverne Schrock
4154adb128 rstudio: add desktop file 
Fixes #20230
 2016-12-22 08:15:56 -06:00
Michael Fellinger
bb80d77d84 neovim: green :CheckHealth 2016-12-19 23:05:31 +01:00
volth
ac97fbab3a fte: init at 0.50.02 2016-12-19 16:15:59 +01:00
Jascha Geerds
62c3d9ad0b Merge pull request #21239 from mimadrid/update/nano-2.7.2 
nano: 2.7.1 -> 2.7.2
 2016-12-17 17:44:13 +01:00
mimadrid
b899b8945f
nano: 2.7.1 -> 2.7.2 2016-12-17 16:39:42 +01:00
Joachim F
7aa8fa28ae Merge pull request #21190 from mdorman/emacs-updates 
Emacs package updates: 2016-12-15
 2016-12-16 12:34:09 +01:00
Michael Alan Dorman
8cd481b5fd org-packages: 2016-12-15 2016-12-15 17:55:56 -05:00
Michael Alan Dorman
01d5fda8c1 melpa-stable-packages: 2016-12-15 
Removals:
 - dummy-h-mode: github account no longer exists
 - judge-indent: github account no longer exists
 2016-12-15 17:55:56 -05:00
Michael Alan Dorman
c5e64ba4c8 melpa-packages: 2016-12-15 
Removals:
 - cursor-in-brackets: github account no longer exists
 - dummy-h-mode: github account no longer exists
 - general-close: removed from melpa
 - judge-indent: github account no longer exists
 2016-12-15 17:55:55 -05:00
Michael Alan Dorman
994b243dd3 elpa-packages: 2016-12-15 2016-12-15 17:55:55 -05:00
David Terry
1152b97925 vscode: 1.7.2 -> 1.8.0 2016-12-15 21:47:31 +01:00
David Terry
35399f93d6 vscode: 1.6.1 -> 1.7.2 2016-12-15 12:04:48 +01:00
Vincent Demeester
910dcdb7d2 idea-ultimate: 2016.3 -> 2016.3.1 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-15 11:24:07 +01:00
taku0
bd55e9db63 android-studio: 2.1.3 -> 2.2.3 2016-12-15 10:41:18 +01:00
Daiderd Jordan
3bd81a0620 Merge pull request #20536 from TikhonJelvis/master 
emacs-24.5-mac-5.15: fixed package by adding build tools
 2016-12-13 23:28:37 +01:00
Daiderd Jordan
29d53f3d5f Merge pull request #20706 from matthewbauer/emacs-macport-version-fix 
emacs-macport: 6.0 -> 6.1
 2016-12-13 23:16:49 +01:00
Aristid Breitkreuz
78ffee7f06 kakoune: update 2016-07-26 -> 2016-12-10 2016-12-13 20:57:35 +01:00
Michael Alan Dorman
5df4ed710a melpa-stable-packages: 2016-12-12 2016-12-12 13:07:33 -05:00
Michael Alan Dorman
a448d478c0 melpa-packages: 2016-12-12 
Removals:
 - bitly - github repo no longer exists
 - gitty - github repo no longer exists
 - gplusify - github repo no longer exists
 2016-12-12 13:07:32 -05:00
Michael Alan Dorman
7a25ceade1 elpa-packages: 2016-12-12 2016-12-12 13:07:32 -05:00
Tim Steinbach
8c8abafc2d
atom: 1.12.6 -> 1.12.7 2016-12-09 15:34:25 -05:00
Michael Alan Dorman
6ef023a62b melpa-stable-packages: 2016-12-07 
Removals:
 - elang: removed from melpa
 2016-12-07 16:51:35 -05:00
Michael Alan Dorman
6f0564bb8c melpa-packages: 2016-12-07 
Removals:
 - debian-bug: cvs server timed out
 - elang: removed from melpa
 2016-12-07 16:51:35 -05:00
Joachim F
48cad0441b Merge pull request #20901 from ambrop72/kdevelop-5.0.3 
kdevelop: 5.0.2 -> 5.0.3
 2016-12-07 05:23:17 +01:00
Ignat Loskutov
1915170dde
idea.datagrip: init at 2016.3 2016-12-06 00:28:09 +03:00
Ambroz Bizjak
4c9bebf8c2 kdevelop: 5.0.2 -> 5.0.3 2016-12-04 18:17:25 +01:00
Igor Sharonov
b5286f3747 neovim-qt: 0.2.3 -> 0.2.4 2016-12-03 16:16:45 +03:00
Tim Steinbach
1ac1d93427
atom: 1.12.5 -> 1.12.6 2016-11-28 17:37:32 -05:00
Rok Garbas
880d616ec0 neovim: 0.1.6 -> 0.1.7 2016-11-28 04:06:19 +01:00
Stefan Siegl
92383e669d idea.webstorm: 2016.3 -> 2016.3.1 2016-11-25 14:20:29 +01:00
Stefan Siegl
e87f28fbb1 idea.phpstorm: 2016.2.2 -> 2016.3 2016-11-25 14:17:20 +01:00
Stefan Siegl
cb8f804b1d idea.pycharm-{community,professional}: 2016.2.3 -> 2016.3 2016-11-25 14:14:42 +01:00
Stefan Siegl
cf709b544a clion: 2016.2.3 -> 2016.3 2016-11-25 14:10:04 +01:00
Matthew Bauer
558551399d
emacs-macport: 6.0 -> 6.1 2016-11-25 00:29:55 -06:00
Matthew Bauer
25cfafdf5b
emacs-macport: fix "Carbon.h" present but cannot be compiled 
Previously, emacs-macport was giving the error:

- AppKit/AppKit.h: present but cannot be compiled
- Carbon/Carbon.h: present but cannot be compiled

This add "MAC_OS_X_VERSION_MIN_REQUIRED=1090" to CFLAGS to allow them
to compile with the new 10.10 headers.

Fixes #20682.
 2016-11-25 00:25:05 -06:00