Commit Graph

107 Commits

Author SHA1 Message Date
Jörg Thalheim
ea706bd98b Merge pull request #25231 from veprbl/root_6.09.02
root: 6.08.02 -> 6.09.02
2017-05-20 17:37:43 +01:00
Matthew Daiter
093130f802 openmvs: init at current master (#25672)
* openmvs: init at current master

* openmvs: simplify expression

* openmvs: init at unstable-2017-05-01
2017-05-12 20:07:11 +01:00
mdaiter
fdd28b6fe0
openmvg: clarify Git version
fixes #25615
2017-05-09 09:39:41 +01:00
Frederik Rietdijk
183cada05a Merge pull request #25590 from mimadrid/update/cytoscape-3.5.1
cytoscape: 3.4.0 -> 3.5.1
2017-05-09 10:03:20 +02:00
mimadrid
0ed5b1c867
cytoscape: 3.4.0 -> 3.5.1 2017-05-07 23:05:59 +02:00
Matthew Daiter
c6385eb0f5 openmvg: init at v1.1 2017-05-05 15:51:32 +02:00
Dmitry Kalinkin
be9c0e8b7e
root: 6.08.02 -> 6.09.02
This also fixes breakage on darwin due to LLVM4.0 migration.

I had to enable opengl because otherwise macOS build is broken.
See root commit 23f8871c7 ('Do not include OpenGL directly but use our
TGLIncludes for that purpose.')

I've enabled xml because TUnfold depends on it.
2017-04-26 16:34:14 -04:00
Vladimír Čunát
9fc61d0db5
simgrid: fixup sandboxed build after update #24915 2017-04-16 14:15:32 +02:00
Sophia Gold
76b8ce3023 simgrid: 3.11.1 -> 3.15 2017-04-15 08:22:02 +02:00
Michael Raskin
47183c813e golly-beta: init at 2.9b2 to test GL issues 2017-03-22 17:02:55 +01:00
Ricardo Ardissone
e17d3d4ef1 gplates: use boost 160
update 161 changed reference parameters for optional
https://hydra.nixos.org/build/49707856/nixlog/1
http://www.boost.org/doc/libs/1_61_0/libs/optional/doc/html/boost_ooptional/relnotes.html
2017-03-08 13:04:34 +02:00
Robin Gloster
bb9a37a2a5
ikarus: remove
unmaintained, only works on 32 bit
2017-03-03 13:43:04 +01:00
Benno Fünfstück
253d736398 boinc: fix location of /etc in $out
Looks like the latest version no longer requires the patch, and the patch instead resulted in
/etc files being installed to `$out/$out/etc` instead of `$out/etc`
2017-03-03 12:58:43 +01:00
Robin Gloster
c1866cade9
libsForQt5.qmltermwidget: fix build 2017-03-02 14:13:35 +01:00
Katona László
085502dd80 cytoscape: fixed issue with startup script 2017-03-01 21:46:49 +01:00
Frederik Rietdijk
2832472da0 golly: use python2 2017-02-10 09:35:10 +01:00
Daiderd Jordan
5a67b130b9
Merge branch 'master' into staging 2017-01-02 00:54:17 +01:00
Dmitry Kalinkin
c7bcb99ff2
root: 6.04.18 -> 6.08.02
This relies on
e9d60c56 ('libc++3.7: fix to use with modern compilers')
2017-01-01 17:52:03 -05:00
Pascal Wittmann
039e90c9d3
fityk: 1.3.0 -> 1.3.1 2017-01-01 18:19:39 +01:00
Ricardo Ardissone
662aa495df gplates: init at 2.0.0 2016-12-16 22:29:53 -02:00
Dmitry Kalinkin
9434ec5441
root: fix environment setup
1) s/envHook/postHook/
2) patch to not set $p that fixes nested ```nix-shell -p root``` calls
2016-10-29 14:47:32 -04:00
Vladimír Čunát
4328629bf8 treewide: fix meta evaluation
There is no `stdenv.maintainers`. /cc @veprbl.
2016-10-22 12:05:23 +02:00
Dmitry Kalinkin
ef96b48659
root: s/python/python2/ 2016-10-21 15:47:38 -04:00
Dmitry Kalinkin
59a8aff8e6
root: add veprbl to maintainers 2016-10-21 13:30:30 -04:00
Joachim F
e22dd2f6c5 Merge pull request #18740 from chris-martin/tulip-4-9
Tulip: 4.1.0 -> 4.9.0
2016-09-20 14:34:17 +02:00
Chris Martin
08e5949235 tulip: 4.1.0 -> 4.9.0 2016-09-18 15:24:29 -04:00
Dmitry Kalinkin
7b9deaba81 root: add setup-hook 2016-09-18 04:45:18 -04:00
Nikolay Amiantov
4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Dmitry Kalinkin
5646c2aba6 root: add support for x86_64-darwin
1) add pcre dependency (for some reason builtin_pcre doesn't work)
2) Disable dependencies that are currently not supported by the
expression.  Most users should not need those. These are disabled to
prevent cmake from picking them up from system and causing impurities.
Once there is a user who needs these they will have to update the
expression.
3) disable some OSX detection code that relies on /usr/bin/sw_vers
that chooses c++ library, silences warnings and sets macosx-version-min.
macosx-version-min is already set by nix using MACOSX_DEPLOYMENT_TARGET
environment variable.
2016-09-11 17:29:13 -04:00
Domen Kožar
9e363a752f openmodelica: enable parallel building
(cherry picked from commit 261d51971a352cbcdc8d70dc74f8971ac202a43d)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-05 18:06:28 +02:00
Tuomas Tynkkynen
b87a2245b1 root: Fix libc dev reference 2016-08-31 12:54:28 +03:00
Robin Gloster
9f80e55428
openmodelica: disable format hardening 2016-08-27 21:54:17 +00:00
Michael Raskin
14736fcf4c openmodelica: fix libgfortran.so search 2016-08-20 21:52:21 +02:00
Michael Raskin
d1951974df golly: 2.7 -> 2.8 2016-08-11 17:57:35 +02:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Dmitry Kalinkin
4449ecb617 root: 6.04.16 -> 6.04.18 (#17265)
root: compile against external gsl

Revert "Revert "root: enable parallel building""

This reverts commit ee1a10ee6b4b0a1a22e3e0dbbcf96a2d667d0685.

ROOT has no problems with parallel build. The problems that caused the
original commit were not related to parallel building.
2016-07-30 01:41:37 +01:00
Ta'iř sj Ořit
3832ebde8b gephi: init at 0.9.1 (#16071) 2016-06-26 22:40:00 +02:00
mimadrid
9b7a53d9cb
cytoscape: init at 3.4.0
Closes #16197
2016-06-16 15:47:21 +02:00
Tuomas Tynkkynen
f1d83444a5 openmodelica: Use makeLibraryPath 2016-06-07 21:18:02 +03:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Vladimír Čunát
ee1a10ee6b Revert "root: enable parallel building"
This reverts commit 2991fdca52ce43218f166c706114ab294dd21b3c.
Hydra builds often report missing various files.
2016-05-26 16:27:59 +02:00
Nicolò Balzarotti
c1c0c99af3 yarp: 2.3.64 -> 2.3.65 (#15662) 2016-05-24 13:30:52 +02:00
Dmitry Kalinkin
088601cb51 root: fix chrooted build, workaround 491f7f017c4dd (cmake: set LIBDIR and INCLUDEDIR for multiple outputs) 2016-04-25 17:38:19 -04:00
Dmitry Kalinkin
f2200369e5 root: fix NixOS build, build with lzma from nix, update homepage url 2016-04-20 01:41:46 -04:00
Dmitry Kalinkin
baded4ea96 root: 5.34.15 -> 6.04.16 2016-04-17 22:59:31 -04:00
Lancelot SIX
8f4a7d6c4c pkgs.motuclient: move application away from pythonPackages 2016-03-02 09:41:02 +01:00
=
a5ed58445f yarp (+ libace): init at 2.3.64 2016-02-24 22:08:29 +01:00
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
a839a48b0a root: fix build by -lX11
The pkgconfig change didn't help, but I'd leave it in.
2015-09-01 08:23:00 +02:00