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: All configureFlags are lists #44423

Merged
merged 12 commits into from Aug 3, 2018
Merged

treewide: All configureFlags are lists #44423

merged 12 commits into from Aug 3, 2018

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Aug 3, 2018 •
edited

Motivation for this change

I have one more commit to enforce this, but not sure whether that's appropriate for 18.09.

I also sprinkled in {enable,with}Feature{,As} to make some things more concise.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

CC @aneeshusa

@Ericson2314 Ericson2314 added this to the 18.09 milestone Aug 3, 2018
@Ericson2314 Ericson2314 requested a review from FRidh as a code owner August 3, 2018 19:49
@Ericson2314 Ericson2314 requested a review from dezgeg August 3, 2018 19:50
@GrahamcOfBorg GrahamcOfBorg added 6.topic: emacs 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python 6.topic: stdenv Standard environment 8.has: documentation labels Aug 3, 2018
@matthewbauer
Copy link
Member

I think scilab still has the issue: https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/science/math/scilab/default.nix

@Ericson2314
Copy link
Member Author

But I refactored that: https://github.com/ObsidianSystems/Nixpkgs/blob/configureFlags-cleanup/pkgs/applications/science/math/scilab/default.nix . OfBorg is confusing me.

@Ericson2314
Copy link
Member Author

@matthewbauer found the issue. Hopefully there's just a few of these. Better to remove it separately.

@Ericson2314 Ericson2314 merged commit 7a337cd into NixOS:staging Aug 3, 2018
@Ericson2314 Ericson2314 deleted the configureFlags-cleanup branch August 3, 2018 21:49
@Ericson2314
Copy link
Member Author

Ericson2314 commented Aug 3, 2018 •
edited

LMK if this causes staging problems. Each change is simple, but there are lots of them.

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: elfutils, flex, libxml2

The following builds were skipped because they don't evaluate on x86_64-linux: scilab

Partial log (click to expand)

cannot build derivation '/nix/store/lq8kzi7rwfdw9j2mc069wvsqmn13j8xm-automake-1.16.1.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/lq1ivvxxqz5kx30ll9y05xz596y84lgv-help2man-1.47.6.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/rw5wa8xbdrsxhxqbdyjqyqrllwr655zq-readline-6.3p08.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/9020q2dpj0hxdwvrp97n33s5m7znvliv-libtool-2.4.6.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/p6y2kv4clqivb9iqxcj7b68d86vnq7rp-python-2.7.15.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/207pkqz4xhvrj1m8y53c8cav9al032yy-hook.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/gv6ni5mv1v7az1siimsir90ismsyj3wq-libxml2-2.9.8.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/9mzs7017xikjahqhnyk6k4c5fd4azi0f-flex-2.6.4.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/c9602swz4blrpk0m3q61zcv5k40q1yh3-elfutils-0.173.drv': 9 dependencies couldn't be built
error: build of '/nix/store/9mzs7017xikjahqhnyk6k4c5fd4azi0f-flex-2.6.4.drv', '/nix/store/c9602swz4blrpk0m3q61zcv5k40q1yh3-elfutils-0.173.drv', '/nix/store/gv6ni5mv1v7az1siimsir90ismsyj3wq-libxml2-2.9.8.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: flex, libxml2

The following builds were skipped because they don't evaluate on x86_64-darwin: elfutils, scilab

Partial log (click to expand)

cannot build derivation '/nix/store/41bcxdxpd6mrv131zni2h7klanykb1b4-libtool-2.4.6.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/azgbf8dlpikmc2v2damj3f5arnb6ggm1-hook.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/35pa729jvpq4ikgncr1kv9pi3m4hd7pr-flex-2.6.4.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/y60nd41pv0cxywiflswkza2fmld1i2g0-bootstrap_cmds-dev-tools-7.0.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/34c0i09lpvrzjhwiwmsmdv0k9v0ipiya-xnu-osx-10.11.6.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/k3m5bwsmgvq3xc1fwzrylpz0nr8xw3ra-IOKit-osx-10.11.6.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/9y3gk8w6in9ny2ry57cyi446mc20yl1d-configd-osx-10.8.5.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/zzmkk0c755s919yfg97dzjndpmi9inp5-python-2.7.15.drv': 15 dependencies couldn't be built
cannot build derivation '/nix/store/mpsabh2w51i8m1x7rni1x0p9dh08lavv-libxml2-2.9.8.drv': 5 dependencies couldn't be built
error: build of '/nix/store/35pa729jvpq4ikgncr1kv9pi3m4hd7pr-flex-2.6.4.drv', '/nix/store/mpsabh2w51i8m1x7rni1x0p9dh08lavv-libxml2-2.9.8.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: elfutils, flex, libxml2

The following builds were skipped because they don't evaluate on aarch64-linux: scilab

Partial log (click to expand)

checking for references to /build in /nix/store/rwk60j2b2q19sdk6q1rk6pbfq97klkih-libxml2-2.9.8-py...
Moving /nix/store/9dqkgijhw9yqrppgrm2crp1d5l6ql3kh-libxml2-2.9.8-bin/bin/xml2-config to /nix/store/yg9pnn3jvi8rgcfzbgs15xm8z4a7l7z5-libxml2-2.9.8-dev/bin/xml2-config
rmdir: failed to remove '/nix/store/9dqkgijhw9yqrppgrm2crp1d5l6ql3kh-libxml2-2.9.8-bin/bin': Directory not empty
Moving /nix/store/wmizvkii253whk18gwlx33gp3c2v9p53-libxml2-2.9.8/lib/xml2Conf.sh to /nix/store/yg9pnn3jvi8rgcfzbgs15xm8z4a7l7z5-libxml2-2.9.8-dev/lib/xml2Conf.sh
rmdir: failed to remove '/nix/store/wmizvkii253whk18gwlx33gp3c2v9p53-libxml2-2.9.8/lib': Directory not empty
Moving /nix/store/nnlvsq38ihf9nijva94x7q8vw04hy0ra-libxml2-2.9.8-man/share/man/man1 to /nix/store/9dqkgijhw9yqrppgrm2crp1d5l6ql3kh-libxml2-2.9.8-bin/share/man/man1
rmdir: failed to remove '/nix/store/nnlvsq38ihf9nijva94x7q8vw04hy0ra-libxml2-2.9.8-man/share/man': Directory not empty
/nix/store/s8hw1k4zlsg9dywp8w5pasjds4s7jjvl-elfutils-0.173
/nix/store/ma79mzq9r57ilb0nvjp6a3fklfnw8x0v-flex-2.6.4
/nix/store/9dqkgijhw9yqrppgrm2crp1d5l6ql3kh-libxml2-2.9.8-bin

@aneeshusa aneeshusa mentioned this pull request Aug 5, 2018
Closed
7 tasks
@oxij oxij mentioned this pull request Aug 18, 2018
Open
@jtojnar jtojnar mentioned this pull request Aug 25, 2018
Merged
9 tasks
This was referenced Aug 30, 2018
Merged
Closed
@jtojnar jtojnar mentioned this pull request Oct 30, 2018
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@FRidh FRidh Awaiting requested review from FRidh

@dezgeg dezgeg Awaiting requested review from dezgeg

Assignees
No one assigned
Labels
6.topic: emacs 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python 6.topic: stdenv Standard environment 8.has: documentation 10.rebuild-darwin: 501+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
18.09
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Ericson2314 @matthewbauer @GrahamcOfBorg @dezgeg @vcunat