Commit Graph

6667 Commits

Author SHA1 Message Date
Vladimír Čunát
bf47162c26
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1508887
2019-03-10 08:04:21 +01:00
Vincent Laporte
3c9bfa32e2 compcert: 3.4 -> 3.5 2019-03-09 05:49:26 -06:00
Jörg Thalheim
65b402ed67
Merge pull request #57023 from alyssais/crystal
crystal: fix build on Darwin
2019-03-08 11:18:31 +00:00
Michael Roitzsch
6a4d2eea8a swift: 4.2.2 -> 4.2.3 2019-03-07 15:22:45 +01:00
Alyssa Ross
5b52e90e4a
crystal: fix build on Darwin 2019-03-07 13:38:35 +00:00
markuskowa
b50855dc35
Merge pull request #56913 from markuskowa/rm-julia06
julia: remove 0.6.4 (julia_06)
2019-03-06 09:36:19 +01:00
Atkins
b8d0bf3dd6
solc: 0.5.4 -> 0.5.5 2019-03-06 16:27:10 +08:00
Peter Simons
68be6bbc31 ghc: add new 8.6.4 version 2019-03-06 08:13:56 +01:00
Markus Kowalewski
c997f5d0f2
julia: remove 0.6.4 (julia_06) 2019-03-05 17:52:58 +01:00
Peter Simons
9d9c599055 swi-prolog: remove myself from list of maintainers 2019-03-05 12:53:04 +01:00
Peter Simons
456f09d76f ghc: Drop outdated compiler versions 8.6.1 and 8.6.2. We have 8.6.3. 2019-03-05 11:13:52 +01:00
Matthew Bauer
1f212565d2 ghc863: dont add extra libs
Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.

Merged in pull request #56795 from @matthewbauer.
2019-03-05 11:13:52 +01:00
Frederik Rietdijk
5d7ab31949 Merge master into staging-next 2019-03-05 08:32:52 +01:00
Wael Nasreddine
37d2f71e2f
go_1_12: set meta.branch to 1.12 (#56852) 2019-03-04 23:18:12 -08:00
Jörg Thalheim
27cb0669c6
Merge pull request #56500 from kalbasit/nixpkgs_add-support-go-1-12
go_1_12: init at go 1.12
2019-03-04 14:22:27 +00:00
Graham Christensen
1774c68090
Merge pull request #56365 from asymmetric/solc-0.5.4
solc: 0.5.3 -> 0.5.4
2019-03-04 08:47:56 -05:00
Will Dietz
209ab53069
Merge pull request #56670 from dtzWill/update/pony-0.27.0
ponyc: 0.26.0 -> 0.27.0, cleanup, use recent LLVM
2019-03-04 00:07:19 -06:00
Will Dietz
145f213806 llvmPackages_8: rc2 -> rc3 2019-03-03 21:54:26 -06:00
Matthew Bauer
7874ca5b61
Merge pull request #56645 from matthewbauer/llvm-8
llvm8: init
2019-03-03 21:00:36 -05:00
Wael M. Nasreddine
252376c617
go_1_12: switch to fetchurl for sha256 consistency on Darwin
fetchFromGitHub and thus fetchzip hashes the contents of the archive and
not the archive itself. Unicode file names lead to different checksums
on HFS+ vs. other file systems because of Unicode normalisation
2019-03-03 16:32:04 -08:00
R. RyanTM
0255d8035b fasm-bin: 1.73.08 -> 1.73.09
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fasm-bin/versions
2019-03-03 20:50:12 +01:00
Frederik Rietdijk
35e73c9dd5 Merge staging into staging-next 2019-03-03 09:35:42 +01:00
Wael M. Nasreddine
6ef04cabd4
go_1_12: init at go 1.12 2019-03-02 14:24:17 -08:00
R. RyanTM
72c111822a kotlin: 1.3.20 -> 1.3.21
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions
2019-03-02 20:59:59 +00:00
Will Dietz
aba880189a ponyc: cleanup a bit, mostly remove old source fixups no longer needed 2019-03-02 02:14:54 -06:00
Will Dietz
7565289ec7 pony-stable: 0.1.6 -> 0.2.0 2019-03-02 02:14:50 -06:00
Will Dietz
a30a76effa ponyc: 0.26.0 -> 0.27.0
https://www.ponylang.io/blog/2019/03/0.27.0-released/
2019-03-02 02:14:48 -06:00
Matthew Bauer
52cb072562 llvm8: init 2019-03-01 23:42:10 -05:00
R. RyanTM
f11ae81793 closurecompiler: 20190121 -> 20190215
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/closure-compiler/versions
2019-03-01 16:03:09 -08:00
Sebastian Graf
cbaec5abc9 Fix include path of libffi used in GHC build 2019-03-01 11:30:05 +01:00
Frederik Rietdijk
205e0fc5bd Merge staging-next into staging 2019-03-01 09:22:21 +01:00
Frederik Rietdijk
2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Luka Blaskovic
8d3e91077b rust: 1.32.0 -> 1.33.0 2019-03-01 07:56:40 +00:00
Ryan Mulligan
6e5caa3f8a
Merge pull request #52624 from alesguzik/update-terra
terra: 2016-06-09 -> 1.0.0-beta1
2019-02-28 19:22:10 -08:00
jacereda
bf3a38ac5f mercury: build on Darwin (#56511) 2019-02-28 17:24:27 +01:00
Peter Hoeg
842f2c9cb5
Merge pull request #56331 from peterhoeg/u/crystal
crystal: init at 0.27.2
2019-02-28 13:49:28 +08:00
Pierre Bourdon
7541e4f8ac
llvm/7/compiler-rt: define CMAKE_*_COMPILER_TARGET unconditionally
When building with -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON the compiler-rt
CMake configuration attempts to use CMAKE_*_COMPILER_TARGET variables,
which are usually only defined in cross-compilation mode.
2019-02-28 04:29:05 +01:00
Matthew Bauer
5c46f77249
Merge pull request #56197 from matthewbauer/cross-fixes3
Android and related cross fixes
2019-02-26 20:30:53 -05:00
Matthew Bauer
b86e62d30d llvm: support cross compilation with useLLVM flag
You can build (partially) with LLVM toolchain using the useLLVM flag.
This works like so:

  nix-build -A hello --arg crossSystem '{ system =
    "aarch64-unknown-linux-musl"; useLLVM = true }'

also don’t separate debug info in lldClang

It doesn’t work currently with that setup hook. Missing build-id?
2019-02-26 19:45:35 -05:00
Matthew Bauer
ead13a3aca llvm: don’t use targetPlatform
LLVM should be target independent because it will work with all
machine types. This is different from GCC where it needs to know what
target to build ahead of time.
2019-02-26 19:45:35 -05:00
Matthew Bauer
aab8c7ba43 netbsd: add cross target 2019-02-26 15:55:47 -05:00
Jörg Thalheim
dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
Ryan Mulligan
10f0d40838
Merge pull request #55287 from vaibhavsagar/bump-smlnj
smlnj: 110.84 -> 110.85
2019-02-25 19:16:31 -08:00
Will Dietz
ed60483257
llvm-polly,clang-polly: Add llvm/clang variants w/polly support (#55065)
* llvm: build w/polly in-tree, optionally

Don't enable by default yet, defer rebuilds.

* top-level: llvm-polly, clang-polly

* bit hacky re:overrides
* need to explicitly set cmake flags for clang to link in polly
2019-02-25 15:20:52 -06:00
Lorenzo Manacorda
572f828e7e solc: 0.5.3 -> 0.5.4 2019-02-25 17:50:54 +01:00
Tom Smeets
5ef3645a69 emscripten: 1.37.36 -> 1.38.28 2019-02-25 13:13:55 +01:00
Peter Hoeg
6618a6fae0 crystal: init at 0.27.2 2019-02-25 12:36:42 +08:00
Matthew Bauer
73061742af Merge remote-tracking branch 'NixOS/master' into staging 2019-02-24 18:54:32 -05:00
Matthew Bauer
e36cd48b6e llvm: don’t use targetPlatform
LLVM should be target independent because it will work with all
machine types. This is different from GCC where it needs to know what
target to build ahead of time.
2019-02-24 17:00:48 -05:00
Matthew Bauer
be6d030b98 llvm6: remove enableTargets
These are no longer used. We build all targets now.
2019-02-24 17:00:48 -05:00
Tomas Hlavaty
dd713e142f sbcl: 1.4.16 -> 1.5.0 2019-02-24 22:56:00 +01:00
Peter Simons
c3f38ddd8b ghcjs: disable Hydra builds while the build is marked as broken 2019-02-24 10:14:29 +01:00
Frederik Rietdijk
c2eac6741b Merge master into staging-next 2019-02-24 09:19:12 +01:00
Austin Seipp
0267483ac3
yosys: 2019.01.08 -> 2019.02.22
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-02-23 12:08:48 -06:00
Austin Seipp
b30ad4be96
nextpnr: 2019.01.08 -> 2019.02.20
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-02-23 12:08:48 -06:00
Austin Seipp
ad8d28c98f
arachne-pnr: update git repo location
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-02-23 12:08:48 -06:00
Will Dietz
663bfb120d gcc: 8.2.0 -> 8.3.0
https://gcc.gnu.org/ml/gcc/2019-02/msg00121.html
2019-02-22 15:38:39 -06:00
Alyssa Ross
0809782c73
Merge pull request #55241 from r-ryantm/auto-update/nim
nim: 0.19.0 -> 0.19.4
2019-02-22 20:11:45 +00:00
Thomas Mader
386a760cfa dmd: Fix dmd.conf 2019-02-22 14:53:56 -05:00
Vladimír Čunát
71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Peter Simons
6f5d2f4611 ghcjs: mark build as broken
Build errors are at:

 - https://hydra.nixos.org/build/89288500
 - https://hydra.nixos.org/build/89286604
2019-02-22 10:35:00 +01:00
Dmitry Kalinkin
f96d4d555b
Merge pull request #55998 from ThomasMader/dlang-update
Dlang update
2019-02-22 02:29:41 -05:00
Thomas Mader
64c958e9a4 dmd: 2.084.0 -> 2.084.1 2019-02-22 07:22:03 +01:00
Thomas Mader
98c6d9d799 ldc: 1.12.0 -> 1.14.0 2019-02-21 22:44:52 +01:00
Michael Raskin
2f6b01f510
Merge pull request #55764 from oxij/pkgs/nasm-from-source
nasm: build from source
2019-02-21 09:54:48 +00:00
Cray Elliott
6959c375a5 openjdk11: 11.0.1+13 -> 11.0.2+9 2019-02-21 01:01:04 -08:00
Frederik Rietdijk
e2cd07b997 Merge staging-next into staging 2019-02-21 07:54:33 +01:00
Lorenzo Manacorda
e639f24681 solc: make z3 dependency optional
It is an optional dependency, which defaults to true.

https://solidity.readthedocs.io/en/latest/installing-solidity.html#smt-solvers
2019-02-20 18:15:45 +01:00
Josef Kemetmüller
3e0723f2b2 cudatoolkit_9_0: Add later released patch updates 2019-02-19 23:23:35 +01:00
Josef Kemetmüller
ec2c972acc cudatoolkit: Fix GUI applications
This fixes the following error when starting nvvp or nsight:

```
(java:23876): Gtk-WARNING **: 19:12:17.777: Unable to locate theme engine in module_path: "adwaita",

A fatal error has been detected by the Java Runtime Environment:

 SIGSEGV (0xb) at pc=0x00007f957f7b67fe, pid=23876, tid=140281059333888

JRE version: Java(TM) SE Runtime Environment (8.0_77-b03) (build 1.8.0_77-b03)
Java VM: Java HotSpot(TM) 64-Bit Server VM (25.77-b03 mixed mode linux-amd64 compressed oops)
Problematic frame:
C  [libpixbufloader-bmp.so+0x27fe]  gdk_pixbuf__bmp_image_load_increment+0xeee
```

Since GDK_PIXBUF_MODULE_FILE should match the version we actually link
to, we override the environment variable using the one provided by the
gdk_pixbuf setup-hook.
2019-02-19 23:23:35 +01:00
Josef Kemetmüller
f483974489 cudatoolkit: Fix building of older versions
Versions prior to 9.0 did not build. Additionally we add some
smoke tests for the binaries in $out/bin.
2019-02-19 23:23:16 +01:00
Matthew Bauer
5d0b0bbf30
Merge pull request #56030 from matthewbauer/revert-72e176
Revert "libcxx: add linker scripts for libc++.a to ensure libc++abi.a…
2019-02-19 11:45:37 -05:00
Matthew Bauer
8cb7ea7dae Revert "libcxx: add linker scripts for libc++.a to ensure libc++abi.a is properly linked"
This reverts commit 72e1764199.

This causes the GHC panic reported in issue #55848.
2019-02-18 20:52:08 -05:00
Matthew Bauer
b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Josef Kemetmüller
c8fcd68662 cudatoolkit: Fixup cuda-gdb ncurses version
The ncurses upgrade to libncurses.so.6 did silently break cuda-gdb quite
some time ago.
2019-02-19 00:47:07 +01:00
Vladimír Čunát
94b518f855
Merge #54576: adoptopenjdk-bin: 11.0.1 -> 11.0.2
Includes security fixes.
2019-02-17 09:45:21 +01:00
Brandon Elam Barker
3aac221a2e ats2: 0.3.12 -> 0.3.13
Due to upcoming packaging changes with ATS2, the -gmp release will be the
same as the old release, and it is the most full-featured release. So
nothing is changing other than the .tgz archive name.
2019-02-16 13:40:15 +00:00
Frederik Rietdijk
6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
Daiderd Jordan
b2e2fe8219
Merge pull request #55618 from zachcoyle/gnu-cobol-enable-darwin
gnu-cobol: enable on darwin
2019-02-14 21:47:37 +01:00
Jan Malakhovski
01d74a5382 nasm: build from source
https://nasm.us is currently down. This way is also preferable, IMHO.
2019-02-14 13:51:47 +00:00
Michael Raskin
0dca6a43ab
Merge pull request #55746 from bhipple/fix/lazarus
lazarus: format expression with more modern style
2019-02-14 06:50:43 +00:00
Benjamin Hipple
444b26e3b5 lazarus: format expression with more modern style
This package was written more than a decade ago; this commit updates the layout
to be more conventional without making any meaningful changes. Note that because
it now has a version attribute in the derivation this does change the hash.
2019-02-13 23:39:19 -05:00
Tobias Mayer
2da868d81e Add shim for clock_gettime until macos >= 10.12 2019-02-13 13:08:57 +01:00
Frederik Rietdijk
7257dedd7c Merge master into staging-next 2019-02-13 12:33:29 +01:00
Michael Raskin
8a50050229
Merge pull request #55528 from fare-patches/master
Update Gambit and Gerbil from Upstream
2019-02-12 22:03:19 +00:00
Guillaume Bouchard
a7c774300b ghc-8.6.3: use system libffi
Use the system `libffi` (`ie` nixpkgs's) instead of built-in libffi
from ghc source tree.

This will prevent library conflict when ghc dynamically links haskell
packages (linked with ghc built-in libffi) and any external library
which uses nixpkgs `libffi`.

Closes https://github.com/NixOS/nixpkgs/pull/55208.
2019-02-12 13:40:59 +01:00
Zach Coyle
e64a9f006f gnu-cobol: enable on darwin 2019-02-11 22:55:07 -05:00
Francois-Rene Rideau
e1655a3b7f gerbil-unstable: 2019-01-25 -> 2019-02-09 2019-02-10 11:22:00 -05:00
Francois-Rene Rideau
70fb3533db gerbil: 0.15 -> 0.15.1 2019-02-10 11:22:00 -05:00
Vladimír Čunát
c40f211499
Merge branch 'staging-next'
It's not completely without regressions, but ATM it seems to bring more
upsides than downsides and the iteration is too long already.
2019-02-10 14:20:49 +01:00
Matthew Bauer
73885bc675
Merge pull request #55489 from matthewbauer/fix-clang-7
llvmPackages_7.clang-unwrapped: don’t link to libatomic on darwin
2019-02-09 22:13:19 -05:00
Matthew Bauer
b60b8226d6 llvm7: don’t link to libatomic on darwin 2019-02-09 13:40:28 -05:00
Matthew Bauer
5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Vladimír Čunát
7f9e3b8206
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
Francois-Rene Rideau
7419ce7106 gambit-unstable: 2019-01-18 -> 2019-02-05
NB: Same as release 4.9.3
2019-02-09 01:09:20 -05:00
Matthew Bauer
961fbc35e5
Merge pull request #54497 from asymmetric/solc-0.5.3
solc: 0.5.2 -> 0.5.3
2019-02-08 17:38:57 -05:00
Alyssa Ross
21d991b1fd
Merge pull request #54578 from alyssais/gcj-darwin
gcj: fix build on Darwin
2019-02-08 16:54:35 +00:00
Joachim F
b584a786ec
Merge pull request #55319 from r-ryantm/auto-update/fasm-bin
fasm-bin: 1.73.06 -> 1.73.08
2019-02-08 13:22:29 +00:00
Francois-Rene Rideau
ce67cd532c gambit: 4.9.2 -> 4.9.3 2019-02-08 00:06:01 -05:00
Timo Kaufmann
882131e7db
Revert "rustc: 1.31.0 -> 1.32.0" (#55379)
This reverts commit 56dba36eb5.
2019-02-07 12:49:37 +01:00
Vladimír Čunát
ff101946a8
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
2019-02-06 14:24:46 +01:00
R. RyanTM
f7b2656d1e fasm-bin: 1.73.06 -> 1.73.08
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fasm-bin/versions
2019-02-06 01:35:50 -08:00
Vaibhav Sagar
ad07ad8f79 smlnj: 110.84 -> 110.85 2019-02-05 16:40:12 -05:00
Eelco Dolstra
56dba36eb5
rustc: 1.31.0 -> 1.32.0 2019-02-05 12:19:15 +01:00
R. RyanTM
98f461cfa8 nim: 0.19.0 -> 0.19.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nim/versions
2019-02-04 16:02:06 -08:00
Will Dietz
4a3f06a652 swift: 4.2.1 -> 4.2.2 2019-02-04 13:23:30 -06:00
Jan Malakhovski
9c1c9cb937 coreclr: move defaults to package file 2019-02-03 15:33:35 +00:00
Jan Malakhovski
3a7f3a1119 oraclejdk8distro, oraclejdk8psu_distro: move defaults to package file 2019-02-03 15:33:24 +00:00
Vladimír Čunát
32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Michael Raskin
446520bb9b
Merge pull request #56026 from oxij/tree/move-defaults-to-package-files-half-cuda
all-packages.nix: move defaults to package files continues^2
2019-02-19 21:54:02 +00:00
Vladimír Čunát
bdd47aaf83
gcl*: fix with updated binutils
The patch was taken from Debian; they apparently don't have a src repo.
2019-02-19 18:02:29 +01:00
Vladimír Čunát
024407bf9a
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1505754
2019-02-19 12:11:04 +01:00
Vladimír Čunát
4851a04deb
go_1_10: fix tests after binutils update 2019-02-19 11:35:54 +01:00
Vincent Laporte
390ed4a626 ocaml-4.08: disable “strictoverflow” hardening 2019-02-19 09:44:04 +01:00
Vincent Laporte
1753b20648 ocaml: init at 4.08.0+beta1 2019-02-19 09:44:04 +01:00
Daiderd Jordan
cbb03f5564
Merge branch 'master' into staging-next 2019-02-17 10:09:12 +01:00
Vladimír Čunát
f7f1a2f54e
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
2019-02-17 08:05:24 +01:00
Jan Malakhovski
d9db71d581 gnu-smalltalk: move defaults to package file 2019-02-03 15:32:18 +00:00
R. RyanTM
725a9720b1 ponyc: 0.25.0 -> 0.26.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ponyc/versions
2019-02-03 08:52:40 +00:00
Vladimír Čunát
bd9f835bf6
Merge branch 'master' into staging-next
Larger rebuild, probably mainly haskell.
Hydra nixpkgs: ?compare=1503325
2019-02-02 17:13:11 +01:00
Lorenzo Manacorda
f4770dbbc8 solc: 0.5.2 -> 0.5.3 2019-02-01 23:06:31 +01:00
Luka Blaskovic
0ae0273803
llvm7: backport patches, fix building rust crates with lto
See: https://github.com/rust-lang/rust/issues/57762
(cherry picked from commit c340704bd3)
2019-02-01 18:24:54 +01:00
Will Dietz
75df522844
Merge #54998: llvm7: replace patch with official upstream commit
(cherry picked from commit 442a74bdf8)
2019-02-01 18:18:05 +01:00
Peter Simons
5649eb713e
Merge pull request #53978 from ElvishJerricco/ghcjs-8.4-8.6-fixes
GHCJS: Fix 8.4 and add 8.6
2019-02-01 13:37:02 +01:00
Vladimír Čunát
8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Vladimír Čunát
5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
adisbladis
affee8aa47
go_1_9: Drop go 1.9
Unsupported by upstream
2019-02-01 06:19:14 +00:00
Alyssa Ross
cbd63a5517
Merge pull request #52655 from prusnak/dotnet
dotnet-sdk: 2.1.402 -> 2.2.103
2019-01-31 18:18:07 +00:00
R. RyanTM
aeb51ab1f2 psc-package: 0.4.2 -> 0.5.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/psc-package/versions
2019-01-31 19:06:04 +01:00
Vladyslav M
f04f90127a
Merge pull request #54844 from r-ryantm/auto-update/closure-compiler
closurecompiler: 20181210 -> 20190121
2019-01-31 19:34:00 +02:00
Will Dietz
636ae80940 llvm7: replace patch with official upstream commit
Hopefully this also addresses any problems enountered
with the patch used previously.
2019-01-31 10:24:37 -06:00
Rob Vermaas
bfc3789f38 julia: add 1.1.0 2019-01-31 14:18:29 +01:00
taku0
8050d594d3 adoptopenjdk-bin: 11.0.1 -> 11.0.2 (openj9 x86_64-darwin) 2019-01-31 16:44:34 +09:00
Michael Raskin
fa67afe92b sbcl: fix uname invocation 2019-01-31 07:21:30 +01:00
Pavol Rusnak
929924d946
dotnet-sdk: 2.1.402 -> 2.2.103 2019-01-30 19:46:40 +01:00
Alyssa Ross
b9b83748f3
gcj: fix build on Darwin
Partially addresses https://github.com/NixOS/nixpkgs/issues/29715.
2019-01-30 18:19:17 +00:00
Will Fancher
0969e91389 Remove GHCJS 8.2 2019-01-30 04:45:41 -05:00
Will Fancher
96360a3a49 GHCJS: Add elvishjerricco as maintainer 2019-01-30 03:24:15 -05:00
Will Fancher
57cb854e42 GHCJS: Add 8.6 2019-01-30 03:22:59 -05:00
Will Fancher
27a48b714d GHCJS: Fix 8.4 build 2019-01-30 03:22:58 -05:00
Tomas Hlavaty
6483a5b5b4 sbcl: 1.4.15 -> 1.4.16 2019-01-29 22:26:14 +01:00
Peter Simons
3b1158c8dd ghcjs: mark compiler builds as broken
These builds have been failing for a long time ...
2019-01-29 20:19:54 +01:00
R. RyanTM
86a66fda12 closurecompiler: 20181210 -> 20190121
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/closure-compiler/versions
2019-01-28 13:35:09 -08:00
Jörg Thalheim
6f6900495d
Merge pull request #54323 from lblasc/rust132
rust: 1.31.0 -> 1.32.0
2019-01-28 16:14:57 +00:00
R. RyanTM
4f832c5ad8 kotlin: 1.3.11 -> 1.3.20
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions
2019-01-28 08:34:48 -05:00
Michael Raskin
545cbf1bc3
Merge pull request #54632 from fare-patches/master
Update gambit and gerbil from upstream
2019-01-28 10:33:29 +00:00
Jörg Thalheim
d5f340f59e
Merge pull request #54658 from allowthere/patch-2
go: 1.11.4 -> 1.11.5
2019-01-27 20:19:23 +00:00
Will Dietz
096ef4f297
Merge pull request #54442 from dtzWill/update/go-1.9.7
go: 1.9.5 -> 1.9.7
2019-01-27 13:29:44 -06:00
Matthew Bauer
8f30e05ce6
Merge pull request #54614 from matthewbauer/libstdcxx
libstdcxx: don’t set stdlib automatically
2019-01-27 13:55:27 -05:00
Matthew Bauer
bb3683d778
Merge pull request #54624 from matthewbauer/libcxx
cc-wrapper: add libcxx for libcxxClang
2019-01-27 13:55:18 -05:00
Vladimír Čunát
a687ef9739
go_1_9: mark as insecure (see the parent commit)
Upstream only supports two latest releases.
https://github.com/golang/go/issues/29903#issuecomment-457307356
2019-01-27 11:33:57 +01:00
Vladimír Čunát
d32e779ae8
go_1_10: 1.10.7 -> 1.10.8 (security)
https://groups.google.com/forum/#!topic/golang-announce/mVeX35iXuSw
https://github.com/NixOS/nixpkgs/pull/54658
2019-01-27 11:29:13 +01:00
Vladimír Čunát
185d88c515
adoptopenjdk-bin: fail in a good way when unsupported
It was breaking the tarball job:
https://hydra.nixos.org/build/87863422
2019-01-27 10:46:07 +01:00
Kosyrev Serge
ea19a8ed1e ghcHEAD: update to 8.7 2019-01-27 10:26:07 +01:00
Kosyrev Serge
c92101bc32 ghc-8.6.3-binary 2019-01-27 10:26:07 +01:00
Matthew Bauer
92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Matthew Bauer
77550df8e6 cc-wrapper: add libcxx for libcxxClang
clang needs to find headers + libraries for compiling with libc++. We
need to add a libcxx argument to cc-wrapper. This means you do not
have to pass in c++ headers directly.

This resolves the last case remaining of #30670. Darwin clang++ now
works properly.

Fixes #30670
2019-01-26 22:45:15 -05:00
allowthere
d803da845f
go: 1.11.4 -> 1.11.5
https://groups.google.com/forum/#!msg/golang-announce/mVeX35iXuSw/Flp8FX7QEAAJ

We have just released Go 1.11.5 and Go 1.10.8 to address a recently reported security issue. We recommend that all users update to one of these releases (if you’re not sure which, choose Go 1.11.5).

This DoS vulnerability in the crypto/elliptic implementations of the P-521 and P-384 elliptic curves may let an attacker craft inputs that consume excessive amounts of CPU.

These inputs might be delivered via TLS handshakes, X.509 certificates, JWT tokens, ECDH shares or ECDSA signatures. In some cases, if an ECDH private key is reused more than once, the attack can also lead to key recovery.

The issue is CVE-2019-6486 and Go issue golang.org/issue/29903. See the Go issue for more details.
2019-01-27 02:59:44 +00:00
Jörg Thalheim
ba34ffc665
Merge pull request #54619 from Mic92/remove-wkennington
treewide: remove wkennington as maintainer
2019-01-26 23:37:27 +00:00
Francois-Rene Rideau
a737bbd40d gerbil-unstable: 2018-11-19 -> 2019-01-25 2019-01-26 12:05:55 -05:00
Francois-Rene Rideau
85f84819fc gerbil: 0.14 -> 0.15 2019-01-26 12:05:54 -05:00
Francois-Rene Rideau
04469284ce gerbil: use full path for gsc, gxc 2019-01-26 12:05:54 -05:00
Francois-Rene Rideau
83a48f7ac4 gambit-unstable : 2018-11-19 -> 2019-01-18
This is actually the same as the stable version 4.9.2.
2019-01-26 12:05:54 -05:00
Francois-Rene Rideau
d9e452d8eb gambit: 4.9.1 -> 4.9.2 2019-01-26 12:05:54 -05:00
Francois-Rene Rideau
f22db06db6 gambit: bootstrap from gitless tarball 2019-01-26 12:05:53 -05:00
Domen Kožar
c71e6fa79b
Merge pull request #54605 from jerith666/elm-unsafe-path-fix
elm: fix UnsafePath error downloading dependencies
2019-01-26 19:06:52 +07:00
taku0
25eabb785c adoptopenjdk-bin: 11.0.1 -> 11.0.2 (hotspot aarch64-linux, x86_64-mac) 2019-01-26 20:47:40 +09:00
Jörg Thalheim
b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Matthew Bauer
f9ed5e0089 libstdcxx: don’t set stdlib automatically
We don’t need to set -stdlib=libstdc++. This only works on Clang so it
is not good to set it globally. In addition, Clang knows to use
libstdc++ on Linux by default if no stdlib is set:

324f918438/lib/Driver/ToolChains/Linux.cpp (L456)

It’s a good policy to just leave off stdlib for now.

Fixes #29877.
2019-01-26 01:55:57 -05:00
Joachim F
25ca8dc093
Merge pull request #52159 from r-ryantm/auto-update/openshadinglanguage
osl: 1.9.10 -> 1.10.2
2019-01-25 15:25:34 +00:00
Alyssa Ross
b17035126d
iasl: broaden platforms
Builds fine on Darwin.
2019-01-25 15:08:31 +00:00
Jörg Thalheim
8dd8698d2e
Merge pull request #54496 from taku0/adoptopenjdk_11.0.2
adoptopenjdk: 11.0.1 -> 11.0.2 (x86_64-linux only) [Security fixes]
2019-01-25 14:38:27 +00:00
Silvan Mosberger
1b998ce854
Merge pull request #54377 from rnhmjoj/go-mime
go: patch missing mimetype database
2019-01-24 19:50:38 +01:00
Jörg Thalheim
2716db1f72
Merge pull request #54548 from mrVanDalo/fix/aarch64-rustc-timeout
rustc: mark compileprocess as timeconsuming
2019-01-24 17:53:37 +00:00
Ingolf Wagner
c5f0dbb660 rustc: mark compileprocess as timeconsuming 2019-01-24 18:30:35 +01:00
Silvan Mosberger
89654abe66
Merge pull request #54360 from dtzWill/update/ispc-1.10.0
ispc: 1.9.2 -> 1.10.0
2019-01-24 00:43:37 +01:00
Matthew Bauer
5629e9de9d
Merge pull request #54350 from vkleen/llvm-ppc
Support PowerPC in llvm
2019-01-23 17:19:07 -05:00
taku0
3a99772d07 adoptopenjdk: 11.0.1 -> 11.0.2 (x86_64-linux only) 2019-01-23 20:52:02 +09:00
Vladimír Čunát
3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Luka Blaskovic
c340704bd3 llvm7: backport patches, fix building rust crates with lto
See: https://github.com/rust-lang/rust/issues/57762
2019-01-22 08:09:37 +00:00
Luka Blaskovic
cc5b55f944 rust: 1.31.0 -> 1.32.0 2019-01-22 08:05:17 +00:00
Will Dietz
24fb891bba go: 1.9.5 -> 1.9.7
https://golang.org/doc/devel/release.html#go1.9.minor
2019-01-21 15:52:13 -06:00
Jörg Thalheim
615ed6d90a
Merge pull request #53170 from lopsided98/uboot-rockpro64
uboot: add RockPro64 support, fix Rock64 build, misc related changes
2019-01-21 20:23:04 +00:00
Matt McHenry
736fe5ae59 elm: fix UnsafePath error downloading dependencies 2019-01-21 14:44:31 -05:00
Tim Steinbach
fad6b012bd
openjdk: 8u192 -> 8u202 2019-01-21 12:19:17 -05:00
Jörg Thalheim
f9aa74f451
Merge pull request #53886 from tex/tex/dlang
DMD to provide libphobos2.so.x.y
2019-01-21 16:29:20 +00:00
Theodore Witkamp
6bfbd2df0f gcc-arm-embedded: fix MANPATH 2019-01-20 12:22:36 -08:00
Frederik Rietdijk
ca2edf79f7 Merge master into staging-next 2019-01-20 18:22:17 +01:00
Jan Tojnar
c622d7d77a
Merge pull request #54324 from jtojnar/vapi-setup-hook
Vapi setup hook
2019-01-20 12:37:53 +01:00
Jörg Thalheim
5ba532f987
Merge pull request #54269 from taku0/oraclejdk-8u201
oraclejdk: 8u191 -> 8u201, 8u202 [Security fixes]
2019-01-20 11:08:45 +00:00
Will Dietz
1506f0f8cd ispc: 1.9.2 -> 1.10.0 2019-01-20 02:00:17 -06:00
taku0
dda9edce1d oraclejdk: add warning message about future udpates 2019-01-20 13:14:42 +09:00
Jan Tojnar
79ca7f4cb4
vala: add setup hook
Add datadir containing vapidir to XDG_DATA_DIRS and move vapipdir to dev output.
2019-01-20 04:06:20 +01:00
Viktor Kleen
469ecc7098
llvm: support PowerPC 2019-01-19 18:04:05 -08:00
rnhmjoj
ba7266c629
go: patch missing mimetype database 2019-01-20 00:58:57 +01:00
Frederik Rietdijk
d531da6f8a
Merge pull request #54094 from rnhmjoj/shell
treewide: use ${stdenv.shell} instead of /bin/sh where possible
2019-01-19 14:15:51 +01:00
adisbladis
32301dbba6
shaderc: git-2018-06-01 -> 2018.0
This is a tagged upstream release
2019-01-19 12:32:54 +00:00
adisbladis
9eb9fd2d9b
shaderc: Add missing meta license 2019-01-19 12:32:53 +00:00
adisbladis
731f0e06b1
shaderc: Turn buildInputs to nativeBuildInputs
These are all build-time only native dependencies
2019-01-19 12:32:52 +00:00
adisbladis
1d55e50fe4
shaderc: Add multiple outputs 2019-01-19 12:32:51 +00:00
Frederik Rietdijk
f8b45e2d84 Merge staging-next into staging 2019-01-19 09:24:01 +01:00
Ben Wolsieffer
414c42a697 ubootRock64, ubootRockPro64: use dtc 1.4.5 2019-01-18 21:00:58 -05:00
taku0
11fbd8299d oraclejdk: 8u191 -> 8u201, 8u202 2019-01-18 21:28:24 +09:00
R. RyanTM
1599992618 fasm-bin: 1.73.05 -> 1.73.06
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fasm-bin/versions
2019-01-17 12:37:35 -08:00
Jörg Thalheim
6d3ed732f8
Merge pull request #54122 from dtzWill/fix/llvm-7-pr39427
llvm7: patch to fix PR39427
2019-01-17 09:39:57 +00:00
Frederik Rietdijk
9cfae76fc5 Merge staging-next into staging 2019-01-17 09:21:29 +01:00
Jörg Thalheim
d3d25f5218
Merge pull request #54044 from Mic92/oraclejdk
oraclejdk: 8.191 -> 8.201; no longer depend on requireFile
2019-01-17 07:26:28 +00:00
Jörg Thalheim
1dc706f060
oraclejdk: 8.191 -> 8.201
also no longer use requireFile and accept the license via nixpkgs option
2019-01-17 07:24:33 +00:00
Will Dietz
946be0ed99 llvm7: patch to fix PR39427
See linked issue for discussion,
but key bits:

* rustc breaks without this
* fix changes ABI, may become 7.1.0
2019-01-16 16:54:59 -06:00
Jörg Thalheim
f11a2b6a35
Merge pull request #52608 from lopsided98/dtc-update
dtc: 1.4.5 -> 1.4.7
2019-01-16 21:34:56 +00:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Will Dietz
94a8a9b812
Merge pull request #52541 from dtzWill/update/iasl-2018-and-xen-fix
iasl: 20180313 -> 20181213; patch xen to work with new acpica-tools
2019-01-16 08:53:32 -06:00
Frederik Rietdijk
42d276c6b8 Merge staging-next into staging 2019-01-15 16:59:03 +01:00
Orivej Desh
d6f401e132 llvm_6, llvm_7: build all default targets (#53941)
This makes LLVM tools (including dependent tools such as LLD) readily useful in
more situations, foresees such needed additions as BPF and NVPTX, and brings
llvm_6 and newer on par with the current default llvm_5.
2019-01-15 04:59:49 +00:00
worldofpeace
263bc89c1b
Merge pull request #53000 from andrew-d/andrew/vala-no-graphviz
vala_0_38, vala_0_40, vala_0_42: add configuration to disable graphviz (to reduce closure size)
2019-01-14 20:08:22 -05:00
Milan Svoboda
3f634dd88c DMD to provide libphobos2.so.x.y 2019-01-14 18:24:11 +01:00
Andrew Dunham
c52362cd18 vala_0_38, vala_0_40, vala_0_42: add configuration to disable graphviz
This allows building Vala without support for Graphviz; useful for more
minimal installs where we don't want to pull it (and transitively,
pango, gd, etc.) in as a dependency.
2019-01-13 23:33:20 -05:00
Will Dietz
5e2ac7e5fd llvm6: enable BPF target here as well 2019-01-13 21:30:24 -06:00
Will Dietz
3054cbd3f2 llvm: include BPF target too, otherwise can't build bcc 2019-01-13 20:59:09 -06:00
Frederik Rietdijk
bb9581cd88 Merge staging-next into staging 2019-01-13 14:46:43 +01:00
R. RyanTM
d85b6275cd fasm-bin: 1.73.04 -> 1.73.05
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fasm-bin/versions
2019-01-13 09:44:08 +01:00
Austin Seipp
53fb3bb3ef compcert: clean up expression
- Require Coq 8.6.1+
  - Split substituteInPlace call into patchPhase
  - Constrain platforms correctly to x86_64 Linux/Darwin, which was all
it supported anyway (there was no way to properly configure i686 builds,
nor cross builds. In the future there might be)
  - Minor stylistic cleanups
  - Add new 'man' and 'doc' outputs (the previous attempt to move the
build artifact outputs into $lib no longer worked correctly and they
were installed into 'out' instead, this fixes it completely).
  - Clean up weird binary artifacts left in $out (that were already
in $lib)
  - Wrap ccomp to undefine _FORTIFY_SOURCE; otherwise it causes
annoying warnings on every invocation

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-12 20:06:28 -06:00
Vladimír Čunát
570d84a01e
Merge branch 'staging-next' 2019-01-13 00:39:38 +01:00
Austin Seipp
3d36ea6a05 nextpnr: with GUI support, be sure to set QT_PLUGIN_PATH
This is to help QT find all the necessary plugin libraries at startup
time, otherwise it freaks out when run out of 'nix-env' environment or
run directly, e.g.  `./result/bin/nextpnr-ice40 --gui`. The reason for
this is that none of the traditional paths it looks for are available.
The workarounds for this are to otherwise:

  - Install e.g. into environment.systemPackages (presumably it will
then pick up QT libraries in /run/current-system/sw/lib/qt-*)

  - Install 'qtbase' into your user environment (qt will also try to
load dependent libraries out of ~/.nix-profile/lib/qt-*)

However, this QT_PLUGIN_PATH wrapping hack is used elsewhere in the
tree, presumably to mitigate these (poor) workarounds, especially for
non-NixOS users. There seems to be no downside to this.

With this, I have been able to run NextPNR's GUI on an Ubuntu 16.04
system using the 'nixGL' hack by simply running the resulting binary
from anywhere (though there seems to be some glitching artifacts in the
floorplan UI, I suspect this is due to a buggy OpenGL stack rather than
any direct problem with NextPNR or the QT libraries themselves).

This does not mark the GUI build as non-broken yet, though. That will
happen in the future after a bit more testing and splitting nextpnr into
separate minimal/GUI attributes.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-12 15:51:00 -06:00
Vladimír Čunát
bde8efe792
Merge branch 'master' into staging-next
A couple thousand rebuilds have accumulated on master.
2019-01-12 12:19:34 +01:00
Yegor Timoshenko
bb1cb2a332
ghc844: update hash for d8495549ba9d194815c2d0eaee6797fc7c00756a patch 2019-01-11 20:06:22 +03:00
Michael Raskin
eb5d51d4cf clasp-common-lisp: update/fix build, 2018-11-28 prerelease (towards 0.9) 2019-01-11 16:29:29 +01:00
Jörg Thalheim
f3cb8cedef
Merge pull request #53744 from prusnak/gcc-arm-embedded-8
gcc-arm-embedded: 7-2018-q2-update -> 8-2018-q4-major
2019-01-11 12:26:13 +00:00
Dmitry Kalinkin
9fac2254b2
Merge pull request #53666 from ThomasMader/dlang-update
dmd: 2.083.1 -> 2.084.0, dub: 1.12.1 -> 1.13.0, dtools: 2.083.1 -> 2.084.0, Literate: 2018-12-23 -> 2019-01-08
2019-01-10 13:54:44 -05:00
Franz Pletz
237deba4e7
Merge remote-tracking branch 'origin/master' into staging 2019-01-10 16:00:34 +01:00
Vladimír Čunát
287144e342
Merge branch 'master' into staging-next 2019-01-10 13:07:21 +01:00
Pavol Rusnak
8eb031786c
gcc-arm-embedded: 7-2018-q2-update -> 8-2018-q4-major 2019-01-10 12:30:42 +01:00
Michael Raskin
e0fd84cf43 sbcl: fix a thread safety bug with an upstream patch 2019-01-10 12:05:55 +01:00
Austin Seipp
beaf69cee2 nextpnr: enable ECP5 P&R with Project Trellis
This requires an absurd, disgustingly gross hack in order to share the
build artifacts necessary for nextpnr to use trellis.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-08 19:15:24 -06:00
Austin Seipp
651679c257 nextpnr: fix version string output
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-08 19:15:24 -06:00
Austin Seipp
412e02c784 nextpnr: disable broken GUI build for now
This didn't work remotely (on a server with Nvidia drivers) _or_ on a
local Intel machine with integrated graphics. I presumably messed
something up (a missing dependency), but I'm not sure where. We can fix
it later.

In the mean time, just disable this by hiding it behind a minimal flag.
As a bonus this reduces the closure size by about half, although it's
still surprisingly large (~300MB or so). Part of that is probably
Python, though.

When the GUI is reintroduced in a working manner, we can expose two
nextpnr attributes for the minimal non-GUI build, and the GUI build.
(Note that I have no plans of making Python optional, since it's
extremely valuable in general and much more lightweight than qtbase.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-08 19:15:24 -06:00
Austin Seipp
1d36130ac1 nextnpr: 2018.12.29 -> 2019.01.08
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-08 19:15:24 -06:00
Austin Seipp
c60adabfbc yosys: 2018.10.17 -> 2019.01.08
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-08 19:15:24 -06:00
Thomas Mader
92236be735 dmd: 2.083.1 -> 2.084.0 2019-01-08 07:51:31 +01:00
Matthew Bauer
3cfdf8eb23
Merge pull request #53539 from matthewbauer/darwin-fixes4
Fixes for recent darwin changes
2019-01-07 15:44:21 -06:00
Matthew Bauer
09ff7707ae llvm3.{8,9}: use old CMAKE_INSTALL_NAME_DIR value
adcf4aa524 broke these two. The old way
seems to work and might still avoid the original lldb issues.
2019-01-06 22:11:38 -06:00
Jorge Acereda
a339eec2f5 futhark: remove obsolete non-hackage package 2019-01-06 22:56:29 +01:00
Daniel Goertzen
1c10efc912 add generic x86_32 support (#52634)
* add generic x86_32 support

- Add support for i386-i586.
- Add `isx86_32` predicate that can replace most uses of `isi686`.
- `isi686` is reinterpreted to mean "exactly i686 arch, and not say i585 or i386".
- This branch was used to build working i586 kernel running on i586 hardware.

* revert `isi[345]86`, remove dead code

- Remove changes to dead code in `doubles.nix` and `for-meta.nix`.
- Remove `isi[345]86` predicates since other cpu families don't have specific model predicates.

* remove i386-linux since linux not supported on that cpu
2019-01-06 12:57:36 -06:00
Frederik Rietdijk
a4250d1478 Merge staging-next into staging 2019-01-06 09:48:31 +01:00
Frederik Rietdijk
e5381cdece Merge master into staging-next 2019-01-06 09:36:23 +01:00
Vladimír Čunát
d84a33d85b
Merge branch 'master' into staging-next
A few more rebuilds (~1k on x86_64-linux).
2019-01-05 15:02:04 +01:00
Domen Kožar
5ec91bac2f
Merge pull request #53326 from domenkozar/elm-packaging-rehaul
Elm: automate packaging with elm2nix
2019-01-05 13:20:16 +00:00
Frederik Rietdijk
60a3973a55 Merge staging-next into staging 2019-01-05 10:15:00 +01:00
Tomas Hlavaty
2d9d6337f8 sbcl: 1.4.13 -> 1.4.15 2019-01-05 05:19:42 +01:00
Frederik Rietdijk
9618abe87c Merge master into staging-next 2019-01-04 21:13:19 +01:00