Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

texlive/bin: remove unnecessary parentheses #225035

Closed
wants to merge 403 commits into from
Closed

texlive/bin: remove unnecessary parentheses #225035

wants to merge 403 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Apr 6, 2023

As suggested here:

#223303 (review)

These parentheses are unnecessary. No change to eval.

mweinelt and others added 30 commits March 28, 2023 01:06
python310Packages.sphinx-autodoc-typehints: 1.23.4 -> 1.22
iana-etc: 20221107 -> 20230316
Previously, builds such as `cmake` would fail with errors like this:

    In file included from /nix/store/injyphmxqgi028skp28fsmdvbdb57nvl-glibc-2.36-48-dev/include/linux/fs.h:19,
                     from /build/cmake-3.24.2/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c:56:
    /nix/store/injyphmxqgi028skp28fsmdvbdb57nvl-glibc-2.36-48-dev/include/linux/mount.h:95:6: error: redeclaration of 'enum fsconfig_command'
       95 | enum fsconfig_command {
          |      ^~~~~~~~~~~~~~~~

The reason behind that is that the kernel exports `linux/mount.h` via
kernel headers APIs that are also defined in `sys/mount.h` from glibc.
To avoid clashes, safeguards were implemented in glibc to prevent this
from happening[1][2].

However, these `#ifndef`-safeguards are removed by `fixincludes` during
gcc's build and the (broken) result is subsequently copied into
`include-fixed/sys/mount.h` which is added to each build via the
cc-wrapper. To work around this, I decided to simply drop the file: it
also exists in glibc's output and our gcc12 doesn't seem to expose this
anymore anyways.

[1] Commit bb1e8b0ca99b5cbedfae3e6245528a87d95ff3e2
[2] Commit 3bd3c612e98a53ce60ed972f5cd2b90628b3cba5
Failing Hydra build: https://hydra.nixos.org/build/193327405
Same fix as for gcc11.
Failing Hydra build: https://hydra.nixos.org/build/193342322
Patch from gcc11 requires some minor adjustments to properly apply.
@ghost ghost mentioned this pull request Apr 6, 2023
15 tasks
@github-actions github-actions bot added 6.topic: emacs Text editor 6.topic: golang 6.topic: lua 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: systemd 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 8.has: changelog 8.has: documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Apr 6, 2023
@ghost ghost closed this Apr 6, 2023
@ghost
Copy link
Author

ghost commented Apr 6, 2023

Sorry

@ghost ghost deleted the pr/texlive/less-parentheses branch April 6, 2023 19:46
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: emacs Text editor 6.topic: golang 6.topic: lua 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: systemd 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 8.has: changelog 8.has: documentation 8.has: module (update) This PR changes an existing module in `nixos/`
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.