mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 17:41:12 +00:00
Code Issues Wiki Activity
83460 commits 267 branches 125 tags 5.3 GiB
Commit graph

850 commits

Author SHA1 Message Date
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Bjørn Forsman 300e495101 sigrok: update whole suite to latest (2016-01) 
Release announcement, 2016-01-30:
https://www.sigrok.org/blog/major-sigrok-releases-libsigrok-libsigrokdecode-sigrok-cli-pulseview

I first tried updating the projects in separate commits. But later I
found cyclic dependencies, that would break git bisect, so I ended up
squashing the commits:

* libsigrok: 0.3.0 -> 0.4.0
  Enable building libsigrokcxx.so, the C++ bindings for libsigrok, by
  adding doxygen, glibmm and python as build deps. This is needed for
  Pulseview >= 0.3.0. Also update the firmware (sigrok-firmware-fx2lafw)
  while at it.

* libsigrokdecode: 0.3.0 -> 0.4.0

* sigrok-cli: 0.5.0 -> 0.6.0

* pulseview: 0.2.0 -> 0.3.0
  New dependency: glibmm (due to libsigrokcxx.pc from libsigrok).

Note that collectd is incompatible with the new libsigrok release, so
I let it use the old one (0.3.0).
 2016-05-11 22:23:29 +02:00
Eelco Dolstra 7ce5d43c63 Fix some URLs that lacked a URI scheme 2016-05-09 19:35:05 +02:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Gabriel Ebner 516f331227 minisat: migrate from builderDefsPackage to mkDerivation 2016-05-08 15:32:58 +02:00
Gabriel Ebner 3f19d757cb veriT: disable broken static linking 2016-05-08 15:11:29 +02:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Joachim Fasting 35efc53274 Merge pull request #15214 from taku0/lp_solve_isnan 
lp_solve: fixed build error due to defining isnan
 2016-05-04 20:55:51 +02:00
taku0 f2bab58b3e lp_solve: change source URL to mirror 2016-05-04 22:17:56 +09:00
taku0 3fa49d5ac4 lp_solve: updated description 2016-05-04 22:03:22 +09:00
taku0 725c85c720 lp_solve: fixed build error due to defining isnan 2016-05-04 19:58:05 +09:00
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
Vincent Laporte 60a7c607d1 hol-light: fix build with camlp5-6.16 2016-05-01 16:10:09 +02:00
Nikolay Amiantov 87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
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