Commit Graph

546 Commits

Author SHA1 Message Date
Ivan Tkatchev
634ac0e565 rhdf5: fix build (#125101) 2021-06-03 22:29:59 +03:00
Alvar Penning
8bf4f7e2f3 rPackages.lwgeom: fix build 2021-05-24 19:09:06 +02:00
Florian Beeres
7ee9a6642b rPackages.RcppArmadillo: fix darwin
RcppArmadillo requires libiconv on darwin to build successfully
2021-05-17 17:40:04 +02:00
github-actions[bot]
6d46d8a9b9
Merge master into staging-next 2021-05-08 18:22:46 +00:00
Robert Hensing
8e3c5eb501 treewide: xvfb_run -> xvfb-run 2021-05-08 15:48:41 +02:00
Jake Gillberg
dbe770ed1e remove references to archived CRAN packages 2021-05-06 23:16:20 -04:00
Jake Gillberg
0ec4668924 run generate-r-packages.R (cran and bioc*) 2021-05-06 11:27:08 -04:00
Jake Gillberg
758b17a0f5 bump bioc in generate-r-packages 2021-05-06 08:47:56 -04:00
Jake Gillberg
f695a3eb1c bump cran 2021-05-05 12:56:44 -04:00
Andrew Childs
7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
Samuel Gräfenstein
819ab46fe7
treewide: pkgconfig -> pkg-config
Fix building with `config.allowAliases = false;`.
2021-03-17 00:00:19 +01:00
Peter Simons
c4d8bd324f r-arrow: update the library to version 3.0.0 to match the version of arrow-cpp
See https://github.com/NixOS/nixpkgs/issues/81761 for further details.
2021-02-16 12:47:21 +01:00
Peter Simons
64b5504939 r-arrow: add missing arrow-cpp dependency to the build
See https://github.com/NixOS/nixpkgs/issues/81761 for further details.
2021-02-16 12:47:21 +01:00
Markus Kowalewski
6dba41fbcb
mpi: use mpi attribute consistently as the default MPI implementations
Use the attribute mpi to provide a system wide default MPI
implementation. The default is openmpi (as before).
This now allows for overriding the MPI implentation by using
the overlay mechanism. Build all packages with mpich instead
of the default openmpi can now be achived like this:
self: super:
 {
   mpi = super.mpich;
 }

All derivations that have been using "mpi ? null" to provide optional
building with MPI have been change in the following way to allow for
optional builds with MPI:
{ ...
, mpi
, useMpi ? false
}
2021-01-23 12:15:13 +01:00
Peter Simons
74c2af4ca7
Merge pull request #110050 from PhDyellow/master_plus_patches_3
r-modules: fix gert build
2021-01-20 09:05:51 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Peter Simons
a15e4b69e7
Merge pull request #93590 from lblasc/r-packages
R: remove qtbase.patch and fix few CRAN packages
2021-01-18 21:22:57 +01:00
Peter Simons
39cb2244ff
Merge pull request #109717 from teto/fix-r-wrapper
rWrapper: use symlinkJoin instead of runCommand
2021-01-18 19:25:59 +01:00
Phil Dyer
a10b00e080 r-modules: fix gert build
gert requires pkgs.libgit2 to build.
2021-01-18 20:49:27 +10:00
Matthieu Coudron
ef156fb8ed rWrapper: use symlinkJoin instead of runCommand
While trying to build a haskell-project I got:

Configuring library for inline-r-0.10.4..
cabal: The pkg-config package 'libR' version ==3.0 || >3.0 is required but it
could not be found.

the rWrapper was only bringing the R binary without its companion
library: this fixes it.
2021-01-18 10:35:35 +01:00
Phil Dyer
364de6ddd2 r-modules: fix clustermq and rzmq build
rzmq uses pkgconfig.

clustermq now incorporates ZMQ libs directly, rather than using
the rzmq package. clustermq now uses zeromq and pkgconfig.

Both packages needed patchShebangs, due to pkgconfig.
2021-01-18 15:30:28 +10:00
Pavol Rusnak
cf2a67fef3
pkgs/development: stdenv.lib -> lib
this takes care of the following folders in pkgs/development:
* arduino
* chez-modules
* go-packages
* guile-modules
* idris-modules
* perl-modules
* r-modules
* ruby-modules
2021-01-17 19:11:59 +01:00
Tikhon Jelvis
4203a4dabc Added suggested macOS fix and fixed data.table package.
`data.table` had a `postInstall` step to rename `data.table.so` to `datatable.so`, but after the package bump the file was already called `datatable.so` and `mv` command would fail.
2021-01-04 18:20:10 -08:00
Tikhon Jelvis
70cd2cb336 r-modules: update cran and bioc packages
The last snapshot was 4 months ago (2020-08-19). I also found that I needed newer definitions when I was trying to fix the R arrow package.

This update required a couple of manual changes:

  1. Removing a few deleted packages from default.nix
  2. Renaming the "assert" package to "r_assert" in generate-r-packages.R because "assert" is a keyword in Nix
2021-01-02 15:03:06 -08:00
Sandro
a3f9335ed2
Merge pull request #101451 from moritzschaefer/fix-r-mirror-path
fix package path for bioc server
2020-11-27 01:58:30 +01:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Luka Blaskovic
0601f34356 R: remove qtbase.patch and fix few CRAN packages 2020-11-05 06:42:38 +00:00
Moritz Schaefer
dfba5e1c9b Fixes missing configure script 2020-10-23 14:40:18 +02:00
Moritz Schaefer
2eda0fbc5b fix package path for bioc server (http://mirrors.ustc.edu.cn/bioc/3.11/bioc/src/contrib/Archive/) 2020-10-23 11:46:53 +02:00
Justin Bedo
6bec22ee40
r-modules: bioc and cran update 2020-08-20 16:46:22 +10:00
Michele Guerini Rocco
bb395a9a47
Merge pull request #91288 from rnhmjoj/zeromq
Remove old zeromq 3.x packages
2020-07-26 17:37:10 +02:00
cfhammill
3c503aa733 rpackages.RcppParallel: Patch shebang
Fixes hydra build error
2020-07-13 14:21:34 -04:00
rnhmjoj
c7b3e54dff
rzmq: use default zeromq 2020-06-22 15:37:36 +02:00
Matt Wittmann
5b3f0c4f4a
r-statmod: Add libiconv to buildInputs 2020-05-14 20:00:58 -07:00
Peter Simons
ec5d1a79d1
Merge pull request #82504 from mcwitt/fix/r-mvtnorm
r-mvtnorm: add libiconv to buildInputs
2020-05-11 20:38:42 +02:00
Alex Branham
cb1a13ad98
R: Update CRAN and bioconductor packages 2020-04-26 17:16:34 -04:00
Matthew Bauer
1c8aba8334 treewide: use blas and lapack
This makes packages use lapack and blas, which can wrap different
BLAS/LAPACK implementations.

treewide: cleanup from blas/lapack changes

A few issues in the original treewide:

- can’t assume blas64 is a bool
- unused commented code
2020-04-17 16:24:09 -05:00
Alex Branham
f5afc20d06
R: Update CRAN and bioconductor packages 2020-04-08 10:01:19 -04:00
Matt Wittmann
dcda9df724
r-mvtnorm: add libiconv to buildInputs
Fixes build failure with `ld: library not found for -liconv`
2020-03-13 10:33:27 -07:00
Edward Tjörnhammar
d5b5ff5ae5
rPackages.ggbio: patch away spelling mistake 2020-02-26 09:45:23 +01:00
tricktron
e97ac66410
r-modules/generic-builder: Add missing iconv library to fix build on darwin (#78965)
Add missing iconv dependency to fix builds of several r-modules on darwin.
2020-02-07 10:50:43 +01:00
Maximilian Bosch
3c525b702a
r-packages: update
This update was primarily done to update rPackages.V8 to 3.0 which
doesn't depend on an ancient version of v8 anymore.

Also dropped the `-lv8_libplatform` linker flag. It seems as this now
part of `v8.so` as `v8_libplatform.so` doesn't exist anymore on recent
v8 versions in nixpkgs, but the headers are still there and there aren't
any "undefined reference to" errors while linking.
2020-01-28 20:11:00 +01:00
Alex Branham
e206c37550
R: Update CRAN and bioconductor packages 2020-01-23 21:22:55 -05:00
Linus Heckemann
1e840fc421 rgl: fix build
It seems that the dev output of libGLU needs to be included explicitly
for this to work. I've also moved the libraries from nativeBuildInputs
to buildInputs to be more semantically correct (and maybe support
cross compilation, not tested though).
2020-01-01 20:37:38 +01:00
Alex Branham
b9a558aaa4 R: Update CRAN and bioconductor packages
Closes https://github.com/NixOS/nixpkgs/pull/75010.
2019-12-16 18:56:49 +01:00
Peter Simons
9be0d6d4ae
Merge pull request #75021 from mnacamura/r-websocket
rPackages.websocket: fix build
2019-12-10 11:00:16 +01:00
Mitsuhiro Nakamura
350d358dea rPackages.websocket: fix build 2019-12-05 13:00:19 +09:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Nick Partridge
4d54c9e368 rPackages.glmnet: Add missing dependency
Fixes the error:
    ld: library not found for -liconv
2019-11-01 08:14:25 +10:00
Nick Partridge
f21ac0e4dc rPackages.ModelMetrics: fix darwin build
This fixes the error:

	auc_.cpp:2:10: fatal error: 'omp.h' file not found
	#include <omp.h>
2019-10-31 10:10:55 +10:00
Peter Simons
7deb982d6a r-systemfonts: fix shebang of configure script
Closes https://github.com/NixOS/nixpkgs/pull/70813.
2019-10-10 20:50:49 +02:00
Dylan Simon
13085f13aa r-systemfonts: fix package dependencies 2019-10-10 20:50:49 +02:00
Peter Simons
ca05a50d83 r-data.table: add missing zlib dependency to fix the build 2019-10-06 14:38:07 +02:00
Alex Branham
24f0ef530e R: Update CRAN and bioconductor packages 2019-10-06 14:38:07 +02:00
Vladimír Čunát
eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Jörg Thalheim
c89df5544e
Merge pull request #69333 from mnacamura/r-ucminf
r-ucminf: fix build on Darwin
2019-09-24 03:36:25 +01:00
Jörg Thalheim
b47d81393d
Merge pull request #69330 from mnacamura/r-rf
r-randomForest: fix build on Darwin
2019-09-24 03:24:06 +01:00
Jörg Thalheim
adc066fec9
Merge pull request #69332 from mnacamura/r-minqa
r-minqa: fix build on Darwin
2019-09-24 03:23:19 +01:00
Mitsuhiro Nakamura
8d64b03b0c r-ucminf: fix build on Darwin 2019-09-24 09:36:22 +09:00
Mitsuhiro Nakamura
aefe6bc2e1 r-minqa: fix build on Darwin 2019-09-24 08:06:26 +09:00
Mitsuhiro Nakamura
3001a1f3ff r-pan: fix build on Darwin 2019-09-24 07:59:04 +09:00
Mitsuhiro Nakamura
8df7139996 r-randomForest: fix build on Darwin 2019-09-24 07:23:25 +09:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Izorkin
329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
cfhammill
8e5aae5a19 Fix broken builds for rgdal and sf R packages
Builds were failing to include PROJ, depending on proj.dev
appears to fix it.
2019-09-02 16:23:24 +03:00
Peter Simons
8ac6b77eff
Merge pull request #66204 from jabranham/r-pkgs
R: Update CRAN and bioconductor packages
2019-08-07 10:24:37 +02:00
Alex Branham
eab786451f
R: Update CRAN and bioconductor packages 2019-08-06 08:49:39 -05:00
Dominic Steinitz
4788c7eb28 Ensure sundialr builds on macos. 2019-08-06 13:45:44 +01:00
Frederik Rietdijk
7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Thomas Tuegel
51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Alex Branham
46bca1d643
R: Update CRAN and bioconductor packages 2019-07-02 15:48:06 -05:00
Alex Branham
00b202e34a
rPackages.git2r: Use system libgit2
Otherwise git2r builds a bundled libgit2
2019-06-14 10:05:07 -05:00
c0bw3b
9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02:00
Alex Branham
0a80d3dc82 R: update CRAN and Bioconductor package sets
Closes https://github.com/NixOS/nixpkgs/pull/59186.
2019-04-11 20:37:18 +02:00
Peter Simons
3c9ff308e7
Merge pull request #58467 from mnacamura/r-sys
r-sys: remove obsolete dependency
2019-03-28 12:42:19 +01:00
Mitsuhiro Nakamura
157921f2e7 rPackages: fix missing dependency to libiconv 2019-03-28 12:11:47 +09:00
Mitsuhiro Nakamura
d07c3139ed r-sys: remove obsolete dependency 2019-03-28 11:20:04 +09:00
Alex Branham
8dcba2b842 R: update CRAN and Bioconductor package sets
Closes https://github.com/NixOS/nixpkgs/pull/57423.
2019-03-14 19:50:37 +01:00
Markus Ankenbrand
7fcfbcdbc9 rPackages.phytools: fix installation 2019-03-06 11:39:48 +01:00
Alex Branham
ec03ed450c update R package set
Closes https://github.com/NixOS/nixpkgs/pull/55462.
2019-02-10 11:16:19 +01:00
Alex Branham
48541ab6b9 R: update CRAN and BIOC package sets
Closes https://github.com/NixOS/nixpkgs/pull/53414.
2019-01-08 09:34:37 +01:00
Alex Branham
6f7459b40b
R: update CRAN package set 2018-12-12 11:17:25 -06:00
Edmund Wu
a898f88d57
rstudioWrapper: include desktop file 2018-12-07 16:44:01 -05:00
Joachim F
f0dbbdf970
Merge pull request #51581 from joachifm/rWrapper-local-runCommand
Implement R wrappers as local-only runCommand
2018-12-07 09:17:44 +00:00
Christian Kauhaus
3b445042ac rPackages.littler: fix build (#51282)
littler gives a wrapped called `r` (or `lr` for non-case-preserving
systems like Darwin) which works as shebang or pipe target.

The build was completely broken before (missing deps).

Symlink executables and manpage into standard locations so that this
packages also works in `environment.systemPackages`.
2018-12-06 17:22:31 +01:00
Joachim Fasting
21d83e5b11
rstudioWrapper: use runCommand, local build only
This seems more appropriate for a wrapper generator.
2018-12-05 20:59:41 +01:00
Joachim Fasting
d2b467a2de
rWrapper: use runCommand, local build only
This seems more appropriate for a wrapper generator.
2018-12-05 20:59:35 +01:00
Timo Kaufmann
63b39af496
pythonPackages.rpy2: various fixes (#51084)
- make sure libreadline is found at runtime
- make sure python libraries are found at runtime
- add libraries necessary to pass the testsuite and standard libraries
2018-11-27 18:24:37 +01:00
Massimo Redaelli
5afe1e7c70 rstudio: fix qt plugins not found 2018-11-23 23:10:29 +01:00
Averell Dalton
25e68e3048 r-ps: patchShebangs in ./configure to fix build 2018-11-02 23:02:04 +01:00
Peter Simons
c9e1380626 r-nloptr: fix build by adding pkgconfig 2018-11-02 17:50:18 +01:00
Peter Simons
9b63cc6313 r-rlang: patch shebang in configure script to fix the build 2018-11-02 17:50:18 +01:00
Tom McLaughlin
cac5c9401e R: update CRAN and BIOC package sets
Closes https://github.com/NixOS/nixpkgs/pull/49430.
2018-11-02 17:50:18 +01:00
Rob Vermaas
3f719b0fad Fix build for rPackages.units
(cherry picked from commit 1eb1fec3ae)
2018-10-08 12:53:43 +02:00
ivanbrennan
989f24befc
git2r: add SSH support
When building the devtools R module, which depends on git2r, it reports
that libssh2 cannot be found, and falls back to building without SSH
support. Adding libssh2.dev to git2r's native build inputs fixes this.
2018-09-11 16:39:20 -04:00
Ryan Mulligan
73ae8e53e2 rPackages.RPostgres: fix configure paths and includes
closes #46208
2018-09-09 14:37:28 -07:00
Mitsuhiro Nakamura
5e42a081a3 r-jqr: fix build (#45333) 2018-08-20 00:08:28 +02:00
volth
e6d3c65442
r-packages: fix regression 2018-08-04 06:19:08 +00:00
Mitsuhiro Nakamura
0a541aa38c rPackages.buildRPackage: fix error if requireX is missing 2018-08-03 01:08:35 +09:00
Mitsuhiro Nakamura
559997179d rPackages: export buildRPackage 2018-08-03 01:08:07 +09:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Markus Ankenbrand
775fd4bfba rPackages.haven: fix installation 2018-07-12 11:07:27 +02:00
Mitsuhiro Nakamura
c072024409 rPackages.reprex: fix build 2018-07-11 23:16:49 +09:00
Markus Ankenbrand
89f44c1314 rPackages.rhdf5: fix installation
Fix #43285
2018-07-10 16:38:11 +02:00
Peter Simons
03476783a5 R: fix evaluation errors 2018-07-07 12:10:46 +02:00
Peter Simons
49c649d573 R: update CRAN package set to snapshot 2018-07-06 2018-07-07 12:10:46 +02:00
Peter Simons
d984656a2a R: update package set
The CRAN snapshot is at "2018-07-03". Bioc is now at 3.8.
2018-07-07 12:10:46 +02:00
Markus Ankenbrand
9eeea0b9ef rPackages.rhdf5: fix installation
Fix #42878
2018-07-02 18:51:18 +02:00
Daiderd Jordan
654960c1cd
Merge pull request #42290 from mnacamura/r-igraph-darwin
rPackages.igraph: fix Darwin build
2018-06-20 19:52:36 +02:00
Mitsuhiro Nakamura
f972a30f16 rPackages.igraph: fix Darwin build 2018-06-20 11:08:29 +09:00
Mitsuhiro Nakamura
dada18527a rPackages.RcppEigen: fix Darwin build 2018-06-20 10:59:18 +09:00
Josef Kemetmüller
aeda45821d rPackages.mgcv: fix darwin build
This fixes the error:
    ld: library not found for -liconv
2018-06-07 00:00:42 +02:00
Josef Kemetmüller
0275562a12 rPackages.Matrix: fix darwin build
This fixes the error:
    ld: library not found for -liconv
2018-06-07 00:00:07 +02:00
Josef Kemetmüller
d8ad2ad916 rPackages.nlme: fix darwin build
This fixes the error:
    ld: library not found for -liconv
2018-06-06 23:59:09 +02:00
Josef Kemetmüller
e023f117f8 rPackages.KernSmooth: fix darwin build
This fixes the error:
    ld: library not found for -liconv
2018-06-06 23:58:46 +02:00
Josef Kemetmüller
5d092b3052 rPackages.cluster: fix darwin build
This fixes the error:
    ld: library not found for -liconv
2018-06-06 23:57:08 +02:00
Mitsuhiro Nakamura
89a5e6db55 rPackages.JuniperKernel: fix non-Darwin build 2018-05-15 17:50:11 +09:00
Mitsuhiro Nakamura
d35604d910 rPackages: fix binutils path on Darwin 2018-05-12 20:51:43 +09:00
Peter Simons
94295e3cee R: update CRAN and BIOC package sets 2018-04-24 09:19:38 +02:00
Shea Levy
05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Graham Christensen
92d53362d4
Move all nixpkgs doc files in to the doc directory
This makes a makefile-driven developer workflow nicer.
2018-03-25 19:52:00 -04:00
Matthew Bauer
9109a90479 treewide: remove some more gettext references 2018-03-22 16:50:14 -05:00
Peter Simons
9c207cd922 R: fix evaluation errors 2018-03-15 21:14:29 +01:00
Peter Simons
52dce0fb38 R: update the CRAN and BIOC package sets 2018-03-15 19:39:55 +01:00
Averell Dalton
028e67abce rPackages.mongolite: fix build 2018-03-10 04:01:49 +01:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Peter Simons
a06b81b8ad
Merge pull request #35651 from mnacamura/r-xml2-darwin
rPackages.xml2: fix darwin build
2018-02-26 20:16:16 +01:00
Mitsuhiro Nakamura
4b1627d313 rPackages.xml2: fix darwin build 2018-02-26 10:47:57 +09:00
Mitsuhiro Nakamura
671e3f5c4d rPackages.JuniperKernel: fix darwin build 2018-02-26 10:00:00 +09:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Justin Bedo
8d03d9b9af
rPackages: add bioconductor archive url 2018-02-21 09:58:17 +11:00
Justin Bedo
cfc07bcf0e
bioconductor: 3.4 -> 3.6 2018-02-21 09:58:17 +11:00
Mitsuhiro Nakamura
c4658ac0a4 rPackages.pbdZMQ: fix package loading on Darwin 2018-02-10 00:54:28 +09:00
Mitsuhiro Nakamura
2533720976 rPackages.data_table: OpenMP support on Darwin 2018-01-19 19:30:55 +09:00
Daiderd Jordan
5a02143c20
Merge pull request #33010 from LnL7/cacert-hook
cacert: add hook that sets SSL_CERT_FILE
2018-01-07 09:55:15 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Daiderd Jordan
091c2b9f04
cacert: cleanup exporting SSL_CERT_FILE 2017-12-27 21:36:32 +01:00
Peter Simons
65b15c40f1 R: update package set 2017-12-01 13:48:26 +01:00
Peter Simons
458331408e r-openssl: fix build 2017-11-30 18:45:47 +01:00
John Ericson
405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files
stdenv setup: Always use both propagated files
2017-11-22 15:23:37 -05:00
John Ericson
da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Matthew Justin Bauer
24e38f3075
r-modules: fix eval
Fixes #31508
2017-11-12 21:49:41 -06:00
Maciej Kazulak
42b70ae5ed nixpkgs manual: add rstudio shell.nix example
Provide an example of a self-contained shell.nix for rstudio with
additional packages.
2017-11-04 12:26:08 +01:00
Hamish Mackenzie
8870d1a67d r-modules: Fix a number of popular R packages
The R V8 package still depends on V8 3.14 so this is also included.
2017-10-21 11:29:21 +01:00
Peter Simons
11131d5fc1 R: update package set 2017-09-29 15:21:09 +02:00
Peter Simons
aa9bebf261 R: update package set 2017-08-31 21:59:06 +02:00
Mitsuhiro Nakamura
c5fe03ace2 r-pbdZMQ: fix Darwin install 2017-07-14 14:32:51 +09:00
Peter Simons
b1ebe7a72c r-modules: update package set 2017-07-02 09:51:42 +02:00
Chris Hodapp
29969a5ec7 rstudio: Fix recompilation issue with custom package set
This attempts to fix the issue described at
https://github.com/NixOS/nixpkgs/pull/22219#issuecomment-291801133.
Any change to the custom packages passed to RStudio causes this to
completely rebuild RStudio, which is completely unnecessary and also a
bit of a hindrance as it's a fairly slow build.

This rolls back most of that old PR, and instead implements something
more like rWrapper.  Existing configurations with the old useRPackages
will break.
2017-05-01 09:46:40 -04:00
Peter Simons
85a9e6dcdf R: update list of broken packages (and some cosmetic) 2017-04-24 15:39:54 +02:00
Peter Simons
430cbcfd2b R: update CRAN and BIOC package sets 2017-04-24 15:39:08 +02:00
Chris Hodapp
80beb55cfc imager (r-modules): add pkgs.x11 to fix build, unmark imager/ForestTools as broken 2017-04-20 14:18:01 -04:00
Peter Simons
add394d8f1 r-modules: update CRAN package set 2017-03-07 14:56:46 +01:00
Peter Simons
f4595fa555 r-modules: drop broken irkernel package set
We can no longer update that package set since, apparently, it has moved
to a different packaging scheme.
2017-03-07 14:56:46 +01:00
Peter Simons
3dc4e12ff0 r-modules: remove weird version assertion 2017-03-07 14:56:46 +01:00
Nikolay Amiantov
477b507a4f rPackages: remove old cuda-related patches
gputools doesn't build but because of unrelated linking issues.
2017-02-28 17:31:07 +03:00
Nikolay Amiantov
6f3e071755 rPackages: try to unbreak reverse dependencies of cudatoolkit 2017-02-28 17:22:06 +03:00
Domen Kožar
ffe935ee86 Merge pull request #23104 from dtzWill/fix/generate-shell
R/generate-shell: Use R from current tree, fix missing wget dep.
2017-02-27 14:06:17 +01:00
Domen Kožar
a7dc912460 Merge pull request #23069 from lukego/R-packages-readme
r-modules/README.md: mention generate-shell.nix
2017-02-27 14:04:35 +01:00
Domen Kožar
4ccb553b70 Merge pull request #22817 from jbedo/r
R: 3.2.4 -> 3.3.2
2017-02-27 14:02:13 +01:00
Domen Kožar
7ed28a0b78
R: fix bio3d build 2017-02-27 13:51:55 +01:00
Justin Bedo
4c2d75f58c
R: unmark edgeR and limma as broken 2017-02-24 15:52:10 +11:00
Justin Bedo
4bb8727284
R: 3.2.4 -> 3.3.2 2017-02-24 15:22:12 +11:00
Will Dietz
2f303bc10e R/generate-shell: Use R from current tree, fix missing wget dep.
Without this change, the 'R' version used might be the wrong
one which changes the package lists used.

Fixes #19530.
2017-02-23 07:46:20 -06:00
Luke Gorrie
a000ec038e r-modules/README.md: mention generate-shell.nix 2017-02-22 04:48:50 +00:00
Eelco Dolstra
9d6a55aefd
~/.nixpkgs -> ~/.config/nixpkgs
The former is still respected as a fallback for config.nix for
backwards compatibility (but not for overlays because they're a new
feature).
2017-02-01 16:07:55 +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
mimadrid
8954412fcc
r-modules: fix snpStats package 2017-01-06 21:07:25 +01:00
mimadrid
b5a0925663
r-modules: fix VariantAnnotation package 2017-01-06 21:07:25 +01:00
mimadrid
6540b6507d
r-modules: fix rtracklayer package 2017-01-06 21:07:25 +01:00
mimadrid
baf65d5000
r-modules: fix Rsubread package 2017-01-06 21:07:25 +01:00
mimadrid
9ebab25442
r-modules: fix gmapR package 2017-01-06 21:07:25 +01:00
mimadrid
286e86f3a5
r-modules: fix oligo package 2017-01-06 21:07:25 +01:00
mimadrid
afd1a4c933
r-modules: fix affyio package 2017-01-06 21:07:25 +01:00
mimadrid
4c0c3c7493
r-modules: fix BitSeq package 2017-01-06 21:07:24 +01:00
mimadrid
272b447ea7
r-modules: fix bamsignals package 2017-01-06 21:07:24 +01:00
mimadrid
c5e4754ca7
r-modules: fix affyPLM package 2017-01-06 21:07:24 +01:00
mimadrid
1d7fd8f3c4
r-modules: fix xml2 package 2017-01-06 21:07:24 +01:00
mimadrid
5b813c2ab0
r-modules: fix XBRL package 2017-01-06 21:07:24 +01:00
mimadrid
512be9e14a
r-modules: fix WhopGenome package 2017-01-06 21:07:24 +01:00
mimadrid
f9d84f8b65
r-modules: fix tkrplot package 2017-01-06 21:07:24 +01:00
mimadrid
0b3e62bb12
r-modules: fix tiff package 2017-01-06 21:07:23 +01:00
mimadrid
9420fa23c6
r-modules: fix TAQMNGR package 2017-01-06 21:07:23 +01:00
mimadrid
2303e63116
r-modules: fix spate package 2017-01-06 21:07:23 +01:00
mimadrid
fcbed4b654
r-modules: fix showtext package 2017-01-06 21:07:23 +01:00
mimadrid
8a6b58d51d
r-modules: fix seqminer package 2017-01-06 21:07:23 +01:00
mimadrid
e1a5eeef06
r-modules: fix seqinr package 2017-01-06 21:07:22 +01:00
mimadrid
1ef67b9e78
r-modules: fix RVowpalWabbit package 2017-01-06 21:05:54 +01:00
mimadrid
ae2723a144
r-modules: fix rtiff package 2017-01-06 21:05:54 +01:00
mimadrid
d7ac90dd0c
r-modules: fix rtfbs package 2017-01-06 21:05:53 +01:00
mimadrid
fd175e4084
r-modules: fix Rssa package 2017-01-06 21:05:52 +01:00
mimadrid
bd2aaada6e
r-modules: fix RSclient package 2017-01-06 21:05:52 +01:00
mimadrid
53235dbe14
r-modules: fix rphast package 2017-01-06 21:05:52 +01:00
mimadrid
780fb79e32
r-modules: fix Rmpfr package 2017-01-06 21:05:51 +01:00
mimadrid
a58db75ccb
r-modules: fix rmatio package 2017-01-06 21:05:51 +01:00
mimadrid
674a2077dd
r-modules: fix rJava package 2017-01-06 21:05:51 +01:00
mimadrid
13a582688f
r-modules: fix RJaCGH package 2017-01-06 21:05:51 +01:00