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

packagekit: 1.1.12 -> 1.1.13 #77498

Merged
merged 3 commits into from Jan 18, 2020
Merged

Conversation

@dtzWill
Copy link
Contributor

@dtzWill dtzWill commented Jan 11, 2020

Motivation for this change

https://github.com/hughsie/PackageKit/blob/PACKAGEKIT_1_1_13/NEWS

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@dtzWill
Copy link
Contributor Author

@dtzWill dtzWill commented Jan 11, 2020

@GrahamcOfBorg test packagekit

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Jan 11, 2020

I should probably add myself as a maintainer to this, I can at least receive pings on it.

@nh2
nh2 approved these changes Jan 12, 2020
Copy link
Contributor

@nh2 nh2 left a comment

nix-review says:

[14 built, 741 copied (2556.1 MiB), 505.7 MiB DL]
https://github.com/NixOS/nixpkgs/pull/77498
8 package built:
discover gnome3.gnome-packagekit gnome3.gnome-software simple-scan packagekit packagekit-qt pantheon.appcenter system-config-printer
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Jan 12, 2020

This looks interesting from the changelog

 - Add support for user services (Julian Andres Klode)

I believe that is this commit hughsie/PackageKit@d9fe720.
The configure output had this:

systemd system unit dir:   /nix/store/1jjkn934bfhma9yayp3pvzdpznjj87lk-packagekit-1.1.13/lib/systemd/system/
systemd user unit dir:     /nix/store/a23ym95iyzhszm4a6yj83dfcfsvjbdzj-systemd-243.3/lib/systemd/user

I notice in the build output with this PR there's a system unit installed but no user services.
So I suspect because the directory for the user unit dir is writable it failed silently?
We should probably set --with-systemduserunitdir.
A better solution might be for them to use --define-variable in

[has_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)])
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Jan 12, 2020

Ooh they just switched to meson

Copy link
Member

@worldofpeace worldofpeace left a comment

While visiting:
* drop trailing slash in system unit dir
* prefer placeholder over escaping
@dtzWill
Copy link
Contributor Author

@dtzWill dtzWill commented Jan 12, 2020

Ooh they just switched to meson sparkles

(for folks following along, FYI this was done after the release of this version, so meson is for "next time" 😸 )

This looks interesting from the changelog

 - Add support for user services (Julian Andres Klode)

I believe that is this commit hughsie/PackageKit@d9fe720.
The configure output had this:

systemd system unit dir:   /nix/store/1jjkn934bfhma9yayp3pvzdpznjj87lk-packagekit-1.1.13/lib/systemd/system/
systemd user unit dir:     /nix/store/a23ym95iyzhszm4a6yj83dfcfsvjbdzj-systemd-243.3/lib/systemd/user

Eep, good catch. Thanks!

I notice in the build output with this PR there's a system unit installed but no user services.
So I suspect because the directory for the user unit dir is writable it failed silently?

This doesn't appear to be the case, as nothing is installed when setting the directory somewhere it can write (as suggested below and in most recent commit).

We should probably set --with-systemduserunitdir.

Pushed commit doing this!

A better solution might be for them to use --define-variable in

Maybe submit an upstream PR? friendly nudge (assuming that seems like a good idea, couldn't say)


Wasn't sure if we should point it to $out/lib/systemd or $out/etc/systemd or indeed perhaps elsewhere (so it can "discover" user services, which maybe is what it is trying for? (??)). If it matters, or there are guidelines for this, I'm happy to be educated or pointed to where such is documented. grep'ing for similar arguments elsewhere in-tree shows a mixed batch, so wasn't sure. Thanks :).

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Jan 16, 2020

@GrahamcOfBorg test packagekit

@nh2
Copy link
Contributor

@nh2 nh2 commented Jan 18, 2020

@worldofpeace Is green, good to go or more to do?

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Jan 18, 2020

@worldofpeace Is green, good to go or more to do?

I believe so, though the changelog was slightly confusing.

@worldofpeace worldofpeace merged commit b873eb7 into NixOS:master Jan 18, 2020
18 checks passed
18 checks passed
packagekit on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
packagekit on aarch64-linux Success
Details
packagekit on x86_64-linux Success
Details
tests.packagekit on aarch64-linux Success
Details
tests.packagekit on x86_64-linux Success
Details
Profpatsch added a commit to Profpatsch/nixpkgs that referenced this pull request Jan 21, 2020
* packagekit: 1.1.12 -> 1.1.13

https://github.com/hughsie/PackageKit/blob/PACKAGEKIT_1_1_13/NEWS

* packagekit: set systemd user unit dir, minor touchups

While visiting:
* drop trailing slash in system unit dir
* prefer placeholder over escaping

* packagekit: dbus dir fixup (thanks @worldofpeace!)

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.