3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

10005 commits

Author SHA1 Message Date
github-actions[bot] 61eb7e2e9e
Merge master into staging-next 2021-07-20 18:01:04 +00:00
R. RyanTM 0d70345ec2 kotlin: 1.5.20 -> 1.5.21 2021-07-20 07:12:53 +00:00
github-actions[bot] c0cb54f9ee
Merge master into staging-next 2021-07-19 18:01:10 +00:00
github-actions[bot] dc802b2e19
Merge master into staging-next 2021-07-19 00:01:36 +00:00
Jan van Brügge a2497d21d7
polyml: 5.8.1 -> 5.8.2 2021-07-18 23:51:35 +02:00
Sandro d5bd34ebf2
treewide: convert phases that contain ":" to dont* = true (#130500) 2021-07-18 23:42:48 +02:00
Maxine Aubrey dbf4e2980d
pkgs: add maxeaubrey to maintainers 2021-07-18 21:23:26 +02:00
github-actions[bot] 382fdc7ad3
Merge master into staging-next 2021-07-18 00:01:24 +00:00
Sandro b4176ae90a
Merge pull request #130472 from Stunkymonkey/inherit-version3
various: cleanup of "inherit version;"
2021-07-18 00:38:39 +02:00
Sandro dd35f1750c
Merge pull request #130157 from kvtb/patch-10
pkgsi686Linux.llvmPackages_12.compiler-rt: fix build
2021-07-18 00:31:28 +02:00
Felix Buehler 82cb33a0ae treewide: remove meta.version 2021-07-18 00:07:38 +02:00
Felix Buehler e023025ee0 various: cleanup of "inherit version;" 2021-07-17 22:39:35 +02:00
Pontus Stenetorp 785b67da96
julia_16-bin: 1.6.1 -> 1.6.2
Patches: https://github.com/JuliaLang/julia/compare/v1.6.1...v1.6.2
2021-07-17 14:40:43 +00:00
github-actions[bot] ee007cdc35
Merge master into staging-next 2021-07-17 06:01:21 +00:00
github-actions[bot] e9ca8c2796
Merge master into haskell-updates 2021-07-17 00:05:09 +00:00
Vladimír Čunát b8130cbd64
Revert "zig: add upstream patch to allow glibc 2.33 builds"
This reverts commit c1d014a975.
The patch was included in 0.8.0 and now was failing to apply.
2021-07-16 16:42:31 +02:00
Vladimír Čunát 3ea417e47f
Merge branch staging into staging-next
The staging version is a bit older already, used in pre-test:
https://hydra.nixos.org/eval/1685435
2021-07-16 09:59:01 +02:00
github-actions[bot] 7959589ea0
Merge master into staging-next 2021-07-16 06:01:04 +00:00
Fabián Heredia Montiel 37d73021ee idris2: fix packagePaths issue
packagePaths changed between idris2 `v0.3.0` and `v0.4.0` and now
includes a version number in the path.

Fixes nixos/nixpkgs#130310

Co-authored-by: zseri <zseri.devel@ytrizja.de>
Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
2021-07-15 21:50:33 -05:00
github-actions[bot] 873ebe9785
Merge master into haskell-updates 2021-07-15 00:05:17 +00:00
Jörg Thalheim 7afa51c2bd Merge remote-tracking branch 'upstream/master' into HEAD 2021-07-14 15:45:51 +02:00
kvtb a7c4537a72
pkgsi686Linux.llvmPackages_12.compiler-rt: fix build
The patch is from old LLVM, which is applied in wrong place of file
2021-07-14 08:26:36 +00:00
zowoq 53caacaf56
Merge pull request #130111 from maxeaubrey/go_1.15.14_1.16.6
go_1_15: 1.15.13 -> 1.15.14, go_1_16: 1.16.5 -> 1.16.6
2021-07-14 13:02:18 +10:00
github-actions[bot] 6e10550c38
Merge master into haskell-updates 2021-07-14 00:05:23 +00:00
Ryan Mulligan 4036bb94c7
Merge pull request #130088 from r-ryantm/auto-update/jrsonnet
jrsonnet: 0.4.1 -> 0.4.2
2021-07-13 09:05:09 -07:00
Maxine Aubrey 4695639fde
go_1_16: 1.16.5 -> 1.16.6 2021-07-13 17:55:35 +02:00
Maxine Aubrey 25eb6344d0
go_1_15: 1.15.13 -> 1.15.14 2021-07-13 17:55:25 +02:00
sternenseemann 54e1d5a3e6 haskell.compiler.ghc865Binary: mark as broken when built with musl
The musl support for binary GHC 8.6.5 relied on ABI compat between musl
and glibc which is no longer the case: https://github.com/NixOS/nixpkgs/issues/129247

Since there is no upstream musl (alpine) bindist for GHC 8.6.5, we can
only accept that binary 8.6.5 is not possible with musl.
2021-07-13 14:36:42 +02:00
R. RyanTM 3e5c6c24d6 jrsonnet: 0.4.1 -> 0.4.2 2021-07-13 11:07:27 +00:00
github-actions[bot] 10be3b5eed
Merge master into haskell-updates 2021-07-13 00:05:23 +00:00
github-actions[bot] 56d22e36bd
Merge master into staging-next 2021-07-12 12:01:28 +00:00
Pavol Rusnak d66917c4df
gcc-arm-embedded: use numVersion as version, rename version to release
followup to 009668465e
2021-07-12 13:11:40 +02:00
Sirio Balmelli 009668465e
gcc-arm-embedded: add numVersion attribute for convenience
There are builds which rely on having the numeric version of gcc (eg "10.2.1")
declared in an environment variable.

Running 'arm-none-eabi-gcc --version' returns:
"arm-none-eabi-gcc (GNU Arm Embedded Toolchain 10-2020-q4-major) 10.2.1 20201103 (release)"

However, the attribute arm-none-eabi-gcc.version is "10-2020-q4-major",
from which there is no way to derive "10.2.1".

Contrast this with the attribute gcc.version which (at this time) gives "10.3.0".

By adding a numVersion attribute, consumers of this package can
correctly determine what GCC version is being executed.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2021-07-12 12:29:46 +02:00
Niklas Hambüchen c114cd459e
Merge pull request #129289 from nh2/issue-129247-ghc-musl-fixes
Fix GHC not building with musl
2021-07-12 05:02:58 +02:00
github-actions[bot] 56ebfce4ee
Merge master into staging-next 2021-07-11 18:01:23 +00:00
Maas Lalani 93d219c8b6
fennel: init at 0.9.2 2021-07-11 11:47:19 -04:00
github-actions[bot] 606194e1c0
Merge staging-next into staging 2021-07-11 00:02:23 +00:00
Martin Weinelt b7e408dd17
Merge branch 'master' into staging-next 2021-07-10 20:15:53 +02:00
Peter Simons efa318ad55
Merge pull request #129800 from r-ryantm/auto-update/gprolog
gprolog: 1.4.5 -> 1.5.0
2021-07-10 11:41:17 +02:00
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
Sandro 45fc7d4a35
Merge pull request #129591 from Shrimpram/master 2021-07-10 01:44:06 +02:00