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

treewide: mass rebuild noop cleanups #47233

Merged
merged 10 commits into from Sep 25, 2018
Merged

treewide: mass rebuild noop cleanups #47233

merged 10 commits into from Sep 25, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Sep 23, 2018

Motivation for this change

First patch is the first patch of #46115 (which should also close #43547 again, but without the "controversial" second patch of #46115), second patch is a fixed edited version of #46127, the rest are trivial noop changes that cause mass rebuilds.

Things done
  • Trivial.
  • All touched packages still build.
  • Running on top of this for a month without issues.

/cc @Ericson2314

oxij and others added 5 commits September 23, 2018 17:29
@oxij
bintools-wrapper, cc-wrapper, stdenv: infer propagateDoc automatically
b2c7a5a 
02c09e0 (NixOS#44558) was reverted in
c981787 but, as it turns out, it fixed an issue
I didn't know about at the time: the values of `propagateDoc` options were
(and now again are) inconsistent with the underlying things those wrappers wrap
(see NixOS#46119), which was (and now is) likely to produce more instances
of NixOS#43547, if not now, then eventually as stdenv changes.

This patch (which is a simplified version of the original reverted patch) is the
simplest solution to this whole thing: it forces wrappers to directly inspect the
outputs of the things they are wrapping instead of making stdenv guess the correct
values.
@Ericson2314 @oxij
gcc-*: Clean up crossStageStatic logic
b14db1b 
54282b9 tread carefuly to avoid a mass
rebuild. This embraces the mass rebuild to clean things up.
@oxij
gcc7: cleanup with a mass rebuild
1abf197
@oxij
llvm_5: cleanup with a mass rebuild
d2674c5
@oxij
llvmPackages_6.libcxx: cleanup with a mass rebuild
ed10043
@oxij oxij force-pushed the tree/mass-rebuild-noop-cleanups branch from 2eb6867 to 9a7e87c Compare September 23, 2018 17:31
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: stdenv Standard environment label Sep 23, 2018
7c6f434c
7c6f434c approved these changes Sep 23, 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 want to give time for opinions, but LGTM.

@oxij oxij force-pushed the tree/mass-rebuild-noop-cleanups branch from 9a7e87c to 87c0206 Compare September 23, 2018 17:57
@GrahamcOfBorg
Copy link

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

Attempted: gcc7, libdaemon, linuxHeaders, llvm_5, newt, pkgconfig, stdenv, texinfo

Partial log (click to expand)

cannot build derivation '/nix/store/v88iwmvr6smk46mik6ha9h25ngbvw7j3-perl5.28.0-XML-Parser-2.44.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/1dfmm3zl3z5gq0m8nr9zy269cb7c62xj-intltool-0.51.0.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/w4bf14ylkmk2hjy55b7q5q2j53d12xmv-gnome-doc-utils-0.20.10.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/2gr4bygnvrc1cl0sczfirqbncpf7sp06-shadow-4.6.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/rwinljk9asx5bp3jl1fli0s1j2ynym2d-util-linux-2.32.1.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/w1qypjydppjiysf4q3wlg47w9z5rgkf6-e2fsprogs-1.44.4.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/jym3ccvyzmv3g1a718z2737m0fv0il19-libarchive-3.3.2.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/y04x7qy9b5jdr9g7sgp7n53z09mwsnpd-cmake-3.12.1.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/nb1ww7p4am45shj9dybnv9hqzsww00kw-llvm-5.0.2.drv': 8 dependencies couldn't be built
error: build of '/nix/store/5v1agk29ycij47xb704lh6zi3hnzl6qn-texinfo-6.5.drv', '/nix/store/8szqv2qd8pkbqb2df5j081iniv6k1r25-pkg-config-0.29.2.drv', '/nix/store/bg6az8bb1b147mghc4r9i5pvryg53k16-libdaemon-0.14.drv', '/nix/store/bnmwz9ll6c61bc2k0076l5385viwckdd-stdenv-linux.drv', '/nix/store/h32lkx4ga2jak0yfnsm805y1sxh9mw6y-gcc-wrapper-7.3.0.drv', '/nix/store/ipmw91zl98p2ais7gab00p2sjvp66h2i-linux-headers-4.18.3.drv', '/nix/store/nb1ww7p4am45shj9dybnv9hqzsww00kw-llvm-5.0.2.drv', '/nix/store/wixwkk04r9iwbmv7qrjn1zcdi1jsgdj7-newt-0.52.20.drv' failed

@GrahamcOfBorg
Copy link

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

Attempted: gcc7, libdaemon, linuxHeaders, llvm_5, newt, pkgconfig, stdenv, texinfo

Partial log (click to expand)

cannot build derivation '/nix/store/v88iwmvr6smk46mik6ha9h25ngbvw7j3-perl5.28.0-XML-Parser-2.44.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/1dfmm3zl3z5gq0m8nr9zy269cb7c62xj-intltool-0.51.0.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/w4bf14ylkmk2hjy55b7q5q2j53d12xmv-gnome-doc-utils-0.20.10.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/2gr4bygnvrc1cl0sczfirqbncpf7sp06-shadow-4.6.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/rwinljk9asx5bp3jl1fli0s1j2ynym2d-util-linux-2.32.1.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/w1qypjydppjiysf4q3wlg47w9z5rgkf6-e2fsprogs-1.44.4.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/jym3ccvyzmv3g1a718z2737m0fv0il19-libarchive-3.3.2.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/y04x7qy9b5jdr9g7sgp7n53z09mwsnpd-cmake-3.12.1.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/nb1ww7p4am45shj9dybnv9hqzsww00kw-llvm-5.0.2.drv': 8 dependencies couldn't be built
error: build of '/nix/store/5v1agk29ycij47xb704lh6zi3hnzl6qn-texinfo-6.5.drv', '/nix/store/8szqv2qd8pkbqb2df5j081iniv6k1r25-pkg-config-0.29.2.drv', '/nix/store/bg6az8bb1b147mghc4r9i5pvryg53k16-libdaemon-0.14.drv', '/nix/store/bnmwz9ll6c61bc2k0076l5385viwckdd-stdenv-linux.drv', '/nix/store/h32lkx4ga2jak0yfnsm805y1sxh9mw6y-gcc-wrapper-7.3.0.drv', '/nix/store/ipmw91zl98p2ais7gab00p2sjvp66h2i-linux-headers-4.18.3.drv', '/nix/store/nb1ww7p4am45shj9dybnv9hqzsww00kw-llvm-5.0.2.drv', '/nix/store/wixwkk04r9iwbmv7qrjn1zcdi1jsgdj7-newt-0.52.20.drv' failed

@oxij
Copy link
Member Author

oxij commented Sep 23, 2018

That rebase was a typo fix in a commit message. I don't see any others, so this now LGTM.

@GrahamcOfBorg
Copy link

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

Attempted: gcc7, libdaemon, linuxHeaders, llvm_5, newt, pkgconfig, stdenv, texinfo

Partial log (click to expand)

cannot build derivation '/nix/store/n9h95acfhrbcwzdqhwfdmz4k0w47kaq0-python2.7-setuptools-40.2.0.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/5xa4a9yhl1vjz6z3yd3s3qvqy0l873xn-intltool-0.51.0.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/6fwnk4aafk22blx32zidhrdanza1hp83-gnome-doc-utils-0.20.10.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/zqrrwj8aj7imqhvx0za4p5jpgmwwaqn2-shadow-4.6.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/3q1gfdsb4m4xij9fl2pqd8kgaix0jffb-util-linux-2.32.1.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/2zwfqf7wxrdzfqrci2hfgs5fhh4grm8f-e2fsprogs-1.44.4.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/hp5q28yfb2qm7rx6lkbi2qgb8c6m5zb1-libarchive-3.3.2.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/wm190qsyxr4x67nz03ax13g2wm5szy8g-cmake-3.12.1.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/6xc0rfc7zrd54zdm1v2c7sgmr63q9p29-llvm-5.0.2.drv': 8 dependencies couldn't be built
error: build of '/nix/store/0ggn1lksci3bqafxci1i2piav2hb9kgc-libdaemon-0.14.drv', '/nix/store/19r3ybk964qvn9z9v0fbjrdync1zhkwy-pkg-config-0.29.2.drv', '/nix/store/24l0dgjqa05h0rzyr8v3vzz5kwn4qi31-texinfo-6.5.drv', '/nix/store/6xc0rfc7zrd54zdm1v2c7sgmr63q9p29-llvm-5.0.2.drv', '/nix/store/d3l5p3nw39bfx6mw39lpj5vcm7apjnk9-stdenv-linux.drv', '/nix/store/pd779klp2ccm4jwq58f4fjb42rsc3qsd-gcc-wrapper-7.3.0.drv', '/nix/store/rw3khxaz9aq23mz4wk6qgwdxw9gh0qlv-newt-0.52.20.drv', '/nix/store/zf18v6yw0k07zhz9ddjv7j7qgf0458d2-linux-headers-4.18.3.drv' failed

xeji
xeji approved these changes Sep 24, 2018
View reviewed changes
Copy link
Contributor

@xeji xeji left a comment

Choose a reason for hiding this comment

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

LGTM

@oxij
Copy link
Member Author

oxij commented Sep 24, 2018

ping

@Ericson2314 Ericson2314 merged commit 2b4b7d4 into NixOS:staging Sep 25, 2018
@Ericson2314
Copy link
Member

Ericson2314 commented Sep 25, 2018 •
edited

Thanks!! Wonderful to see those TODOs purged :).

@oxij oxij mentioned this pull request Oct 19, 2018
Merged
1 task
@oxij oxij deleted the tree/mass-rebuild-noop-cleanups branch November 18, 2018 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@7c6f434c 7c6f434c 7c6f434c approved these changes

@xeji xeji xeji approved these changes

Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 501+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@oxij @GrahamcOfBorg @Ericson2314 @7c6f434c @xeji