MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
81341 commits 253 branches 124 tags 5.9 GiB
Commit graph

824 commits

Author SHA1 Message Date
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
Nicolas B. Pierron
72c6f8a140 Ensure that we can evaluate the platform attribute of ocaml packages. 2016-03-13 19:08:26 +00:00
Thomas Tuegel
3ef7671cea ncurses: combine $lib and $out outputs 
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
 2016-03-08 11:35:24 -06:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Peter Simons
288d01fe2b stellarium: update to 0.14.2 
This patch also fixes https://github.com/NixOS/nixpkgs/issues/13582.
 2016-03-04 23:05:48 +01:00
Vincent Laporte
014a30da93 why3: 0.86.2 -> 0.86.3 
And merge with ocamlPackages.why3
(the OCaml library would not work correctly if packaged separately).
 2016-03-04 09:29:10 +01:00
Arseniy Seroka
0aac2960fc Merge pull request #13639 from bzizou/gromacs 
gromacs: 4.6.5 -> 4.6.7 + MPI support
 2016-03-03 23:29:32 +03:00
Vincent Laporte
c2a2c2ecd4 ltl2ba: fix build on darwin 2016-03-03 10:24:13 +01:00
Frederik Rietdijk
1d1b0a8ab8 Merge pull request #13510 from lancelotsix/relocate_motu_client 
pkgs.motuclient: move application away from pythonPackages
 2016-03-02 08:02:53 -05:00
Lluís Batlle i Rossell
a95e65b1eb gtkwave: update to 3.3.70 2016-03-02 12:42:20 +01:00
Lancelot SIX
8f4a7d6c4c pkgs.motuclient: move application away from pythonPackages 2016-03-02 09:41:02 +01:00
Vincent Laporte
694a5ba291 eprover: fix build on Darwin 2016-02-29 15:35:40 +01:00
zimbatm
17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00