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

systemd: use stable tree #37692

Merged
merged 1 commit into from Mar 23, 2018
Merged

systemd: use stable tree #37692

merged 1 commit into from Mar 23, 2018

Conversation

abbradar
Copy link
Member

Motivation for this change

This fixes a bug with changed qemu network interface names and also generally
should be preferred to using a release tag. It seems we were doing systemd the wrong way all this time! There is a stable tree which we didn't use at least for v237 and v230 (I think never!).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

Also patches should be cherry-picked from it to our fork from time to time (I've documented it).

@fpletz probably we should rename current tree nixos-v238-old and name mine new one nixos-v238, or we can just force-push.

@abbradar abbradar requested a review from fpletz March 23, 2018 09:49
@abbradar abbradar changed the title systemd: use stable tree [WIP] systemd: use stable tree Mar 23, 2018
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

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

Partial log (click to expand)

Cannot nix-instantiate `systemd' because:
�[31;1merror:�[0m while evaluating 'callPackageWith' at �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix�[0m:113:35, called from �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/top-level/all-packages.nix�[0m:13859:13:
while evaluating 'makeOverridable' at �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix�[0m:72:24, called from �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix�[0m:117:8:
while evaluating anonymous function at �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/os-specific/linux/systemd/default.nix�[0m:1:1, called from �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix�[0m:74:12:
assertion failed at �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/os-specific/linux/systemd/default.nix�[0m:15:1

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: systemd

Partial log (click to expand)

cannot build derivation '/nix/store/qxx99llhk861rlwixaafpj870hsprrp8-python3-3.6.4-env.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/q7qnanmvj26nb6ff0kgjzb58q2c9pqf4-ronn-gems.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/h3yx6xw21a0jbm3fcxa48hjp50a3dmjh-shadow-4.5.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/nlhxh8gnvnxasqjvgm007a4c4hrz48fp-gnu-efi-3.0.8.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/6xi6hzpmqkah2liqqmapa2cnsckfds4d-ronn-0.7.3.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/h4ak5daaf1v6x78mhmznrhh4m9xdswmr-util-linux-2.31.1.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/2c2czlg5ffli2x8xvg6l4kh4bw1jajcr-glib-2.56.0.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/jfd6zr91ck3sh4mmdb9gzwy2ihm67bbs-libidn2-2.0.4.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/gdz46dk6vbjyajximhf58hwgkvi4f1rr-systemd-238.drv': 41 dependencies couldn't be built
error: build of '/nix/store/gdz46dk6vbjyajximhf58hwgkvi4f1rr-systemd-238.drv' failed

@Mic92
Copy link
Member

Mic92 commented Mar 23, 2018

I have never seen this repo before :). I thought maintainers have to cherry-pick them-self.

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: systemd

Partial log (click to expand)

[601/1461] Compiling C object 'systemd-coredump@exe/src_coredump_coredump.c.o'.
[602/1461] Compiling C object 'systemd-resolved@exe/src_resolve_resolved-dns-scope.c.o'.
[603/1461] Compiling C object 'systemd-resolved@exe/src_resolve_resolved-manager.c.o'.
[604/1461] Compiling C object 'loginctl@exe/src_login_loginctl.c.o'.
[605/1461] Compiling C object 'systemd-resolve@exe/src_resolve_resolve-tool.c.o'.
[606/1461] Compiling C object 'machinectl@exe/src_machine_machinectl.c.o'.
[607/1461] Compiling C object 'systemctl@exe/src_systemctl_systemctl.c.o'.
ninja: build stopped: subcommand failed.
builder for '/nix/store/0cdrggb66j4h3nmljzxbcsfhd2448kq0-systemd-238.drv' failed with exit code 1
�[31;1merror:�[0m build of '/nix/store/0cdrggb66j4h3nmljzxbcsfhd2448kq0-systemd-238.drv' failed

@abbradar
Copy link
Member Author

@Mic92 me too, I discovered it only accidentally because systemd maintainer mentioned it!

@abbradar @fpletz
systemd: use stable tree
6b9771e 
This fixes a bug with changed qemu network interface names and also generally
should be preferred to using a release tag.
@fpletz
Copy link
Member

fpletz commented Mar 23, 2018

Wasn't aware of systemd-stable either. Nice though. 👍

Force-pushed to nixos-v238 without a rename for now because the old version shouldn't really be used. Should be available on Github even though it's not on a branch for a while anyway.

Changed the repo owner in the commit and trying the predictable interface tests now.

@evverx evverx mentioned this pull request Mar 23, 2018
Closed
fpletz
fpletz approved these changes Mar 23, 2018
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

LGTM

@fpletz fpletz changed the title [WIP] systemd: use stable tree systemd: use stable tree Mar 23, 2018
@fpletz fpletz added this to the 18.03 milestone Mar 23, 2018
@fpletz fpletz merged commit eae4eec into NixOS:staging Mar 23, 2018
@abbradar abbradar deleted the systemd-238 branch March 23, 2018 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
1.severity: mass-rebuild 10.rebuild-darwin: 1-10 10.rebuild-linux: 501+
Projects
None yet
Milestone
18.03
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@abbradar @GrahamcOfBorg @Mic92 @fpletz @vcunat @xeji