Artturin
7e49471316
treewide: optional -> optionals where the argument is a list
...
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
Nikolay Korotkiy
57ec8cf4b3
spatialite_gui: init at 2.1.0-beta1
2022-09-19 21:18:20 +03:00
Nikolay Korotkiy
5fbc12bd70
spatialite_tools: move to applications/gis
2022-09-19 10:45:09 +03:00
Artturi
79c42aa06c
Merge pull request #186564 from Artturin/crossevalfixes
...
Fixes for cross-compilation
2022-08-27 17:49:00 +03:00
Nikolay Korotkiy
30536606bb
qgis-ltr: 3.22.9 → 3.22.10
2022-08-21 01:31:26 +03:00
Nikolay Korotkiy
e54e97acec
qgis: 3.26.1 → 3.26.2
2022-08-21 01:30:53 +03:00
Christian Kögler
71bcefa910
Merge pull request #174538 from r-ryantm/auto-update/dcw-gmt
...
dcw-gmt: 2.1.0 -> 2.1.1
2022-08-16 17:18:23 +02:00
Artturin
c6568adb00
treewide: makeWrapper buildInputs to nativeBuildInputs
...
most found with https://github.com/siraben/nix-lint
2022-08-16 13:14:19 +03:00
Thomas Watson
c3aff2b7d7
qgis, qgis-ltr: fix build
...
A recent upgrade to PyQt5 broke the build due to incompatibilities
with SIP < 5. Upstream QGIS has supported SIP >= 5 for a while now
so this patch corrects the issue by using the latest SIP and adding
the necessary dependencies.
The logic to find the PyQt5 libraries and SIP files is different
for SIP >= 5, so a patch is included to correctly supply them.
This also adds wrapGAppsHook to prevent opening file dialogs from
crashing on non-NixOS distributions.
2022-08-06 19:17:07 -05:00
Will Cohen
1d908484a8
grass: 8.0.1 -> 8.2.0
2022-07-19 12:52:16 -04:00
github-actions[bot]
83702a6ef7
Merge master into staging-next
2022-07-18 18:01:14 +00:00
Nikolay Korotkiy
75fdfe76cd
qgis-ltr: 3.22.8 → 3.22.9
2022-07-18 14:09:45 +02:00
Nikolay Korotkiy
83841f8bf7
qgis: 3.26.0 → 3.26.1
2022-07-18 14:09:45 +02:00
R. Ryantm
ad4097bbf4
dcw-gmt: 2.1.0 -> 2.1.1
2022-07-07 22:03:58 +00:00
Josef Kemetmüller
1ca04aa9f1
treewide: Stop setting CMAKE_SKIP_BUILD_RPATH=OFF
...
This is now the new default and thus doesn't need to be set manually
anymore.
2022-07-04 03:49:01 +03:00
R. Ryantm
7a7f7327b1
gmt: 6.3.0 -> 6.4.0
2022-06-25 23:06:31 +00:00
Robert Scott
466c2e342a
treewide/applications: add sourceType
binaryNativeCode
for many packages
2022-06-23 18:38:19 +01:00
Will Cohen
f2eef30c0d
qgis-ltr: 3.22.6 -> 3.22.8
2022-06-23 12:41:04 +02:00
Will Cohen
34a533b1e2
qgis: 3.24.2 -> 3.26.0
2022-06-23 12:41:04 +02:00
AndersonTorres
bdbfd5cead
whitebox-tools: use SRI hash format
2022-06-09 23:16:59 -03:00
AndersonTorres
0965a51404
udig: use SRI hash format
2022-06-09 23:16:58 -03:00
AndersonTorres
254a82389d
openorienteering-mapper: use SRI hash format
2022-06-09 23:16:58 -03:00
Rick van Schijndel
37c633f7ae
treewide: pkgs/applications: mark broken for darwin
2022-05-29 10:56:04 +02:00
Will Cohen
8d03b2418e
qgis-ltr: 3.22.5 -> 3.22.6
2022-05-03 14:39:07 +02:00
Will Cohen
14d77e895d
qgis: 3.24.1 -> 3.24.2
2022-05-03 14:39:07 +02:00
Will Cohen
699a5dd470
grass: add willcohen to maintainers
2022-04-28 15:21:54 -04:00
Will Cohen
0bc0206244
grass: 7.8.6 -> 8.0.1
2022-04-28 15:20:32 -04:00
Ben Siraphob
1cf5591a99
Merge pull request #165303 from Stunkymonkey/treewide-pname-version-18
2022-03-24 22:55:34 -05:00
Felix Buehler
e0476d93fe
treewide: rename name to pname&version
2022-03-23 22:34:54 +01:00
Will Cohen
fd620c8da1
qgis: 3.24.0 -> 3.24.1
2022-03-22 17:56:16 +01:00
Will Cohen
826febf74f
qgis-ltr: 3.22.4 -> 3.22.5
2022-03-22 17:56:16 +01:00
Will Cohen
b2ffb9fc96
qgis-ltr: add willcohen to maintainers
2022-02-27 22:30:33 +01:00
Will Cohen
e18d2801ad
qgis: add willcohen to maintainers
2022-02-27 22:30:33 +01:00
Will Cohen
9f27578b40
qgis-ltr: 3.16.16 -> 3.22.4
2022-02-27 22:30:33 +01:00
Will Cohen
2448f4dd45
qgis: 3.22.3 -> 3.24.0
2022-02-27 22:30:33 +01:00
R. Ryantm
bdc257a47c
dcw-gmt: 2.0.2 -> 2.1.0
2022-02-12 21:26:09 -08:00
R. RyanTM
b9f12b66d5
gmt: 6.2.0 -> 6.3.0
...
(#149186 )
2022-02-11 12:14:39 +01:00
Will Cohen
8b1103b60e
grass: fix build on darwin
2022-01-26 07:44:26 -05:00
Will Cohen
0072957c7e
qgis-ltr: 3.16.14 -> 3.16.16
2022-01-25 23:14:33 -08:00
Will Cohen
2ca00af2c7
qgis: 3.22.1 -> 3.22.3
2022-01-25 23:14:33 -08:00
Will Cohen
de256f2c02
qgis, qgis-ltr: only expose unwrapped via passthru
2022-01-25 23:14:33 -08:00
Matthew Pickering
85d0a94f90
qgis, pyqt: introduce qgis-ltr and update qgis
...
Add qtlocation to pyqt, and ensure that it is included with both
qgis derivations.
2022-01-25 23:14:33 -08:00
Matthew Pickering
ce4927f0d5
qgis: enable 3D, grass
...
Grass is a runtime dependency which qgis attempts to find on the path.
3D is on by default with normal distributions so we should
also enable it.
2022-01-25 23:14:33 -08:00
Matthew Pickering
8b2cf0a45d
grass: wrap grass with wrapGAppsHook
2022-01-25 23:14:33 -08:00
Matthew Pickering
92b62e7353
grass: Add pdal dep and missing feature flags
...
This is used for processing lidar point clouds.
2022-01-25 23:14:33 -08:00
Matthew Pickering
b9ea948aca
grass: 7.6.1 -> 7.8.6
2022-01-25 23:14:33 -08:00
Nikolay Korotkiy
f16e78d0a0
zombietrackergps: 1.03 → 1.10
2022-01-09 23:50:50 +03:00
Will Cohen
2cdbb565ad
qgis: update QSCI_SIP_DIR location
2022-01-05 19:02:00 -05:00
R. Ryantm
44586149d7
dcw-gmt: 2.0.1 -> 2.0.2
2021-12-31 09:36:06 +00:00
Thiago Kenji Okada
99d5bdf78f
Merge pull request #150287 from mpickering/whitebox-tools
...
whitebox-tools: 1.4.0 -> 2.0.0
2021-12-12 12:12:26 -03:00
Matthew Pickering
94809fac30
whitebox-tools: 1.4.0 -> 2.0.0
2021-12-11 18:40:13 +00:00
R. Ryantm
8690dd9467
dcw-gmt: 1.1.4 -> 2.0.1
2021-12-11 08:51:17 +00:00
Robert Schütz
53801ef122
qmapshack: 1.16.0 -> 1.16.1
...
https://github.com/Maproom/qmapshack/releases/tag/V_1.16.1
2021-12-04 16:51:53 -08:00
Kerstin Humm
2d0c11c034
qgis: add erictapen as maintainer
2021-11-26 20:58:59 +01:00
Lancelot SIX
e5adc91d63
qgis: 3.16.13 -> 3.16.14
2021-11-24 14:16:50 +00:00
Lancelot SIX
39a0639b70
qgis: 3.6.10 -> 3.6.13
2021-11-14 17:28:41 +00:00
Nikolay Korotkiy
5fe151db46
qmapshack: fix localization
2021-11-12 12:26:48 +03:00
Dmitry Kalinkin
e0532475bc
treewide: remove darwin-only manual wrapQtApp invocations
2021-09-28 10:29:46 -04:00
Lancelot SIX
042eebd8d9
qgis: fix build with PROJ 8
...
Co-authored-by: Robert Schütz <nix@dotlambda.de>
2021-09-26 23:11:28 -07:00
R. RyanTM
44d045f7d3
saga: 7.9.0 -> 7.9.1
2021-09-14 09:05:52 +00:00
Nikolay Korotkiy
ac47659bde
qgis: 3.16.9 → 3.16.10
2021-08-24 00:47:39 +03:00
Nikolay Korotkiy
8d49729305
qgis: 3.16.7 → 3.16.9
2021-08-01 13:36:28 +03:00
Robert Schütz
1ec5651913
treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil
2021-07-03 13:45:57 +02:00
Eduardo Sánchez Muñoz
3626f2663b
qgis: fix PyQt5 SIP path
2021-06-27 00:25:13 +02:00
R. RyanTM
91a67c5c1a
gmt: 6.1.1 -> 6.2.0
2021-06-07 02:26:31 +00:00
Robert Schütz
103d945f80
qmapshack: 1.15.2 -> 1.16.0
...
https://github.com/Maproom/qmapshack/releases/tag/V_1.16.0
2021-05-27 09:35:57 +02:00
Lancelot SIX
93f419b7a8
qgis: 3.16.6 -> 3.16.7
2021-05-27 09:35:57 +02:00
github-actions[bot]
6cdac75d25
Merge staging-next into staging
2021-05-16 18:32:44 +00:00
Eduardo Sánchez Muñoz
08a26e4579
pythonPackages.sip: rename to sip_4
...
sip 4 is the old and unmaintained version
2021-05-10 20:41:38 +02:00
Daniël de Kok
85f96822a0
treewide: fix cargoSha256/cargoHash
...
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.
This change updates cargoSha256/cargoHash tree-wide.
Fixes #121994 .
2021-05-08 00:36:37 -07:00
Luke Granger-Brown
59ecd5167a
qmapshack: support Quazip 1.x
2021-05-02 01:18:50 +00:00
Lancelot SIX
689b77097e
qgis: 3.16.5 -> 3.16.6
2021-04-21 17:17:31 +01:00
Lancelot SIX
f8da9ce9fc
qgis: 3.10.13 -> 3.16.5
...
The file has been reformated using nixpkgs-fmt.
2021-04-15 11:14:15 -04:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias
2021-04-04 19:49:52 +02:00
Sandro
2e38cbe858
Merge pull request #116169 from sikmir/oomapper
...
openorienteering-mapper: 0.9.4 → 0.9.5
2021-03-25 10:46:43 +01:00
Nikolay Korotkiy
0149eb8a42
openorienteering-mapper: 0.9.4 → 0.9.5
2021-03-14 19:52:18 +03:00
R. RyanTM
2d632d08ad
saga: 7.8.2 -> 7.9.0
2021-03-09 13:34:57 +00:00
Ben Siraphob
3bbad8b041
treewide: remove inherited stdenv.lib
2021-01-27 12:44:43 +07:00
Sandro
6186f92cb7
Merge pull request #101520 from sikmir/udig
...
udig: init at 2.0.0
2021-01-19 12:06:57 +01:00
Jonathan Ringer
9bb3fccb5b
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
...
continuation of #109595
pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.
python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Nikolay Korotkiy
cade5d7fa5
udig: init at 2.0.0
2021-01-19 02:05:32 +03:00
Ben Siraphob
badf51221d
treewide: stdenv.lib -> lib
2021-01-16 17:58:11 +07:00
Profpatsch
4a7f99d55d
treewide: with stdenv.lib; in meta -> with lib;
...
Part of: https://github.com/NixOS/nixpkgs/issues/108938
meta = with stdenv.lib;
is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.
This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.
The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Nikolay Korotkiy
1ed65d38c5
qgis: 3.10.11 → 3.10.13, mark unbroken
2020-12-23 20:53:15 +03:00
Pavol Rusnak
ef21e636b9
Merge pull request #106809 from sikmir/saga
...
saga: 7.8.1 → 7.8.2
2020-12-14 17:43:17 +01:00
Nikolay Korotkiy
7b80f669f9
saga: 7.8.1 → 7.8.2
2020-12-13 12:40:45 +03:00
R. RyanTM
104f43c9b1
qmapshack: 1.15.1 -> 1.15.2
2020-12-11 00:17:49 +00:00
zimbatm
bbc9af1f0a
tree-wide: do not use pkgs.extend in nixpkgs
...
Each invocation of pkgs.extends adds 130MB of allocation to the hydra
evaluator. We are already struggling with the amount of memory nixpkgs
requires.
`pkgs.extend` is a useful escape-hatch, but should be not be used inside
of nixpkgs directly.
2020-11-30 14:24:40 +01:00
Nikolay Korotkiy
bea6a6f865
zombietrackergps: 1.01 → 1.03
2020-11-29 11:00:41 +03:00
Nikolay Korotkiy
92672cfff8
qmapshack: 1.15.0 → 1.15.1
2020-11-27 12:32:55 +03:00
Sandro
de8335475d
Merge pull request #102741 from sikmir/whitebox
...
whitebox-tools: 1.3.0 → 1.4.0
2020-11-24 23:35:45 +01:00
freezeboy
8e375d71f0
saga: 7.7.0 -> 7.8.1
...
* Remove obsolete patches (merged into this release)
* rewrite without stdenv
2020-11-20 22:24:20 +01:00
Lancelot SIX
10af77af13
qgis: 3.10.10 -> 3.10.11
2020-11-09 12:12:51 +00:00
Nikolay Korotkiy
a9d894b85e
whitebox-tools: 1.3.0 → 1.4.0
2020-11-04 13:12:09 +03:00
Frederik Rietdijk
9e1943edc0
Merge master into staging-next
2020-10-13 19:34:34 +02:00
Nikolay Korotkiy
f637dd34f6
openorienteering-mapper: 0.9.3 -> 0.9.4
2020-10-11 20:39:59 +03:00
Jan Tojnar
aabcf2d8f5
Merge branch 'master' into staging-next
2020-10-11 00:27:21 +02:00
sohalt
e96fd6e6b7
zombietrackergps: init at 1.01
2020-10-10 11:20:17 -04:00
Vladimír Čunát
338b25697c
Merge branch 'master' into staging-next
...
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
> 3926 x86_64-darwin
> 4645 x86_64-linux
2020-10-10 11:32:10 +02:00
Frederik Rietdijk
084c4da16a
qgis: 3.10.9 -> 3.10.10
2020-10-08 18:57:26 +02:00
WORLDofPEACE
34aaac6d7c
Merge branch 'staging-next' into staging
2020-09-20 18:41:15 -04:00
Vincent Laporte
ffc3f8227b
saga: use proj 6
2020-09-15 21:47:28 +02:00
Thomas Tuegel
106616102d
grass: fix libmysqlclient include path
2020-09-12 06:58:26 -05:00
Frederik Rietdijk
d362c0e54e
Merge master into staging-next
2020-09-06 18:14:23 +02:00
R. RyanTM
77b366044b
gmt: 6.1.0 -> 6.1.1
2020-09-04 22:39:53 +00:00
Nikolay Korotkiy
3106c30903
cmake: fix CMAKE_FIND_FRAMEWORK
2020-08-29 13:37:56 +02:00
Lancelot SIX
04f858ff5e
qgis: 3.10.7 -> 3.10.9
2020-08-28 09:40:16 +01:00
lassulus
cedef0c6c7
gmt: use pname instead of name
2020-08-24 09:58:16 +02:00
Lassulus
76b7192972
Merge pull request #88837 from tviti/gmt
...
gmt: init at 6.1.0
2020-08-24 09:56:16 +02:00
Taylor Viti
115a36703e
gmt: init at 6.1.0
2020-08-22 15:12:31 -10:00
Michael Raskin
5a3aa53600
Merge pull request #94619 from doronbehar/saga-opencv4
...
saga: 7.6.3 -> 7.7.0
2020-08-16 10:17:16 +00:00
zowoq
473536e3b5
buildRustPackage: remove platform.all from packages
2020-08-16 12:48:18 +10:00
Doron Behar
adaf0065a0
saga: 7.6.3 -> 7.7.0
...
Other changes include:
- Reformat inputs and arguments to drv.
- Use autoreconfHook as upstream's generated ./configure has proved to
be not reliable (it didn't detect properly missing deps).
- Add many more dependencies that were detected now with autoreconfHook.
- Upgrade gui dep to wxGTK31-gtk3.
- Upgrade opencv dep to opencv4.
2020-08-08 15:54:33 +03:00
Matthew Bauer
22f82fc8ca
Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"
...
This reverts commit e36b1d4ad1
, reversing
changes made to c2ea7318be
.
Should go to staging.
2020-07-29 18:20:56 -05:00
Nikolay Korotkiy
b53902f535
cmake: fix CMAKE_FIND_FRAMEWORK
2020-07-28 19:05:43 +03:00
Lancelot SIX
3bdefc8802
qgis: 3.10.4 -> 3.10.7
2020-06-22 13:47:53 +01:00
Nikolay Korotkiy
1ae9228fb6
whitebox-tools: 1.2.0 -> 1.3.0
2020-06-18 12:06:37 +03:00
Doron Behar
01d4e2fe33
treewide: use ffmpeg_3 explicitly if not wanted otherwise
...
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Benjamin Hipple
33e9db21d6
Merge pull request #87950 from sikmir/mapper
...
openorienteering-mapper: 0.9.2 -> 0.9.3
2020-06-03 23:42:51 -04:00
R. RyanTM
84b0c4ee58
saga: 7.6.2 -> 7.6.3
2020-05-27 12:29:19 +00:00
Nikolay Korotkiy
a46d7f2d72
openorienteering-mapper: 0.9.2 -> 0.9.3
2020-05-16 23:28:54 +03:00
Doron Behar
c0137489ef
saga: explicitly use opencv2
2020-05-05 10:32:14 +03:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
R. RyanTM
73d63a68a3
saga: 7.6.1 -> 7.6.2
2020-04-07 17:00:20 +00:00
Lancelot SIX
8e8efc7ace
qgis: 3.10.1 -> 3.10.4
2020-03-24 20:38:01 -07:00
Mario Rodas
fa9290102e
Merge pull request #82717 from r-ryantm/auto-update/saga
...
saga: 7.5.0 -> 7.6.1
2020-03-17 08:20:22 -05:00
R. RyanTM
c9836e9f6d
saga: 7.5.0 -> 7.6.1
2020-03-16 09:54:28 +00:00
Nikolay Korotkiy
cfb57680ee
openorienteering-mapper: 0.9.1 -> 0.9.2
2020-03-15 08:03:51 +00:00
Benjamin Hipple
6a54fd3acf
whitebox-tools: upgrade cargo fetcher and cargoSha256
...
Infra upgrade as part of #79975 ; no functional change expected.
2020-02-28 00:24:54 -08:00
Maxim Krivchikov
bba9b7fe6e
whitebox-tools: 0.16.0 -> 1.2.0
2020-02-22 10:45:35 +00:00
Benjamin Hipple
eb11feaa0b
treewide: change fetchCargoTarball default to opt-out
...
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.
This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.
See #79975 for details.
2020-02-13 22:41:37 -08:00
R. RyanTM
1543fd14be
saga: 7.3.0 -> 7.5.0
2020-02-10 18:04:44 +01:00
Robin Gloster
f9f46dc327
treewide: NIX_*_FLAGS -> string
2019-12-31 00:15:46 +01:00
Renaud
013e439fd8
Merge pull request #75036 from sikmir/oom
...
openorienteering-mapper: 0.9.0 -> 0.9.1
2019-12-21 17:30:50 +01:00
Lancelot SIX
90ebbaa86a
qgis: 3.10.0 -> 3.10.1
2019-12-17 12:17:13 +01:00
Izorkin
154f6f1e43
grass: fix mysql_config query
2019-12-08 11:08:31 +01:00
Nikolay Korotkiy
191de93ea7
openorienteering-mapper: 0.9.0 -> 0.9.1
2019-12-05 10:52:55 +03:00
c0bw3b
9315000432
saga: remove jasper from inputs
...
It is unused since v2.2.6 (2016)
https://sourceforge.net/p/saga-gis/bugs/224/
2019-11-17 19:17:12 +01:00
Lancelot SIX
c803971bfd
qgis: 3.8.2 -> 3.10.0
...
See http://changelog.qgis.org/en/qgis/version/3.10/
2019-10-29 10:22:01 +01:00
Nikolay Korotkiy
f6b8a4d7ef
openorienteering-mapper: 0.8.4 -> 0.9.0
2019-10-23 13:31:47 -07:00
Lancelot SIX
5d8ec9b99b
qgis: 3.8.0 -> 3.8.3
2019-10-02 10:03:06 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
...
This reverts commit f8a8fc6c7c
.
2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
...
This reverts commit 41af38f372
, reversing
changes made to f0fec244ca
.
Let's delay this. We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next
2019-09-15 13:18:54 +02:00
Daniel Schaefer
a5b2e090ec
whitebox: 0.9.0 -> 0.16.0 ( #68682 )
2019-09-13 17:08:57 +00:00
Izorkin
329a88efa7
treewide: replace mysql.connector-c to libmysqlclient
2019-09-09 15:55:34 +03:00
volth
7bb6b373ab
treewide: name -> pname ( #67513 )
2019-08-31 07:41:22 -04:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
volth
46420bbaa3
treewide: name -> pname (easy cases) ( #66585 )
...
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk
a28a9ac156
Merge master into staging-next
2019-07-16 11:15:46 +02:00