Commit Graph

53 Commits

Author SHA1 Message Date
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
Goetz
f76ab1db42
RStudio: 2022.02.3+492 -> 2022.07.1.+554 (#185154)
RStudio: 2022.02.3+492 -> 2022.07.1.+554

Separate quarto fix and pandoc installation
2022-09-20 11:24:19 +02:00
Goetz
1f95c49331
RStudio: 1.4.1717 -> 2022.02.3+492 (#177021)
rstudio: 1.4.1717 -> 2022.02.3+492

The old version does not compile with gcc11. Also the used nixos-22.05
libraries (R interpreter) have changed their interfaces that have to be
also patched. Updating RStudio is useful.

* Remove Quarto patch

Follow review in
https://github.com/NixOS/nixpkgs/pull/177021#pullrequestreview-1007625773

* Fix not FHS paths

Create explicit nix path replacement of hard coded FHS paths for pandoc and nodejs.
2022-06-17 16:08:22 +02:00
Rick van Schijndel
433701147a
treewide: pkgs/applications: mark broken for aarch64-linux 2022-05-30 13:42:58 +02:00
Daniel Thwaites
4f9b8a0702
lib/strings: optimise hasInfix function (#168175)
* lib/strings: optimise hasInfix function

* lib/strings: optimise hasInfix further using regex

* rstudio: call hasInfix with a string

* lib/strings: remove let from hasInfix

Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>

Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
2022-04-22 12:43:25 -04:00
K900
cb2cfba6f7 treewide: switch all desktop file generators to new API
Notably:
- remove explicit arguments that match the defaults
- convert everything to the right Nix types
2022-02-25 13:40:38 -08:00
Fabian Möller
4329d79dba
nixos/tests: link tests to their packages 2022-01-23 21:08:10 +01:00
Matthieu Coudron
711a269add rstudio: set meta.mainProgram 2022-01-18 22:43:21 +01:00
cfhammill
fd51177e5c
rstudio-server, rstudioServerWrapper: init at rstudio.version (1.4.1717)
Co-authored-by: Justin Bedo <cu@cua0.org>
Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Benjamin Darwin <bcdarwin@gmail.com>
2022-01-17 10:24:37 +11:00
Ingo Blechschmidt
480285a39e rstudio: fix desktop icon 2021-11-05 20:36:14 +01:00
Justin Bedo
71fa2b05f6
rstudio: fix source revision reference 2021-10-17 22:20:54 +11:00
Artturin
a2fa069103 rstudio: 1.2.5042 -> 1.4.1717 2021-10-15 03:56:09 +03:00
Changlin Li
81fa0babba Remove changlinli from rstudio maintainers list
I don't have the bandwidth to maintain the rstudio package
2021-10-07 04:43:26 -04:00
Emery Hemingway
e36f885a09 rstudio: remove ehmry from maintainers 2021-09-24 12:17:57 +02: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
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Alex Branham
56be910cd3
Rstudio: 1.2.5033 -> 1.2.5042
Need the patch to backport a fix so Rstudio compiles against R 4.0.0
2020-04-28 20:59:45 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Simon Lackerbauer
321d788e2a rstudio: 1.2.1335 -> 1.2.5033 2020-02-29 18:38:18 +01:00
Thomas Churchman
c32ccccd9d
rstudio: use qt5's mkDerivation (#74381) 2020-02-09 01:44:53 -05:00
Eamonn Coughlan
cd9aec6114 rstudio: fix build with new hunspell-dicts 2019-09-05 17:33:24 +02:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Averell Dalton
5f10ab6377 rstudio: fix build 2019-08-15 11:04:25 +02:00
Averell Dalton
248041aa20 rstudio-preview: remove package 2019-04-14 20:47:28 +02:00
Averell Dalton
7a59ec3982 rstudio: 1.1.463 -> 1.2.1335 2019-04-14 20:47:28 +02:00
Averell Dalton
98fb0ab430 rstudio-preview: update to current 2019-01-21 00:41:58 +01:00
Averell Dalton
23461f33eb rstudio(-preview): fix build 2019-01-21 00:41:58 +01:00
Averell Dalton
c93caa5a67 rstudio-preview: init at f33fb2b2 2018-11-03 19:09:58 +01:00
Averell Dalton
34a5a43890 rstudio: 1.1.456 -> 1.1.463 2018-10-27 23:57:53 +02:00
Simon Lackerbauer
3f61866ea6 rstudio: 1.1.442 -> 1.1.456 (#45781) 2018-08-30 16:56:04 +02:00
Simon Lackerbauer
0743c349ce
rstudio: 1.1.423 -> 1.1.442 2018-04-17 23:24:49 +02:00
mingchuan
5e31eaea9d
rstudio: 1.1.414 -> 1.1.423
Also fixes the version number displayed in GUI.
2018-02-08 01:30:45 +08:00
mingchuan
fb2a43f8ad
rstudio: 1.1.383 -> 1.1.414 2018-01-15 22:12:55 +08:00
Samuel Dionne-Riel
7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
mingchuan
00e1a22348 rstudio: fix build 2017-11-10 07:00:47 +08:00
Nikolay Amiantov
e2a7f508fc rstudio: enable parallel building
Also cleanup inputs.
2017-10-17 03:40:11 +03:00
Nikolay Amiantov
b1736511ce boost: make 1.65 the default 2017-10-17 03:40:11 +03:00
Simon Lackerbauer
bb94e0408f rstudio: 1.1.351 -> 1.1.383 2017-10-16 02:38:26 +02:00
Simon Lackerbauer
40cbf90861 rstudio: 1.1.216 -> 1.1.351 2017-08-31 20:09:41 +02:00
mingchuan
fecc1f8b70 rstudio: fix build 2017-08-20 17:35:33 +08:00
Thomas Tuegel
210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05: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
Changlin Li
d6f602c247 RStudio: 0.98.110 -> 1.1.216
This fixes incompatibilities introduced by a new R version in
d16c38a260

It also fixes #25315 as a result.
2017-04-30 05:47:33 -04: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
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
Emery Hemingway
2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00
mucaho
d0d953d910 rstudio: add run-time dependency gnumake
fixes #9163.
2015-10-25 16:18:21 +01:00
Peter Simons
9ce41e3fa0 rstudio: fix Emacs syntax highlighting 2015-03-25 19:34:45 +01:00