memento: 1.6.0 -> 1.7.0 + moved to by-name + OCR (optional) support #476399
+104
−64
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nixpkgs-ci
bot
added
10.rebuild-linux: 1-10
pkgs/by-name/me/memento/package.nix
Outdated
| let | ||
| libmocr = stdenv.mkDerivation { | ||
| pname = "libmocr"; | ||
| version = "unstable-2023-11-15"; # Placeholder version |
Member
There was a problem hiding this comment.
Suggested change
| version = "unstable-2023-11-15"; # Placeholder version | |
| version = "0-unstable-2023-11-15"; |
pkgs/by-name/me/memento/package.nix
Outdated
Comment on lines
36
to
41
| meta = with lib; { | ||
| description = "A library for Manga OCR"; | ||
| homepage = "https://github.com/ripose-jp/libmocr"; | ||
| license = licenses.gpl2; | ||
| platforms = platforms.linux; | ||
| }; |
Member
There was a problem hiding this comment.
Suggested change
| meta = with lib; { | |
| description = "A library for Manga OCR"; | |
| homepage = "https://github.com/ripose-jp/libmocr"; | |
| license = licenses.gpl2; | |
| platforms = platforms.linux; | |
| }; | |
| meta = { | |
| description = "Library for Manga OCR"; | |
| homepage = "https://github.com/ripose-jp/libmocr"; | |
| license = lib.licenses.gpl2; | |
| platforms = lib.platforms.linux; | |
| }; |
pkgs/by-name/me/memento/package.nix
Outdated
| in | ||
| '' | ||
| wrapProgram "$out/bin/memento" \ | ||
| --prefix PATH : "${yt-dlp}/bin" ${lib.optionalString withOcr "--suffix PYTHONPATH : \"${pyEnv}/${pyEnv.sitePackages}\""} |
Member
There was a problem hiding this comment.
Do we need to use pyEnv.sitePackages instead of python.sitePackages? Would be the first time pyEnv.sitePackages is used in nixpkgs
Member
Author
There was a problem hiding this comment.
nope. I found pyEnv made more sense but I changed it to python3.sitePackages as requested.
nixpkgs-ci
bot
removed
the
9.needs: reviewer
Added optional support for OCR. Off by default because it doubles closure size plus one needs to download the model imperatively. Some stats: 1.6 weighs: /nix/store/86kmz0zc87hg1v3nwxgf0zd2839d539c-memento-1.6.0 1.3 GiB 1.7 without Ocr : /nix/store/ygd1zr809v5apyjvmydw6nccx1ycc2mh-memento-1.7.0 1.3 GiB 1.7 with ocr: /nix/store/19g1qk5g9kirsqgw1s0nasb676hj8qia-memento-1.7.0 3.3 GiB Amon the novelties, it now builds with system qcoro.
teto
force-pushed
the
teto/bump/memento
branch
from
b7b330c to
809daf1
Compare
nixpkgs-ci
bot
added
the
12.approvals: 1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.