cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
74183 commits 1 branch 0 tags 3.7 GiB
Commit graph

3131 commits

Author SHA1 Message Date
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
Vincent Laporte
399a9da2ae camlp5: 6.12 -> 6.14 2015-09-23 19:05:02 +02:00
Peter Simons
5c1afdd5f6 cabal2nix: update to version 20150922 2015-09-23 15:08:19 +02:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup 
Frequently using multiple *almost* identical attributes is bad.
 2015-09-23 10:42:34 +02:00
Eelco Dolstra
e7631452e9 texinfo: Disable tests 
These appear to fail randomly:

  http://hydra.nixos.org/build/26194907/nixlog/325/raw
 2015-09-22 12:46:58 +02:00
Eelco Dolstra
fbaaa9cccc swig2: Enable on Darwin 2015-09-22 11:59:39 +02:00
Jaka Hudoklin
0d32d4cd84 kibana: 4.2.0 -> 4.1.2 
Kibana needs to be downgraded, so it works with current stable elasticsearch
 2015-09-22 00:30:19 +02:00
William A. Kennington III
7040350f34 swig: 3.0.6 -> 3.0.7 2015-09-21 14:38:49 -07:00
Tobias Geerinckx-Rice
ee7df6a566 dub: 0.9.23 -> 0.9.24 
Use fetchFromGitHub, and drop a seemingly spurious 'unzip' dependency
(I can find no reference to it in either the source or the resulting
binary).
 2015-09-21 19:22:14 +02:00
William A. Kennington III
3fcbd5a829 Merge branch 'master.upstream' into staging.upstream 2015-09-20 14:54:53 -07:00
William A. Kennington III
5ba050a1a3 cmake: 3.3.1 -> 3.3.2 2015-09-20 14:08:22 -07:00
William A. Kennington III
222f5454a0 Merge pull request #9892 from benley/swig3-darwin 
swig3: re-enable darwin builds
 2015-09-19 16:30:26 -07:00
William A. Kennington III
6e09223627 Merge branch 'master.upstream' into staging.upstream 2015-09-18 17:16:27 -07:00
Jaka Hudoklin
5baac1e962 kibana: 3.1.1 -> 4.2.0 2015-09-19 00:33:35 +02:00
Tobias Geerinckx-Rice
7cfa918aac lemon: init at 1.0 2015-09-18 03:46:06 +02:00
Vladimír Čunát
a418096d6a Merge branch 'master' into staging 2015-09-17 20:07:20 +02:00
Lancelot SIX
bed1eb3260 autogen: 5.18.5 -> 5.18.6 (close #9885) 
See http://lists.gnu.org/archive/html/info-gnu/2015-09/msg00006.html for
announcement
 2015-09-17 19:55:34 +02:00
Eelco Dolstra
f81982e779 gdb: Update to 7.10 2015-09-17 15:56:42 +02:00
Eelco Dolstra
e636e0a532 gdb: Look for debug info in /run/current-system/sw/lib/debug 
The previous default was $out/lib/debug, which wasn't very useful.

This ensures that you can do

  environment.systemPackages = [ pkgs.hello.debug ];

to install debug info.
 2015-09-17 15:56:37 +02:00
Benjamin Staffin
cc1af6640c swig3: re-enable darwin builds 2015-09-16 16:28:13 -04:00
Andreas Wagner
937741c9f3 teensy-loader-cli: consistent naming, version bump 2015-09-16 19:14:01 +02:00
Pascal Wittmann
c748c0fb41 global: 6.5 -> 6.5.1 2015-09-15 23:47:18 +02:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream 
This is a partial merge of staging where we have up to date binaries for
all packages.
 2015-09-15 12:16:49 -07:00
William A. Kennington III
8dc7073546 Merge branch 'master.upstream' into staging.upstream 2015-09-15 12:04:41 -07:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Peter Simons
e1bbc6f35c cabal2nix: fix version number 20180903 to 20150903 
Thanks to @drvink for pointing this out.
 2015-09-14 13:46:16 -07:00
goibhniu
529fad3fcf Merge pull request #9691 from samuelrivas/update-argyllcms 
Update argyllcms
 2015-09-14 10:01:36 +02:00
Pascal Wittmann
d65776b6a6 help2man: 1.47.1 -> 1.47.2 2015-09-12 12:07:28 +02:00
Pascal Wittmann
b7dd128a7a intel-gpu-tools: 1.11 -> 1.12 2015-09-12 11:58:57 +02:00
Peter Simons
6b682a9e37 haskell-language-nix: pull this library in from Hackage 2015-09-11 10:28:30 +02:00
Peter Simons
f6fd6defa5 haskell-nix-paths: pull the library in from Hackage now that it's been published 2015-09-11 10:28:30 +02:00
Peter Simons
10d196c7f1 sqldeveloper: update to version 4.1.1.19.59 
I also switched the build to depend on openjdk instead of Oracle's proprietary
one. I'm open to suggestions on how to determine the proper value of $JAVA_HOME
in a jdk-agnostic fashion. Right now, I just hard-coded the proper choice for
openjdk.

* pkgs/development/tools/database/sqldeveloper/default.nix:
 2015-09-10 16:47:43 +02:00
Peter Simons
1e5e17eeac haskell-nix-paths: initial version 1 2015-09-09 11:31:14 +02:00
Nikolay Amiantov
57c33c1c54 lambdabot: rework custom modules and configuration 2015-09-08 17:50:55 +03:00
Pascal Wittmann
7ed4046d90 checkstyle: 6.9 -> 6.10.1 2015-09-08 13:53:28 +02:00
Arseniy Seroka
c32727fa08 Merge pull request #9653 from gfxmonk/gup 
gup: new package
 2015-09-08 13:47:39 +03:00
Tim Cuthbertson
9dfef9ff26 gup: init at version 0.5.1 2015-09-08 20:45:20 +10:00
Arseniy Seroka
91339593be Merge pull request #9702 from ardumont/add-github-release 
[new] github-release
 2015-09-08 13:29:01 +03:00
Antoine R. Dumont
280c896a94 github-release: init at 0.6.2 2015-09-08 07:43:41 +02:00
Peter Simons
ca9158fa82 cabal2nix: fix version number 20180903 to 20150903 
Thanks to @drvink for pointing this out.
 2015-09-07 23:35:45 +02:00
Peter Simons
06a7b22985 cabal2nix: fix https://github.com/NixOS/cabal2nix/issues/203 some more 2015-09-07 17:34:59 +02:00
Peter Simons
d4f7bf9c29 cabal2nix: re-generate the build files to make sure all dependencies are listed correctly 
Fixes https://github.com/NixOS/cabal2nix/issues/203.
 2015-09-07 16:03:28 +02:00
Bjørn Forsman
afdbfd9552 grabserial: drop pythonX.Y- name prefix 
It's an application, not a library/module.
 2015-09-07 15:54:00 +02:00
Arseniy Seroka
c8904b593d Merge pull request #9677 from mayflower/init-rustfmt 
Init rustfmt
 2015-09-07 16:24:38 +03:00
Robin Gloster
7a90c8daa8 rustfmt: init at git-2015-09-05 2015-09-07 12:07:00 +00:00
Samuel Rivas
4ef2d19981 jam: add yacc as build input 
I am not sure why do I need this locally, it seems to be passing in hydra
anyway...
 2015-09-07 11:37:18 +02:00
ts468
054be41e04 Revert "ocaml-modules: fix naming: "_" -> "-"" 2015-09-06 21:15:10 +02:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style 
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
 2015-09-06 10:26:30 +02:00
Bob van der Linden
b5da2e0237 node-webkit: added nwjs 0.12.3 2015-09-05 16:01:37 +02:00
William A. Kennington III
31f5bbdaff go-repo-root: Move to go-packages 2015-09-05 00:38:42 -07:00
William A. Kennington III
7baf0e734e gotags: Move to go-packages 2015-09-05 00:27:16 -07:00
William A. Kennington III
9a5d1d85af goimports: Move to go-packages 2015-09-05 00:16:56 -07:00
William A. Kennington III
8c6088c0ce gocode: Move to go-packages 2015-09-05 00:15:02 -07:00
Peter Simons
fcb0bdbaa0 Merge pull request #9639 from k0ral/scons 
scons: 2.3.5 -> 2.3.6
 2015-09-03 21:08:32 +02:00
koral
bfe09b88fc scons: 2.3.5 -> 2.3.6 2015-09-03 17:37:56 +00:00
Peter Simons
65a415a1b2 cabal2nix: update to version 20180903 2015-09-03 17:53:24 +02:00
Daniel Brockman
06b6648770 flow: 0.13.1 -> 0.14.0, fixes #9321 2015-09-03 13:51:08 +02:00
Peter Simons
ada81b80fd cabal2nix: update to version 20150824-66-gd281a60 
This patch fixes https://github.com/NixOS/nixpkgs/issues/9599.
 2015-09-02 17:46:39 +02:00
Thomas Strobel
616aa2bdda ocaml modules: fix some CamelCase and under_scores 2015-09-02 09:14:59 +02:00
Eelco Dolstra
6cadec8906 ant: Update to 1.9.6 2015-09-01 12:00:04 +02:00
Tobias Geerinckx-Rice
cfe12c7edd yodl: Sourceforge -> (fetchFrom)GitHub 
Cosmetic tweaks; maintain.

CC@ pSub
 2015-09-01 05:42:12 +02:00
Tobias Geerinckx-Rice
687d60ec73 icmake: Sourceforge -> (fetchFrom)GitHub 
Also add myself as a maintainer.

CC@ pSub
 2015-09-01 05:28:53 +02:00
Tobias Geerinckx-Rice
f4193da388 flexc++: 2.02.00 -> 2.03.00 
Good-bye Sourceforge, hello (fetchFrom)GitHub. Please stay nice.
 2015-09-01 03:28:19 +02:00
Peter Simons
b2c3c58476 cabal2nix: add myself as a maintainer 2015-08-30 12:49:45 +02:00
Aycan iRiCAN
523cd395c7 cabal2nix: fixed sha256 hash 2015-08-30 11:47:25 +03:00
Eelco Dolstra
4e41b64511 valgrind: Separate doc output 2015-08-27 19:07:44 +02:00
Luca Bruno
c91d360cec pidginsipe: add nss and nspr (ZHF) 2015-08-27 12:29:45 +02:00
Bjørn Forsman
3c67f86211 openocd: enable support for CMSIS-DAP debuggers 
I.e., add 'hidapi' to buildInputs. Build tested.
 2015-08-26 22:06:08 +02:00
Bjørn Forsman
1a13d28151 openocd: 0.8.0 -> 0.9.0 
Build tested.
 2015-08-26 22:01:07 +02:00
Peter Simons
b106fbfb4f cabal2nix: update to version 20150824 2015-08-25 17:15:41 +02:00
Domen Kožar
e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Tobias Geerinckx-Rice
e8a55a43cf ccache: update 3.2.2 -> 3.2.3 2015-08-25 05:03:05 +02:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Thomas Tuegel
06717667cc Revert "autogen: don't write temp files outside build dir" 
This reverts commit 1ea4ea1375.
 2015-08-23 10:28:48 -05:00
Thomas Tuegel
1ea4ea1375 autogen: don't write temp files outside build dir 2015-08-23 10:26:29 -05:00
Desmond O. Chang
ef721079ca gradle: 2.2.1 -> 2.6 2015-08-23 12:07:16 +02:00
Aycan iRiCAN
afe6f05310 cabal2nix: fixed sha256 hash 
I was getting below error:
output path ‘/nix/store/i73iz0id6ap6qg1p6jaqadl053h2cgfz-cabal2nix-9f58996’ should have r:sha256 hash ‘1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d’, instead has ‘0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv’
 2015-08-22 11:04:09 +03:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Jude Taylor
65dd349574 update mysteriously varying git hashes 2015-08-21 12:00:35 -07:00
Eelco Dolstra
aba76f23a5 Revert "add Darwin's flavor of lsof" 
This reverts commit 7024b4dc62. It
breaks evaluation (possibly related to earlier reverts):

http://hydra.nixos.org/build/24887643
 2015-08-21 12:05:06 +02:00
Michael Raskin
a2b718fc80 Switch to the git version for now to get Gecko 40 compatibility 2015-08-21 09:28:23 +03:00
Eelco Dolstra
6769633b64 autogen: Fix build outside of chroot 
http://hydra.nixos.org/build/24870256
 2015-08-20 20:42:41 +02:00
William A. Kennington III
2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Jascha Geerds
50d90a2538 gtkdialog: Add missing dependency on hicolor_icon_theme (#9369) 2015-08-20 16:03:58 +02:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
William A. Kennington III
c3592084cf golint: Update to 2015-06-23 2015-08-19 13:51:09 -07:00