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

polkit: 0.113 -> 0.115 #43127

Merged
merged 2 commits into from Aug 3, 2018
Merged

polkit: 0.113 -> 0.115 #43127

merged 2 commits into from Aug 3, 2018

Conversation

symphorien
Copy link
Member

Motivation for this change

I am affected by a bug fixed in 0.114 (https://bugs.freedesktop.org/show_bug.cgi?id=96977 )

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): udisks
  • 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.
Other considerations

All fedora patches have been merged upstream.
Tests pass and have been enabled on linux.

cc @dtzWill regarding musl support: 551f070 introduced a musl patch (source
https://bugs.freedesktop.org/show_bug.cgi?id=50145 ) but this patch does not apply anymore, and
this other bug https://bugs.freedesktop.org/show_bug.cgi?id=75187 introduced similar changes.
I tried building polkit on musl:

nix-build . -A polkit --arg crossSystem '(import <nixpkgs> {}).lib.systems.examples.musl64'

but this fails to build dependencies ( /nix/store/b0q57pcgkn2z185nrk2dx6lyjys18xqy-bsd-compat-netbsd-7.1.2-x86_64-unknown-linux-musl.drv ).
So I chose to drop the patch completely. As of now we don't need it since dependencies don't build.

@adisbladis
Copy link
Member

The udisks2 test is relying on polkit, lets run it :)
@GrahamcOfBorg test udisks2

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: tests.udisks2

Partial log (click to expand)

building '/nix/store/n7gr6dsmljz03ij3d5yds6rghg52vnq9-xlock.pam.drv'...
building '/nix/store/slnkc9pvwvbi0v3y5jza423fsgl734rv-xscreensaver.pam.drv'...
cannot build derivation '/nix/store/sapb5p3fawabim7ynwwdfny22171m8kr-etc.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/2yqxyf5r68nfsgs1yggnk6hi0nzynkb7-nixos-system-machine-18.09.git.7bfb85d.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/3wk3kdb3567hjr0s24ky15i1gi8n6g89-closure-info.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/nsa6sim9whwzdfhisrh7pg8vcx8p1k7z-run-nixos-vm.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/5fzlvq3pnv47g9fz649j1klg8h126krr-nixos-vm.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/2alahawp4izb49g081vf40615dc9drx6-nixos-test-driver-udisks2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/pqpvphpwywmxmddqn64f2sg12ap58yjl-vm-test-run-udisks2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/pqpvphpwywmxmddqn64f2sg12ap58yjl-vm-test-run-udisks2.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: tests.udisks2

Partial log (click to expand)

cannot build derivation '/nix/store/gfmhivp60rp3fn7ywzvwhyqc4p4v826a-system-units.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/g1ms5adgm4p0yqb6hacicdi4jrnpnxgp-user-units.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/b05pbck6zfk2l0nabfpycx9gi385h15v-etc.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/rxd9y64nrrxkrl3pdgk23d2qcqydym8j-nixos-system-machine-18.09.git.d3c833d.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/wz4s30dv7dkbvpxp1zn48nswahdh6lv7-closure-info.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/bf01n8qy0qjb1azv6pn5kmw4zsp0bral-run-nixos-vm.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/9x9m9b0zwrynshybj41bbxl9jkn4ykg7-nixos-vm.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/vmim7qkmxq47g9ki1p1w9qav98ackjm0-nixos-test-driver-udisks2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/i2fz2nl0bcknk5i1gpix3gl8v6w5ls2x-vm-test-run-udisks2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/i2fz2nl0bcknk5i1gpix3gl8v6w5ls2x-vm-test-run-udisks2.drv' failed

@adisbladis
Copy link
Member

The build is failing because of unpatched shebangs in tests.

@symphorien
Copy link
Member Author

Here is a version which should build with sandboxing.

@xeji
Copy link
Contributor

xeji commented Jul 8, 2018

@GrahamcOfBorg build polkit

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: polkit

Partial log (click to expand)

cannot build derivation '/nix/store/rkfmznq4cdh14fkjsr7x56d11dr0s85n-absolute_gir_path.patch.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/7a24jlkp6y96b35xx6gwvv5gacx7zpk2-harfbuzz-1.8.0.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/4fryw32zyyl7jy2hwnbg4azp3jiaz9li-gobject-introspection-1.56.0.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/0bvl2nbvfzxj60ybn3650bz1bphpy925-harfbuzz-icu-1.8.0.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/7999sj9ngq4521p8iv8gslv39cicj5g7-texlive-core-big.bin-2017.drv': 18 dependencies couldn't be built
cannot build derivation '/nix/store/mwvhcqbxr4klhgvs4ml726q6ill5ihvk-texlive-combined-2017.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/a190ra5qhvxc1kpz77mw2g84h5spnvwy-dblatex-0.3.10.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/5b3jfz15signliyhl58l3g2rnf1vgdly-gtk-doc-1.28.drv': 15 dependencies couldn't be built
cannot build derivation '/nix/store/slrax5z0ic70jk3d05m2ikq9s1ng9jil-polkit-0.114.drv': 18 dependencies couldn't be built
error: build of '/nix/store/slrax5z0ic70jk3d05m2ikq9s1ng9jil-polkit-0.114.drv' failed

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

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

Failure on x86_64-linux (full log)

Attempted: polkit

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/6m9jpa3zqps7jwxdw6h4dz5yz1fv2ri0-texlive-bin-2017-doc
strip is /nix/store/90vmpr41dzsx350k5argycaf693hnl1l-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/6m9jpa3zqps7jwxdw6h4dz5yz1fv2ri0-texlive-bin-2017-doc
checking for references to /build in /nix/store/6m9jpa3zqps7jwxdw6h4dz5yz1fv2ri0-texlive-bin-2017-doc...
cannot build derivation '/nix/store/g52kqw2nmfw4spl16x4vyg2xbik5hnv5-texlive-core-big.bin-2017.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/fgb5gqvbffv0654g6qvf7wc6r8vkcyb3-texlive-combined-2017.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/3icckbj421bfk3jyvvdvmlfqazfc97g6-dblatex-0.3.10.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/mmn0wk7i1nd4gm1p1ppk7ai9avdbn917-gtk-doc-1.28.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/453kxszqgyvxzhc84g76facv4x5h748c-polkit-0.114.drv': 2 dependencies couldn't be built
error: build of '/nix/store/453kxszqgyvxzhc84g76facv4x5h748c-polkit-0.114.drv' failed

@dtzWill
Copy link
Member

dtzWill commented Jul 9, 2018

@symphorien Thanks for the ping and effort re:musl!

  • Pinging is great! Hopefully there's a "musl team" to ping soon, see [meta][administrative] Create musl team, please? :D #43265
  • Cross-compilation is often more problematic than native building--so if you're on a x86_64-linux builder you can test musl support by simply prepending "pkgsMusl" to the attribute. So, pkgsMusl.polkit :). That said you'll still encounter dependency problems while I cleanup the systemd patchery (long been working in my fork for the curious, but that's mostly a staging area for things I'm sending uptsream :))
  • If in doubt or no response, dropping the patch is the right thing and no worries (indeed, apologies for the trouble). But if you know you're dropping things or MIGHT be breaking things, please ping me/us anyway (as you've done) so we aren't surprised later :). Much appreciated.

I haven't investigated the musl patch situation yet since it appears to have build problems elsewhere that need attention. (And I'm hoping to clean up systemd bits for inclusion soon!)

@symphorien
Copy link
Member Author

Is there anything I should modify ?

@xeji
Copy link
Contributor

xeji commented Aug 2, 2018

let's try again, maybe the dependencies have been fixed
@GrahamcOfBorg build polkit

@jtojnar
Copy link
Contributor

jtojnar commented Aug 2, 2018

0.115 was released by the way.

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

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: polkit

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/x5xi2hw96klldyv7szyljmi9xpd82973-polkit-0.114
shrinking /nix/store/x5xi2hw96klldyv7szyljmi9xpd82973-polkit-0.114/lib/libpolkit-agent-1.so.0.0.0
shrinking /nix/store/x5xi2hw96klldyv7szyljmi9xpd82973-polkit-0.114/lib/polkit-1/polkit-agent-helper-1
shrinking /nix/store/x5xi2hw96klldyv7szyljmi9xpd82973-polkit-0.114/lib/polkit-1/polkitd
shrinking /nix/store/x5xi2hw96klldyv7szyljmi9xpd82973-polkit-0.114/lib/libpolkit-gobject-1.so.0.0.0
strip is /nix/store/ah0va6j4cnwj9nx4j6rwcfc8nh785jwm-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/x5xi2hw96klldyv7szyljmi9xpd82973-polkit-0.114/lib
patching script interpreter paths in /nix/store/x5xi2hw96klldyv7szyljmi9xpd82973-polkit-0.114
checking for references to /build in /nix/store/x5xi2hw96klldyv7szyljmi9xpd82973-polkit-0.114...
/nix/store/hqfvkv2iak87wg1h7za359vx5ai0dg08-polkit-0.114-bin

@xeji
Copy link
Contributor

xeji commented Aug 2, 2018

I'll add 0.115 here shortly

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: polkit

Partial log (click to expand)

checking for references to /tmp/nix-build-polkit-0.114.drv-0 in /nix/store/cdfn3vmfa5yvv7y2nk1gnikifsn50969-polkit-0.114-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/kl6r9cziy38cvqb4n3b1m4dmg3qvb3v1-polkit-0.114
shrinking /nix/store/kl6r9cziy38cvqb4n3b1m4dmg3qvb3v1-polkit-0.114/lib/libpolkit-agent-1.so.0.0.0
shrinking /nix/store/kl6r9cziy38cvqb4n3b1m4dmg3qvb3v1-polkit-0.114/lib/polkit-1/polkit-agent-helper-1
shrinking /nix/store/kl6r9cziy38cvqb4n3b1m4dmg3qvb3v1-polkit-0.114/lib/polkit-1/polkitd
shrinking /nix/store/kl6r9cziy38cvqb4n3b1m4dmg3qvb3v1-polkit-0.114/lib/libpolkit-gobject-1.so.0.0.0
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/kl6r9cziy38cvqb4n3b1m4dmg3qvb3v1-polkit-0.114/lib 
patching script interpreter paths in /nix/store/kl6r9cziy38cvqb4n3b1m4dmg3qvb3v1-polkit-0.114
checking for references to /tmp/nix-build-polkit-0.114.drv-0 in /nix/store/kl6r9cziy38cvqb4n3b1m4dmg3qvb3v1-polkit-0.114...

@xeji xeji changed the title polkit: 0.113 -> 0.114 polkit: 0.113 -> 0.115 Aug 2, 2018
@xeji
Copy link
Contributor

xeji commented Aug 2, 2018

@GrahamcOfBorg build polkit

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

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: polkit

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/bvgwmw0vmz6n7fgbycs96qmxikjbnvi4-polkit-0.115
shrinking /nix/store/bvgwmw0vmz6n7fgbycs96qmxikjbnvi4-polkit-0.115/lib/libpolkit-agent-1.so.0.0.0
shrinking /nix/store/bvgwmw0vmz6n7fgbycs96qmxikjbnvi4-polkit-0.115/lib/polkit-1/polkit-agent-helper-1
shrinking /nix/store/bvgwmw0vmz6n7fgbycs96qmxikjbnvi4-polkit-0.115/lib/polkit-1/polkitd
shrinking /nix/store/bvgwmw0vmz6n7fgbycs96qmxikjbnvi4-polkit-0.115/lib/libpolkit-gobject-1.so.0.0.0
strip is /nix/store/ah0va6j4cnwj9nx4j6rwcfc8nh785jwm-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/bvgwmw0vmz6n7fgbycs96qmxikjbnvi4-polkit-0.115/lib
patching script interpreter paths in /nix/store/bvgwmw0vmz6n7fgbycs96qmxikjbnvi4-polkit-0.115
checking for references to /build in /nix/store/bvgwmw0vmz6n7fgbycs96qmxikjbnvi4-polkit-0.115...
/nix/store/9k139ppamj0c70p28jimy7c9cfig2hsv-polkit-0.115-bin

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: polkit

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/fxmzb85bhpyl8r6wzk2frjdpj8n6csma-texlive-bin-2017-doc
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/fxmzb85bhpyl8r6wzk2frjdpj8n6csma-texlive-bin-2017-doc
checking for references to /build in /nix/store/fxmzb85bhpyl8r6wzk2frjdpj8n6csma-texlive-bin-2017-doc...
cannot build derivation '/nix/store/nrrjskmbri3lrd2k866sxd9f473cpkmx-texlive-core-big.bin-2017.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/g0kwzk8f04wvjd1wavkiwbsdnk6y024k-texlive-combined-2017.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/h0k2kl4n0wn717xg4b2r0k9859wlybhy-dblatex-0.3.10.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/3j9mi9cdsg1yjbmvyh4fgmlmqvw6jwbn-gtk-doc-1.28.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/ckq208fb20fx65v7vv0gd6zlipq1gq85-polkit-0.115.drv': 2 dependencies couldn't be built
error: build of '/nix/store/ckq208fb20fx65v7vv0gd6zlipq1gq85-polkit-0.115.drv' failed

@xeji
Copy link
Contributor

xeji commented Aug 3, 2018

x86_64-linux failure is in a dependency and unrelated to this PR (builds fine locally on this branch).

But we have an issue with darwin: Looks like spidermonkey_17 -> spidermonkey_52 makes polkit unsupported on darwin. @symphorien was it necessary to update this?

(I find it rather weird that polkit depends on a javascript engine, see #8989 )

@vcunat
Copy link
Member

vcunat commented Aug 3, 2018

The weird part is that they decided to use JS for configuration.

@jtojnar
Copy link
Contributor

jtojnar commented Aug 3, 2018

polkit uses javascript to allow system administrators to override rules, the requirements were bumped in 0.114: https://cgit.freedesktop.org/polkit/commit/?id=81b92d6c36a086fb370b69440b0a05dfbfa23085

Yep, something small like lua or lisp would be nicer though.

@xeji
Copy link
Contributor

xeji commented Aug 3, 2018

So what do we do - leave darwin at polkit 0.113 ?

@jtojnar
Copy link
Contributor

jtojnar commented Aug 3, 2018

Is polkit even used on darwin?

@xeji
Copy link
Contributor

xeji commented Aug 3, 2018

Not sure but this causes a 19 darwin rebuilds, mostly mate / lxqt-related stuff

@jtojnar
Copy link
Contributor

jtojnar commented Aug 3, 2018

Yeah, except for falkon, none of the darwin rebuilds look like they would work on darwin anyway (all desktop environment components).

@xeji
Copy link
Contributor

xeji commented Aug 3, 2018

Agree. So I'd say let's merge this and fix the fallout later if anyone complains.

@xeji xeji merged commit 0323ac9 into NixOS:staging Aug 3, 2018
@symphorien symphorien deleted the polkit-update branch March 21, 2020 18:16
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

7 participants