1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 21:17:46 +00:00
Commit graph

2233 commits

Author SHA1 Message Date
Rahul Gopinath fb50abba2e vis: 2016-10-09 -> 0.3 2017-03-26 09:09:02 -07:00
Thomas Tuegel 84ed473763
notepadqq: correct packaging errors and pin to Qt 5.6 2017-03-25 08:49:39 -05:00
Leon Isenberg acb3135613 emacsMacport: correct description 2017-03-24 22:58:32 +01:00
Maximilian Bosch bde3acbd2a
idea.phpstorm: 2016.3.2 -> 2017.1 2017-03-24 22:16:40 +01:00
Winnie Quinn 1b4151b12f vscode: 1.10.0 -> 1.10.2
In addition to the version bump, this also fixes a broken install phase
on macOS. The install now completes properly on macOS 10.12 and
"bin/code" is now correctly linked to the binary within the bundle.
2017-03-24 16:48:24 -04:00
ndowens bc4dc9cb75 codeblocks: 13.12 -> 16.01
(@7c6f434c) move the buildInputs missed in the initial version to
nativeBuildInputs, too.

Pushed instead of #24074
2017-03-24 17:49:30 +01:00
Jiri Danek da13619591 idea-community: 2016.3.5 -> 2017.1 2017-03-24 12:46:19 +01:00
Baptist BENOIST 7d72b9b74e Remove bbenoist from maintainers
Sorry guys but I did not used Nix since months and cannot spend time
maintaining my previous work...
2017-03-23 03:03:04 +01:00
Vincent Laporte 09e814c681 proofgeneral_HEAD: Bump 2017-03-22 01:36:35 +00:00
Robin Gloster c5f818f74d
elvis: fix build 2017-03-22 00:45:39 +01:00
Chris Martin a1b7dd62d4 idea.idea-community: 2016.3.4 -> 2016.3.5 2017-03-21 12:27:37 -04:00
Michael Alan Dorman 06795f757d melpa-packages: 2017-03-20 2017-03-21 07:01:57 -04:00
Michael Alan Dorman 2126246bff melpa-stable-packages: 2017-03-20 2017-03-21 07:01:57 -04:00
Michael Alan Dorman b71b1b6e9a elpa-packages: 2017-03-20 2017-03-21 07:01:56 -04:00
ndowens 5f2ada853e Merge pull request #24098 from ndowens/sigil
sigil: 0.9.6 -> 0.9.7
2017-03-19 19:39:05 -05:00
ndowens 00cc586f6f sigil: 0.9.6 -> 0.9.7 2017-03-19 19:37:21 -05:00
ndowens a289b03412 Merge pull request #24088 from ndowens/tiled
tiled: 0.17.0 -> 0.18.2
2017-03-19 18:37:26 -05:00
ndowens c5ce21ec80 tiled: 0.17.0 -> 0.18.2 2017-03-19 18:34:46 -05:00
Tim Steinbach 4385a67ef2 Merge pull request #24079 from ndowens/nano
nano: 2.7.3 -> 2.7.5
2017-03-19 18:31:06 -04:00
ndowens ed2c0a8328 Merge pull request #24084 from ndowens/scite
scite: 3.3.7 -> 3.7.3; Cosmetic changes
2017-03-19 17:29:01 -05:00
ndowens e27a85709d scite: 3.3.7 -> 3.7.3; Cosmetic changes 2017-03-19 17:28:35 -05:00
ndowens 981313fd30 Merge pull request #24083 from ndowens/nedit
nedit: 5.6a -> 5.7
2017-03-19 17:19:42 -05:00
ndowens 8ab037e0b5 nedit: 5.6a -> 5.7 2017-03-19 17:18:26 -05:00
ndowens 685ac5287b nano: 2.7.3 -> 2.7.5 2017-03-19 16:36:48 -05:00
ndowens 6ceabb62e2 Merge pull request #24076 from ndowens/mg
mg: 20110905 -> 20161005;
2017-03-19 16:31:58 -05:00
ndowens d6114f6c6b mg: 20110905 -> 20161005; Remove un-needed configure patch
mg: 20110905 -> 20161005
2017-03-19 16:31:14 -05:00
ndowens 876dead5b6 joe: 4.2 -> 4.4 2017-03-19 15:41:35 -05:00
ndowens 6b71f32fb5 Move intltool to nativeBuildInputs 2017-03-19 13:15:40 -05:00
ndowens 9fae97b719 Update default.nix
Cosmetic change
2017-03-19 13:02:08 -05:00
Frank Lanitz 01f706b30b Geany: 1.30 -> 1.30.1 2017-03-19 18:39:39 +01:00
Drew Hess b800655639
emacs25Macport: fix for new macOS 10.10 frameworks.
See https://github.com/NixOS/nixpkgs/pull/23907#issuecomment-286627100.
2017-03-19 18:11:21 +01:00
Daiderd Jordan a48df6fba6 Merge pull request #22508 from matthewbauer/remove-emacs24macport
emacs24macport: remove
2017-03-18 22:19:20 +01:00
Tuomas Tynkkynen 5658324d82 neovim: Fix eval error
Not sure at all if this is the right thing to do. cc @edanaher
2017-03-18 20:01:15 +02:00
Michael Raskin 846b6d250a Merge pull request #23256 from edanaher/ensime
Ensime
2017-03-18 18:24:19 +01:00
Michael Raskin bbeaf8abf6 Merge pull request #23081 from Kendos-Kenlen/rubymine
RubyMine
2017-03-18 17:22:11 +01:00
Michael Raskin e8d7014dac Merge pull request #22722 from patternspandemic/kodestudio
kodestudio: init at 17.1
2017-03-18 17:18:10 +01:00
Benno Fünfstück a4d6e2cf16 atom: avoid using LD_PRELOAD. Fixes glibc compat issues
The wrapper for Atom was loading libraries via LD_PRELOAD, for example
libxkbfile. Now, if you installed atom via nix-env and happened to use a newer
nixpkgs for that than what your system environment is build against, you could
end up with an error like this:

```
uname: relocation error:
/nix/store/68sa3m89shpfaqq1b9xp5p1360vqhwx6-glibc-2.25/lib/libdl.so.2:
symbol _dl_catch_error, version GLIBC_PRIVATE not defined in file libc.so.6
with link time reference
```

This happens because atom calls the `uname` executable from the system to
determine the platform. Because that inherits the `LD_PRELOAD` environment
variable, so the libxkbfile library that the `atom` wrapper was build against
is loaded into `uname`. But since `atom` comes from `nix-env`, the `libxkbfile`
it was built with might be compiled against a newer version of `glibc` than
`uname`, which comes from the system, was! Having two versions of glibc loaded
into the same processes results in chaos.

To fix this, we avoid setting `LD_PRELOAD` and instead use patchelf to set the
correct RPATH. RPATH is not inherited by child processes, so the above issue
can no longer occur.

The only small complication here is that the library that actually loads
libxkbfile is not the atom binary itself, but a node extension that atom uses.
So instead of setting the RPATH on `atom` only, we also set the `rpath` on all
node extensions (`*.node`) the output.
2017-03-18 01:51:36 +01:00
Nikolay Amiantov a8785daf0e emacs: fix runtime GTK3 dependencies
Fixes #23845.
2017-03-18 01:32:42 +03:00
patternspandemic bb728268b5
kodestudio: init at 17.1 2017-03-16 15:50:01 -07:00
Mogria 1893ed54dc sublime3: fix hardcoded /bin/bash when executing commands for build systems (#23561)
* sublime3: replace hardcoded /bin/bash with /usr/bin/env

exec.py in Default.package-sublime calls /bin/bash with subprocess.
See Issue #12011. Because of this builds could not be started from
withtin Sublime Text.

* sublime3: use wrapped of bash to fix internal build system

Without the wrapped version of bash (a symlink to $bash/bin/bash)
with LD_PRELOAD to glibc an relocation error occurs when trying
to run builds from within Sublime Text 3.  See Issue #12011.
2017-03-15 11:32:44 +01:00
Robert Helgesson 5228bc9f2e
eclipses: add dependencies as build inputs
Having `glib` in the build inputs will allow its build hook to
trigger. Also adds `gsettings_desktop_schemas` as a dependency since
Eclipse appears to need the schemas under certain circumstances.
2017-03-14 20:38:04 +01:00
Joachim F 40c1406b18 Merge pull request #23856 from mdorman/emacs-updates
Automated emacs package updates
2017-03-13 23:33:01 +01:00
Tim Steinbach 2d1ea867b7 Merge pull request #23866 from mimadrid/update/bluefish-2.2.10
bluefish: 2.2.9 -> 2.2.10
2017-03-13 18:26:58 -04:00
mimadrid 61e8c0370d
bluefish: 2.2.9 -> 2.2.10 2017-03-13 23:01:35 +01:00
Michael Alan Dorman 29559f6d7a melpa-packages: 2017-03-13 2017-03-13 15:00:27 -04:00
Michael Alan Dorman 2b1faaae9e melpa-stable-packages: 2017-03-13 2017-03-13 15:00:27 -04:00
Michael Alan Dorman 4433fc9089 elpa-package: 2017-03-13 2017-03-13 15:00:27 -04:00
Olegs Jeremejevs 39cd6ccb8e Add subl symlink for Sublime Text 3 (#23815) 2017-03-12 21:59:48 +00:00
Ambroz Bizjak 2d47e1be72 kdevelop: 5.0.3 -> 5.0.4 (#23788) 2017-03-12 16:49:24 +01:00
Franz Pletz 12f3006861
vim: 8.0.0329 -> 8.0.0442 2017-03-11 08:14:28 +01:00
Gauthier POGAM--LE MONTAGNER acd8ede120 atom: 1.14.4 -> 1.15.0 2017-03-10 15:53:04 +01:00
Peter Hoeg 26625c928b neovim-qt: run tests 2017-03-08 20:31:29 +08:00
Peter Hoeg a9e990b818 neovim: 0.2.5 -> 0.2.6 2017-03-08 20:07:40 +08:00
Peter Hoeg 2c99575c66 neovim-qt: 0.2.4 -> 0.2.5 2017-03-08 17:35:37 +08:00
Michael Alan Dorman cc5bb40c1c melpa-packages: 2017-03-06 2017-03-06 16:18:14 -05:00
Michael Alan Dorman 192bc411b0 melpa-stable-packages: 2017-03-06 2017-03-06 16:18:14 -05:00
Michael Alan Dorman 5ff2a924c6 elpa-packages: 2017-03-06 2017-03-06 16:18:14 -05:00
Frank Lanitz 69ca4dec31 Geany: 1.29 -> 1.30 2017-03-05 15:53:41 +01:00
Shea Levy 81db3f2b0b nix-buffer: 2.2.0 -> 2.3.0 2017-03-05 06:35:34 -05:00
zraexy 7582da5d8b eclipse: import builder instead of callPackage
Switched from callPackage to import so that dependencies are passed
instead of being grabbed from pkgs.

[Bjørn: wrap overlong line.]
2017-03-05 11:27:50 +01:00
ndowens cd18b65432 hexcurse: 1.58 -> 1.60.0 2017-03-05 09:37:25 +01:00
Shea Levy eaa4b5e216 nix-buffer: 2.1.0 -> 2.2.0 2017-03-04 13:47:40 -05:00
Michael Raskin 8eccd34f10 vim_configurable: enable ximSupport by default 2017-03-03 21:20:19 +01:00
Tim Steinbach 45a86b0816 Merge pull request #23387 from Kendos-Kenlen/atom
atom: 1.14.3 -> 1.14.4
2017-03-02 08:25:15 -05:00
Thomas Tuegel 60d1915b61
melpa-stable-packages: 2017-03-01 2017-03-02 07:24:02 -06:00
Thomas Tuegel 00f28d74c9
melpa-packages: 2017-03-01 2017-03-02 07:23:49 -06:00
Thomas Tuegel b955f27ad9
elpa-packages: 2017-03-01 2017-03-02 07:23:19 -06:00
Gauthier POGAM--LE MONTAGNER 869bc1c07e atom: 1.14.3 -> 1.14.4 2017-03-02 13:44:47 +01:00
David Terry fdd436b3e4 vscode: 1.9.1 -> 1.10.0 2017-03-01 23:35:05 +01:00
Shea Levy b0cff50983 nix-buffer: 2.0.0 -> 2.1.0 2017-03-01 12:59:48 -05:00
Shea Levy 1c4d8de99b nix-buffer: 1.2.3 -> 2.0.0 2017-03-01 07:41:08 -05:00
Gauthier POGAM--LE MONTAGNER 83644ee24d idea.rubymine: 2016.3.1 -> 2016.3.2 2017-02-28 22:45:36 +01:00
Bjørn Forsman 81de55118d
eclipse: add aliases for "latest" versions
Add aliases like "eclipse-cpp = eclipse-cpp-46" so that user
configurations can point to "eclipse-cpp" and have it not regularly
break as nixpkgs is updated.
2017-02-27 20:30:17 +01:00
Thomas Tuegel 127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Thomas Tuegel 4f2e7a0424
Separate Qt 5 packages from dependent libraries 2017-02-27 11:49:04 -06:00
Evan Danaher dcab427908 vim-plugins: Add infrastructure for python[3]Dependencies.
This allows vim plugins to specify python dependencies required at
runtime, and they will be added to the python environment.
2017-02-27 12:36:03 -05:00
Thomas Tuegel 0ed156a216 Merge pull request #22977 from ttuegel/triage-kde4
Remove KDE 4 desktop packages
2017-02-25 12:21:44 -06:00
Thomas Tuegel 0757d49800
Remove kde4.kdevelop
- Already updated to KDE 5 in Nixpkgs
2017-02-24 16:48:32 -06:00
romildo f67a097488 idea.clion: 2016.3.2 -> 2016.3.3 2017-02-23 16:55:18 -03:00
Profpatsch 8e54fced98 flpsed: ghostscript patch, fixes, new url
gs was called at runtime, fix the execvp call.
The url changed to its own domain.
A little face-lift for the package code.
2017-02-23 18:52:30 +01:00
Jascha Geerds 11d86725df idea-ultimate: 2016.3.3 -> 2016.3.4 2017-02-23 15:07:59 +01:00
Joachim F 2379d5e537 Merge pull request #23033 from mdorman/emacs-updates
Automated emacs package updates
2017-02-21 16:27:00 +01:00
Michael Alan Dorman e2487c26b4 melpa-packages: 2017-02-20
Removals:
 - malabar-mode: removed from melpa
2017-02-20 20:18:21 -05:00
Michael Alan Dorman 602fbdbf48 melpa-stable-packages: 2017-02-20
Removals:
 - malabar-mode: removed from melpa
2017-02-20 20:18:20 -05:00
Michael Alan Dorman c5d211df4c elpa-packages: 2017-02-20 2017-02-20 20:18:20 -05:00
Rafael de F. Ferreira 1daf49ccf4 idea-community: 2016.3.3 -> 2016.3.4 2017-02-20 21:25:20 +01:00
Graham Christensen 69a0e9ea11 Merge pull request #22985 from Kendos-Kenlen/master
idea.webstorm: 2016.3.2 -> 2016.3.3
2017-02-20 10:01:31 -05:00
Frederik Rietdijk ffe6935ea8 kile: 2016-10-24 -> 2017-02-09 2017-02-20 11:44:14 +01:00
Gauthier POGAM--LE MONTAGNER 326fa70896 idea.webstorm: 2016.3.2 -> 2016.3.3 2017-02-19 03:10:50 +01:00
Tim Steinbach 376b377775
atom: 1.14.1 -> 1.14.3 2017-02-17 16:13:18 -05:00
Graham Christensen b3c6449e13 Merge pull request #22844 from LnL7/vim-8.0.0329
vim: 8.0.0075 -> 8.0.0329
2017-02-15 21:27:43 -05:00
Daiderd Jordan d2d12c2f4c
vim: 8.0.0075 -> 8.0.0329 2017-02-15 21:00:59 +01:00
Robert Helgesson 0969569902
eclipse-plugin-yedit: init at 1.0.20.201509041456 2017-02-15 20:53:37 +01:00
Aycan iRiCAN 2ce7dd7fbb emacs: fix sha256 hashes of savannah patches 2017-02-15 18:33:01 +03:00
Thomas Tuegel d440052b64 Merge pull request #22787 from mdorman/emacs-updates
Automated emacs package updates
2017-02-14 12:49:50 -06:00
Eelco Dolstra 314dd9215b Merge pull request #16654 from awakenetworks/parnell/setcap-wrappers
Adding setcap-wrapper functionality to Nix
2017-02-14 16:25:06 +01:00
Michael Alan Dorman 25a2f90731 melpa-packages: 2017-02-13
Removals:
 - ebib-handy: removed from melpa
 - goose-theme: repository removed
2017-02-14 06:55:38 -05:00
Michael Alan Dorman cd90c7fe79 melpa-stable-packages: 2017-02-13 2017-02-14 06:55:36 -05:00
Michael Alan Dorman 58b5c49ddd elpa-packages: 2017-02-13 2017-02-14 06:55:34 -05:00
Michael Alan Dorman 5ebf37f749 org-packages: 2017-02-13 2017-02-14 06:55:32 -05:00
Robert Helgesson 08779a71e9
eclipse-plugin-jdt: 4.6 -> 4.6.2 2017-02-14 00:32:58 +01:00
Parnell Springmeyer 9e36a58649
Merging against upstream master 2017-02-13 17:16:28 -06:00
Robert Helgesson 486b9be579
eclipse-plugin-scala: use stable download URL
Unfortunately, the latest release does not appear to be available
through a stable URL.
2017-02-14 00:03:19 +01:00
Thomas Tuegel 74041a42a9
shimbun: init at 20170203.647 2017-02-13 16:02:14 -06:00
Shea Levy 6651c72df1 proofgeneral_HEAD: Bump 2017-02-11 21:01:56 -05:00
Joachim F 8d0e16a08e Merge pull request #22641 from vrthra/kakoune-2017-02-09
kakoune: 2016-12-30 -> 2017-02-09
2017-02-11 20:15:23 +01:00
Langston Barrett a749b73ff8
ne: migrate from (broken) tetex to texlive
related: #21770.  vcunat re-indented the longDescription.
2017-02-11 17:57:32 +01:00
Peter Hoeg 5e0dbfe931 Merge branch 'master' into f/nvim-qt 2017-02-11 11:46:37 +08:00
Rahul Gopinath 4f74f9158a kakoune: 2016-12-30 -> 2017-02-09 2017-02-10 14:06:28 -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
Matthew Bauer 3a9a707fd4
emacs24macport: remove 2017-02-06 16:46:05 -06: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
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