fetchFromGitHub: Always add meta.homepage to the derivation #29815
Conversation
pkgs/top-level/all-packages.nix
Outdated
| @@ -223,7 +222,8 @@ with pkgs; | |||
| EOF | |||
| ''; | |||
| netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; | |||
| } // passthruAttrs) // { inherit rev; }; | |||
| } // passthruAttrs) // { inherit rev; }) | |||
| // { meta.homepage = "${baseUrl}/"; }; | |||
There was a problem hiding this comment.
Could you also extract passthruAttrs down here?
Then I'd merge this.
There was a problem hiding this comment.
Did some refactoring in 5d0f7dc721997424c85624df0713c07b9cc79fc4 which makes it possible. If I didn't miss anything 5d0f7dc721997424c85624df0713c07b9cc79fc4 shouldn't change the result at all.
The refactoring was necessary to avoid the passthruAttrs redundancy as these attributes are required for both fetchzip and fetchgit (e.g. the sha256 attribute).
pkgs/top-level/all-packages.nix
Outdated
| netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; | ||
| })) | ||
| // passthruAttrs // { inherit name; }; | ||
| in fetcher fetcherArgs // { meta.homepage = "${baseUrl}/"; inherit rev; }; |
There was a problem hiding this comment.
I like this, thank you! (Although extracting the private section into privateAttrs will make it even better.)
I just noticed that GitHub does not add the final slash when you navigate to a project page, so we shouldn't too.
There was a problem hiding this comment.
Good points, thanks! I've changed it accordingly.
The attribute meta.homepage was only added if "fetchFromGitHub = false" which might be unexpected. Now, it will be set unconditionally.
And remove the tailing slash from "meta.homepage" as suggested by @orivej (because GitHub doesn't add the final slash).
primeos
force-pushed
the
fetchFromGitHub
branch
from
5d0f7dc
to
fe02d8c
Compare
Not sure if this is a good idea / worth it. Consider it an suggestion (could make it more foolproof a33402b 馃槃).