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

mepo: 0.4.2 -> 0.5 #189344

Closed
wants to merge 7 commits into from
Closed

mepo: 0.4.2 -> 0.5 #189344

wants to merge 7 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Sep 1, 2022

Description of changes

First commit is a simple version bump.

Second commit adds gpsd as an optional dependency and points mepo's scripts' gpspipe to the correct path. It also makes silent reporting of the user's location to Mozilla and geoclue opt-in rather than opt-out; this issue has been reported upstream to request a build flag so we don't have to use patches.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ghost
Copy link
Author

ghost commented Sep 2, 2022

Added commits which were formerly part of #189345.

@McSinyx
Copy link
Member

McSinyx commented Sep 2, 2022 via email

@ghost
Copy link
Author

ghost commented Sep 2, 2022

Path to GeoClue binaries need substitution

Done: 3b8d39d136de50cfd3b0e3159cb0b2b318b67565

and IMHO Mozilla location service should be conditionally enabled in the same manner as the others.

I don't understand what you mean... isn't reportLocationToMozilla conditionally enabling the mozilla location service?

BTW you should rebase the commits for each to be meaningful (GitHub suggestion should be read-only).

I don't understand this either... what do you mean by meaningful? And what GitHub suggestion?

@McSinyx
Copy link
Member

McSinyx commented Sep 2, 2022

isn't reportLocationToMozilla conditionally enabling the mozilla location service?

It is, apologies, I misread 😅

what do you mean by meaningful [commit]?

37ceaf7d4c5c1157b3eb51262d520fc0ec0cdb77 and 3b8d39d136de50cfd3b0e3159cb0b2b318b67565 are examples of commits that only make sense with the context of the discussion. Each commit should make sense by itself should it be merged.

what GitHub suggestion?

The one created 37ceaf7d4c5c1157b3eb51262d520fc0ec0cdb77.

@ghost
Copy link
Author

ghost commented Sep 2, 2022

37ceaf7 and 3b8d39d are examples of commits that only make sense with the context of the discussion. Each commit should make sense by itself should it be merged.

Oh, I see, you want me to squash the history to clean it up. Sure, no problem.

Each commit should make sense by itself should it be merged.

Right. Just to be clear though, I don't think it is a good idea to merge the version bump without the user location protection. I will squash the history into two commits, but I hope that either both of them or else neither of them is merged.

@McSinyx
Copy link
Member

McSinyx commented Sep 2, 2022 via email

Adam Joseph added 2 commits September 1, 2022 23:39
mepo 0.5 silently reports the user's location to Mozilla without
asking first.  Let's disable this by default.

This has been reported to upstream with a request for a build-time
flag so we can drop the patch:

  https://todo.sr.ht/~mil/mepo-tickets/41
@ghost
Copy link
Author

ghost commented Sep 2, 2022

Thanks! GitHub UX kinda only allows merging all or nothing

Ah, interesting; I did not know that. I have plenty of complaints about github :)

hence often quite some nitpick round trips are needed.

No problem. Should be squashed now into four separate topic-specific commits at 8981daa. This should make things easier down the line if one of them needs to be reverted.

Copy link
Member

@McSinyx McSinyx left a comment

Choose a reason for hiding this comment

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

Working as expected for me.

@sikmir
Copy link
Member

sikmir commented Sep 4, 2022

Result of nixpkgs-review pr 189344 run on x86_64-linux 1

2 packages built:
  • mepo
  • mepo-x11

@sikmir
Copy link
Member

sikmir commented Sep 4, 2022

I guess .orig file should not be installed:

$ ls results/mepo/bin/*.orig
results/mepo/bin/mepo_ui_menu_user_pin_updater.sh.orig

Comment on lines 21 to 26
, geoclueSupport ? false , geoclue2

# transmits user's location without asking first
, reportLocationToMozilla ? false

, gpsdSupport ? true , gpsd
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
, geoclueSupport ? false , geoclue2
# transmits user's location without asking first
, reportLocationToMozilla ? false
, gpsdSupport ? true , gpsd
, geoclueSupport ? false, geoclue2
# transmits user's location without asking first
, reportLocationToMozilla ? false
, gpsdSupport ? true, gpsd

Shouldn't we assert something here? not sure what tbh

Copy link
Author

Choose a reason for hiding this comment

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

Shouldn't we assert something here?

Why?

Copy link
Member

Choose a reason for hiding this comment

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

Would it work to turn all on or off?

Copy link
Author

Choose a reason for hiding this comment

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

Correct: all 2^3 combinations of the three boolean flags are valid.

pkgs/applications/misc/mepo/default.nix Show resolved Hide resolved
pkgs/applications/misc/mepo/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/mepo/default.nix Outdated Show resolved Hide resolved
@ofborg ofborg bot requested a review from McSinyx September 4, 2022 19:09
@ghost ghost requested review from SuperSandro2000 and removed request for sikmir and McSinyx September 4, 2022 19:22
@ghost
Copy link
Author

ghost commented Sep 4, 2022

I guess .orig file should not be installed:

$ ls results/mepo/bin/*.orig
results/mepo/bin/mepo_ui_menu_user_pin_updater.sh.orig

I'm trying to reproduce this.

We might need --no-backup-if-mismatch in patchFlags. I'm surprised that isn't the default.

@ghost
Copy link
Author

ghost commented Sep 6, 2022

So, based on upstream's response it doesn't look like there is an easy solution, and my concerns will likely recur in future version bumps.

I'll let the package maintainers @sikmir @McSinyx decide what to do here. Feel free to use some/all/none of the changes in this PR.

@ghost ghost closed this Sep 6, 2022
@ghost ghost deleted the pr/mepo/bump/0.5 branch January 23, 2024 06:49
This pull request was closed.
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.

4 participants