Tuomas Tynkkynen
4ff8f377af
Merge remote-tracking branch 'upstream/master' into staging
2016-04-28 00:13:53 +03:00
Tuomas Tynkkynen
ca0e724266
otter: Mark broken
...
Build hangs an hits the hydra time limit:
http://hydra.nixos.org/build/34897110
2016-04-27 03:24:04 +03:00
Edward Tjörnhammar
f027aa2059
jonprl: corrected sha change
2016-04-26 22:23:37 +02:00
Frederik Rietdijk
d5e6a4494a
Python: use PyPI mirror ( #15001 )
...
* mirrors: add pypi
* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Dmitry Kalinkin
088601cb51
root: fix chrooted build, workaround 491f7f017c
(cmake: set LIBDIR and INCLUDEDIR for multiple outputs)
2016-04-25 17:38:19 -04:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Vladimír Čunát
e9379f7416
Merge branch 'staging'
...
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Vincent Laporte
71e0ce571b
csdp: fix build on Darwin
...
When the `INSTALL` file is present, `make` claims that the `install`
target is up-to-date.
2016-04-22 11:53:43 +02:00
Nikolay Amiantov
fb2c651647
qgroundcontrol: move to qmakeHook
...
This reverts commit 11294eaf16
.
2016-04-20 18:55:48 +03:00
Nikolay Amiantov
0b88755d37
fritzing: move to qmakeHook
...
This reverts commit 81fc546df3
.
2016-04-20 18:55:47 +03: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
aszlig
11294eaf16
qgroundcontrol: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qgroundcontrol
override the whole configurePhase, so this hook isn't run at all.
Instead of using pushd/popd, I'm making it a bit more readable by just
spawning a subshell with the right working directory.
This fixes the build of qgroundcontrol and it now successfully compiles
on my machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
01900ac06e
qgroundcontrol: Drop unused preConfigure phase
...
The configurePhase is overridden here and the preConfigure hook isn't
referenced otherwise in the package, so it's basically dead code.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
81fc546df3
fritzing: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of fritzing
override the whole configurePhase, so this hook isn't run at all.
This fixes the build of fritzing and it now successfully compiles on my
machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Nikolay Amiantov
6f3e72eef6
Merge pull request #14658 from abbradar/search-path-fixes
...
Search path fixes
2016-04-14 03:08:41 +04:00
Arseniy Seroka
0420a532e9
Merge pull request #14649 from vbgl/coq_8.5.1
...
Coq 8.5pl1
2016-04-13 22:16:48 +03:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
joachifm
860aa01782
Merge pull request #14618 from moretea/update_mcrl2
...
Update mcrl2
2016-04-12 23:42:45 +02:00
Maarten Hoogendoorn
ec098aad41
mcrl2: 2009.01 -> 2014.09
2016-04-12 22:16:30 +02:00
Tuomas Tynkkynen
d7de8bc911
Merge pull request #14636 from kragniz/samtools
...
samtools: init at 1.3
2016-04-12 22:24:34 +03:00
Louis Taylor
70c1b2b1c0
samtools: init at 1.3
2016-04-12 20:13:40 +01:00
Vincent Laporte
a036fda544
coq: 8.5 -> 8.5pl1
2016-04-12 19:43:11 +02:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Damien Cassou
8f7d11e39c
Merge pull request #14468 from vbgl/why3-0.87
...
why3: 0.86.3 -> 0.87.0
2016-04-05 19:15:52 +02:00
Vincent Laporte
9dfa26d2ce
why3: 0.86.3 -> 0.87.0
2016-04-05 08:09:00 +02:00
Gabriel Ebner
e336cd003a
picosat: enable proof output and install various utils
2016-04-02 18:45:47 +02:00
Gabriel Ebner
659c240be8
picosat: 960 -> 965
2016-04-02 18:43:32 +02:00
Chris Ostrouchov
a32d5d3755
lammps: init at 2016-02-16
2016-04-01 18:37:52 -04:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
joachifm
0660ff5625
Merge pull request #14334 from ne0phyte/kicad-4.0.2
...
kicad: 2013 stable -> 4.0.2
2016-03-31 21:01:22 +00:00
Michael Raskin
011f69992a
satallax: 1.4 -> 2.7
2016-03-31 16:23:08 +02:00
ne0phyte
cce37d2164
kicad: 2013 stable -> 4.0.2
2016-03-31 15:29:39 +02:00
Michael Raskin
016d523d82
cvc4: fix the build by skipping line markers in cpp expansions during configure, helps the configure script to find Boost version
2016-03-31 01:52:33 +02:00
joachifm
532beaa2a3
Merge pull request #13913 from grwlf/torch
...
torch: add expression for Torch7 the machine-learning framework
2016-03-30 14:29:32 +00:00
Patrick Callahan
66b5055b95
gazebo: init at 6.5.1 and 7.0.0
2016-03-28 11:44:37 -07:00
Patrick Callahan
f30e40df69
qgroundcontrol: init at 2.9.4
2016-03-24 20:06:31 -07:00
Sergey Mironov
de4f541b0e
torch: add unsup package
2016-03-22 22:20:45 +03:00
Sergey Mironov
56b34be001
torch: read user PATH and LD_LIBRARY_PATH
2016-03-22 00:57:30 +03:00
Sergey Mironov
6bb8f45182
torch: image, enable JPEG and PNG support
2016-03-22 00:38:52 +03:00
Sergey Mironov
4a36a0c504
torch: unhardcode references to luajit
2016-03-21 12:53:34 +03:00
Joachim Fasting
649c2cd027
lp_solve: mark as broken
...
See https://hydra.nixos.org/build/32393768/log/raw
2016-03-19 12:46:22 +01:00
Sergey Mironov
a56b9ab5be
torch: use default luajit
2016-03-19 12:37:06 +03:00
Arseniy Seroka
1fb354d1ab
Merge pull request #14008 from bzizou/scotch
...
scotch: init at 6.0.4
2016-03-18 22:50:20 +03:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr
75af59f8eb
scotch: init at 6.0.4
2016-03-18 10:54:41 +01:00
Sergey Mironov
1b05139414
torch: Read LUA_PATH and LUA_CPATH set by users
2016-03-16 23:53:46 +03:00
Sergey Mironov
f499f61c85
torch: don't use default value for src
2016-03-16 23:53:40 +03:00
Sergey Mironov
7f3b083610
torch: init at torch-git-2016-03-08
...
Torch is a machine-learning framework written in Lua
2016-03-14 16:05:55 +03:00