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

dupeguru: Fix build #99076

Merged
merged 1 commit into from Oct 11, 2020
Merged

dupeguru: Fix build #99076

merged 1 commit into from Oct 11, 2020

Conversation

@avdv
Copy link
Contributor

@avdv avdv commented Sep 29, 2020

Motivation for this change

ZHF: #97479

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.
pkgs/applications/misc/dupeguru/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/dupeguru/default.nix Outdated Show resolved Hide resolved
@avdv avdv force-pushed the fix-dupeguru branch from 9eb0588 to 4e8d70a Sep 29, 2020
@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 29, 2020

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the fix-up commits.

This can be done without git rebase -i by doing:

git reset HEAD~1                    # move fix-up commits into unstaged
git add -- pkgs/                    # move changes into staged
git commit --amend --no-edit        # add changes to previous commit
git push ... ... --force            # modify current PR branch

However, git rebase -i is a more powerful alternative, I created a small video demonstrating it's use here. A more indepth text tutorial can be found here

@avdv avdv force-pushed the fix-dupeguru branch from 4e8d70a to 9ef36cc Sep 29, 2020
@risicle
Copy link
Contributor

@risicle risicle commented Sep 29, 2020

WFM non-nixos linux x86_64

@avdv
Copy link
Contributor Author

@avdv avdv commented Sep 30, 2020

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the fix-up commits.

Done.

But in no way I can read from CONTRIBUTING that fixup commits should be squashed. And I would assume nobody picks that up from the sentence "If you have commits pkg-name: oh, forgot to insert whitespace: squash commits in this case. Use git rebase -i." in the manual either (it's quite hidden).

Also, you started making code suggestions, where you have to expect people pushing the "commmit" button resulting in a commit to the PR... 🤷‍♂️ And I don't really understand what's the point, since one can simply squash when merging here on GitHub, avoiding re-evaluation of ofborg?!

@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 11, 2020

Also, you started making code suggestions, where you have to expect people pushing the "commmit" button resulting in a commit to the PR... man_shrugging

I usually make the edits locally, re-build the package. Doing those changes locally are easier

And I don't really understand what's the point, since one can simply squash when merging here on GitHub, avoiding re-evaluation of ofborg?!

It's not for your benefit, it's for the benefit of those reviewing your PR. I'm sacrificing my free time to review the changes. In general, it's not very rewarding to do reviews.
I get 20-120 github notifications in a day. Having to spend additional time "cleaning up" after others contributes burn out.

Not to mention that your PR just "happens" to be only one commit, so squashing happens to be a possibility in this one instance.

The nixpkgs manual uses the term "logical units"; the term is vague, but it allows for the flexibility needed when doing non-conventional changes. In any case, I don't think a comment and some formatting warrants a separate commit.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 11, 2020

this was marked broken in #99956 , please rebase, and unmark it as broken

Note: the patch should be removed when the next version is released.

Co-authored-by: Jon <jonringer@users.noreply.github.com>
@avdv avdv force-pushed the fix-dupeguru branch from 9ef36cc to 9ecd266 Oct 11, 2020
@avdv
Copy link
Contributor Author

@avdv avdv commented Oct 11, 2020

It's not for your benefit, it's for the benefit of those reviewing your PR. I'm sacrificing my free time to review the changes. In general, it's not very rewarding to do reviews.
I get 20-120 github notifications in a day. Having to spend additional time "cleaning up" after others contributes burn out.

But is it really less work to explain the squashing machinery each time and having to revisit the PR at a later time than to simply choose the right button (especially - as in this case - if the changes are from yourself basically?) You don't have to answer, I don't want to start a discussion here... just a thought.

this was marked broken in #99956 , please rebase, and unmark it as broken

Done. Thanks ❤️ !

@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 11, 2020

But is it really less work to explain the squashing machinery each time and having to revisit the PR at a later time than to simply choose the right button (especially - as in this case - if the changes are from yourself basically?

It is less work the first time. But it's more to set expectations, so that further contributions are easier to review.

Also avoids having to do, "it was okay in this one previous PR because it was only meant to be a single commit, so i could squash it. But in this one you have 2 package additions and a version bump, so that's not something I can easily do from github."

Copy link
Contributor

@jonringer jonringer left a comment

diff LGTM
gui launches fine

https://github.com/NixOS/nixpkgs/pull/99076
1 package built:
dupeguru

@jonringer jonringer merged commit 3ccef37 into NixOS:master Oct 11, 2020
19 checks passed
19 checks passed
@github-actions[bot]
tests tests
Details
@github-actions[bot]
action
Details
@ofborg[bot]
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions[bot]
Wait for ofborg
Details
@ofborg[bot]
dupeguru, dupeguru.passthru.tests on aarch64-linux Success
Details
@ofborg[bot]
dupeguru, dupeguru.passthru.tests on x86_64-linux Success
Details
@ofborg[bot]
grahamcofborg-eval ^.^!
Details
@ofborg[bot]
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg[bot]
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg[bot]
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9ecd266"; rev="9ecd266e92b8de614862f927d6efc6906018d623"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg[bot]
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9ecd266"; rev="9ecd266e92b8de614862f927d6efc6906018d623"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9ecd266"; rev="9ecd266e92b8de614862f927d6efc6906018d623"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9ecd266"; rev="9ecd266e92b8de614862f927d6efc6906018d623"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9ecd266"; rev="9ecd266e92b8de614862f927d6efc6906018d623"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9ecd266"; rev="9ecd266e92b8de614862f927d6efc6906018d623"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9ecd266"; rev="9ecd266e92b8de614862f927d6efc6906018d623"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg[bot]
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@avdv avdv deleted the fix-dupeguru branch Oct 12, 2020
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