Paperwork 1.2.4 #46487
Paperwork 1.2.4 #46487
Conversation
There was a problem hiding this comment.
Looks good to me, thanks for the cleanups.
Given that the backend and frontend are now in one repositories it would probably make more sense to split out the source into a separate Nix expression file (eg. source.nix) and directly use src = "${source}/paperwork-backend"; so that we don't need to set the source root anymore.
| } // removeAttrs args [ "domain" "owner" "repo" "rev" ]) // { inherit rev; }; | ||
| url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) group+"%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; | ||
| meta.homepage = "https://${domain}/${lib.optionalString (group != null) group+"/"}${owner}/${repo}/"; | ||
| } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; }; |
There was a problem hiding this comment.
Can you please split this into a separate commit?
There was a problem hiding this comment.
This breaks fetchFromGitLab.
Before:
https://gitlab.com/api/v4/projects/psmisc%2Fpsmisc/repository/archive.tar.gz?sha=v23.2
After:
https://gitlab.com/api/v4/projects/%2Fpsmisc%2Fpsmisc/repository/archive.tar.gz?sha=v23.2
There was a problem hiding this comment.
@azlig I'd like to revert this PR until this is resolved, okay?
There was a problem hiding this comment.
@ryantm: Ah, this is just a grouping issue, going to fix that instead.
|
Tested this also on NixOS, so I ticked off the checkboxes accordingly. @symphorien: Can you please ping me again after you've split off the |
For example, paperwork is at https://gitlab.gnome.org/World/OpenPaperwork/paperwork and you can fetch this repo with group = "World", owner = "OpenPaperwork", and repo = "paperwork".
symphorien
force-pushed
the
paperwork-0.2.4
branch
from
8cb304e
to
46cd67e
Compare
|
@aszlig I just split the first commit as requested. |
Thanks to @symphorien for this work, which apart from the update itself includes a few more fixes and cleanups. I've tested building and running the upgraded Paperwork and while I haven't done extensive testing on every little feature it seems to work so far. The changes also include an addition to fetchFromGitLab, which allows to specify a group. Merges: NixOS#46487
Motivation for this change
update (most of these updates could be made standalone. tell me if you want to split.)
Things done
The new home for paperwork is the gnome gitlab instance, but they have an unusual namespacing. Instead of the "traditional" owner/repo url, there are three levels: group/owner/repo: https://gitlab.gnome.org/World/OpenPaperwork/paperwork
I have adapted
fetchFromGitLabto take an optionalgroupargument.I have checked that I can still scan/ocr succesfully with paperwork.
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/) (just paperwork)nix path-info -Sbefore and after)cc @aszlig as maintainer.