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.

Sign up for GitHub

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

Jump to bottom

cc-wrapper, bintools-wrapper: simply symlink man and info outputs #46115

Merged
merged 1 commit into from
Nov 22, 2018
Merged

cc-wrapper, bintools-wrapper: simply symlink man and info outputs #46115

merged 1 commit into from
Nov 22, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Sep 5, 2018 •
edited
Loading

Motivation for this change

See commit messages. See discussion in #43547.

Things done
  • It evaluates.
  • It worked before these changes were reverted.
  • It still works.

@oxij oxij requested a review from Ericson2314 as a code owner September 5, 2018 18:46
@oxij oxij mentioned this pull request Sep 5, 2018
Closed
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: stdenv Standard environment label Sep 5, 2018
@Ericson2314
Copy link
Member

Ericson2314 commented Sep 5, 2018 •
edited
Loading

Can we do the first commit for master and release-18.09 and save the symlinking for later? I think no one disagrees with that.

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

cannot build derivation '/nix/store/a7v8s753dn611ami7d413h5kmnbcbgsj-help2man-1.47.6.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/b1z2nd6g9idg23aqkd4hi2gxwlwdbafl-binutils-wrapper-2.30.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/nj5njcp1za0wqjmhpyqswcfj1vc82zxs-diffutils-3.6.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/r8gd9dm3hraq7dfdsgmy8lc7fsblmj9s-findutils-4.6.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/d0vllkd0lbpbgvyln94d4x1b5vgd6622-libtool-2.4.6.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/v3g4z2nlc2ad5cn04gs1b2h5h9d3a5k2-gcc-wrapper-7.3.0.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/vwlv8n6m0ckbfaw21hp3kz9wg7sfn5sb-hook.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/f069pp5gaqdgzrxiws71qzxfylwdwq1m-patch-2.7.6.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/q6xv2lj678rc16qscpk8bzm8y61l0alq-stdenv-linux.drv': 23 dependencies couldn't be built
error: build of '/nix/store/q6xv2lj678rc16qscpk8bzm8y61l0alq-stdenv-linux.drv' failed

@oxij oxij mentioned this pull request Sep 5, 2018
Closed
@oxij oxij force-pushed the stdenv/bintools-cc-symlink branch from c8587c4 to 74f517d Compare September 5, 2018 20:01
@oxij oxij requested a review from FRidh as a code owner September 5, 2018 20:01
@oxij
Copy link
Member Author

oxij commented Sep 5, 2018 via email

@oxij
Copy link
Member Author

oxij commented Sep 5, 2018

@FRidh sorry for the code owner noise today.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package labels Sep 5, 2018
@GrahamcOfBorg
Copy link

Timed out, unknown build status on aarch64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

cannot build derivation '/nix/store/jb7f4mp8khpx4fx7q6v0nidx1knp81yp-help2man-1.47.6.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/yd28k8r0n508s7j8dbkxh8xrfc8dw5yn-binutils-wrapper-2.30.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/3yi3yyjydrjskyfywsiws06g42li2nqn-diffutils-3.6.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/0yn6nb6lmhgv9irbd3pa4ggcn19y4ddl-findutils-4.6.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/1aw3mqyfxsajbp2ix99pkn20jq03idin-libtool-2.4.6.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/xjzhrrxnsbxrw12nss87jalhqr81ax9a-gcc-wrapper-7.3.0.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/0wzha0mh4fprn5lqynhfbxhlf82h2kqk-hook.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/pvcngc8ahsyqyw4h2gk9kzyn8zrmqiwm-patch-2.7.6.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/34ml5g2b9w3sirhs3qh6352y5b6p3jla-stdenv-linux.drv': 25 dependencies couldn't be built
error: build of '/nix/store/34ml5g2b9w3sirhs3qh6352y5b6p3jla-stdenv-linux.drv' failed

@oxij oxij force-pushed the stdenv/bintools-cc-symlink branch from 74f517d to c8587c4 Compare September 5, 2018 20:49
@oxij
Copy link
Member Author

oxij commented Sep 5, 2018

Ah, #46119 is a mass-rebuild too. I reset this back to the original.

@GrahamcOfBorg GrahamcOfBorg removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 5, 2018
@GrahamcOfBorg GrahamcOfBorg added 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 6.topic: ruby 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: clean-up labels Oct 19, 2018
@oxij
cc-wrapper, bintools-wrapper: simply symlink man and info outputs
d32f51c 
With the previous commit `propagateDoc` is now always given the correct value
(i.e. it is never set to `true` when there are no `man` and `info` outputs).
Hence, we can simply symlink the original outputs to the wrapper outputs.

Pros:

- simpler, less indirection compared to `propagated-user-env-packages`,
- uses less inodes (1 symlink, which nix then simply automatically resolves
  and removes, vs. two directories and a file),
- makes direct references like "export MANPATH=${stdenv.cc.man}/share/man"
  simply work.

Cons:

- I'm not aware of any.

This and the previous commit together almost completely revert commits
fde7296,
fa41297, and
c981787.
@oxij oxij force-pushed the stdenv/bintools-cc-symlink branch from 89a3415 to d32f51c Compare November 7, 2018 08:38
@GrahamcOfBorg GrahamcOfBorg removed 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 6.topic: ruby 6.topic: stdenv Standard environment 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 7, 2018
7c6f434c
7c6f434c approved these changes Nov 22, 2018
View reviewed changes
Copy link
Member

@7c6f434c 7c6f434c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure about the current nomenclature; shouldn't this target staging?

@FRidh FRidh changed the title Follow up to #43547 cc-wrapper, bintools-wrapper: simply symlink man and info outputs Nov 22, 2018
@FRidh FRidh changed the base branch from staging-next to staging November 22, 2018 08:27
@FRidh
Copy link
Member

FRidh commented Nov 22, 2018

Changed base to staging.

@7c6f434c
Copy link
Member

Thank you.

@7c6f434c 7c6f434c merged commit ad1abb2 into NixOS:staging Nov 22, 2018
@oxij
Copy link
Member Author

oxij commented Nov 22, 2018

Yay! Thanks! I really hope this won't get reverted...

@oxij oxij deleted the stdenv/bintools-cc-symlink branch August 12, 2023 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c 7c6f434c approved these changes

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

@basvandijk basvandijk Awaiting requested review from basvandijk

@edolstra edolstra Awaiting requested review from edolstra

@nbp nbp Awaiting requested review from nbp

@peti peti Awaiting requested review from peti

@ryantm ryantm Awaiting requested review from ryantm

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux-stdenv This PR causes stdenv to rebuild
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@oxij @Ericson2314 @GrahamcOfBorg @FRidh @7c6f434c