Commit Graph

3427 Commits

Author SHA1 Message Date
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Michael Raskin
238cb743bc scons: 2.4.1 -> 2.5.0 2016-04-13 14:47:04 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Tuomas Tynkkynen
ba59be833b sunxi-tools: Don't build on darwin
http://hydra.nixos.org/build/34390183/nixlog/1/raw

While at it, use fetchFromGitHub.
2016-04-13 04:06:15 +03:00
Tim Steinbach
7c2deb94bf chromedriver: 2.14 -> 2.21 2016-04-12 11:07:56 -04:00
zimbatm
c8484b95be Merge pull request #14600 from nckx/update/gup
Update gup and rename gfxmonk -> timbertson
2016-04-12 12:08:43 +01:00
Peter Simons
4fe298f248 Merge pull request #14603 from obadz/haste-fix
haskellPackages.haste-compiler: fix build issue in #14581
2016-04-12 10:01:27 +02:00
Franz Pletz
ef37c57e4e dfu-util: 0.8 -> 0.9 2016-04-12 04:28:50 +02:00
obadz
c3860bf008 haskellPackages.haste-compiler: fix build issue in #14581 2016-04-11 17:21:18 +01:00
Tobias Geerinckx-Rice
57ef1712e3
Substite new GitHub username ‘timbertson’ for ‘gfxmonk’ 2016-04-11 16:35:18 +02:00
obadz
7f2163fc97 haskellPackages.haste-compiler: fix so that it now builds and runs
Required adding:
haskellPackages.haste-Cabal, and
haskellPackages.haste-cabal-install
2016-04-11 15:24:56 +01:00
Tobias Geerinckx-Rice
613cef6240
gup: 0.5.4 -> 0.5.5; use fetchFromGitHub 2016-04-11 16:21:12 +02:00
obadz
e8b3532d26 xqilla: init at 2.3.3 2016-04-11 13:57:19 +01: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
0f5dff43b7 doxygen: fix finding libiconv after #13856
The changed the build system to cmake, and it somehow won't find the
includes. I'm lazy to investigate details ATM.
2016-04-08 13:49:26 +02:00
joachifm
df3a139dc4 Merge pull request #14439 from zimbatm/travis-1.8.2
travis: init at 1.8.2
2016-04-08 00:39:51 +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
Peter Simons
3110ba445f cabal2nix: update to version 20160406 2016-04-07 07:53:57 +02:00
Domen Kožar
b77df197f5 phantomjs2: 2.0.0 -> 2.1.1 (fix build)
(cherry picked from commit 94036474c2b424ac19c4e8e30b5b026210649789)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-04-06 12:30:06 +01:00
Tuomas Tynkkynen
6b42f9f4be Merge commit 'bde820' from staging
http://hydra.nixos.org/eval/1252653 - only ~9400 packages to go at the
time of writing this.
2016-04-06 01:18:28 +03:00
Tim Steinbach
54d93ab15a liquibase: init at 3.4.2 2016-04-05 10:44:24 -04:00
zimbatm
dd0994e919 travis: init at 1.8.2 2016-04-04 14:24:45 +01:00
joachifm
a703bd49a9 Merge pull request #14418 from mucaho/vscode
Add visual studio code editor
2016-04-03 19:07:08 +00:00
mucaho
7b06260c1c electron: make it compatible with vscode
Use patchelf instead of wrapProgram to inject lookup path of shared
libraries.
Allow the nix expression to be called with optional version argument.
2016-04-03 16:04:46 +01:00
joachifm
8c6f5ecf8f Merge pull request #14259 from anderspapitto/master
distcc: add libiberty as a buildInput
2016-04-02 23:10:27 +00:00
Anders Papitto
c8865465cc distcc: add libiberty as a buildInput 2016-04-02 13:56:55 -07:00
Eric Bailey
b11d8590d0 rebar3-nix-bootstrap: correct homepage URL
s/erl-nix/erlang-nix/
2016-04-02 15:45:06 -05:00
Aaron Son
bbfad5111a gradle: Fix gradle-2.12 on Linux to find libstdc++.so reference in native library. 2016-04-01 14:33:23 -07:00
Mathias Schreck
5c21ca886e galen: 2.2.3 -> 2.2.4 2016-04-01 12:51:17 +02: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
Nikolay Amiantov
5199176b65 Merge branch 'master' into staging 2016-03-31 15:46:52 +03:00
Domen Kožar
253af9a0a4 Merge pull request #14319 from grahamc/jenkins
jenkins: copy .war to $out, fixes #14137
2016-03-30 18:19:07 +01:00
Graham Christensen
0b8dd57694 jenkins: copy .war to $out, fixes #14137 2016-03-30 11:47:05 -05:00
Luca Bruno
18918507f2 oprofile: depend on libiberty_static 2016-03-30 17:51:20 +02:00
Vladimír Čunát
a26357eefe Merge recent staging (with binaries on Hydra) 2016-03-30 10:41:02 +02:00
Evgeny Egorochkin
5982591afc binutils: cherry-pick a patch from master; this fixes build failure for akonadi; see https://sourceware.org/bugzilla/show_bug.cgi?id=19698 2016-03-29 22:46:22 +03:00
Pascal Wittmann
0ca288abc8 global: 6.5.3 -> 6.5.4 2016-03-29 21:29:26 +02:00
Vladimír Čunát
117183e27e intltool: fix problems with perl-5.22
http://hydra.nixos.org/build/33608086/nixlog/1/raw
2016-03-29 11:12:42 +02:00
Anthony Cowley
8db6998a0a doxygen: fix on darwin
This avoids an issue where an old OS X SDK is assumed, leading to a
linker error of the form:

Undefined symbols: __Unwind_Resume
2016-03-28 18:19:41 -04:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Nikolay Amiantov
ef06c7db8f spin: add ispin with tools 2016-03-26 17:05:29 +03:00
Nikolay Amiantov
f273dd226c swarm: init at 3.1 2016-03-26 17:04:41 +03:00
Pascal Wittmann
54e1628b19 checkstyle: 6.16.1 -> 6.17 2016-03-25 17:22:11 +01:00
Pascal Wittmann
d02f35956b gtk-doc: 1.24 -> 1.25 2016-03-24 00:07:40 +01:00
Pascal Wittmann
d05540b683 global: 6.5.2 -> 6.5.3 2016-03-24 00:07:40 +01:00
Domen Kožar
b7f50b493c flow: 0.18.1 -> 0.22.1
(cherry picked from commit 15761b0520383a816d250b4301982e9d088be14b)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-22 21:22:15 +00:00
Nikolay Amiantov
ad1f158111 Merge pull request #14088 from jgillich/rust-head
Rust updates
2016-03-23 00:10:07 +04:00
Jakob Gillich
02b20eecc2 rustfmt: 2016-02-15 -> 2016-03-22 2016-03-22 17:33:06 +01:00
Pascal Wittmann
891fd356d7 avarice: fix build by using gcc49
See #13559
2016-03-22 16:44:31 +01:00
Jakob Gillich
a9326f6f34 cargoMaster: 2016-02-25 -> 2016-03-22 2016-03-22 13:16:56 +01:00