JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,463 Commits 2 Branches 0 Tags 13 GiB
1f9a7ec651
Commit Graph

5072 Commits

Author SHA1 Message Date
Vladimír Čunát
2d2dbe083f
Merge branch 'master' into staging 
Hydra: ?compare=1429281
 2018-01-27 09:14:22 +01:00
adisbladis
f686b90a58
sbcl: 1.4.2 -> 1.4.3 2018-01-27 14:07:10 +08:00
Thomas Mader
50c23666fc dmd: 2.078.0 -> 2.078.1 2018-01-26 22:08:28 +01:00
Clemens Fruhwirth
2f83f52ab8 gcc: 7.2.0 -> 7.3.0 2018-01-26 15:59:22 +01:00
Tuomas Tynkkynen
99fc949330 gcc7: Drop flex again 
I think I lost this during merge conflict resolution
 2018-01-26 16:50:13 +02:00
Peter Simons
a74b0e717d ghc-8.4.1: revert "update to 8.4.1-alpha2" 
This reverts commit d232856846 from
https://github.com/NixOS/nixpkgs/pull/34172. The new version does not compile:
https://nix-cache.s3.amazonaws.com/log/zhxjgmilqh5bnp16rv0fx4b6bcrhxf2a-ghc-61db0b8.drv.
 2018-01-26 13:01:12 +01:00
Peter Simons
a45dfaa335 Drop broken Haskell compilers. 
- ghc versions 6.10.4, 6.12.3, and 7.2.2 are broken, and 6.10.2-binary is no
   longer necessary after those versions have been dropped

 - halvm version 2.4.0 hasn't compiled in a long time

 - uhc version 1.1.9.4 hasn't compiled in a long time
 2018-01-26 13:01:11 +01:00
Tuomas Tynkkynen
8f0508ebc1 go: Scale up test timeouts 
I can't reproduce the problem on an idle machine where it finishes in
112.954s, so let's hope this works.

https://hydra.nixos.org/build/68236758
 2018-01-26 03:49:24 +02:00
Andrew Childs
7857399288 rustc: Fix corrupted .rlib files caused by stripping on Darwin 2018-01-26 09:41:24 +09:00
Daiderd Jordan
1dd284ceb5
rust: disable another fragile test 2018-01-24 23:06:10 +01:00
adisbladis
f7dd6951aa
go: 1.9.2 -> 1.9.3 2018-01-24 23:00:26 +08:00
Frederik Rietdijk
769342b37b Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-24 14:17:49 +01:00
Tuomas Tynkkynen
0663e972a4 ponyc: Not supported on aarch64 
https://hydra.nixos.org/build/67722376
 2018-01-23 21:42:30 +02:00
Daniel Peebles
d18af2680d
Revert "clang-{4,5}: prefer python3, much friendlier for cross" 2018-01-23 10:13:07 -05:00
John Ericson
796e2e8c75
Merge pull request #34177 from dtzWill/fix/llvm-remove-unneeded-deps 
llvm-{4,5}: remove perl, groff -- not needed
 2018-01-22 19:26:29 -05:00
Will Dietz
973d4f5354 clang-{4,5}: prefer python3, much friendlier for cross 2018-01-22 17:31:37 -06:00
Will Dietz
7e52676240 llvm-{4,5}: remove perl, groff -- not needed 2018-01-22 17:29:14 -06:00
Kosyrev Serge
d232856846
ghc841: update to 8.4.1-alpha2 2018-01-23 01:40:38 +03:00
John Ericson
a3bff14dbe Merge remote-tracking branch 'upstream/master' into staging 2018-01-22 16:20:24 -05:00
John Ericson
ec0c4802ae
Merge pull request #26799 from obsidiansystems/cross-haskell 
haskell infra: Fix cross compilation to work with new system
 2018-01-22 15:31:19 -05:00
Daiderd Jordan
a786218b9d
Merge branch 'master' into staging 2018-01-22 20:55:37 +01:00
Will Dietz
bd67bf5ca0 julia-git: mark broken, hasn't built since 2017-04-08. (#34150) 
* julia-git: mark broken, hasn't built since 2017-04-08.

First broken: https://hydra.nixos.org/build/51447624
Last successful: https://hydra.nixos.org/build/51385779

cc #34135
 2018-01-22 19:07:03 +00:00
Frederik Rietdijk
6b0873440b Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-22 16:09:11 +01:00
Vladimír Čunát
246ba46db7
Merge older staging (finished on Hydra) 
https://hydra.nixos.org/eval/1427837?filter=&compare=1427817
Fixes #34087.
 2018-01-22 08:54:37 +01:00
Ben Gamari
bf687907d7 haskell lib: Make Cabal compiler names explicit 
Cabal2nix expects a --compiler flag that contains a Cabal Compiler description.
We used to use the compiler's derivation name for this, but this breaks when
cross-compiling due to the target suffix. Instead we add an explicit
haskellCompilerName attribute to Haskell compiler derivations.
 2018-01-21 23:31:05 -05:00
John Ericson
8560c025bc ghc 8.4.1: Reformat to move rev into src 2018-01-21 23:31:04 -05:00
John Ericson
a2516efb26 ghcHEAD: Bump version ghc-8.5.20180118 2018-01-21 23:31:04 -05:00
John Ericson
23c29ebc90 ghc 8.2.2: Add bgamari's STRIP detection fix 2018-01-21 23:31:04 -05:00
John Ericson
60f45a2af1 ghc 8.0.2: Patch Cabal so --extra-*-dirs works right 2018-01-21 23:31:04 -05:00
Ben Gamari
af03b7746a ghc 8.2.2 & head: Work around ARM bugs in BFD ld by using gold 2018-01-21 23:31:03 -05:00
Ryan Trinkle
bd0de2f1cb ghc: Fix env vars and configure flags to be weird 
GHC currently handles this stuff in a quite non-standard way, basically
taking prog var `FOO` to mean `FOO_FROM_TARGET`. It's because it
(wrongly) thinks from stage 2's perspective.
 2018-01-21 23:31:03 -05:00
John Ericson
e760de8108 ghc: Predicate libiconv on not using glibc instead of Darwin 2018-01-21 23:31:03 -05:00
John Ericson
398ac54593 ghc: Fix cross compilation to work with new system 2018-01-21 23:31:03 -05:00
John Ericson
bc16cfc009 ghc: Remove old cross work 
That way the next commit can apply a similar diff to each GHC.
 2018-01-21 23:31:02 -05:00
John Ericson
0eb3acaf38 ghc: echo -n mk/build.mk to avoid extra line 2018-01-21 23:27:38 -05:00
John Ericson
5a6b6b4ac5 ghc: Normalize derivations a bit before cross 
These changes will affect the final derivation
 2018-01-21 23:27:38 -05:00
Peter Simons
4532826e99
Merge pull request #34037 from ElvishJerricco/fix-ghcjs-lts-10 
Fixed GHCJS
 2018-01-21 19:55:25 +01:00
Vladimír Čunát
82c78b86c7
clang: mass-rebuild code cleanup 2018-01-21 15:48:35 +01:00
Vladimír Čunát
a94c7ba096
Merge branch 'master' into staging 
Hydra: ?compare=1428079
 2018-01-21 15:47:08 +01:00
Vladimír Čunát
5fb5beb929
Merge #33948: {llvm,clang}-{4,5}: better man-pages 
Don't rebuild entire projects just to get manpages.
 2018-01-21 11:35:10 +01:00
Tuomas Tynkkynen
ea0736d8ef mono: Disable on aarch64 
mono40: https://hydra.nixos.org/build/67660031
mono44: https://hydra.nixos.org/build/67666036
mono50: https://hydra.nixos.org/build/67825397
mono54: https://hydra.nixos.org/build/67825452
 2018-01-21 01:41:57 +02:00
Will Fancher
fcc8cae88d Fixed GHCJS 2018-01-20 15:47:59 -05:00
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
Will Dietz
514f67e3a8 clang-{4,5}: set postBuild to empty string to avoid rebuild for now 2018-01-16 14:08:59 -06:00
Will Dietz
33c132e9b3 llvm-{4,5}: don't build entire project to get the manpages 
Much cheaper to build this way.

Also this gives them a different name to avoid confusion
and clutter when using `nix-env -qaP` or similar.
 2018-01-16 14:08:58 -06: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
Drew Hess
3ed545ab31
Revert "gcc, binutils: Get rid of 32-bit ARM configure flag exception" 
This commit breaks native armv7l-linux builds. Revert it until it can
be root-caused. This reversion does not affect other platforms or
cross-compiling.

This reverts commit 0f5c804631.
 2018-01-08 20:03:33 -08:00
Daiderd Jordan
b195d8ab07 rustc: disable failing tests on darwin 2018-01-09 03:37:53 +01:00
zimbatm
0af2c5891b rust: store the cargo-vendor config 
cargo-vendor generates almost the right cargo config. Store it with the
vendored files and patch it on use.

This allows to re-use the generated config when using git dependencies.
 2018-01-09 03:37:53 +01:00
zimbatm
c5456dbfec cargo: 0.22.0 -> 0.23.0 2018-01-09 03:37:53 +01:00
zimbatm
8559dd0474 rustc: 1.21.0 -> 1.22.1 
* removed --enable-clang as it has disappeared
* removed old fixes that have been integrated in upstream
 2018-01-09 03:37:53 +01:00
Jude Taylor
d2734eead9 fix typo 2018-01-08 10:31:12 -08:00
Jude Taylor
a19e258707 let ghcjs packages compile with new cross-compiling 2018-01-08 10:30:15 -08:00
Vladimír Čunát
5837d1a070
Merge branch 'master' into staging 2018-01-08 17:33:31 +01:00
Karol Chmist
6c6f620e59 Wrap dotty to prevent installing all the files profile 2018-01-08 12:43:44 +01:00
Peter Simons
48a6d1a2ab
Merge pull request #33405 from dhess/ghc-armv7l 
Make GHC work on armv7l-linux
 2018-01-08 11:50:41 +01:00
Geoffrey Huntley
0056411afc
corrected spelling mistake 2018-01-08 16:45:10 +11:00
Francois-Rene Rideau
aa87655318 gambit: 4.8.8-415-g29ed48bb -> 4.8.8-427-g37b111a5 2018-01-07 10:00:21 -05:00
Daiderd Jordan
5a02143c20
Merge pull request #33010 from LnL7/cacert-hook 
cacert: add hook that sets SSL_CERT_FILE
 2018-01-07 09:55:15 +01:00
Daiderd Jordan
e66a5f8862
Merge pull request #33342 from LnL7/clang-outputs 
clang: add lib output
 2018-01-07 09:43:38 +01:00
Graham Christensen
5d3a86fdb2
Merge pull request #33471 from yrashk/pony-0.21.2 
ponyc: 0.21.0 -> 0.21.2
 2018-01-05 21:18:36 -05:00
Graham Christensen
95ffb2087b
Merge pull request #33483 from ThomasMader/dmd2.078.0 
dmd: 2.075.1 -> 2.078.0
 2018-01-05 21:17:19 -05:00
Thomas Mader
fa6538fbc4 dmd: 2.075.1 -> 2.078.0 2018-01-05 20:50:30 +01:00
Pascal Wittmann
9708ae00cd
Merge pull request #33476 from jtojnar/colm-platforms 
colm: loosen platform restrictions
 2018-01-05 20:43:02 +01:00
Samuel Dionne-Riel
7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
Jan Tojnar
845632557f
colm: loosen platform restrictions 
Seems to build on aarch64 and i686 Linux.
 2018-01-05 20:10:13 +01:00
Daiderd Jordan
fdaab47d58 rust: fix sandbox build on darwin 2018-01-05 19:06:08 +01:00
Yurii Rashkovskii
a15bd7816a
ponyc: 0.21.0 -> 0.21.2 2018-01-05 09:52:11 -08:00
AndersonTorres
4a553dc247 jwasm: init at git-2017-11-22 2018-01-05 01:48:11 -02:00
Drew Hess
8ad5937f90
ghc: 8.2.2 on armv7l doesn't build without explicit use of ld.gold. 2018-01-03 15:59:07 -08:00
Drew Hess
461139e3fa
ghc: ARM builds have an LLVM runtime dependency. 2018-01-03 15:57:23 -08:00
John Ericson
3fb5fd0060 ghc: Normalize derivations in hash-preserving ways 2018-01-03 17:04:19 -05:00
John Ericson
0df29e1259 ghc: Noramlized source URLs 2018-01-03 17:04:19 -05:00
John Ericson
faa4b45a1e ghc 8.2.2, head: Inline common* bindings 
Cross case purposely changed as it will be rewritten anyways. But no
native hashes should be changed.
 2018-01-02 21:00:23 -05:00
John Ericson
a5cc983c45 ghc: Clean up, and add passthru.targetPrefix, in preparation for cross 
No hashes should be changed.
 2018-01-02 19:50:38 -05:00
Frederik Rietdijk
804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD 2018-01-02 19:10:45 +01:00
Jörg Thalheim
bc5bf95858
Merge pull request #33279 from lopsided98/go-stdenv-shell 
go-1.8, go-1.9: use stdenv.shell instead of /usr/bin/env bash
 2018-01-02 16:21:41 +01:00
Drew Hess
1e137832b8
ghc: add ARM variants to meta.platforms for new binary versions. 2018-01-02 03:57:12 -08:00
Drew Hess
9c91d0d63c
ghc: fix armv7l-linux support in new binary versions. 2018-01-02 03:36:42 -08:00
Frederik Rietdijk
e3de7b06b7 jsonnet: 0.9.4 -> 0.9.5 2018-01-02 10:15:31 +01:00
Daiderd Jordan
812f7714e2
clang: move libclang to separate lib output 
Currently clang-unwrapped can't be used as a buildInput without also
shadowing clang/clang++ of a clang based stdenv.
 2018-01-02 00:50:01 +01:00
Vladimír Čunát
1fcd92ce92
Merge branch 'master' into staging 
A few thousand rebuilds from master, again.
Hydra: ?compare=1422362
 2017-12-31 09:53:49 +01:00
John Ericson
4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant 
Make cross compilation elegant
 2017-12-30 22:58:02 -05:00
John Ericson
046f091e0d treewide: Don't use envHook anymore 
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
 2017-12-30 22:04:22 -05:00
John Ericson
4ad9a97e96 gcc: Don't let solaris hack pollute CC elsehwere 2017-12-30 22:04:22 -05:00
John Ericson
0f5c804631 gcc, binutils: Get rid of 32-bit ARM configure flag exception 
Now that we do `--enable-targes=all`, there is no risk of missing the
needed emulation.

This reverts commit ebc9b161cd.
This reverts commit 88efc22b44.
 2017-12-30 22:04:22 -05:00
John Ericson
9cda2f5559 gcc: Fix deps, for cross and consistency 
Mainly making sure we have tools to build target libs
 2017-12-30 22:04:22 -05:00
John Ericson
114a9b6253 gcc: Let cc-wrapper's setup hook define any tool env vars we need 2017-12-30 22:04:21 -05:00
John Ericson
bc23afe5c7 gcc: Add build->build dep for C compilers 
5 already had this, but I forgot the other versions.
 2017-12-30 22:04:21 -05:00
John Ericson
5b74540c5b treewide: Use depsBuildBuild for buildPackges.stdenv.cc 2017-12-30 22:04:21 -05:00
Dmitry Kalinkin
6d9769663d
cc-wrapper: allow compilers to specify unsupported hardening modes 
Fixes: 0fd7ef61b2 ('clang_34: Disable hardening bits (#28543)')
 2017-12-30 12:23:25 -05:00
Frederik Rietdijk
2d0bead714 Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-30 17:04:54 +01:00
Peter Simons
1b33f09aae uhc: disable broken build 2017-12-30 13:54:25 +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
Yegor Timoshenko
41ab3d4bd5
Merge pull request #33100 from olynch/mitschemeX11 
mitschemeX11: init at 9.2
 2017-12-30 04:33:53 +03: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
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