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 #74732

Closed
wants to merge 12 commits into from
Closed

Paperwork update #74732

wants to merge 12 commits into from

Conversation

@symphorien
Copy link
Contributor

@symphorien symphorien commented Nov 30, 2019

Motivation for this change

paperwork now has a desktop file!

Things done

paperwork, paperwork-backend: 1.2.4 -> 1.3.0
libinsane2: init at 1.0.2
pyinsane2: remove, superseeded by libinsane2 (there is no other reverse dependency in nixpkgs)

I can't run nix-review because natsort does not build on master.

  • 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 nix-review --run "nix-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.
Notify maintainers

cc @

@symphorien symphorien requested review from FRidh and jonringer as code owners Nov 30, 2019
@symphorien symphorien mentioned this pull request Nov 30, 2019
5 of 10 tasks complete
@symphorien
Copy link
Contributor Author

@symphorien symphorien commented Nov 30, 2019

cc @aszlig

cp ${python3Packages.paperwork-backend}/bin/.paperwork-shell-wrapped $out/bin/paperwork-shell
# install desktop files and icons
# paperwork-shell install copies everything to $HOME/.local/share instead of $out/share
mkdir -p home/.local

This comment has been minimized.

@aszlig

aszlig Nov 30, 2019
Member

Hm, can't this be directly patched instead?

This comment has been minimized.

@symphorien

symphorien Dec 1, 2019
Author Contributor

Patching is not better, because the user is supposed to be able to call paperwork-shell install.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Dec 1, 2019

please fix up the commit history

@jonringer
Copy link
Contributor

@jonringer jonringer commented Dec 1, 2019

should be roughly a commit per package change

@symphorien
Copy link
Contributor Author

@symphorien symphorien commented Dec 1, 2019

About rewriting the history: my git-fu is not good enough. In any case, I ticked the checkbox "Allow edits from maintainers." so if it is important to you, feel free to edit this PR to your liking.

@symphorien
Copy link
Contributor Author

@symphorien symphorien commented Dec 14, 2019

ping

@jonringer
Copy link
Contributor

@jonringer jonringer commented Dec 14, 2019

git rebase -i is your friend

git rebase -i HEAD~12
# clump related commits together, the old commit is at the top, youngest at the bottom
# for commits can be "rolled-up" to the previous, edit pick to be squash
# save buffer
git push <fork> <branch> --force
@symphorien
Copy link
Contributor Author

@symphorien symphorien commented Dec 14, 2019

No time to dedicate to fighting with git.

@symphorien symphorien closed this Dec 14, 2019
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.