Gleb Peregud
108f3cf67f
Add patch which makes rebar compilation hermetic
2015-12-15 14:05:51 +01:00
Gleb Peregud
4ba1a51b7f
Move registry to rebar3, since it needs it itself to be bootstrapped.
...
This makes rebar3 build a bit more hermetic. Next stage is to pull in
rebar3 plugins dependencies for bootstrap to pick up.
2015-12-15 14:05:19 +01:00
Gleb Peregud
033902d269
Refactor fetchHex out of buildHex.
...
This will allow to reuse this code to fetch rebar3's dependencies to
ensure it's hermetic build.
2015-12-15 14:01:38 +01:00
Gleb Peregud
bcc4ca029a
Add rebar3 package
2015-12-15 01:02:52 +01:00
Anton Fedotov
cbe786a530
ccache: create symlinks to gcc lib & include in ccache-links directory
...
This patch fixes compilation errors when using ccache wrapper:
```
cc1: error: /nix/store/19vvbsjs6l6j0r22albzhysxfvr94imf-ccache-links/lib/gcc/*/*/include-fixed: No such file or directory
```
2015-12-14 12:15:22 +03:00
Lancelot SIX
5aa99f680e
pkgs.gdb: 7.10 -> 7.10.1
...
See https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00003.html
2015-12-12 14:54:25 +01:00
Pascal Wittmann
e0a7c3a54b
intel-gpu-tools: 1.12 -> 1.13
2015-12-12 12:05:19 +01:00
Pascal Wittmann
42c7004d33
checkstyle: 6.12.1 -> 6.13
2015-12-12 12:05:19 +01:00
Pavan Rikhi
2de85bd7e5
sassc: v3.2.4 -> v3.3.2
2015-12-10 17:27:46 -05:00
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
Pascal Wittmann
f38170b40c
Merge pull request #10960 from dochang/gradle
...
gradle: 2.6 -> 2.8
2015-11-11 12:11:55 +01:00
Domen Kožar
fba69ef35a
Merge pull request #10940 from msteen/flow
...
flow: added Linux support
2015-11-11 12:03:32 +01:00
Desmond O. Chang
b9c11de2a8
gradle: 2.6 -> 2.8
2015-11-11 16:45:19 +08:00
Pascal Wittmann
d8c5f4dd56
Merge pull request #10655 from spacefrogg/dialog
...
dialog: updated to 1.2.20150920
2015-11-10 17:25:49 +01:00
Matthijs Steen
67c4c5fd16
flow: added Linux support
...
Changed the build inputs to only include the additional Darwin inputs when building for Darwin.
2015-11-10 16:23:20 +01:00
Michael Raitza
01038feea0
dialog: 1.2-20150225 -> 1.2.20150920
2015-11-10 13:27:48 +00:00
Edward Tjörnhammar
38ca909811
maven: 3.2.5 -> 3.3.3
2015-11-10 08:46:14 +01:00
Chris Martin
d03cee22c4
parse: init at 3.0.1
2015-11-09 04:22:34 -05:00
William Roe
3c8f2fc9a7
exercism: migrate to go-packages, 1.9.2 -> 2.2.1
2015-11-09 01:17:57 +00:00
William A. Kennington III
a26c8e9b83
Merge branch 'master.upstream' into staging.upstream
2015-11-07 15:51:51 -08:00
Domen Kožar
4f44172f49
Merge pull request #10855 from ryanartecona/jq-oniguruma
...
jq: build with oniguruma for regex support
2015-11-07 20:01:19 +01:00
Ryan Artecona
76e99d76ce
jq: build with oniguruma for regex support
2015-11-07 13:54:45 -05:00
Aristid Breitkreuz
c35e349409
rename make->gnustep-make to avoid people installing it accidentally
2015-11-07 16:08:17 +01:00
Pascal Wittmann
fcb4627695
Merge pull request #9980 from wavewave/gradle25
...
add gradle 2.5.
2015-11-06 17:17:28 +01:00
Ian-Woo Kim
3d5f95d61b
gradle: reinit at 2.5.
...
For some projects (especially using android ndk), we still need to keep 2.5.
2015-11-06 07:31:58 -08:00
William A. Kennington III
2837a5e091
Merge branch 'master.upstream' into staging.upstream
2015-11-05 10:07:28 -08:00
Nicolas B. Pierron
13a379cfa2
Merge pull request #10672 from wizeman/u/upd-rr
...
rr: 3.0.0 -> 4.0.0
2015-11-05 14:21:25 +00:00
Eelco Dolstra
3e44182487
Merge remote-tracking branch 'origin/systemd-219' into staging
2015-11-04 15:37:28 +01:00
William A. Kennington III
4251612faa
Merge branch 'master.upstream' into staging.upstream
2015-11-04 01:00:48 -08:00
Ricardo M. Correia
84afac6b89
cargo: 0.5.0 -> 0.6.0
2015-11-03 20:32:12 +01:00
Jude Taylor
137cadb66b
darwin purity: flow
2015-11-03 04:53:25 -08:00
Jude Taylor
135b32f2a0
darwin purity: doxygen
2015-11-02 14:37:10 -08:00
Ricardo M. Correia
2ede3e6ddd
rustfmt: 2015-10-17 -> 2015-10-28
...
... which also fixes the build.
Also, I've switched the compiler to the stable channel since rustfmt
supports it now.
2015-11-02 15:44:42 +01:00
Bjørn Forsman
eeced1bc51
jenkins: 1.633 -> 1.636
2015-11-02 10:39:16 +01:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Eelco Dolstra
81f6c62004
Merge remote-tracking branch 'origin/master' into systemd-219
2015-10-30 15:47:37 +01:00
Vincent Laporte
7cb6dbc3d0
merlin: 2.2 -> 2.3
2015-10-29 21:35:41 +01:00
Ricardo M. Correia
3136a17834
rr: 3.0.0 -> 4.0.0
2015-10-28 23:20:42 +01:00
Pascal Wittmann
36a529e566
icmake: 7.22.01 -> 7.23.02
2015-10-28 17:43:41 +01:00
Domen Kožar
8f977608f4
add sslmate: easy to buy, deploy, and manage your SSL certs
2015-10-26 12:57:27 +01:00
goibhniu
f84cbe2a70
Merge pull request #10592 from AndersonTorres/eweb
...
eweb: init at 9.10
2015-10-25 15:52:06 +01:00
goibhniu
20d530bc7d
Merge pull request #10440 from AndersonTorres/funnelweb
...
Funnelweb: init at 3.20
2015-10-25 15:51:15 +01:00
AndersonTorres
55bdc98c3d
Funnelweb: init at 3.20
2015-10-25 03:40:50 -02:00
AndersonTorres
4a3a6866fd
eweb: init at 9.10
2015-10-25 03:30:07 -02:00
Cillian de Róiste
e42e4cfbd9
Meson: tidy up, untabify
2015-10-24 12:50:15 +02:00
goibhniu
f8af597f0c
Merge pull request #10504 from brandonedens/meson-build
...
Meson build package
2015-10-24 12:40:14 +02:00
Charles Strahan
a9c3950f2d
watchman: 3.0.0 -> 4.1.0
2015-10-23 14:03:30 -04:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
goibhniu
b784494577
Merge pull request #10395 from dochang/editorconfig-core-c
...
editorconfig-core-c: init at 0.12.0
2015-10-22 23:26:26 +02:00
goibhniu
d673bf7ed3
Merge pull request #10429 from anderspapitto/master
...
rtags: init at 9fed420
2015-10-21 18:31:37 +02:00
Brandon Edens
6774b09af7
Add meson build system package.
2015-10-21 09:08:48 -07:00
Domen Kožar
156f164677
Merge pull request #10432 from lancelotsix/update_pkgs.complexity
...
pkgs.complexity: 0.4 -> 1.3
2015-10-21 11:06:23 +02:00
Anders Papitto
8af5e2ef01
rtags: init at 9fed420
2015-10-18 13:49:23 -07:00
Robin Gloster
5815b95176
flow: 0.14.0 -> 0.17.0
2015-10-18 10:22:47 +00:00
Ricardo M. Correia
ef8b078ce7
rustfmt: 2015-09-23 -> 2015-10-17
...
Also convert from fetchgit to fetchFromGitHub.
2015-10-18 04:12:11 +02:00
Lancelot SIX
f4c250f76f
pkgs.complexity: 0.4 -> 1.3
...
See https://lists.gnu.org/archive/html/info-gnu/2015-10/msg00004.html
for announcement
2015-10-17 10:22:12 +02:00
Pascal Wittmann
280621778a
Merge pull request #10403 from rehno-lindeque/heroku-3.42.20
...
heroku: 3.32.0 -> 3.42.20
2015-10-15 22:22:37 +02:00
Rehno Lindeque
bbfae3c013
heroku: 3.32.0 -> 3.42.20
2015-10-15 20:03:07 +00:00
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Desmond O. Chang
739724b4b0
editorconfig-core-c: init at 0.12.0
2015-10-15 08:26:55 +08:00
Utku Demir
57ad847982
jenkins: 1.631 -> 1.633
2015-10-14 21:21:12 +03:00
Vincent Laporte
37d731790b
ocp-index: requires OCaml >= 4
2015-10-14 19:27:33 +02:00
Vincent Laporte
92e2e18fbb
ocaml-ocp-indent: 1.4.2b -> 1.5.2
2015-10-14 19:26:38 +02:00
Vincent Laporte
621b66c3df
js_of_ocaml: fix for OCaml < 4.0
2015-10-14 19:25:58 +02:00
Timofei Kushnir
43c906ea0b
oprofile: 1.0.0 -> 1.1.0
2015-10-13 13:27:50 +03:00
Peter Simons
35059e73ff
Merge pull request #10346 from tk-ecotelecom/develop
...
oprofile: depend on kernel headers to correctly compile 'operf' util.
2015-10-13 11:12:55 +02:00
Peter Simons
1f172c6e7b
Merge pull request #10339 from AndersonTorres/nuweb
...
Nuweb: init at 1.58
2015-10-13 01:07:57 +02:00
AndersonTorres
da77f21e5f
Nuweb: init at 1.58
2015-10-12 18:39:17 -03:00
Michael Raskin
7671360e91
Force SLimerJS Gecko compatibility even higher
2015-10-13 00:21:44 +03:00
Edward Tjörnhammar
c10caef1a2
Merge pull request #10062 from gebner/sbt-loader-package
...
sbt: use sbt-launcher-package.
2015-10-12 23:02:58 +02:00
Timofei Kushnir
aefa4a181f
oprofile: depend on kernel headers to correctly compile 'operf' util.
2015-10-12 17:50:13 +03:00
Timofei Kushnir
d7eb1dd8d0
oprofile: depend on kernel headers to correctly compile 'operf' util.
2015-10-12 15:02:01 +03:00
Timofei Kushnir
6ea8f649e6
Create kernel headers dependency to correctly compile 'operf' util.
2015-10-12 13:05:04 +03:00
Tobias Geerinckx-Rice
e8ca6b7a62
ccache 3.2.3 -> 3.2.4
...
Bug fixes:
- Fixed build error related to zlib on systems with older make versions
(regression in ccache 3.2.3).
- Made conversion-to-bool explicit to avoid build warnings (and potential
runtime errors) on legacy systems.
- Improved signal handling: Kill compiler on SIGTERM; wait for compiler to
exit before exiting; die appropriately.
- Minor fixes related to Windows support.
- The correct compression level is now used if compression is requested.
- Fixed a bug where cache cleanup could be run too early for caches larger
than 64 GiB on 32-bit systems.
2015-10-09 21:59:51 +02:00
Casey Ransom
8b8f87cf21
jq: 1.4 -> 1.5
2015-10-08 17:13:32 -04:00
Domen Kožar
b4603f8275
Merge pull request #10137 from davidak/kibana-fix-url
...
kibana: fix url and hash
2015-10-08 12:23:30 +02:00
Pascal Wittmann
9d37d4cc9d
checkstyle: 6.10.1 -> 6.11.2
2015-10-06 13:13:57 +02:00
Vincent Laporte
de84782ded
ocaml-deriving: drop legacy package
2015-10-03 08:26:42 +02:00
Eelco Dolstra
b23038dd80
Merge remote-tracking branch 'origin/master' into systemd-219
2015-10-01 14:17:46 +02:00
William A. Kennington III
e7bb9e1023
Merge branch 'master.upstream' into staging.upstream
2015-09-30 13:26:04 -07:00
Bjørn Forsman
f35de8ea64
jenkins: 1.594 -> 1.631
2015-09-30 17:25:39 +02:00
William A. Kennington III
5c7ba8c971
pkgconfig: 0.28 -> 0.29
2015-09-29 16:12:06 -07:00
William A. Kennington III
271972de0a
Merge branch 'master.upstream' into staging.upstream
2015-09-29 15:54:33 -07:00
David Kleuker
a2e6d9a4da
kibana: fix url and hash
2015-09-29 20:17:22 +02:00
vbgl
b02c07641b
Merge pull request #10014 from vbgl/camlp5-6.13
...
camlp5: 6.12 → 6.14
2015-09-29 19:43:15 +02:00
Jude Taylor
48a791d270
darwin purity: doxygen
2015-09-28 18:32:41 -07:00
Tobias Geerinckx-Rice
8ce79e0ef0
d-feet: remove unused arguments
2015-09-29 03:21:34 +02:00
Edward Tjörnhammar
c351c22db5
ihaskell: make sure the wrapped binaries pick up the python path
2015-09-28 21:26:17 +02:00
Eelco Dolstra
5b52b3589c
valgrind: Update to 3.11.0
2015-09-28 15:52:31 +02:00
Thomas Tuegel
2e0589b4ca
kde414: build with kdelibs-4.14.12
...
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Lancelot SIX
a4158cbe94
autoconf-archive: 2015.02.24 -> 2015.09.25
...
See https://lists.gnu.org/archive/html/info-gnu/2015-09/msg00007.html
for announcement
2015-09-27 08:41:01 +00:00
Bjørn Forsman
3f27be8e5d
dbench: move loadfiles from $out/share/ to $out/share/loadfiles/
...
Seems cleaner.
Hm, there are also loadfiles in $out/share/doc/dbench/loadfiles/
(installed by the upstream build system), but there is no iscsi/
directory in there.
2015-09-26 15:26:17 +02:00
Bjørn Forsman
dc06278641
dbench: expression clean-up
...
Whitespace, ordering, add meta attributes.
2015-09-26 15:08:50 +02:00
Bjørn Forsman
8e7ce3de00
dbench: 20101121 -> 2013-01-01 (latest)
...
This fixes the build (the old version has wrong hash now).
2015-09-26 15:01:39 +02:00
Gabriel Ebner
98be4ed5e8
sbt: use sbt-launcher-package.
2015-09-25 16:54:35 +02:00
Robin Gloster
4ed66c9f02
rustfmt: fix build
...
rustfmt now needs to have llvm in its buildInputs since rust does not bundle it
and rustfmt needs to link to it.
2015-09-24 09:00:55 +00:00
Robin Gloster
2d3537fbf2
racer: git-2015-05-18 -> 1.0.0
2015-09-24 08:58:43 +00:00
William A. Kennington III
d5395b0506
Merge pull request #10024 from mayflower/update-rust
...
Update rust and dependants
2015-09-23 22:43:25 -07:00
William A. Kennington III
5cfe893cc4
Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
...
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Robin Gloster
760be9cf70
rustfmt: git-2015-09-05 -> git-2015-09-23
2015-09-23 21:16:16 +00:00
Robin Gloster
feda2925f7
cargo: 0.3.0 -> 0.5.0
2015-09-23 21:16:16 +00:00