Commit Graph

9916 Commits

Author SHA1 Message Date
Niklas Hambüchen
63b1e6e489 ghc*-binary: Remove no-op --with-gmp-libraries 2021-07-10 02:49:42 +02:00
Niklas Hambüchen
c6a77590e3 haskell.compiler.ghc8102Binary: Split ghcBinDists set into default and musl.
This allows to implement the "HACK" mentioned in the commit to
build `pkgsMusl` GHCs on Hydra without failing evaluation on Darwin.

Reference of the discussion:
https://github.com/NixOS/nixpkgs/pull/129289#discussion_r663956747

Patch contributed by @sterni.
2021-07-10 02:49:42 +02:00
Niklas Hambüchen
f4e62a996f pkgsMusl.haskell.compiler.ghc{8104,884,901,HEAD}: Disable sphinx for musl
Adds new package options:

* enableDocs
* enableHaddockProgram

to control whether to build Sphinx docs, and GHC haddocks and the
haddock program.

Unfortunately currently the building of the `haddock `program
and generating GHC docs are mixed into one option, see:
https://gitlab.haskell.org/ghc/ghc/-/issues/20077

Making Sphinx docs disableable, and disabling them by default
for Musl and cross builds, makes it much easier to provide these
builds without having to support Sphinx's enormous dependency
tree for those ways of building.
2021-07-10 02:49:42 +02:00
Niklas Hambüchen
8adcd39504 ghc: Add comments about hardeningDisable pie for musl 2021-07-10 02:49:42 +02:00
Niklas Hambüchen
8b15fccf8a pkgsMuslhaskell.compiler.{ghc884,ghc8104}: Use GHC 8.10 as bootstrap compiler.
This addresses the fact that `ghc865Binary` segfaults on musl
(see #118731) because of the glibc+musl mix used in there.

With the previous commits, `ghc8102Binary` was changed to use
the musl-based bindist from GHC HQ instead, which works.

With this change, all nix Haskell compilers builds on musl:

    NIX_PATH=nixpkgs=. nix-build --no-link --expr 'with import <nixpkgs> {}; { inherit (pkgsMusl.haskell.compiler) ghc884 ghc8104 ghc901 ghcHEAD; }'
2021-07-10 02:49:42 +02:00
Niklas Hambüchen
f154c3adde haskell.compiler.ghc865Binary: Disable "pie" hardening. See #129247
While this does not fix `ghc865Binary` with musl, it at least prevents
that the other, newer errors are shadowed (see #129247).
2021-07-10 02:49:42 +02:00
Niklas Hambüchen
c866b8a13b haskell.compiler.ghc8102Binary: find -executable -> -perm -0100 2021-07-10 02:49:42 +02:00
Niklas Hambüchen
da1cf8cb90 pkgsMusl.haskell.compiler.ghc8102Binary: Fix musl segfault. Fixes #118731 #129247.
This commit replaces the musl + glibc hackery in the GHC bindist
compiler by using the new musl based bindist that GHC HQ provides
(built on Alpine).
We could alternatively also use a nix-built musl boostrap compiler,
but it seems nicer to use the GHC HQ one for now.

This fixes the compiler built by
`pkgsMusl.haskell.compiler.ghc8102Binary` segfaulting (#118731)
since the commit

    5e2311d2f - musl: 1.2.1 -> 1.2.2

concretely, musl commit

    01c7920f - remove redundant pthread struct members repeated for layout purposes

which I suspect breaks some glibc/musl ABI compatibility that may have
existed accidentally until then.

The added

    lib.optional stdenv.targetPlatform.isMusl "pie";

also fixes that the packaged bindist compiler cannot create a binary
in its `installCheck` phase (and overall); see detail explanation
in #129247.
2021-07-10 02:49:41 +02:00
Niklas Hambüchen
5777bd3d56 haskell.compiler.ghc8102Binary: Remove sed of /usr/bin/* commands.
None of the current bindists appear to contain these paths in their
`ghc-stage2` binary.
2021-07-10 02:49:41 +02:00
Niklas Hambüchen
1326009806 haskell.compiler.ghc8102Binary: Add check for arch-specific libraries.
With this check, we no longer don't notice when the upstream bindist
changes its dependencies (e.g. because a newer Debian version is used
that uses a new `ncurses` version).
2021-07-10 02:49:41 +02:00
Niklas Hambüchen
8a2de701f7 haskell.compiler.ghc8102Binary: Fix build on i686.
The library override that was present in the code referred to a
name that isn't even used in current GHC bindists.

Tested with:

    NIX_PATH=nixpkgs=. nix-build --no-link -A haskell.compiler.ghc8102Binary --argstr system i686-linux
2021-07-05 16:38:24 +02:00
Niklas Hambüchen
67e8744ef8 ghc: Refactor: Extract ghcBinDists 2021-07-05 16:38:24 +02:00
Niklas Hambüchen
947f757bba haskell.packages.ghc8102Binary: Add comments 2021-07-05 16:38:24 +02:00
Niklas Hambüchen
8d11c1380a pkgsMusl.haskell.compiler.ghc901: Fix evaluation with musl
`glibcLocales` only exists when glibc is used.

Similar to commit:

    8727284a - haskell: only use glibcLocales when using glibc
2021-07-04 22:15:59 +00:00
Sandro
cc9e99b9d9
Merge pull request #128744 from nagy/chicken-binpath
chickenPackages_5.chicken: use lib.makeBinPath instead
2021-07-01 00:25:47 +02:00
Daniel Nagy
b553ac45a2
chickenPackages_5.chicken: use lib.makeBinPath instead 2021-06-30 09:23:22 +02:00
Sandro
fe4d13701b
Merge pull request #128560 from asbachb/update/java/11
openjdk: 11.0.10+11 -> 11.0.11+9
2021-06-30 00:33:15 +02:00
Sandro
ce8ca923bb
Merge pull request #128204 from simonchatts/smlnj 2021-06-28 23:36:31 +02:00
Benjamin Asbach
8c8b704c79 openjdk: 11.0.10+11 -> 11.0.11+9
fixes #128407
2021-06-28 16:25:49 -05:00
Simon Chatterjee
4a4fc6c9c9 smlnjBootstrap: move dependents over to regular smlnj
smlnjBootstrap seems to exist as a workaround for a failing x86_64-darwin build
of regular smlnj. Now this is fixed, the workaround can be removed.
(aarch64-darwin is being actively worked on by the smlnj project, and currently
is supported by neither derivation.)
2021-06-28 10:50:56 +01:00
Simon Chatterjee
9fdc5e10ee smlnj: fix x86_64-darwin build 2021-06-28 10:50:53 +01:00
Sandro
16b3047428
Merge pull request #128197 from nagy/vlang-022
vlang: 0.1.21 -> weekly.2021.25
2021-06-27 18:33:44 +02:00
Daniel Nagy
e73b32f1c5
vlang: 0.1.21 -> weekly.2021.25 2021-06-27 10:37:06 +02:00
Sandro
4b74a98ec5
Merge pull request #128139 from misuzu/llvm12_armv7l
llvm_12: disable failing 'DebugInfo/X86/vla-multi.ll' on armv7l
2021-06-26 21:57:05 +02:00
Daniel Nagy
1d60b17566
chickenPackages_5.chicken: check the binaryVersion (#128202)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-26 21:47:51 +02:00
Robert Schütz
d6234c2165 Merge branch 'master' into staging-next 2021-06-26 00:33:58 +02:00
misuzu
68bc5b4224 llvm_12: disable failing 'DebugInfo/X86/vla-multi.ll' on armv7l 2021-06-25 23:28:46 +03:00
Sandro
b9312e7a29
Merge pull request #128060 from hrhino/scala-runners 2021-06-25 19:20:48 +02:00
Sandro
f7f7562dc6
Merge pull request #128113 from luc65r/pkg/myrddin
myrddin: init at 0.3.1
2021-06-25 19:19:13 +02:00
Lucas Ransan
f9d39423e7
myrddin: init at 0.3.1 2021-06-25 17:33:55 +02:00
Harrison Houghton
246b757d26 scala-runners: init at unstable-2020-02-02
This is a script to run multiple versions of scala either by version
number or build hash.
2021-06-25 10:47:30 -04:00
Michael Weiss
396c700795
Merge pull request #128096 from primeos/llvm_git
llvmPackages_git: 2021-06-11 -> 2021-06-19
2021-06-25 15:00:53 +02:00
Michael Weiss
d9d0021012
llvmPackages_git: 2021-06-11 -> 2021-06-19 2021-06-25 14:44:59 +02:00
Sandro
fef1fef93d
Merge pull request #127948 from LibreCybernetics/update-idris2 2021-06-25 14:35:44 +02:00
github-actions[bot]
bae6b2055f
Merge master into staging-next 2021-06-25 12:06:04 +00:00
Robert Schütz
c1dca92daf Merge branch 'master' into staging-next 2021-06-25 10:02:10 +02:00
Subhrajyoti Sen
45527fa014
kotlin: 1.5.10 -> 1.5.20 2021-06-25 10:36:27 +05:30
Matthew Bauer
8c10630b9e
Merge pull request #127979 from matthewbauer/compiler-rt-mark-broken
compiler-rt{5,6,7,8,9,10}: mark broken on aarch64-darwin
2021-06-24 16:07:45 -05:00
Fabián Heredia Montiel
c454c6855e idris2: 0.3.0 → 0.4.0
v0.4.0:
 - Added gmp as a build dependency
 - Removed bootstrap-test (test still available and more general)
 - Renamed bootstrap-build to bootstrap (bootstrap previously did
   bootstrap-build and bootstrap-test)
2021-06-24 13:27:56 -05:00
Jan Tojnar
a01a771740
Merge pull request #127243 from maxeaubrey/vala_cleanup
vala: drop 0.36, 0.44
2021-06-24 11:16:12 +02:00
Sandro
12a0371894
Merge pull request #127882 from babariviere/fix/darwin-graalvm 2021-06-24 11:15:03 +02:00
Matthew Bauer
91578ff6f8 compiler-rt{5,6,7,8,9,10}: mark broken on aarch64-darwin
These don’t have support for this platform, so just mark it as broken
for now.
2021-06-23 22:54:24 -05:00
Bastien Riviere
a6bb32aecc
graalvm-ce: fix NativePRNG errors on darwin
Fix NativePRNG errors when building softwares like `babashka`.
Also temporarly disable JShell in installCheckPhase.
2021-06-23 12:43:10 +02:00
Jonathan Ringer
32e7183410
Merge pull request #127419 from NixOS/python-unstable
Python package set minor updates
2021-06-22 14:49:00 -07:00
github-actions[bot]
c7bb5a79c8
Merge master into staging-next 2021-06-22 12:05:00 +00:00
sternenseemann
cd33c34578 haskell.compiler.ghc884: patch for sphinx >= 4.0
With sphinx 4, interpreting the conf.py fails due to a decode
error: https://gitlab.haskell.org/ghc/ghc/-/issues/19962
The fix is an one line change which we have to backport from GHC
master.

9.2 and 8.10.6 will have a fix for this, GHC 9.0.1 and ghcHEAD
already have and GHC 8.10.4 has been patched in nixpkgs already.
2021-06-22 13:42:55 +02:00
sternenseemann
a8c2421e5b haskell.compiler.ghc8104: patch for sphinx >= 4.0
With sphinx 4, interpreting the conf.py fails due to a decode
error: https://gitlab.haskell.org/ghc/ghc/-/issues/19962

The fix is an one line change which we have to backport from GHC master.
Thus ghcHEAD is not affected by this problem.

9.2 and 8.10.6 will most likely have a fix for this.

TODO: Patch 8.8.4 and 9.0.1
2021-06-22 13:42:55 +02:00
Redvers Davies
bdb83d6589
pony-corral: 0.5.0 -> 0.5.1 (#127695)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-22 10:06:55 +02:00
github-actions[bot]
6f3d57cba9
Merge master into staging-next 2021-06-22 06:04:24 +00:00
Sandro
d514b8d012
Merge pull request #127674 from fgaz/qbe/2021-06-17 2021-06-22 02:38:26 +02:00