Commit Graph

117 Commits

Author SHA1 Message Date
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Bjørn Forsman
22321f2e58 cudatoolkit: don't move $out/include to $out/usr_include
This effectively reverts 86c283824f
("If cuda headers are presented to nix [...]") and all the following
workarounds that was added due to that commit.

As far as I can tell[1] this hack isn't needed anymore. And moving
includes to $out/usr_include causes pain for cudatoolkit users, so
better get rid of it.

In patches that did more than the $out/usr_include workaround, I only
changed the line back to $out/include instead of re-generating the
patches and fully removing the changed line.

[1]: I build tested blender and caffe, and temporarily added
recurseIntoAttrs to rPackages and haskellPackages so that nox-review
could get proper coverage. However, many of the packages do not build
even before this patch. I also built CUDA samples with cudatoolkit7
that ran fine.
2015-09-10 10:35:40 +02:00
Peter Simons
5d1bcf2f4e R: fix Hydra build & evaluation errors 2015-08-06 20:13:50 +02:00
Peter Simons
36fc26c0fc R: regenerate CRAN and BIOC packages 2015-08-06 20:13:50 +02:00
Peter Simons
7a0fa8f898 r-modules: fix evaluation errors 2015-08-06 20:13:49 +02:00
Michel Kuhlmann
18cff91fb7 R: regenerate CRAN and BIOC packages
Closes https://github.com/NixOS/nixpkgs/pull/9037.
2015-08-06 20:13:49 +02:00
Peter Simons
73ad191afb r-modules: fix Hydra evaluation errors 2015-08-06 20:13:49 +02:00
Nikolay Amiantov
e3461ce259 rPackages.stringi: add ICU data tables 2015-07-28 12:33:29 +03:00
Peter Simons
b59685de83 r-stringi: fix build 2015-07-12 02:38:42 +02:00
Michel Kuhlmann
bb2b683e63 R: regenerate CRAN and BIOC packages 2015-07-09 14:52:17 +02:00
Peter Simons
bb42c215e2 R: improve support for CRAN and Bioconductor package sets
- Update the instructions for re-generating each of the package set files.
 - Provide test-evaluation.nix expression to verify that the package sets evaluates.
 - Update list of known broken packages.
2015-06-17 23:19:56 +02:00
Jeffrey David Johnson
93a742fd28 R: add support for Bioconductor packages 2015-06-17 23:19:56 +02:00
Peter Simons
362e60a5dc r-modules: fix rapportools 2015-06-16 12:48:50 +02:00
Peter Simons
21c18c4f0a r-modules: fix rapport 2015-06-16 12:48:50 +02:00
Peter Simons
ccd6988b3d r-modules: fix xml2 2015-06-16 12:48:50 +02:00
Peter Simons
8ac6350ce7 r-modules: fix pander 2015-06-16 12:48:50 +02:00
Peter Simons
9fc5317055 r-modules: fix curl 2015-06-16 12:48:50 +02:00
Peter Simons
d4c810cccd r-modules: disable broken packages to avoid Hydra evaluation errors 2015-06-16 12:48:49 +02:00
Peter Simons
b667cb6163 Merge pull request #8298 from abbradar/r-updates
R updates
2015-06-15 20:31:57 +02:00
Nikolay Amiantov
29779ae642 R: regenerate CRAN packages 2015-06-12 03:44:39 +03:00
Nikolay Amiantov
9bb5e7edbd generate-cran-packages: make executable 2015-06-12 03:44:38 +03:00
Thomas Tuegel
8245caedf1 rPackages.SamplerCompare: build with openblas 2015-06-09 11:47:40 -05:00
Thomas Tuegel
58754130cc rPackages.slfm: build with openblas 2015-06-09 11:47:26 -05:00
Thomas Tuegel
77aa1c990e rPackages.Mposterior: build with openblas 2015-06-09 11:47:12 -05:00
Thomas Tuegel
b120a737fd rPackages.BayesLogit: build with openblas 2015-06-09 11:43:00 -05:00
Peter Simons
949746f9f5 r-modules: disable broken builds 2015-05-15 13:48:38 +02:00
Peter Simons
278df52729 r-xml2: fix build 2015-05-15 13:47:27 +02:00
Peter Simons
aaa9f837a9 r-modules: fix Hydra evaluation errors 2015-05-13 11:31:39 +02:00
Michel Kuhlmann
aabee7eb46 r-modules: regenerate 2015-05-11T14:48:00+0100 2015-05-12 07:47:41 +02:00
Peter Simons
e313cd711e r-modules: disable broken builds on Hydra 2015-04-20 17:38:46 +02:00
Peter Simons
0b088ce581 r-modules: revert "disable builds that depend on broken gdal library"
This reverts commit 9e9b5e6e69. gdal has
been fixed in 1645795c53.
2015-04-19 17:52:50 +02:00
Peter Simons
9e9b5e6e69 r-modules: disable builds that depend on broken gdal library 2015-04-17 20:02:46 +02:00
Michel Kuhlmann
cc5f5f0fd3 r-modules: update from CRAN state at 2015-04-16T11:23:00+0100
Closes https://github.com/NixOS/nixpkgs/pull/7411.
2015-04-17 15:38:12 +02:00
William A. Kennington III
758319f67f One more mysql fix 2015-04-01 16:52:38 -07:00
Peter Simons
aed1895643 r-modules: remedy remaining Hydra failures 2015-03-29 00:17:55 +01:00
Peter Simons
f6886c62dc r-modules: disable broken builds on Hydra 2015-03-28 10:36:54 +01:00
Michel Kuhlmann
c96bc1e507 r-modules: fixing rggobi by adding initial expression for ggobi 2015-03-26 12:20:07 +01:00
Peter Simons
5238bfb73f r-modules: fix evaluation errors 2015-03-21 23:33:50 +01:00
Peter Simons
701251e435 r-modules: update from CRAN state at 2015-03-21T20:01:16+0100) 2015-03-21 23:33:50 +01:00
Joachim Fasting
0e52c562b5 RAppArmor: use AppArmor 2.9 2015-03-19 14:14:28 +01:00
Peter Simons
d388855731 r-SID: mark broken 2015-03-09 21:14:00 +01:00
Peter Simons
e8b33876af r-Cell: drop obsolete package 2015-03-09 16:43:37 +01:00
Peter Simons
a591dbac3b r-modules: update from CRAN state at 2015-03-09T16:32:24+0100 2015-03-09 16:37:05 +01:00
Peter Simons
eaf728c3d3 r-modules: fix git2r, TAQMNGR, and WhopGenome 2015-03-06 11:21:21 +01:00
Peter Simons
030bd26af3 r-modules: mark daff and rjade broken 2015-03-04 12:51:43 +01:00
Adam Vogt
2397f96d92 CRAN MASS_7.3-39 was uploaded twice, so use the newer checksum
The two dates are:

Packaged: 2015-02-20 08:29:38 UTC; ripley
Packaged: 2015-02-24 10:34:20 UTC; ripley

There were with changes to tests/Examples/MASS-Ex.Rout.save,
but the rest of the code seems unaffected.
2015-02-26 19:16:55 -05:00
Adam Vogt
5adab4cbc9 remove some packages marked broken for cran-packages.nix
those packages were removed from cran (and cran-packages.nix)
2015-02-26 16:17:15 -05:00
Adam Vogt
f8d0a412d6 update cran packages 2015-02-25 17:50:42 -05:00
Adam Vogt
8365753a43 let generate-cran-packages.R read checksums from cran-packages.nix
this lets "Rscript generate-cran-packages.R > cran-packages.nix"
complete much quicker, because we only have to download packages
with new versions.
2015-02-25 17:43:43 -05:00