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

Paperwork update #81921

Closed
wants to merge 0 commits into from
Closed

Paperwork update #81921

wants to merge 0 commits into from

Conversation

@symphorien
Copy link
Contributor

symphorien commented Mar 6, 2020

Motivation for this change
  • update paperwork
  • fix paperwork-shell
  • add a desktop file for paperwork
Things done
  • add the new dependency libinsane
  • remove pyinsane2 as it was only needed by older versions of paperwork and is now unmaintained upstream
  • 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.
Copy link
Contributor

jonringer left a comment

can you clean up git history, there should only be 4 commits

use git rebase -i

@symphorien
Copy link
Contributor Author

symphorien commented Mar 6, 2020

It's impossible to use rebase after a merge. I can squash if you prefer.

@jonringer
Copy link
Contributor

jonringer commented Mar 6, 2020

you can use rebase -i to remove the merge commits, and squash the related ones

@jonringer
Copy link
Contributor

jonringer commented Mar 6, 2020

although i almost never do merge commits, so maybe im wrong

@symphorien
Copy link
Contributor Author

symphorien commented Mar 6, 2020

git rebase -i lists 11058 commits. I am afraid it is unworkable. I can either squash or leave the PR as is. Feel free to edit it to you liking, as I ticked the allow edits from maintainers box.

@jonringer
Copy link
Contributor

jonringer commented Mar 6, 2020

you can also do git rebase --onto master HEAD~15, after resolving the conflicts, the git history should be fixed

@symphorien
Copy link
Contributor Author

symphorien commented Mar 6, 2020

git rebase --onto master HEAD~15 makes one merge conflict by commit imported by the merges. That is about 11000 merge conflicts.

@jonringer
Copy link
Contributor

jonringer commented Mar 6, 2020

it's listed under https://nixos.org/nixpkgs/manual/#submitting-changes-making-patches that your git commits should be done in a way that "makes sense" (logical units). Usually to make it easy for cherry-picks to release branches. 3 bumps and 4 fixups to the paperwork package is not in the spirit of CONTRIBUTING.md

Copy link
Contributor

jonringer left a comment

please groom git history, should be ~5 commits

@symphorien symphorien closed this Mar 7, 2020
@symphorien symphorien force-pushed the symphorien:paperwork-update branch from c46044b to 82b54d4 Mar 7, 2020
@symphorien symphorien mentioned this pull request Mar 7, 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

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