nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-21 05:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
124,149 Commits 191 Branches 125 Tags 8 GiB
6f1bdd8011
Commit Graph

42674 Commits

Author SHA1 Message Date
Frederik Rietdijk
0a447a6a3d python: httpbin: 0.5.0 -> 0.6.2 2017-12-31 10:55:06 +01:00
Frederik Rietdijk
08ebd1618b python: htmlmin: 0.1.11 -> 0.1.12 2017-12-31 10:55:05 +01:00
Frederik Rietdijk
c0df492163 python: gssapi: 1.2.0 -> 1.3.0 2017-12-31 10:55:05 +01:00
Frederik Rietdijk
495bf9b9c1 python: grpcio: 1.7.3 -> 1.8.2 2017-12-31 10:55:05 +01:00
Frederik Rietdijk
5a3ee42c44 python: GPy: 1.8.4 -> 1.8.5 2017-12-31 10:55:05 +01:00
Frederik Rietdijk
ceec68a8bb python: google-api-core: 0.1.2 -> 0.1.3 2017-12-31 10:55:05 +01:00
Frederik Rietdijk
c2bd0cea42 python: gensim: 3.0.1 -> 3.2.0 2017-12-31 10:55:05 +01:00
Frederik Rietdijk
b0ac491e11 python: ftfy: 5.1.1 -> 5.2.0 2017-12-31 10:55:05 +01:00
Frederik Rietdijk
2c41a488f5 python: fonttools: 3.17.0 -> 3.21.0 2017-12-31 10:55:04 +01:00
Frederik Rietdijk
96f4e27e18 python: Flask-Testing: 0.6.2 -> 0.7.1 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
bcead958d7 python: flake8-debugger: 1.4.0 -> 3.0.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
dea154d378 python: Fiona: 1.7.10.post1 -> 1.7.11 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
a435277ff9 python: filelock: 2.0.13 -> 2.0.14 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
710a85a3a0 python: faulthandler: 2.6 -> 3.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
166c9fd85d python: Faker: 0.8.7 -> 0.8.8 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
78d6446a20 python: Eve: 0.7.4 -> 0.7.5 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
ffebbd2f8d python: easy-thumbnails: 2.4.2 -> 2.5 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
b6d84fa6ab python: docker-compose: 1.15.0 -> 1.18.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
cb5a82020f python: docker: 2.5.1 -> 2.7.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
68436b4597 python: djangorestframework: 3.7.3 -> 3.7.7 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
db39391c01 python: django-jinja: 2.2.2 -> 2.4.1 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
a2426f0013 python: distro: 1.0.4 -> 1.2.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
6521f19a43 python: dask: 0.15.4 -> 0.16.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
e06dac7f2a python: cytoolz: 0.8.2 -> 0.9.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
f5196cce42 python: cx_Freeze: 5.0.2 -> 5.1.1 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
0978a41467 python: csscompressor: 0.9.4 -> 0.9.5 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
466dad658d python: credstash: 1.13.4 -> 1.14.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
2678ce77f0 python: botocore: 1.8.10 -> 1.8.21 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
5ce2e95c98 python: bokeh: 0.12.10 -> 0.12.13 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
36b8acaf1f python: attrs: 17.2.0 -> 17.4.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
7812f83a2d python: astropy: 2.0.2 -> 2.0.3 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
b77f351365 python: astroid: 1.5.3 -> 1.6.0 2017-12-30 17:06:32 +01:00
Frederik Rietdijk
db3a07fbda python: astor: 0.5 -> 0.6.2 2017-12-30 17:06:31 +01:00
Frederik Rietdijk
fb60a2fba5 python: asn1crypto: 0.23.0 -> 0.24.0 2017-12-30 17:06:31 +01:00
Frederik Rietdijk
e09ccfa379 python: asgiref: 1.1.2 -> 2.0.1 2017-12-30 17:06:31 +01:00
Frederik Rietdijk
1dd3e8125d python: APScheduler: 3.4.0 -> 3.5.0 2017-12-30 17:06:31 +01:00
Frederik Rietdijk
195a00e7a3 python: aiohttp: 2.3.3 -> 2.3.7 2017-12-30 17:06:31 +01:00
Frederik Rietdijk
15ceedc572 python: aenum: 2.0.8 -> 2.0.9 2017-12-30 17:06:31 +01:00
Frederik Rietdijk
2ec466e6d9 python: absl-py: 0.1.5 -> 0.1.7 2017-12-30 17:06:31 +01:00
Frederik Rietdijk
2d0bead714 Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-30 17:04:54 +01:00
Frederik Rietdijk
9d4de1eac8
Merge pull request #32852 from georgewhewell/django-2_0 
django: add 2.0 release
 2017-12-30 15:30:05 +00:00
Frederik Rietdijk
9ee22e24b3
Merge pull request #33065 from teto/protocol 
protocol: init at 20171226
 2017-12-30 15:23:52 +00:00
Herwig Hochleitner
8e0a8d2bd8 webkitgtk: 2.18.3 -> 2.18.4 
CVE-2017-7156
CVE-2017-13856
CVE-2017-13866
CVE-2017-13870
 2017-12-30 14:52:50 +01:00
Peter Simons
1b33f09aae uhc: disable broken build 2017-12-30 13:54:25 +01:00
Peter Simons
016aa581a7 haskell: extend generic builder to recognize mis-configured Cabal 2.x builds 
Cabal 1.x says:

 | Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.

But in version 2.x, that warning is split into two lines differently:

 | Warning:
 |     This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure.

This commit modifies the call to "egrep" to recognize both versions by virtue
of the "-z" flag, which essentially interprets the whole configure-time output
as one long line.
 2017-12-30 13:53:05 +01:00
Peter Simons
a05d950812 haskell-intero-nix-shim: build is broken 2017-12-30 13:53:05 +01:00
Peter Simons
8128c17d44 haskell-vaultenv: build is broken due to "optparse-applicative <0.14" dependency 
Ping @lnl7.
 2017-12-30 13:53:04 +01:00
Peter Simons
7eeea3d7e2 haskell: configure overrides to fix numerous package builds with GHC 7.10.3 2017-12-30 13:53:04 +01:00
Peter Simons
f84d863793 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
fa9adf335b.
 2017-12-30 13:53:04 +01:00
Peter Simons
0232282eb5 hackage2nix: disable broken Hydra builds 
- Ping @khumba for failing "hoppy-runtime":
   https://hydra.nixos.org/build/66704172.

 - Drop "persistent-redis" from the list of maintained packages (@psibi)
   because it continues to fail: https://hydra.nixos.org/build/66704120.
 2017-12-30 13:51:48 +01:00
Peter Simons
f5a501074f Drop Haskell package set for GHC 7.8.4. 
We support only the last three major releases, i.e. 7.10.x is the latest
compiler we worry about.

The *compiler* is still there, though; it's just the package set that's been
removed.
 2017-12-30 13:51:07 +01:00
Peter Simons
af6f4f0849 ghc: drop obsolete version 7.8.3 
We have the newer minor release 7.8.4.
 2017-12-30 13:51:07 +01:00
Frederik Rietdijk
bb729316dd
Merge pull request #33201 from rnhmjoj/steamcontroller 
Add Steam controller userspace driver
 2017-12-30 11:55:47 +00:00
rnhmjoj
c3b98dcead
pythonpackages.libusb1: init at 1.6.4 2017-12-30 12:31:45 +01:00
Adam Fidel
6a6e34b81e fastpbkdf2: init at version 1.0.0 (#33155) 2017-12-30 05:26:08 +03:00
Yegor Timoshenko
41ab3d4bd5
Merge pull request #33100 from olynch/mitschemeX11 
mitschemeX11: init at 9.2
 2017-12-30 04:33:53 +03:00
Will Dietz
4818f75054 radare2: enable parallel building 2017-12-29 18:55:20 -06:00
Will Dietz
85842b586a radare2: 2.1.0 -> 2.2.0 2017-12-29 18:54:01 -06:00
John Ericson
eb27be0731
Merge pull request #33186 from obsidiansystems/cross-binutils 
binutils: Fix cross, again
 2017-12-29 17:42:38 -05:00
Ben Gamari
c15c449236 binutils: Always search DT_RPATH 2017-12-29 17:32:28 -05:00
John Ericson
b1dcc6c201
Merge pull request #33185 from obsidiansystems/cross-simple 
treewide: A few misc cross changes from #26805
 2017-12-29 17:30:18 -05:00
Tuomas Tynkkynen
722295fc15 openblas: Support ARMv6 2017-12-30 00:19:57 +02:00
John Ericson
e73d805aa9 libelf: Fix cross compilation 
There is an upstream bug where it is assumed that if host != build, host
doesn't support shared libraries. We override that overly conservative
check. See
http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html

Also clean up some comments.
 2017-12-29 17:19:22 -05:00
John Ericson
7ede347ce9 Merge #33167 into staging 2017-12-29 15:46:46 -05:00
John Ericson
5db559f855 Merge branch 'mingw32-w64-fix' into ericson2314-cross-base 2017-12-29 15:46:02 -05:00
John Ericson
52a4a7c3bb
Merge pull request #33167 from bnikolic/mingw32-w64-fix 
Mingw_w64 fix to get cross-compilation working again
 2017-12-29 15:44:17 -05:00
John Ericson
bc3a6e260a Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fix 2017-12-29 15:28:56 -05:00
John Ericson
5d336d36bb Merge commit 'e82bd498d1a2a28fb20249569a6f49fcaab9aca8' into mingw32-w64-fix 2017-12-29 15:28:49 -05:00
Peter Simons
4a01a175a3
Merge pull request #33158 from shlevy/hslib-haskell-build-inputs-again 
Revert "Revert "hslib: Function to extract the haskell build inputs of a package.""
 2017-12-29 20:51:24 +01:00
Shea Levy
89e882f956
Merge branch 'haskell-ide-engine' 2017-12-29 14:41:47 -05:00
Shea Levy
961907de47
Add haskell-ide-engine 2017-12-29 14:41:15 -05:00
Shea Levy
1ee61d8f23
Revert "Revert "hslib: Function to extract the haskell build inputs of a package."" 
Trying again, without changing the generic builder.

This reverts commit 65138e8a41.
 2017-12-29 14:37:24 -05:00
John Ericson
169227bfd2 Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix 2017-12-29 14:24:10 -05:00
John Ericson
2365e2ffcd Merge commit '51948eab9415fde1825dea5c7d31b99b2e1a0fdb' into mingw32-w64-fix 2017-12-29 14:23:05 -05:00
Bojan Nikolic
771bae04e8 gcc: Enable SSP and shared libs in the final stage for MinGW 
Hardening on by default now that we don't use the cross wrapper. In
turn, hardening requires libssp in particular.
 2017-12-29 13:27:02 -05:00
Frederik Rietdijk
d8490e34a5 python.pkgs.numexpr: 2.6.2 -> 2.6.4 2017-12-29 18:57:06 +01:00
Vladimír Čunát
a1a3e54ac9
Merge branch 'master' into staging 
Haskell rebuild :-)
Hydra: ?compare=1421865
 2017-12-29 18:39:36 +01:00
volth
4026ea9c8a collectd: 5.7.2 -> 5.8.0 
This is https://github.com/NixOS/nixpkgs/pull/32811 without refactoring parts.

Closes #32811
 2017-12-29 17:34:55 +00:00
Frederik Rietdijk
d3297379ad
Merge pull request #33175 from johbo/pelican-without-pandoc 
pelican: Disable pandoc support for now
 2017-12-29 17:24:02 +00:00
Johannes Bornhold
5b7f9db5c5 pelican: Disable pandoc support for now 
Version 3.7.1 is not compatible with the current (more recent) pandoc version.
Since pandoc support is optional in pelican, we can ship it without pandoc
support until a fix will be applied upstream.

Kept a note in the buildInputs so that the improvement opportunity can be
spotted again on future updates of pelican.
 2017-12-29 18:13:11 +01:00
Jörg Thalheim
805e25988f
Merge pull request #33174 from Mic92/pythonix 
python3Packages.pythonix: init at 0.1.0
 2017-12-29 17:49:34 +01:00
Jörg Thalheim
7e20ba9515 python3Packages.pythonix: init at 0.1.0 2017-12-29 17:38:05 +01:00
Peter Simons
40a3d775a5 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
246f2ece36.
 2017-12-29 15:47:44 +01:00
Peter Simons
504016f753
Merge pull request #32993 from shlevy/haskell-internal-libs 
haskell generic-builder: Support installing internal libs.
 2017-12-29 15:41:19 +01:00
sternenseemann
019c631840 libhttpseverywhere: 0.4.5 -> 0.6.5 2017-12-29 14:22:30 +01:00
Rickard Nilsson
1de251c664 haskellPackages.LDAP: Fix build 2017-12-29 11:42:20 +01:00
Christoph Hrdinka
d07bc8bb30
woff2: init at 1.0.2 
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
 2017-12-29 11:38:08 +01:00
Vincent Laporte
efcb39233d ocaml: adds an argument to enable flambda 2017-12-29 10:49:13 +01:00
Vladimír Čunát
f29000b002
Merge branch 'master' into staging 
Hydra: ?compare=1421760
 2017-12-29 10:13:33 +01:00
Vladimír Čunát
0e8283370b
mesa: 17.2.7 -> 17.2.8 (maintenance) 2017-12-29 10:01:21 +01:00
Vladimír Čunát
6bbec17d44
Merge #32626: atk: clean up 2017-12-29 10:01:00 +01:00
Vladimír Čunát
1963be9945
Merge #32795: vala_*: patch updates 2017-12-29 10:00:31 +01:00
Vladimír Čunát
6f7cd9bb7e
Merge #32884: libnftnl: 1.0.7 -> 1.0.8 2017-12-29 10:00:03 +01:00
Vladimír Čunát
4076ef0dd3
libdrm: 2.4.88 -> 2.4.89 2017-12-29 10:00:02 +01:00
Vladimír Čunát
90803b9f4c
Merge #32954: glibc: patch update and support RHEL 6 2017-12-29 09:59:59 +01:00
Orivej Desh
e63b2fbfb3
Merge pull request #32870 from dtzWill/update/llvm-5.0.1 
llvm 5: 5.0.0 -> 5.0.1
 2017-12-29 07:59:15 +00:00
Yegor Timoshenko
1f3f774bbe
Merge pull request #33040 from yegortimoshenko/20171225.022736/easyrpg-player 
easyrpg-player: init at 0.5.3
 2017-12-29 08:33:58 +03:00
Robin Gloster
5908726117
jbake: cleanup 2017-12-29 03:26:25 +01:00
John Mercier
78d76e4b55 jbake: init at 2.5.1 2017-12-29 03:26:13 +01:00
Maarten Hoogendoorn
536d1d3016 dlib: 19.6 -> 19.8 2017-12-29 03:11:33 +01:00
Robin Gloster
48464d620d php: clean up mysql/mariadb handling 2017-12-29 02:18:35 +01:00
Izorkin
1f4c02fc9e libdbiDrivers: fix config 2017-12-29 02:18:35 +01:00
Robin Gloster
b56ebb07bc redland: use connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
add8d3282e tora: use mysql.connector-c 2017-12-29 02:18:35 +01:00
Izorkin
2bbb4810f4 lisp-modules: mysql -> mysql.connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
d3a0663a7d gdal_1_11: needs mysql57 not mariadb 2017-12-29 02:18:35 +01:00
Robin Gloster
572b2bda4e treewide: generalise for both mysql & mariadb 2017-12-29 02:18:35 +01:00
Robin Gloster
6903ea6050 treewide: libmysql -> mysql.connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
f3445606ac libdbiDrivers: libmysql -> connector-c 2017-12-29 02:18:35 +01:00
Izorkin
4ef619dadd mariadb: replace to connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
9213a2cf66 poco: libmysql -> connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
d75ae56f3f mariadb: replace to connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
b69befbfd5 mariadb: replace to connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
462076c909 pcre: add patch fixing stack frame size detection 2017-12-29 02:18:35 +01:00
Robin Gloster
d357734637 urweb: fix build 2017-12-29 02:18:35 +01:00
Robin Gloster
d9d98cd324 treewide: fix up some mysql.connector-c fallout 2017-12-29 02:18:35 +01:00
Robin Gloster
9359050ae2 mariadb: more lib -> connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
02545a64a9
glm: 0.9.8.4 -> 0.9.8.5, clean up build 2017-12-29 01:11:39 +01:00
Maxwell Huang-Hobbs
87e71f22c8
glm: 0.9.6.1 -> 0.9.8.4, include built glm.pc 2017-12-29 01:11:38 +01:00
Joe Doyle
e9886dde9b csfml: init at 2.4 (#33000) 2017-12-28 22:04:02 +01:00
Peter Simons
d54384bb80
Merge pull request #33129 from domenkozar/ghc-binary-boot-pkgs 
ghc: wire up new binary ghc for bootstrapping
 2017-12-28 19:28:40 +01:00
Peter Simons
65138e8a41 Revert "hslib: Function to extract the haskell build inputs of a package." 
This reverts commit d545ef3fa1. Please don't
commit substantial changes to the generic Haskell builder without giving me a
chance to review them.
 2017-12-28 19:23:41 +01:00
hyphon81
7ccceeacca
pythonPackages.chainer: init at 3.2.0 2017-12-28 17:47:15 +01:00
hyphon81
0184f60c1c
pythonPackages.cupy: init at 2.2.0 2017-12-28 17:47:08 +01:00
hyphon81
e5921012a1
pythonPackages.filelock: init at 2.0.13 2017-12-28 17:47:03 +01:00
hyphon81
a9379a6d67
pythonPackages.fastrlock: init at 0.3 2017-12-28 17:46:59 +01:00
hyphon81
05573d3e06
nccl: init at 1.3.4-1 2017-12-28 17:46:52 +01:00
Shea Levy
a7334eb476
Merge branch 'hslib-haskell-build-inputs' 2017-12-28 11:24:45 -05:00
Domen Kožar
695a026f5f
ghc: wire up new binary ghc for bootstrapping 
This change brings development feedback loop improvement
from a couple of ghc rebuilds to only one for working on generic
builder.

To completely eliminate the rebuilds, use two nixpkgs clones
and point boot packages to the unmodified one.
 2017-12-28 15:11:50 +00:00
adisbladis
907face464
qt5: Add qtvirtualkeyboard submodule 2017-12-28 21:13:45 +08:00
Christoph Hrdinka
47a71e9426
pg_tmp: init at 2.3 
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
 2017-12-28 13:50:06 +01:00
Frederik Rietdijk
1dc391d92b
Merge pull request #32890 from vanschelven/google-cloud-speech 
google-cloud-speech: init at 0.30.0
 2017-12-28 10:56:10 +00:00
adisbladis
da09b6b1ae
Merge pull request #33119 from jwiegley/Xaw3d-fix 
Xaw3d: 1.6 -> 1.6.2
 2017-12-28 18:08:52 +08:00
Vincent Laporte
a9d066a990 coqPackages.tlc: init at 20171206 
TLC is a general purpose Coq library that provides an alternative to Coq's
standard library.

Homepage: http://www.chargueraud.org/softs/tlc/
 2017-12-28 08:19:54 +01:00
Peter Hoeg
7798051817
Merge pull request #32927 from peterhoeg/u/kdeapp 
kde-applications: 17.08.3 -> 17.12.0
 2017-12-28 08:22:27 +08:00
John Wiegley
6674e34614 Xaw3d: 1.6 -> 1.6.2 
Previously the version was given as 1.6.2, but the tarball it was installing
from was only 1.6.
 2017-12-27 15:33:09 -08:00
Peter Simons
635c10140f hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.7-7-g6012213 from Hackage revision
e61097beb3.
 2017-12-27 21:33:17 +01:00
Peter Simons
071c6bb8ab LTS Haskell 10.1 
Fixes https://github.com/NixOS/nixpkgs/issues/33097.
 2017-12-27 21:33:12 +01:00
Peter Simons
63a9142279
Merge pull request #33054 from NixOS/ghc-prebuilt 
ghc prebuilt: Add 7.8.4, 7.10.3 and 8.2.1, and make consistent style
 2017-12-27 21:31:56 +01:00
Peter Simons
d9d554a287
Merge pull request #33089 from NixOS/revert-33077-scalendar-cycle 
Revert "haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval"
 2017-12-27 18:34:49 +01:00
Peter Simons
39eb15b028 haskell-scalendar: break the infinite recursion to avoid evaluation errors 
Suggested in https://github.com/NixOS/nixpkgs/pull/33077#issuecomment-353993598.
 2017-12-27 18:33:45 +01:00
Peter Hoeg
8423b6a3d4 wp-cli: allow using more memory as composer can exhaust it 2017-12-28 00:39:09 +08:00
Peter Hoeg
e8db78639c openwsman: do not compile on Darwin 2017-12-27 16:43:36 +08:00
Owen Lynch
afd198f0f4 mitschemeX11: init at 9.2 2017-12-26 22:32:23 -05:00
Justin Wood
6af1a08e9b Elixir: init 1.6-rc.0 (#33034) 2017-12-26 16:53:24 -05:00
Peter Simons
adabca4b13
Revert "haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval" 2017-12-26 22:24:30 +01:00
Graham Christensen
cd78ac9586
Merge pull request #33020 from pbogdan/flashtool-broken 
flashtool: mark as broken
 2017-12-26 15:51:14 -05:00
Robin Gloster
46abd5f764
python.pkgs.jinja2: enable tests 2017-12-26 20:39:26 +01:00
Tuomas Tynkkynen
47c782f7f5 Merge remote-tracking branch 'upstream/master' into staging 2017-12-26 21:10:12 +02:00