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

dbus-broker: 9 -> 11 #35325

Merged
merged 1 commit into from Feb 22, 2018
Merged

dbus-broker: 9 -> 11 #35325

merged 1 commit into from Feb 22, 2018

Conversation

peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Feb 22, 2018 •
edited

Motivation for this change

When this was merged directly to master, @GrahamcOfBorg failed evaluating it.

So let's try again.

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.

@adisbladis
Copy link
Member

linuxHeaders_4_15 was dropped in fd0f15f

Just replace linuxHeaders_4_15 with linuxHeaders :)

Mic92
Mic92 reviewed Feb 22, 2018
View reviewed changes
pkgs/top-level/all-packages.nix Outdated
dbus-broker = callPackage ../os-specific/linux/dbus-broker {};
# dbus-broker needs kernel 4.14+
dbus-broker = callPackage ../os-specific/linux/dbus-broker {
linuxHeaders = linuxHeaders_4_15;
Copy link
Member

Choose a reason for hiding this comment

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

Just delete this line. There is only linuxHeaders by now, which is equal to linuxHeaders_4_15.

@peterhoeg
Copy link
Member Author

Thank you @adisbladis and @Mic92. I was using unstable here where linuxHeaders == linuxHeaders_4_4.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/cm6ak6lyc2vp3h723a2h4vjy7558h5y7-dbus-broker-11
shrinking /nix/store/cm6ak6lyc2vp3h723a2h4vjy7558h5y7-dbus-broker-11/bin/dbus-broker-launch
shrinking /nix/store/cm6ak6lyc2vp3h723a2h4vjy7558h5y7-dbus-broker-11/bin/dbus-broker
gzipping man pages under /nix/store/cm6ak6lyc2vp3h723a2h4vjy7558h5y7-dbus-broker-11/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/cm6ak6lyc2vp3h723a2h4vjy7558h5y7-dbus-broker-11/lib  /nix/store/cm6ak6lyc2vp3h723a2h4vjy7558h5y7-dbus-broker-11/bin
patching script interpreter paths in /nix/store/cm6ak6lyc2vp3h723a2h4vjy7558h5y7-dbus-broker-11
checking for references to /build in /nix/store/cm6ak6lyc2vp3h723a2h4vjy7558h5y7-dbus-broker-11...
/nix/store/cm6ak6lyc2vp3h723a2h4vjy7558h5y7-dbus-broker-11

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/vp815zjqii2vjn3f7x2q9m3hb0g5hlr4-dbus-broker-11
shrinking /nix/store/vp815zjqii2vjn3f7x2q9m3hb0g5hlr4-dbus-broker-11/bin/dbus-broker-launch
shrinking /nix/store/vp815zjqii2vjn3f7x2q9m3hb0g5hlr4-dbus-broker-11/bin/dbus-broker
gzipping man pages under /nix/store/vp815zjqii2vjn3f7x2q9m3hb0g5hlr4-dbus-broker-11/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/vp815zjqii2vjn3f7x2q9m3hb0g5hlr4-dbus-broker-11/lib  /nix/store/vp815zjqii2vjn3f7x2q9m3hb0g5hlr4-dbus-broker-11/bin 
patching script interpreter paths in /nix/store/vp815zjqii2vjn3f7x2q9m3hb0g5hlr4-dbus-broker-11
checking for references to /tmp/nix-build-dbus-broker-11.drv-0 in /nix/store/vp815zjqii2vjn3f7x2q9m3hb0g5hlr4-dbus-broker-11...
/nix/store/vp815zjqii2vjn3f7x2q9m3hb0g5hlr4-dbus-broker-11

@peterhoeg peterhoeg merged commit 1c67ee4 into NixOS:master Feb 22, 2018
@peterhoeg peterhoeg deleted the u/dbusb branch February 22, 2018 09:42
@peterhoeg peterhoeg restored the u/dbusb branch February 23, 2018 02:28
@peterhoeg peterhoeg deleted the u/dbusb branch March 5, 2018 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@peterhoeg @adisbladis @GrahamcOfBorg @Mic92