3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

299955 commits

Author SHA1 Message Date
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 a666b15572 argp-standalone: Add -fPIC.
Fixes `pkgsMusl.elfutils` failing with `recompile with -fPIC`.

This was discovered trying to build `pkgsMusl.haskell.compiler.ghcHEAD`.
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
Anderson Torres 09c38c29f2
Merge pull request #127863 from AndersonTorres/new-qmk
qmk: 0.0.45 -> 0.0.52
2021-07-03 00:11:41 -03:00
Ryan Mulligan 7d884bafa3
Merge pull request #129055 from r-ryantm/auto-update/alda
alda: 1.4.4 -> 1.5.0
2021-07-02 19:41:20 -07:00
Luke Granger-Brown 5a4b7d989f
Merge pull request #128870 from hagl/submit/pgtop
pgtop: init at 0.11
2021-07-03 01:54:11 +01:00
Luke Granger-Brown 02b2ec5a17
Merge pull request #128883 from primeos/libliftoff
libliftoff: init at 0.1.0
2021-07-03 01:53:01 +01:00
Luke Granger-Brown 6e5dae1274
Merge pull request #128876 from fabaff/bump-mdformat
python3Packages.mdformat: 0.7.6 -> 0.7.7
2021-07-03 01:52:18 +01:00
Luke Granger-Brown 61d8ece2d1
Merge pull request #128879 from raboof/jetbrains-updates
jetbrains: updates
2021-07-03 01:51:21 +01:00
Luke Granger-Brown 4670c25e3d
Merge pull request #128920 from wamserma/luks-trim-ae-note
nixos/luksroot: add note about AE to allowDiscards
2021-07-03 01:47:38 +01:00
Luke Granger-Brown 1de7020858
Merge pull request #128776 from eduardosm/seafile
seafile-shared: 8.0.1 -> 8.0.3, seafile-client: 8.0.1 -> 8.0.3
2021-07-03 01:35:39 +01:00
R. RyanTM 0cd16a251d alda: 1.4.4 -> 1.5.0 2021-07-03 00:34:40 +00:00
Luke Granger-Brown 3db607501e
Merge pull request #128794 from helsinki-systems/feat/cephsh-shell
ceph: Enable cephfs-shell and use system liburing
2021-07-03 01:34:07 +01:00
Luke Granger-Brown 83292f696d
Merge pull request #128811 from r-ryantm/auto-update/goaccess
goaccess: 1.5 -> 1.5.1
2021-07-03 01:32:50 +01:00
Luke Granger-Brown 59dd42012b
Merge pull request #128877 from raboof/jetbrains-update-script-https
jetbrains: use https for update script
2021-07-03 01:32:12 +01:00
Luke Granger-Brown e3b1c9e852
Merge pull request #129043 from j0hax/beats
beats: 1.0 -> 1.1
2021-07-03 01:31:11 +01:00
Luke Granger-Brown ff474e2e67
Merge pull request #128887 from musfay/adriconf-init
adriconf: init at 2.4.1
2021-07-03 01:30:40 +01:00
Mario Rodas c857859286
Merge pull request #128928 from marsam/update-nodejs
nodejs: 12.22.1 -> 12.22.2, 14.17.1 -> 14.17.2, 16.4.0 -> 16.4.1
2021-07-02 18:31:58 -05:00
Johannes Arnold 3a234945ff beats: 1.0 -> 1.1 2021-07-03 00:16:04 +02:00
Silvan Mosberger e23072af78
Merge pull request #128930 from felixsinger/pkgs/mumble/add-maintainer
mumble,murmur: Add Felix Singer as maintainer
2021-07-03 00:05:42 +02:00
Fabian Affolter 8cc04d3c86
Merge pull request #128981 from fabaff/bump-python-telegram-bot
python3Packages.python-telegram-bot: 13.6 -> 13.7
2021-07-02 23:35:11 +02:00
Fabian Affolter 3691514da0
Merge pull request #128944 from fabaff/bump-exploitdb
exploitdb: 2021-06-29 -> 2021-07-02
2021-07-02 23:15:35 +02:00
Fabian Affolter 71a0aeced1
Merge pull request #128918 from fabaff/bump-metasploit
metasploit: 6.0.50 -> 6.0.51
2021-07-02 23:15:20 +02:00
Fabian Affolter 4946976011
Merge pull request #128996 from dotlambda/aiomusiccast-0.8.1
python3Packages.aiomusiccast: 0.8.0 -> 0.8.1
2021-07-02 23:14:39 +02:00
Jörg Thalheim c40d0126f8
Merge pull request #129022 from Mic92/flask-compress
python3.pkgs.flask-compress: fix version metadata
2021-07-02 21:04:51 +01:00
Jörg Thalheim 7a80459aa7
Merge pull request #129013 from Mindavi/isomd5sum/cross-2
isomd5sum: support cross: move python to nativeBuildInputs
2021-07-02 21:04:31 +01:00
Jörg Thalheim e137675453
python3.pkgs.flask-compress: fix version metadata 2021-07-02 21:19:24 +02:00
aszlig 3895ec33ad
nixos/tests/zsh-history: Fix matching prompt
In commit fbbaa4d40f, the Zsh default
prompt has changed from "walters" to "suse". So instead of:

  root@default>

... we now have:

  root@default:~/ >

However, in the NixOS VM test, we are matching "root@default>", which
doesn't include the current working directory and thus eventually leads
to a test failure after timing out.

To fix this, I changed the regex to include a newline at the beginning
and made sure that the hostname ends with a word boundary. This way it
doesn't matter whether the prompt is "walters" or "suse", because after
all the test is not about the prompt but about whether the history
mechanism works (or not).

Signed-off-by: aszlig <aszlig@nix.build>
2021-07-02 21:01:49 +02:00
Bernardo Meurer a143a6dd34
Merge pull request #110837 from rvolosatovs/update/neovim
neovim: 0.4.4 -> 0.5.0
2021-07-02 11:54:10 -07:00
Fabian Affolter 920b9f2d1a python3Packages.daphne: 3.0.1 -> 3.0.2 2021-07-02 11:49:57 -07:00
Fabian Affolter 3605a1f362 python3Packages.twitterapi: 2.7.3 -> 2.7.4 2021-07-02 11:28:09 -07:00
Rick van Schijndel f5fac4dcd5 isomd5sum: support cross-compilation by moving python to nativebuildinputs 2021-07-02 20:24:47 +02:00
Gabriel Ebner b38329171a
Merge pull request #128926 from collares/lean-3.31
lean: 3.30.0 -> 3.31.0
2021-07-02 19:57:13 +02:00
Michael Weiss f26f9ae120
Merge pull request #129006 from primeos/seatd
seatd: Fix cross-compilation
2021-07-02 19:54:33 +02:00
Maximilian Bosch 10860c9256
Merge pull request #128978 from sikmir/gopass
gopass: 1.12.6 → 1.12.7
2021-07-02 19:00:37 +02:00
Michael Weiss 7b39311bb2
seatd: Fix cross-compilation 2021-07-02 18:46:23 +02:00
Maximilian Bosch a498577a2c
Merge pull request #128899 from Ma27/bump-grafana
grafana: 8.0.3 -> 8.0.4
2021-07-02 18:42:56 +02:00
Vladyslav M 379fa1afa9
Merge pull request #128910 from sternenseemann/foot-1.8.1
foot: 1.8.0 -> 1.8.1
2021-07-02 19:10:58 +03:00
Roman Volosatovs 58ba227160
neovim: 0.4.4 -> 0.5.0
`"-DUSE_BUNDLED=OFF"` is from 2bcf18deaa/contrib/flake.nix (L25)
2021-07-02 18:10:01 +02:00
Ben Siraphob 28acaac96f
Merge pull request #128271 from Kreyren/localBinInPath 2021-07-02 22:17:44 +07:00