Skip to content

udisks2: 2.1.6 -> 2.1.8, extend workaround to include musl#37810

Merged
dtzWill merged 2 commits intoNixOS:stagingfrom
dtzWill:update/udisks2-2.1.8
Apr 3, 2018
Merged

udisks2: 2.1.6 -> 2.1.8, extend workaround to include musl#37810
dtzWill merged 2 commits intoNixOS:stagingfrom
dtzWill:update/udisks2-2.1.8

Conversation

@dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 25, 2018

(Don't update udisks past 2.1.x to keep things compat)

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

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Mar 25, 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: udisks, udisks2

Partial log (click to expand)


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

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


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: udisks, udisks2

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/qmh62k80swlmccfr24plkp7a58g3x03l-udisks-2.1.8-man
gzipping man pages under /nix/store/qmh62k80swlmccfr24plkp7a58g3x03l-udisks-2.1.8-man/share/man/
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/qmh62k80swlmccfr24plkp7a58g3x03l-udisks-2.1.8-man
checking for references to /build in /nix/store/qmh62k80swlmccfr24plkp7a58g3x03l-udisks-2.1.8-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/lwmw080bkrr7b3cldz3r43h83ndrj1x6-udisks-2.1.8-dev
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/lwmw080bkrr7b3cldz3r43h83ndrj1x6-udisks-2.1.8-dev/lib
patching script interpreter paths in /nix/store/lwmw080bkrr7b3cldz3r43h83ndrj1x6-udisks-2.1.8-dev
checking for references to /build in /nix/store/lwmw080bkrr7b3cldz3r43h83ndrj1x6-udisks-2.1.8-dev...

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: udisks, udisks2

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/pwgrga96hrjwyrd6k88rghw26bvm9yrr-gtk-doc-1.27
strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/pwgrga96hrjwyrd6k88rghw26bvm9yrr-gtk-doc-1.27/lib  /nix/store/pwgrga96hrjwyrd6k88rghw26bvm9yrr-gtk-doc-1.27/bin
patching script interpreter paths in /nix/store/pwgrga96hrjwyrd6k88rghw26bvm9yrr-gtk-doc-1.27
/nix/store/pwgrga96hrjwyrd6k88rghw26bvm9yrr-gtk-doc-1.27/bin/gtkdocize: interpreter directive changed from "/bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/pwgrga96hrjwyrd6k88rghw26bvm9yrr-gtk-doc-1.27...
cannot build derivation '/nix/store/2yf9fqsib2z2j8pplpif9379z4pd60rz-polkit-0.113.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/rwpd5jywwm2np74r017lafj73snalzrk-udisks-2.1.8.drv': 5 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/rwpd5jywwm2np74r017lafj73snalzrk-udisks-2.1.8.drv' failed

@jtojnar
Copy link
Member

jtojnar commented Mar 26, 2018

What compatibility are you talking about? 2.7.6 seems to work just fine with the packages in nixpkgs: #35551

@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018

Honestly I don't recall! I'll revisit that and let you know, sorry :).

@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018

Oh, right, it needed additional deps (blockdev, etc.) that seemed beyond scope for what I was working on (particularly ensuring NixOS worked across such changes)... part of the storaged-project. Which I see you tackled in that PR! \o/

I'll separate this out then, thanks for putting together that PR and pointing me to it!

@dtzWill dtzWill closed this Mar 26, 2018
@dtzWill dtzWill reopened this Mar 26, 2018
@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018

Actually at least this minor update is needed, 2.1.6 wants to write to stdout which is no good. Newer code uses dup2.

@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: udisks, udisks2

Partial log (click to expand)


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

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


@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018

Okay to go ahead with this while waiting on #35551? That seems stalled for a bit since it's a bigger change where this is a minor update + fix that doesn't impact non-musl.

(that PR seems to also require building various selinux bits that need to be updated, see #36978).

@Mic92
Copy link
Member

Mic92 commented Mar 26, 2018

Independent from this pull request but we should evaluate the musl target for x86_64 at some point.

@jtojnar
Copy link
Member

jtojnar commented Mar 26, 2018

I could merge it even though the patch does not cover everything – it is still an improvement.

That aside, do you have a link to an upstream issue/pull request about musl support in udisks2?

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: udisks, udisks2

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/2yg1fr8rh98a30hssvcks7hi9yq4z469-gtk-doc-1.27
strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/2yg1fr8rh98a30hssvcks7hi9yq4z469-gtk-doc-1.27/lib  /nix/store/2yg1fr8rh98a30hssvcks7hi9yq4z469-gtk-doc-1.27/bin
patching script interpreter paths in /nix/store/2yg1fr8rh98a30hssvcks7hi9yq4z469-gtk-doc-1.27
/nix/store/2yg1fr8rh98a30hssvcks7hi9yq4z469-gtk-doc-1.27/bin/gtkdocize: interpreter directive changed from "/bin/sh" to "/nix/store/adw9jx59wnrh5659wz43nbjya3m4b3gl-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/2yg1fr8rh98a30hssvcks7hi9yq4z469-gtk-doc-1.27...
cannot build derivation '/nix/store/lz1amgfjczbnsig7xjng11q5sgw5v29d-polkit-0.113.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/hh457a2kca2h573qk1x7jj74g9zxflza-udisks-2.1.8.drv': 5 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/hh457a2kca2h573qk1x7jj74g9zxflza-udisks-2.1.8.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: udisks, udisks2

Partial log (click to expand)

cannot build derivation '/nix/store/qhvbgqsd5fwg5zaixs23xql4fii0pbx4-harfbuzz-1.7.5.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/qdm1l89x8h25l1fhpnqrrv839wf3c9rf-gobject-introspection-1.56.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/7q2g5knrmi6yl467gw86b19j54cvmq5h-harfbuzz-icu-1.7.5.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/21w8czgnbbm2w5svjxq4wz0yq4sb560h-texlive-core-big.bin-2017.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/40202xlw5fg5gkdhv412w9pkmw8mrgmy-texlive-combined-2017.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/2pz5r7s1h25cnz1afk38y1677wvscrsb-dblatex-0.3.10.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/k872qraibfg1arxk6z6805f2b2avgv94-gtk-doc-1.27.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/kfjkmx62phg8khdrqjwh86l4c4akxanp-polkit-0.113.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/lc26lk7wws9g1gc5ws2dfb48n5f95hkz-udisks-2.1.8.drv': 2 dependencies couldn't be built
error: build of '/nix/store/lc26lk7wws9g1gc5ws2dfb48n5f95hkz-udisks-2.1.8.drv' failed

@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018

That aside, do you have a link to an upstream issue/pull request about musl support in udisks2?

I do not, sorry. I just notice that it, like many projects, are more musl-compat in newer versions :).

Not sure re:2.7.6, still whack-a-mole fixing all the FS-related utilities that it needs (mostly applying upstream fixes so far, happily) so can't say but hopefully it works since this version does.

@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018

@jtojnar the particular issue was fixed with: storaged-project/udisks@7f30aee

@dtzWill
Copy link
Member Author

dtzWill commented Apr 3, 2018

@jtojnar ping! Thoughts on going ahead with this while waiting on the larger update?

@jtojnar
Copy link
Member

jtojnar commented Apr 3, 2018

Let's go ahead with this. After reviewing the other upgrade, I think it is not ready and will not have time to finish it soon.

@dtzWill
Copy link
Member Author

dtzWill commented Apr 3, 2018

Sounds like a plan! Thanks!

@dtzWill dtzWill merged commit 8422a14 into NixOS:staging Apr 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants