Commit Graph

6020 Commits

Author SHA1 Message Date
Austin Seipp
fa8f4b187f icestorm: fix chipdb location for icebox_vlog
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-14 16:11:01 -06:00
Antoine Eiche
ad81ceec86 devpi-server: 4.3.1 -> 4.4.0
We also disable 3 tests because they are failing with pytest 3.4.0.
2018-02-14 23:01:43 +01:00
Frederik Rietdijk
672bb6b4ab Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
Jan Tojnar
c878414363
gnome-desktop-testing: init at 2016.1 2018-02-14 21:02:58 +01:00
James Earl Douglas
5d20a55c34
jenkins: 2.105 -> 2.89.3 (LTS) 2018-02-14 07:07:08 -07:00
zimbatm
e8194c2c5b
ruby: remove unsupported versions (#34927)
* remove EOL ruby versions for security and maintenance reasons.
* only expose ruby_MAJOR_MINOR to the top-level. we don't provide
guarantees for the TINY version.
* mark all related packages as broken
* switch the default ruby version from 2.3.x to 2.4.x
2018-02-14 09:53:54 +00:00
lewo
c385a1bda4
Merge pull request #33430 from vdemeester/init-gopkgs
gopkgs: init at 2017-12-29
2018-02-14 08:55:50 +01:00
Vincent Demeester
502e32cfeb
gotests: init at 1.5.2
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-14 07:46:32 +01:00
Vincent Demeester
8cf5684814
gopkgs: init at 2017-12-29
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-14 07:44:08 +01:00
Vincent Demeester
5c410b94b5
go-outline: init at 2017-08-04
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-14 07:41:42 +01:00
Austin Seipp
3b6c08b55b icestorm: 2018.02.04 -> 2018.02.14
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-14 00:31:13 -06:00
Tuomas Tynkkynen
0ea1c45b04 gnumake: Drop pkgconfig if not building with guileSupport
This used to be the case before commit 531e4b80c9 which seems to
have dropped it by accident.

Removes one unnecessary build of pkgconfig during stdenv bootstrapping.
2018-02-14 01:47:28 +02:00
Profpatsch
eef9d363e1 buildah: init at 0.11 2018-02-13 23:04:16 +01:00
Will Dietz
e25a343716 cmake: don't force gcc, use more general cc/c++ 2018-02-13 12:39:34 -06:00
lewo
596a03e002
Merge pull request #33429 from vdemeester/init-gomodifytags
gomodifytags: init at 2017-12-14
2018-02-13 19:10:28 +01:00
Will Dietz
94ab0da6b1 lsof: fix build w/musl 2018-02-13 09:44:58 -06:00
Will Dietz
c0d343bc5f patchelfUnstable: fix build on musl, disable failing test 2018-02-13 09:44:58 -06:00
Will Dietz
37c2ac90e6 cmake: fix cross
TODO: toolchain file instead?
2018-02-13 09:44:29 -06:00
Ben Gamari
d625f181bd autoconf: Enable cross-compilation 2018-02-13 09:44:28 -06:00
Ben Gamari
2870c99cef autogen: Enable cross-compilation 2018-02-13 09:44:26 -06:00
Peter Simons
afb83e0e03 multi-ghc-travis: update to current Git master 2018-02-13 10:57:40 +01:00
Michiel Leenaars
ae6887d222 arpa2cm: init -> 0.5 2018-02-12 19:43:01 +01:00
Profpatsch
2922bee722 remove profpatsch from maintainer list of a few packages 2018-02-12 06:24:38 +01:00
Profpatsch
b806863a82 jid: remove package 2018-02-12 06:23:33 +01:00
Pascal Wittmann
b0047a527c
fswatch: 1.9.3 -> 1.11.2 2018-02-11 13:29:43 +01:00
Pascal Wittmann
2d6d52b60c
icmake: 9.02.04 -> 9.02.06 2018-02-11 12:02:27 +01:00
Jörg Thalheim
b3e42e607c
Merge pull request #34021 from dtzWill/update/boomerang-20180118
boomerang: switch to new active fork, cleanup, maintain
2018-02-10 15:57:24 +00:00
Thomas Mader
1ac2ce107c dub: 1.7.1 -> 1.7.2 2018-02-10 14:36:19 +01:00
Jörg Thalheim
777c8388e6
Merge pull request #34523 from womfoo/init/librarian-puppet-go-0.3.9
librarian-puppet-go: init at 0.3.9
2018-02-10 11:32:40 +00:00
Thomas Mader
a1f920e900 dtools: 2.078.1 -> 2.078.2 2018-02-10 10:49:17 +01:00
Jörg Thalheim
7fd8e8b40e
Merge pull request #33427 from vdemeester/init-go-symbols
go-symbols: init at 2017-02-06
2018-02-10 09:47:30 +00:00
Franz Pletz
a51cda85ff
Merge pull request #34434 from markuskowa/uhd-fix-boost-pr
uhd: 3.10.2.0 -> 3.10.3.0
2018-02-09 18:33:11 +00:00
Jörg Thalheim
7d9313fff3
Merge pull request #34635 from zauberpony/hcloud-init-v1.3.0
hcloud: init at 1.3.0
2018-02-09 16:38:12 +00:00
Jörg Thalheim
03ad93a879
Merge pull request #34701 from holidaycheck/chromedriver-2.35
chromedriver: 2.33 -> 2.35
2018-02-09 16:09:21 +00:00
adisbladis
d1c5b483d2
yaml2json: init at unstable-2017-05-03 2018-02-09 16:46:21 +08:00
Dan Peebles
dfd300c81d treewide: s/pkgs.fedoraproject.org/src.fedoraproject.org/
Upstream killed the pkgs server but src continues to serve up the exact
same content, so we can just point there and all hashes should be unchanged.
2018-02-08 16:38:08 -05:00
Tim Steinbach
86ab2e3842
Merge pull request #34446 from nlewo/pr/skopeo
skopeo: remove the patch by setting a variable at build time
2018-02-08 16:19:46 +00:00
Antoine Eiche
a38cb9411c skopeo: 0.1.27 -> 0.1.28 2018-02-08 14:33:58 +01:00
Will Dietz
a90f841769 heaptrack: Add dep on kdiagram for chart goodness 2018-02-07 20:56:54 -06:00
Will Dietz
427a4cd463 heaptrack: don't be specific about boost 2018-02-07 20:56:54 -06:00
Will Dietz
11d9f3aae1 heaptrack: 2017-10-30 -> 2018-01-28 2018-02-07 20:56:54 -06:00
Ruben Maher
72326cda80 flow: 0.64.0 -> 0.65.0 2018-02-08 10:02:50 +10:30
Adrien Devresse
52f6310626 lttng-ust: refactor
liburcu appears in the public API of LTTNG: it should be a
propagatedBuildInputs.
2018-02-07 18:34:53 +01:00
adisbladis
51c442c007
Merge pull request #34702 from ryantm/bossa
bossa: 2014-08-18 -> 1.8
2018-02-08 00:11:02 +08:00
Mathias Schreck
7bd68dff1e chromedriver: 2.33 -> 2.35 2018-02-07 16:57:10 +01:00
Ryan Mulligan
8930a14422 autoconf-archive: 2017.03.21 -> 2017.09.28 2018-02-06 07:35:31 -08:00
Ryan Mulligan
295934adda bear: 2.2.1 -> 2.3.11 2018-02-05 21:13:54 -08:00
Ryan Mulligan
84ea1ba890 bossa: 2014-08-18 -> 1.8 2018-02-05 20:29:26 -08:00
Mathias Schreck
674b39b048 jenkins: 2.103 -> 2.105 2018-02-05 20:13:28 +01:00
Elmar Athmer
04769e898f hcloud: init at 1.3.0 2018-02-05 19:14:55 +01:00
Rodney Lorrimar
4250f50dc9 electron: 1.7.9 -> 1.7.11
https://github.com/electron/electron/releases/tag/v1.7.10
https://github.com/electron/electron/releases/tag/v1.7.11
2018-02-05 12:31:11 +01:00
Austin Seipp
f610a780e4 icestorm: 2018.01.10 -> 2018.02.04
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-04 11:59:00 -06:00
Frederik Rietdijk
575d8ba030
Merge pull request #34585 from calvertvl/upd_loccount_1.2
loccount: 1.1 -> 1.2
2018-02-04 12:31:50 +00:00
Victor Calvert
d6e1c7bd94 loccount: 1.1 -> 1.2 2018-02-04 04:50:30 -05:00
Peter Hoeg
c00cc986e8 wp-cli: 1.4.1 -> 1.5.0 2018-02-04 11:51:03 +08:00
Bjørn Forsman
e193d8674b astyle: 2.05.1 -> 3.1 2018-02-03 22:48:20 +01:00
Venkateswara Rao Mandela
3d74ccf5e8 doxygen: 1.8.11 -> 1.8.14 2018-02-03 20:02:42 +01:00
adisbladis
97be994d6a
qcachegrind: Fix build with Qt 5.10 2018-02-03 22:03:59 +08:00
Jörg Thalheim
401fd19bd6
Merge pull request #34539 from dtzWill/feature/retdec-smaller
retdec: split up, greatly reduce in size (by default)
2018-02-03 12:21:59 +00:00
Vladimír Čunát
dd57c63793
Merge branch 'staging'
There are some Darwin regressions and a mysterious Lisp issue,
but also a security update of curl...
2018-02-03 10:56:07 +01:00
Jörg Thalheim
e35090706c gdbgui: 0.10.0.1 -> 0.11.0.0 2018-02-03 09:40:44 +00:00
Frederik Rietdijk
73d985f1b5 buildbot: buildbot-pkg fix
Fixes issue mentioned in
https://github.com/NixOS/nixpkgs/pull/33992#issuecomment-360937226
2018-02-03 10:05:53 +01:00
Frederik Rietdijk
2564ea97c0
Merge pull request #33992 from lopsided98/buildbot-update
buildbot: 0.9.11 -> 0.9.15.post1
2018-02-03 09:05:16 +00:00
Tuomas Tynkkynen
10c8e6d0c5 Merge remote-tracking branch 'upstream/master' into staging 2018-02-03 02:50:21 +02:00
Will Dietz
5a08309e8d retdec: separate "support", greatuly reduce size by default
Don't include PE signatures by default,
offer "full" variant containing them if desired.
2018-02-02 16:12:39 -06:00
Will Dietz
0380728ddc retdec: homepage fixup 2018-02-02 16:12:38 -06:00
Markus Kowalewski
67b0496e0b uhd: uhd firmware 3.7.3->3.10.3, lock img version to host tools
thanks to lukeadams for the patch
2018-02-02 11:21:14 -08:00
Markus Kowalewski
56253afe2e uhd: 3.10.2.0 -> 3.10.3.0 2018-02-02 11:21:14 -08:00
Tuomas Tynkkynen
33e744a5b4 gdb: 8.0.1 -> 8.1 2018-02-02 18:47:01 +02:00
Kranium Gikos Mendoza
35b8a406bb librarian-puppet-go: init at 0.3.9 2018-02-02 22:07:48 +11:00
Rodney Lorrimar
480e3f343a buildkite-agent: enable building on darwin 2018-02-01 10:33:10 +00:00
Will Dietz
293424b745 gdb: 8.0.1 -> 8.1
https://sourceware.org/ml/gdb/2018-01/msg00026.html
2018-01-31 14:59:44 -06:00
Brian McKenna
5877cfb9ce lambdabot: add Hoogle 2018-01-31 22:33:21 +11:00
Antoine Eiche
81b9ca062d skopeo: remove the patch by setting a variable at build time 2018-01-31 08:57:15 +01:00
Vladimír Čunát
c9171e5a4c
Merge branch 'master' into staging
Hydra: ?compare=1430035
2018-01-30 19:51:33 +01:00
Stefan Frijters
6c744fc93d pyprof2calltree: init at 1.4.3 (#34379) 2018-01-30 09:09:36 +00:00
Pierre-Etienne Meunier
4b0000a1de Pyrseas: init at 0.8.0 (#34225)
* Pyrseas: init at 0.8.0

Pyrseas is a declarative tool for managing PostgreSQL schemas.

* Replacing python27Packages with python2Packages

* Explaining why the tests are disabled

* Pyrseas: updating after review
2018-01-29 17:17:04 +00:00
Tim Steinbach
0f01846e97
gradle: 4.4.1 -> 4.5 2018-01-29 11:52:50 -05:00
Moritz Ulrich
f8c4ccd89b
ws: Init at 0.2.1 2018-01-29 10:23:07 +01:00
Franz Pletz
e3fbefd678
jenkins: 2.101 -> 2.103 2018-01-28 18:52:23 +01:00
adisbladis
f85163e89c
Merge pull request #34326 from ThomasMader/dub1.7.1
dub: 1.6.0 -> 1.7.1
2018-01-28 22:36:05 +08:00
Thomas Mader
b07f0f9eec dub: 1.6.0 -> 1.7.1 2018-01-28 09:30:52 +01:00
adisbladis
a7794d287b
Merge pull request #34347 from aneeshusa/make-bsdtar-available-for-vagrant
vagrant: Make bsdtar available to extract boxes
2018-01-28 09:57:08 +08:00
Aneesh Agrawal
9c33aa8465 vagrant: Make bsdtar available to extract boxes 2018-01-27 15:48:19 -08:00
adisbladis
41af33a039
mypy: 0.540 -> 0.560 2018-01-28 06:51:33 +08:00
adisbladis
92d790117d
ccache: 3.3.4 -> 3.3.5 2018-01-28 06:51:28 +08:00
Sarah Brofeldt
4d8be61278
Merge pull request #34325 from ThomasMader/dtools2.078.1
dtools: 2.078.0 -> 2.078.1
2018-01-27 21:20:31 +01:00
Tuomas Tynkkynen
c3a658deb1 Merge remote-tracking branch 'upstream/master' into staging 2018-01-27 21:53:16 +02:00
zimbatm
e526128aed
packer: 1.1.0 -> 1.1.3 (#34329) 2018-01-27 12:57:11 +00:00
Andreas Rammhold
30e7a09b26
Merge pull request #34317 from dtzWill/update/fac-1.0.4
fac: 1.0.1 -> 1.0.4, add man page
2018-01-27 09:41:03 +00:00
Andreas Rammhold
934191c4c2
Merge pull request #34321 from mimadrid/update/yq-2.3.4
yq: 2.3.3 -> 2.3.4
2018-01-27 09:34:11 +00:00
Miguel Madrid Mencía
cda71dc907
yq: 2.3.3 -> 2.3.4 2018-01-27 10:12:07 +01:00
Vladimír Čunát
2d2dbe083f
Merge branch 'master' into staging
Hydra: ?compare=1429281
2018-01-27 09:14:22 +01:00
Vladimír Čunát
ef60e41145
cmake: bring back 3.9 for Darwin bootstrap
Broken by ba6e0ae33df36; see e.g. https://hydra.nixos.org/build/68223628
2018-01-27 09:11:37 +01:00
Ben Wolsieffer
7c609d76b1 buildbot: make buildbot-pkg a real package, and add it as a build input of buildbot 2018-01-26 19:41:27 -05:00
Will Dietz
77a6cb32c6 fac: 1.0.1 -> 1.0.4, add man page 2018-01-27 09:20:59 +09:00
Ben Wolsieffer
d2e83e6357 buildbot: 0.9.11 -> 0.9.15.post1 2018-01-26 17:29:01 -05:00
Thomas Mader
820d78492d dtools: 2.078.0 -> 2.078.1 2018-01-26 22:18:48 +01:00
Peter Simons
03ef28473d haskell-tinc: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Peter Simons
c83b455c7d haskell-intero-nix-shim: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Vincent Demeester
89f73ceda5 dep: 0.4.0 -> 0.4.1
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-25 20:08:25 +01:00
adisbladis
52d2d62caa
Merge pull request #34243 from bachp/gitlab-runner-10.4.0
gitlab-runner: 10.3.0 -> 10.4.0
2018-01-25 09:38:44 +08:00
Vincent Demeester
39676b5b01
dep: 0.3.1 -> 0.4.0
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-24 15:48:55 -08:00
Pascal Bach
029e80a90b gitlab-runner: 10.3.0 -> 10.4.0 2018-01-24 22:38:57 +01:00
Will Dietz
fffd72cb56 lsof: fix for cross 2018-01-24 09:33:35 -06:00
Frederik Rietdijk
769342b37b Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-24 14:17:49 +01:00
Ruben Maher
e17d01dffc flow: 0.63.1 -> 0.64.0 2018-01-24 13:13:10 +10:30
Elmar Athmer
adabeea0b8 vultr: 1.13.0 -> 1.15.0 2018-01-23 18:44:18 +01:00
John Ericson
f432c48298
Merge pull request #34173 from dtzWill/fix/cross-misc-ben-1
misc minor cross fixups from @bgamari
2018-01-22 21:44:34 -05:00
John Ericson
e1b8eb7d36
Merge pull request #34180 from dtzWill/fix/texinfo-cross
texinfo: fix cross
2018-01-22 21:34:48 -05:00
Ben Gamari
2893657014 automake: Enable cross-compilation 2018-01-22 20:25:44 -05:00
Ben Gamari
8f8b836bce libtool2: Enable cross-compilation 2018-01-22 20:25:44 -05:00
Will Dietz
cafe25224f flex: review feedback
* top-level attributes, not crossAttrs
* use depsBuildBuild
2018-01-22 18:44:42 -06:00
Will Dietz
f57fc787fd texinfo: fix cross 2018-01-22 18:26:51 -06:00
Will Dietz
67be78f129 flex: patch around attempt to regen manpage, fix cross 2018-01-22 16:51:31 -06:00
Ben Gamari
715fcb4266 flex: Don't disable static while cross-compiling flex
linux-pam appears to rely on this while cross-compiling.

(cherry picked from commit 4009dd163ac30cd25833bf7eb19b5e26e75c474f)
2018-01-22 16:51:30 -06:00
Ben Gamari
e6f9e82ee4 flex: Use native dependencies where applicable
Flex needs both a C compiler for the build environment, as well as a native m4.

(cherry picked from commit 81827c0084c1a69e41894a4d38b0c0b267eaff34)
2018-01-22 16:51:30 -06:00
Daiderd Jordan
a786218b9d
Merge branch 'master' into staging 2018-01-22 20:55:37 +01:00
WilliButz
c8d5121c1d
deis: 1.13.3 -> 1.13.4 2018-01-22 18:59:13 +01:00
Frederik Rietdijk
6b0873440b Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-22 16:09:11 +01:00
Tuomas Tynkkynen
73695300bc patchelfUnstable: Fix hash 2018-01-22 11:00:29 +02:00
Herwig Hochleitner
7706f38a6c patchelfUnstable: 0.10-pre-20160920 -> 0.10-pre-20180108 2018-01-22 02:16:29 +01:00
Will Dietz
bcf81b828d radare2-cutter: init at 1.1
radare2 qt gui, using name used in AUR
since 'cutter' already exists.
2018-01-21 15:47:35 -06:00
Will Dietz
242ec8cba2 boomerang: switch to new active fork, cleanup, maintain 2018-01-21 15:38:56 -06:00
Daiderd Jordan
82de183455
Merge pull request #34088 from LnL7/xcbuild-platform-version
xcbuild: platform version
2018-01-21 20:50:20 +01:00
Nicolas Mattia
1d47908879 gpp: init at 2.25 and add @nmattia as maintainer (#34098)
* maintainers: add nmattia
* gpp: init at 2.25

GPP is a handy preprocessing tool, not yet present in the package set.
2018-01-21 19:17:31 +00:00
Vladimír Čunát
ba6e0ae33d
cmake: 3.9.6 -> 3.10.2
Close #33435 (superseded).
2018-01-21 11:59:12 +01:00
Daiderd Jordan
6377391d68
xcbuild: include version in wrapper 2018-01-20 20:50:23 +01:00
Daiderd Jordan
6fba728a6d
xcbuild: include version in sdk
Without this xcbuild can detect an incorrect version for store paths
that have a sequence of digits in their hash.

ld: malformed 32-bit x.y.z version number: 85294

/nix/store/yz966rdvw1blblvzs15pxpcd85294isw-MacOSX.platform/Developer/SDKs/MacOSX.sdk
2018-01-20 20:42:29 +01:00
Luke Adams
457bf6da58 phantomjs2: set QT_QPA_PLATFORM to allow use in daemons
resolves issues with Grafana email attachments

Suggested in https://github.com/ariya/phantomjs/issues/15217#issuecomment-354713760
2018-01-19 23:52:53 -06:00
Vincent Demeester
7f454c04ea
gomodifytags: init at 2017-12-14
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-19 15:55:29 -08:00
Vincent Demeester
9492e5e559
go-symbols: init at 2017-02-06
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-19 15:51:00 -08:00
Yurii Rashkovskii
bfd5b6fb79
gdbgui: 0.9.1.0 -> 0.10.1.0 2018-01-18 14:56:50 -08:00
Herwig Hochleitner
330104be9e leiningen: 2.7.1 -> 2.8.1 2018-01-18 18:55:26 +01:00
Peter Simons
29f0f38433 multi-ghc-travis: update to latest Git version and create a proper Haskell build
The attribute haskellPackages.multi-ghc-travis refers to a proper Cabal build
that includes the package's library
2018-01-18 17:01:33 +01:00
Shea Levy
f040f64636
bazel: Bump nix-hacks.patch for 0.9. 2018-01-18 10:25:47 -05:00
Frederik Rietdijk
27f6f9409b
Merge pull request #33967 from yegortimoshenko/20180117.050213/mornfall
maintainers: remove mornfall from packages
2018-01-18 11:27:31 +01:00
Peter Hoeg
08d3da7ad0
Merge pull request #33968 from peterhoeg/f/wp
wp-cli: use as much memory as possible
2018-01-18 08:16:53 +08:00
Tim Steinbach
239606c176
gradle: 4.4 -> 4.4.1 2018-01-17 10:31:01 -05:00
Daiderd Jordan
1504e69420 irony-server: use libclang 2018-01-17 15:53:08 +02:00
Daiderd Jordan
2807920302 ycmd: use libclang 2018-01-17 15:53:08 +02:00
Tuomas Tynkkynen
67c73b4e64 Merge commit '2e56ba' from staging into master 2018-01-17 12:50:46 +02:00
Peter Hoeg
35abe070ee wp-cli: use as much memory as possible
Instead of imposing an arbitrary memory limit via php.ini, let wp-cli use as
much as possible. If you need to limit the memory use, there are mechanisms in
your OS far better suited for this.
2018-01-17 14:01:01 +08:00
Yegor Timoshenko
506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
Bas van Dijk
af47db6a3a elk: 5.6.5 -> 5.6.6
Security fix for CVE-2018-3818.

https://www.elastic.co/guide/en/kibana/5.6/release-notes-5.6.6.html
https://www.elastic.co/guide/en/logstash/5.6/logstash-5-6-6.html
2018-01-17 02:11:19 +01:00
Bas van Dijk
e842ffbb33 elk: 6.1.1 -> 6.1.2
Contains a security fix for kibana: CVE-2018-3818.

https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-6.1.2.html
https://www.elastic.co/guide/en/logstash/6.1/logstash-6-1-2.html
https://www.elastic.co/guide/en/kibana/6.1/release-notes-6.1.2.html
https://www.elastic.co/guide/en/beats/libbeat/6.1/release-notes-6.1.2.html
2018-01-17 01:29:53 +01:00
Tobias Geerinckx-Rice
0f84673f3d
Remove nckx as a maintainer for all packages
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00
Tuomas Tynkkynen
2e56ba6fbd Merge remote-tracking branch 'upstream/master' into staging 2018-01-16 22:49:20 +02:00
John Ericson
5a754e75b4 Merge branch 'ericson2314-cross-master' into staging 2018-01-16 13:05:39 -05:00
Jörg Thalheim
c53f1518f8
Merge pull request #33426 from nlewo/pr/go-protobuf
go-protobuf: init at 2018-01-04
2018-01-16 08:15:09 +00:00