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

iproute: add $dev output #46558

Merged
merged 1 commit into from Sep 12, 2018
Merged

iproute: add $dev output #46558

merged 1 commit into from Sep 12, 2018

Conversation

teto
Copy link
Member

@teto teto commented Sep 12, 2018 •
edited

to provide the user API include/ that was previously dropped.

Motivation for this change

I needed some of the declaration there. It's not a big deal to copy/paste them but still there should be no need.

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.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: iproute

Partial log (click to expand)

strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0jxn6wycxrylfhjnl8rwpdvh6q4925fn-iproute2-4.18.0/lib  /nix/store/0jxn6wycxrylfhjnl8rwpdvh6q4925fn-iproute2-4.18.0/sbin
patching script interpreter paths in /nix/store/0jxn6wycxrylfhjnl8rwpdvh6q4925fn-iproute2-4.18.0
checking for references to /build in /nix/store/0jxn6wycxrylfhjnl8rwpdvh6q4925fn-iproute2-4.18.0...
moving /nix/store/0jxn6wycxrylfhjnl8rwpdvh6q4925fn-iproute2-4.18.0/sbin/* to /nix/store/0jxn6wycxrylfhjnl8rwpdvh6q4925fn-iproute2-4.18.0/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/hisrc6077y35i2qvwhb04ghc2x2pljnb-iproute2-4.18.0-dev
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/hisrc6077y35i2qvwhb04ghc2x2pljnb-iproute2-4.18.0-dev
checking for references to /build in /nix/store/hisrc6077y35i2qvwhb04ghc2x2pljnb-iproute2-4.18.0-dev...
/nix/store/0jxn6wycxrylfhjnl8rwpdvh6q4925fn-iproute2-4.18.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: iproute

Partial log (click to expand)

strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8qfz64a2xxy666lwk4zq7cm60dpssxd2-iproute2-4.18.0/lib  /nix/store/8qfz64a2xxy666lwk4zq7cm60dpssxd2-iproute2-4.18.0/sbin
patching script interpreter paths in /nix/store/8qfz64a2xxy666lwk4zq7cm60dpssxd2-iproute2-4.18.0
checking for references to /build in /nix/store/8qfz64a2xxy666lwk4zq7cm60dpssxd2-iproute2-4.18.0...
moving /nix/store/8qfz64a2xxy666lwk4zq7cm60dpssxd2-iproute2-4.18.0/sbin/* to /nix/store/8qfz64a2xxy666lwk4zq7cm60dpssxd2-iproute2-4.18.0/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/sxajnr5qmrp7hxv2dypr5naq6k7gzixy-iproute2-4.18.0-dev
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/sxajnr5qmrp7hxv2dypr5naq6k7gzixy-iproute2-4.18.0-dev
checking for references to /build in /nix/store/sxajnr5qmrp7hxv2dypr5naq6k7gzixy-iproute2-4.18.0-dev...
/nix/store/8qfz64a2xxy666lwk4zq7cm60dpssxd2-iproute2-4.18.0

@xeji
Copy link
Contributor

xeji commented Sep 12, 2018

Please rebase this on staging, it's a mass rebuild.

@teto teto changed the base branch from master to staging September 12, 2018 06:45
@teto
Copy link
Member Author

teto commented Sep 12, 2018

My bad I forgot. Done.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: iproute

Partial log (click to expand)

strip is /nix/store/rf59n87kcrrnrnw3l3s94q879m8vaspm-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/pq6qdh4cgfl9fsh2sz45vgng213wmlgz-iproute2-4.18.0/lib  /nix/store/pq6qdh4cgfl9fsh2sz45vgng213wmlgz-iproute2-4.18.0/sbin
patching script interpreter paths in /nix/store/pq6qdh4cgfl9fsh2sz45vgng213wmlgz-iproute2-4.18.0
checking for references to /build in /nix/store/pq6qdh4cgfl9fsh2sz45vgng213wmlgz-iproute2-4.18.0...
moving /nix/store/pq6qdh4cgfl9fsh2sz45vgng213wmlgz-iproute2-4.18.0/sbin/* to /nix/store/pq6qdh4cgfl9fsh2sz45vgng213wmlgz-iproute2-4.18.0/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/xgk6jawl1bk1x972kaiawl10gqs70ra2-iproute2-4.18.0-dev
strip is /nix/store/rf59n87kcrrnrnw3l3s94q879m8vaspm-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/xgk6jawl1bk1x972kaiawl10gqs70ra2-iproute2-4.18.0-dev
checking for references to /build in /nix/store/xgk6jawl1bk1x972kaiawl10gqs70ra2-iproute2-4.18.0-dev...
/nix/store/pq6qdh4cgfl9fsh2sz45vgng213wmlgz-iproute2-4.18.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: iproute

Partial log (click to expand)

strip is /nix/store/lw308kxqcm9frx4vlfjh30da1x4gsmwx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/6x98r6kvj3z4pavw62c2i0x2wl5y75yz-iproute2-4.18.0/lib  /nix/store/6x98r6kvj3z4pavw62c2i0x2wl5y75yz-iproute2-4.18.0/sbin
patching script interpreter paths in /nix/store/6x98r6kvj3z4pavw62c2i0x2wl5y75yz-iproute2-4.18.0
checking for references to /build in /nix/store/6x98r6kvj3z4pavw62c2i0x2wl5y75yz-iproute2-4.18.0...
moving /nix/store/6x98r6kvj3z4pavw62c2i0x2wl5y75yz-iproute2-4.18.0/sbin/* to /nix/store/6x98r6kvj3z4pavw62c2i0x2wl5y75yz-iproute2-4.18.0/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/nakhqhb66bhrc5j1b5bql416byrd30w9-iproute2-4.18.0-dev
strip is /nix/store/lw308kxqcm9frx4vlfjh30da1x4gsmwx-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/nakhqhb66bhrc5j1b5bql416byrd30w9-iproute2-4.18.0-dev
checking for references to /build in /nix/store/nakhqhb66bhrc5j1b5bql416byrd30w9-iproute2-4.18.0-dev...
/nix/store/6x98r6kvj3z4pavw62c2i0x2wl5y75yz-iproute2-4.18.0

xeji
xeji reviewed Sep 12, 2018
View reviewed changes
pkgs/os-specific/linux/iproute/default.nix Outdated
makeFlags = [
"DESTDIR="
"LIBDIR=$(out)/lib"
"SBINDIR=$(out)/sbin"
"MANDIR=$(out)/share/man"
"BASH_COMPDIR=$(out)/share/bash-completion/completions"
"DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs
"HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers
"HDRDIR=$(dev)/include/iproute2" # Don't install headers
Copy link
Contributor

Choose a reason for hiding this comment

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

nitpick: the comment "don't install headers" doesn't really fit anymore 😄

Copy link
Member Author

Choose a reason for hiding this comment

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

tunnelvision strikes again ! fixed.

@teto
iproute: add $dev output
7e5434a 
to provide the user API include/ that was previously dropped.
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: iproute

Partial log (click to expand)

/nix/store/6x98r6kvj3z4pavw62c2i0x2wl5y75yz-iproute2-4.18.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: iproute

Partial log (click to expand)

/nix/store/pq6qdh4cgfl9fsh2sz45vgng213wmlgz-iproute2-4.18.0

@xeji xeji merged commit d8b7ffc into NixOS:staging Sep 12, 2018
@teto teto deleted the iproute_include branch May 13, 2020 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xeji xeji xeji left review comments

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@teto @GrahamcOfBorg @xeji