Commit graph

3107 commits

Author SHA1 Message Date
Robin Gloster
34e67f558f rustfmt: 2015-10-28 -> 2015-12-08 2015-12-10 16:23:39 +00:00
Herwig Hochleitner
58ba1d5bd3 leiningen: 2.5.2 -> 2.5.3, fixes #11537 2015-12-08 02:58:33 +01:00
Vladimír Čunát
263fd55d4b Merge recent staging built on Hydra
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Matt Whiteley
94baac8d02 chefdk: 0.4.0 -> 0.10.0 2015-12-03 13:28:26 -08:00
Arseniy Seroka
e024f7fec9 Merge pull request #11409 from FlorentBecker/kcov
kcov: fix issue #11399
2015-12-03 16:28:45 +03:00
Florent Becker
fa8586495d kcov: fix issue #11399 2015-12-02 22:20:01 +01:00
William Casarin
bc698428aa multi-ghc-travis: init at git-2015-11-04 2015-11-29 17:39:34 -08:00
Vladimír Čunát
f2ad4a47e8 cmake: remove conditional patch that no longer applies
Close #11290. The patch will no longer apply on *any* platform.
2015-11-29 08:58:39 +01:00
Vincent Laporte
6a622acc87 merlin: 2.3 -> 2.3.1 2015-11-28 10:42:08 +01:00
Nikolay Amiantov
2472e19914 Merge pull request #11278 from abbradar/gdb-guile
gdb: use system zlib, fix guile support
2015-11-27 02:09:13 +03:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Domen Kožar
67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Nikolay Amiantov
d96f7128e1 gdb: use system zlib, fix guile support 2015-11-26 16:43:44 +03:00
Pascal Wittmann
765afaec88 sslmate: make meta.maintainers a list 2015-11-25 23:06:09 +01:00
Joachim Fasting
6ccf87defe bam: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Vladimír Čunát
13eca6f79a Merge #11067: SmartOS updates
I amended some commits slightly.
2015-11-23 14:45:44 +01:00
Danny Wilson
baf7fdcb75 SmartOS: bison: make help2man target specific dependency 2015-11-23 11:42:01 +01:00
Danny Wilson
d510109c54 SmartOS: texinfo: Fix build and make configureFlags target optional. 2015-11-23 11:42:00 +01:00
Danny Wilson
1752268aed SmartOS: Fix pkgconfig 0.29 build 2015-11-23 00:01:55 +01:00
Arseniy Seroka
c89f058b4a Merge pull request #11191 from volhovM/fix/gradle-update
gradle: refactor
2015-11-22 22:40:49 +03:00
Pascal Wittmann
0773d7b576 checkstyle: 6.11.2 -> 6.12.1 2015-11-22 14:07:53 +01:00
Mikhail Volkhov
bc05b570e6 gradle: refactor 2015-11-22 12:46:10 +03:00
Aristid Breitkreuz
77e07fbbd9 add working lsof mirror 2015-11-21 23:48:41 +01:00
Domen Kožar
704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Shea Levy
db995a95ee Merge remote-tracking branch 'origin/master' into staging 2015-11-21 07:46:55 -05:00
Jude Taylor
852988348d Merge branch 'staging' of https://github.com/NixOS/nixpkgs into sandbox-profiles 2015-11-20 19:58:46 -08:00
Pascal Wittmann
815e9f5af2 help2man: 1.47.2 -> 1.47.3 2015-11-20 17:21:23 +01:00
Pascal Wittmann
35f32d0fda Merge pull request #10971 from ericbmerritt/trv-package
trv: init at 0.1.3
2015-11-20 14:26:24 +01:00
William A. Kennington III
22bf2d0bf3 flex: 2.5.39 -> 2.6.0 2015-11-18 17:50:27 -08:00
Pascal Wittmann
dd81844322 Merge pull request #11120 from vizanto/pr-boot
boot: 2.2.0 -> 2.4.2
2015-11-18 13:39:24 +01:00
Danny Wilson
1ebc5bfa21 boot: 2.2.0 -> 2.4.2 2015-11-18 11:48:04 +01:00
Pascal Wittmann
c283a3da68 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-18 11:34:09 +01:00
Ricardo M. Correia
2b694c237b cargo, cargoSnapshot: add rustc runtime dependency
It turns out that cargo implicitly depends on rustc at runtime: even
`cargo help` will fail if rustc is not in the PATH.

This means that we need to wrap the cargo binary to add rustc to PATH.
However, I have opted into doing something slightly unusual: instead of
tying down a specific cargo to use a specific rustc (i.e., wrap cargo so
that "${rustc}/bin" is prefixed into PATH), instead I'm adding the rustc
used to build cargo as a fallback rust compiler (i.e., wrap cargo so
that "${rustc}/bin" is suffixed into PATH). This means that cargo will
prefer to use a rust compiler that is in the default path, but fallback
into the one used to build cargo only if there wasn't any rust compiler
in the default path.

The reason I'm doing this is that otherwise it could cause unexpected
effects. For example, if you had a build environment with the
rustcMaster and cargo derivations, you would expect cargo to use
rustcMaster to compile your project (since rustcMaster would be the only
compiler available in $PATH), but this wouldn't happen if we tied down
cargo to use the rustc that was used to compile it (because the default
cargo derivation gets compiled with the stable rust compiler).

That said, I have slightly modified makeRustPlatform so that a rust
platform will always use the rust compiler that was used to build cargo,
because this prevents mistakenly depending on two different versions of
the rust compiler (stable and unstable) in the same rust platform,
something which is usually undesirable.

Fixes #11053
2015-11-18 02:41:45 +01:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Jaka Hudoklin
be067811ff Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4
influxdb: 0.8.3 -> 0.9.4, fix module
2015-11-17 17:18:24 +01:00
lethalman
ca186286d7 Merge pull request #10986 from teh/master
update flow + new go binary (codesearch)
2015-11-16 20:45:10 +01:00
Danny Wilson
bcc7d8add9 Texinfo requires GNU awk, mainly during make check.
This fixes build on SmartOS.
2015-11-16 17:20:16 +01:00
Danny Wilson
ee56b6aa24 Doxygen: fix build on SmartOS 2015-11-16 17:20:14 +01:00
Danny Wilson
15c676fd30 SmartOS: Make pkgconfig use proper i18n. 2015-11-16 17:20:13 +01:00
Danny Wilson
a93f883556 Fix bison build on Illumos. 2015-11-16 17:20:11 +01:00
Jaka Hudoklin
9c1943fb6f influxdb: 0.8.3 -> 0.9.4, fix module 2015-11-16 14:22:08 +01:00
Domen Kožar
4755afc385 Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)
Merge rest of the fixes from staging
2015-11-16 11:23:06 +01:00
Florent Becker
7ff5826e08 kcov : init at 29 2015-11-15 18:07:48 +01:00
William A. Kennington III
050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Bjørn Forsman
30313d5c6e jenkins: 1.637 -> 1.638 (important security fixes)
I fat fingered the previous update, *this* is the real important
security updates:

https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:40:09 +01:00
Bjørn Forsman
7a1c4ab324 jenkins: 1.636 -> 1.637 (security fixes)
https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:34:44 +01:00
Eric Merritt
be301b345f trv: init at 0.1.3
This adds the trv ocaml build tool to the system
2015-11-11 19:10:19 -08:00
Tom Hunger
14efaba4c8 flow: 0.17.0 -> 0.18.1 2015-11-11 15:28:56 +00:00
Vladimír Čunát
1e6097f00a stace: add libunwind support (fixes #10515)
I think it's not worth making such a small library optional as in the PR.
2015-11-11 15:04:47 +01:00