Commit graph

4927 commits

Author SHA1 Message Date
Vladimír Čunát 94f4857bc5
Merge branch 'master' into staging
Hydra: ?compare=1427817
2018-01-20 10:05:27 +01:00
Vladimír Čunát 5fafb7ef73
clang-3.8: fixup build after #33953 917429233b 2018-01-20 09:48:35 +01:00
Orivej Desh 836951fc14
Merge pull request #34050 from jammerful/mono
mono{48,50,54}: Fix libgdiplus path in dll config map
2018-01-19 22:21:05 +00:00
jammerful 7ae8d2b567 mono{48,50,54}: Fix libgdiplus path in dll config map 2018-01-19 15:52:44 -05:00
Kosyrev Serge 8d027c1113
ghc841: GHC 8.4.1: nix-shell -p haskell.compiler.ghc841 2018-01-19 16:06:02 +03:00
John Ericson a18053bdfe Merge remote-tracking branch 'upstream/master' into staging 2018-01-18 14:17:58 -05:00
Tim Steinbach e1db0afd61
openjdk: 8u152 -> 8u172 2018-01-18 11:22:44 -05:00
Shea Levy d4dbe03be5
Revert "openjdk: 8u152 -> 8u162"
This bump causes the bazel build to fail with:

> Cannot find requested resource bundle for locale en_US

This reverts commit 241e509abd.
2018-01-18 10:07:04 -05:00
Tuomas Tynkkynen 61a75a1d22 Merge remote-tracking branch 'upstream/master' into staging 2018-01-18 00:24:33 +02:00
Tim Steinbach c5b5568a12
kotlin: 1.2.10 -> 1.2.20 2018-01-17 10:25:25 -05:00
Tim Steinbach 241e509abd
openjdk: 8u152 -> 8u162 2018-01-17 10:11:11 -05:00
Tim Steinbach 416ef9bd8e
openjdk: 9.0.1 -> 9.0.4 2018-01-17 10:11:11 -05:00
Tim Steinbach ca8169a6f1
Merge pull request #33979 from taku0/oraclejdk-8u161
oraclejre: 9.0.1 -> 9.0.4 [Critical security fixes]
2018-01-17 14:14:51 +00:00
taku0 41cb6636fb oraclejre: 9.0.1 -> 9.0.4 2018-01-17 23:05:28 +09:00
Tim Steinbach a74e13f057
Merge pull request #33976 from taku0/oraclejdk-8u161
oraclejdk: 8u151, 8u152, 9.0.1 -> 8u161, 8u162, 9.0.4 [Critical security fixes]
2018-01-17 13:56:52 +00:00
Tim Steinbach 1d17b481c6
Merge pull request #31552 from taku0/jdk9-remove-jce
oraclejdk: remove JCE option
2018-01-17 13:56:40 +00:00
Tuomas Tynkkynen 884a167f87 Merge remote-tracking branch 'upstream/master' into staging 2018-01-17 12:52:47 +02:00
Tuomas Tynkkynen 67c73b4e64 Merge commit '2e56ba' from staging into master 2018-01-17 12:50:46 +02:00
taku0 88ba2698c3 oraclejdk: 8u151, 8u152, 9.0.1 -> 8u161, 8u162, 9.0.4 2018-01-17 19:12:21 +09:00
Vladimír Čunát e0c5af37e9
Merge #33955: lldb-{4,5}: install manpage 2018-01-16 23:04:28 +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
Daiderd Jordan eee6eef6af
Merge pull request #33953 from LnL7/clang-lib-cmake
clang: patch cmake files for lib output
2018-01-16 22:17:01 +01:00
Will Dietz 74bcd87ed9 lldb-{4,5}: install manpage 2018-01-16 15:15:41 -06:00
Tuomas Tynkkynen 2e56ba6fbd Merge remote-tracking branch 'upstream/master' into staging 2018-01-16 22:49:20 +02:00
Daiderd Jordan 917429233b
clang: patch cmake files for lib output
Fixes cmake build issues introduced in #33342.
2018-01-16 21:46:43 +01:00
Michael Raskin 847db60f02
julia: 0.6.0 -> 0.6.2 2018-01-16 19:30:04 +00:00
John Ericson 5a754e75b4 Merge branch 'ericson2314-cross-master' into staging 2018-01-16 13:05:39 -05:00
Erik Schnetter 6c1277a864 julia: 0.6.0 -> 0.6.2 2018-01-16 12:09:37 -05:00
Tuomas Tynkkynen 222f905fd9 rustc: Supports ARMv7 2018-01-16 14:17:40 +02:00
Guillaume Bouchard 156b8029f2 ispc: 20170807 -> 1.9.2
Version bump, fixes #29979
2018-01-15 12:25:03 +01:00
Jörg Thalheim 092aaf22f6
Merge pull request #33888 from kamilchm/ponyc
ponyc: 0.21.2 -> 0.21.3
2018-01-15 09:28:04 +00:00
adisbladis 6e8290ec31
solc: 0.4.17 -> 0.4.19 2018-01-15 17:11:33 +08:00
Kamil Chmielewski 282934ca8e ponyc: 0.21.2 -> 0.21.3
https://github.com/ponylang/ponyc/issues/2478
2018-01-15 08:15:01 +01:00
Dan Peebles 1a054480d3 mono54: init
Still trying to figure out how msbuild should fit into the picture...
2018-01-14 15:36:00 -05:00
Tuomas Tynkkynen 6ed0fe7e45 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix
2018-01-14 21:18:27 +02:00
Jörg Thalheim df400a17de
Merge pull request #33732 from kamilchm/ponyc
ponyc: FIX $CC undefined, using gcc as the linker
2018-01-13 18:24:40 +00:00
Thomas Mader 5f0c823a61 ldc: Disable cdvecfill test to fix build on older processors
https://github.com/NixOS/nixpkgs/pull/33830
2018-01-13 14:57:03 +01:00
Peter Simons aecc868ac1
Merge pull request #33733 from dhess/arm-cross-fixes
ghc, haskell-modules: ARM cross build fixes.
2018-01-11 16:56:20 +01:00
Drew Hess e4f3fe051e ghc, haskell-modules: ARM cross build fixes.
As requested in #33405.
2018-01-11 10:45:44 -05:00
Michael Raskin 18ca43f339
Merge pull request #33612 from fare-patches/master
Update gambit and gerbil
2018-01-11 09:38:08 +00:00
Francois-Rene Rideau 699c8cc832 gerbil: 0.12-DEV-836-gcde6802 -> 0.12-DEV-1030-gbbed3bc 2018-01-11 04:28:18 -05:00
Kamil Chmielewski a628055e5c ponyc: FIX $CC undefined, using gcc as the linker
https://github.com/ponylang/ponyc/issues/2482
2018-01-11 03:46:16 +01:00
Thomas Mader 81d289fed0 ldc: Remove dynamiccompile tests for Darwin too 2018-01-10 22:48:36 +01:00
Austin Seipp 155a2f270f yosys: 2017.12.06 -> 2018.01.10
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-01-10 14:00:58 -06:00
Austin Seipp 87132df854 arachne-pnr: 2017.12.06 -> 2018.01.10
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-01-10 14:00:58 -06:00
Joachim F 3b4ebab230
Merge pull request #33532 from ThomasMader/ldc1.7.0
ldc: 1.5.0 -> 1.7.0
2018-01-10 19:51:37 +00:00
Thomas Mader 1aff67ce19 ldc: 1.5.0 -> 1.7.0 2018-01-10 20:08:26 +01:00
John Ericson 98b3db2eef
Merge pull request #33676 from obsidiansystems/less-arm-hack
gcc, binutils: Narrow down ARM hack so only native builds are affected
2018-01-09 17:52:45 -05:00
John Ericson c98e6b6771 gcc, binutils: Narrow down ARM hack so only native builds are affected 2018-01-09 17:25:49 -05:00
Robin Gloster 7c5430c27c
Revert "rust: store the cargo-vendor config"
This reverts commit 0af2c5891b.

See 0af2c5891b (commitcomment-26737983)
This breaks the cargoSha256 hashes.
2018-01-09 15:03:03 +01:00