gnomeExtensions: add patch framework and fix extensions#137131
Merged
maralorn merged 5 commits intoNixOS:masterfrom Sep 30, 2021
Merged
gnomeExtensions: add patch framework and fix extensions#137131maralorn merged 5 commits intoNixOS:masterfrom
maralorn merged 5 commits intoNixOS:masterfrom
Conversation
It's like Haskell's overlay system, but way more primitive. We simply pre-define some package overrides that are required for an automatically packaged extension to work. Ideally, all (or almost all) currently manually pacakged extensions will work this way. Since these are mostly just a few lines each, there is no need to split this up into a lot of small files.
github-actions
bot
added
the
6.topic: GNOME
Member
Author
|
@jtojnar I'd like to know your opinion about my approach to patching extensions. Generally it is the right move forward, as it will make manual packaging like #134789 obsolete. Having patches on top of automatic packaging means that maintainers don't have to manually track updates. My main open question however is how should we deal with patches that are more than just a few lines, especially those that require actual patch files (instead of |
ofborg
bot
added
11.by: package-maintainer
|
Result of 380 packages built successfully:
4 suggestions:
|
Member
|
This looks good to me. It should work fine with patch files too and I would say the usual advice on choosing files vs. |
10 tasks
Member
Author
|
My convention proposal for patches with more than one file:
|
We want the pname to match a potential automatic packaging (if the extension is updated to support a more recent GNOME version) as closely as possible.
10 tasks
This was referenced Sep 13, 2021
Member
|
I think this is a good change. Setting the install phase and using dontBuild gives us the most flexibility and minimizes surprises for people stumbling over this. I am not totally convinced by the filename |
piegamesde
force-pushed
the
gnome-extensions
branch
from
1192232 to
49041cd
Compare
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/easy-way-to-add-paths-to-gi-typelib-path/15240/2 |
maralorn
approved these changes
Sep 28, 2021
Member
|
If no one else merges or raises concerns, I will merge this in 48h. Please ping me, if I forget. |
Comment on lines
+1
to
+5
| { | ||
| lib, | ||
| ddcutil, | ||
| gjs, | ||
| }: |
Member
There was a problem hiding this comment.
Suggested change
| { | |
| lib, | |
| ddcutil, | |
| gjs, | |
| }: | |
| { lib | |
| , ddcutil | |
| , gjs | |
| }: |
Member
Author
There was a problem hiding this comment.
I think we had this discussion more than once in the past. Until nixpkgs settles on some coding style that is enforced automatically, I will keep it like this.
| runHook preInstall | ||
| mkdir -p $out/share/gnome-shell/extensions/ | ||
| cp -r -T $src $out/share/gnome-shell/extensions/${uuid} | ||
| cp -r -T . $out/share/gnome-shell/extensions/${uuid} |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/easy-way-to-add-paths-to-gi-typelib-path/15240/4 |
12 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
Motivation for this change
Fixes #136111 and #136112. @chrisportela please give it a try.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)