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
zathura: 0.4.4 -> 0.4.5 and plugins update #81124
Conversation
cc @globin . |
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.
Diff LGTM 👍
Zathura builds and runs fine for me.
@doronbehar Are you able to merge this? 👍 |
Why? |
No, I don't have merge permissions.
Well, in the past they had some issues with their GitLab instance. Now they don't, and it seems like a more official source to me, compared to that GitHub mirror. If you strongly think I should revert it, I'll do it. |
I was mostly wondering about the tarballs downloaded with fetchurl like |
@@ -9,12 +9,15 @@ | |||
with stdenv.lib; | |||
|
|||
stdenv.mkDerivation rec { | |||
pname = "zathura-core"; | |||
pname = "zathura"; |
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.
Then would it make sense to also rename the zathura_core
attribute to zathura
.
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.
Upstream's project name for this is: https://pwmt.org/projects/zathura/download/ - zathura
, not zathura_core
.
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.
@doronbehar Here is a zathura_core
attribute (inside a private scope):
https://github.com/NixOS/nixpkgs/blob/2cd18aba94dd500eb3693d4882f7d19b9caaf18b/pkgs/applications/misc/zathura/default.nix#L11
I agree that using upstream's hashes is awesome, but I tend to like the idea of using |
In this case, it would not be possible to reuse upstream hashes because nix doesn't support SHA2. The way I see it, using the released tarballs should provide a better long term reproducibility. The other problem with
I think your idea of having faster than repology updates will hit this issue as well and it would require a major refactoring of how addition: after writing this, I found out that I made few mistakes here: 1) fetchGitLab is based on |
@veprbl I'm not sure I've managed to follow. So I'll address all my misunderstandings here:
What was the original motive / reason for which you suggested to change the attribute to
So we (almost) always use
You mean it'll be more reproducible because:
?
I'm didn't refer to "faster than repology updates", I only meant I intend to contribute to the repology project by parsing nixpkgs for derivations that use |
You've changed the value of
The tarballs generated by GitLab are not stored on disks and not backed up. The hashes may change with new version of GitLab or with a switch to another service. Another reason why the released tarballs are more "reproducible" is because fetched with
So in the end we get that some of the fetchurl tarballs can be found:
But after your change they are not (you don't adjust girara):
So my problem with your change is that you switch away from the stable tarballs and remove the possibility for tarballs to be archived on tarballs.nixos.org.
If you look at my outputs above, you may notice that the plugin tarballs are missing. This is because the find-tarballs.nix has another flaw which it that it doesn't inspect context for strings. I thought this would require a major refactoring to work this around, but it can be also a hack like this: diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index 6c8ad97d355..a97138d4a1a 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -10,6 +10,7 @@ in symlinkJoin {
buildInputs = [ makeWrapper ];
+ inherit plugins;
postBuild = ''
makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \
--prefix PATH ":" "${lib.makeBinPath [ file ]}" \ I think, this change need to be applied to the zathura. |
I wonder what that is..
OK, I guess there I'll be able to find other ways for my future repology improvement to check for new releases via their GitLab instance.
My opinion is not that strong regarding this, it's just that usually, (see |
2cd18ab
to
f620961
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.
Works for me, after updating mupdf to 1.16.1.
Motivation for this change
Update.
Things done
Switched to fetchFromGitLab in all plugin projects.
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)