-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
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
upscaler: init at 1.4.0 #356497
upscaler: init at 1.4.0 #356497
Conversation
Hello, I have opened #327919 before, but it's certainly better if you can do it. |
Oh crap, totally missed that, probably because i was looking for gnome-upscaler instead of upscaler. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some comments :3
c9bba5b
to
80d5bb1
Compare
|
||
# Load SDK | ||
-_lib_names = ('libvulkan.so.1', 'vulkan-1.dll', 'libvulkan.dylib') | ||
+_lib_names = ('@vulkan_loader@/lib/libvulkan.so.1', 'vulkan-1.dll', 'libvulkan.dylib') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My solution is probably better as this does not address compatibility issues it may have on macOS
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe. Ideally there'd be a way to test this stuff on darwin. I might have a poke at setting up a hackintosh to test.
pkgs/by-name/up/upscaler/package.nix
Outdated
description = "Upscale and enhance images"; | ||
homepage = "https://tesk.page/upscaler"; | ||
license = lib.licenses.gpl3Only; | ||
maintainers = with lib.maintainers; [ grimmauld ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maintainers = with lib.maintainers; [ grimmauld ]; | |
maintainers = with lib.maintainers; [ grimmauld getchoo ]; |
And feel free to add me here as well :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(add me as well)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the deps too, or just upscaler?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd be fine with the deps too
9d99164
to
fa560b7
Compare
fa560b7
to
310547a
Compare
repo = "upscayl-ncnn"; | ||
rev = "refs/tags/${finalAttrs.version}"; | ||
hash = "sha256-rGnjL+sU5x3VXHnvuYXVdxGmHdj9eBkIZK3CwL89lN0="; | ||
fetchSubmodules = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is failing in Ofborg as the submodules use SSH, but we should actually be able to drop this as we're using the system equivalents
fetchSubmodules = true; |
310547a
to
d5b0261
Compare
d5b0261
to
3431d20
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nixpkgs-review
result
Generated using nixpkgs-review
.
Command: nixpkgs-review pr 356497
aarch64-linux
✅ 6 packages built:
- python311Packages.vulkan
- python311Packages.vulkan.dist
- python312Packages.vulkan
- python312Packages.vulkan.dist
- upscaler
- upscayl-ncnn
Successfully created backport PR for |
New packages:
The python vulkan api bindings might or might not work on darwin systems too, I do not have any way to check.
This module can be tested individually against the example program using
nix-shell -E 'with import /path/to/local/nixpkgs {}; mkShell { buildInputs = [ (python312.withPackages(ps: with ps; [ vulkan ])) ]; }' --run python3 /path/to/example/file
upscayl-ncnn is a fork of realesrgan-ncnn-vulkan which is already packaged for nix. Therefore, the package definition is very similar. I assumed the fork will run on darwin systems too, like upstream does. I do not have any way to test however. The patches had to be adapted to apply cleanly on the fork. Upscayl-ncnn is not yet part of nixpkgs because upscayl nixpkg is a repackaged AppImage, thus not building the backend from source.
This can be tested individually by
upscayl-bin -i INPUT.png -o OUTPUT.png
Upscaler is a regular GUI app with desktop entry and everything. It will depend on the other two packages and thus can't really be tested individually. It should just work. Tested on nixos x86_64-linux.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.