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.

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

pciutils: use standardized equivalent for canonicalize_file_name #43267

Merged
merged 1 commit into from Jul 9, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jul 9, 2018

Fixes w/musl.

Update broke build w/musl, fix by using equivalent standard method.

Unusually "clear-cut" fix, see man 3 canonicalize_file_name.

Will be sending upstream momentarily...

  • 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.

@dtzWill
Copy link
Member Author

dtzWill commented Jul 9, 2018

Upstream: pciutils/pciutils#6

Will update to mention the PR (someone else submitted), hopefully included upstream soon or at least before next release :).

@dtzWill
Copy link
Member Author

dtzWill commented Jul 9, 2018

@GrahamcOfBorg build pkgsMusl.pciutils

@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: pkgsMusl.pciutils

Partial log (click to expand)

Cannot nix-instantiate `pkgsMusl.pciutils' because:
�[31;1merror:�[0m Musl libc only supports Linux systems.

@dtzWill
Copy link
Member Author

dtzWill commented Jul 9, 2018

Don't think borg's built much musl-native before, so fully expect this to timeout :D.

@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: pciutils

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: pciutils

Partial log (click to expand)

shrinking /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0/lib/libpci.so.3.6.0
shrinking /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0/sbin/setpci
shrinking /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0/sbin/lspci
gzipping man pages under /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0/share/man/
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0/lib  /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0/sbin
patching script interpreter paths in /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0
checking for references to /build in /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0...
moving /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0/sbin/* to /nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0/bin
/nix/store/ii569wzw2f9ixybqf7fn4y8m9qiqv44z-pciutils-3.6.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: pciutils

Partial log (click to expand)

shrinking /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0/sbin/setpci
shrinking /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0/sbin/lspci
shrinking /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0/lib/libpci.so.3.6.0
gzipping man pages under /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0/share/man/
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0/lib  /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0/sbin
patching script interpreter paths in /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0
checking for references to /build in /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0...
moving /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0/sbin/* to /nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0/bin
/nix/store/0qic1zzl0rwsq08wrq8393vn1z0rbw1a-pciutils-3.6.0

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: pkgsMusl.pciutils

Partial log (click to expand)

cannot build derivation ‘/nix/store/b07ibplws6d1axwv57hgkqa5x1cy4x4v-help2man-1.47.6.drv’: 5 dependencies couldn't be built
cannot build derivation ‘/nix/store/fk0ap2vs5fnkqlyb8dnb4pb431gydxag-readline-6.3p08.drv’: 3 dependencies couldn't be built
cannot build derivation ‘/nix/store/ahqz883aj2ip0njjjpx44ihm2krjvzq4-libtool-2.4.6.drv’: 5 dependencies couldn't be built
cannot build derivation ‘/nix/store/lil2ilasvajhhi3jj6qpqzmgjc7agii6-python-2.7.15.drv’: 10 dependencies couldn't be built
cannot build derivation ‘/nix/store/hx27gkagvcf10rx023p1041xpsbzj7ng-hook.drv’: 6 dependencies couldn't be built
cannot build derivation ‘/nix/store/szkznwygkqs9h36wi8slrnij76b3h8ha-libxml2-2.9.8.drv’: 4 dependencies couldn't be built
cannot build derivation ‘/nix/store/x2ydljvqj235114if74ql4a1n9a0r4qw-libxslt-1.1.32.drv’: 5 dependencies couldn't be built
cannot build derivation ‘/nix/store/bh664zs5lgxbndkgkkwn0ghs5zcna44v-kmod-25.drv’: 6 dependencies couldn't be built
cannot build derivation ‘/nix/store/90wqg18m5lnmbvf3nwgfnas6sz5257ad-pciutils-3.6.0.drv’: 5 dependencies couldn't be built
error: build of ‘/nix/store/90wqg18m5lnmbvf3nwgfnas6sz5257ad-pciutils-3.6.0.drv’ failed

@dtzWill
Copy link
Member Author

dtzWill commented Jul 9, 2018

Sending to staging due to rebuilds.....

@dtzWill dtzWill closed this Jul 9, 2018
@dtzWill dtzWill changed the base branch from master to staging July 9, 2018 21:47
@dtzWill dtzWill reopened this Jul 9, 2018
@dtzWill dtzWill merged commit 301559c into NixOS:staging Jul 9, 2018
@dtzWill dtzWill deleted the fix/pciutils-3.6.0-musl branch July 9, 2018 22:08
@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: pciutils

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: pkgsMusl.pciutils

Partial log (click to expand)

shrinking /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0/sbin/setpci
shrinking /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0/sbin/lspci
shrinking /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0/lib/libpci.so.3.6.0
gzipping man pages under /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0/share/man/
strip is /nix/store/5ihkpxfwb2s4k92pdl82pg9k7dbr99k6-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0/lib  /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0/sbin
patching script interpreter paths in /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0
checking for references to /build in /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0...
moving /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0/sbin/* to /nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0/bin
/nix/store/n4855h0kqzb8yjs17shqg237r4q31hgx-pciutils-3.6.0

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: pciutils

Partial log (click to expand)

cannot build derivation '/nix/store/bydkn80930s41yidl2a2il8bsrmpi609-help2man-1.47.6.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/pns5qsv4srzry9shcsj6wh1wbgc7i411-readline-6.3p08.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/z0f461s2nwsyv4j07ml7xnd4yhsc669j-libtool-2.4.6.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/3l0231gkag48ac2ypd3bwsqr51p0p5j9-python-2.7.15.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/42cnapg0pd49scagd1q5divckngdp7as-hook.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/w75dmix7s9qavs96bk0x44p7kl96ggsa-libxml2-2.9.8.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/xlpf5ipm79vdd4xmp92gy0yaah8ys6nj-libxslt-1.1.32.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/iabnxsqfz08k3akd0fsn1zbjbqvl3amy-kmod-25.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/p5n1w9kbbx8nmlss954plzc5w1rwcawf-pciutils-3.6.0.drv': 5 dependencies couldn't be built
error: build of '/nix/store/p5n1w9kbbx8nmlss954plzc5w1rwcawf-pciutils-3.6.0.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: pciutils

Partial log (click to expand)

shrinking /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0/sbin/setpci
shrinking /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0/sbin/lspci
shrinking /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0/lib/libpci.so.3.6.0
gzipping man pages under /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0/share/man/
strip is /nix/store/h0nc84ybvb8g724fwysvcghh1675wjli-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0/lib  /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0/sbin
patching script interpreter paths in /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0
checking for references to /build in /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0...
moving /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0/sbin/* to /nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0/bin
/nix/store/krkqpbpyd8i70bdvip4w0isn9x56p5f2-pciutils-3.6.0

@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: pciutils

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants