gnomeExtensions: include extensions for GNOME 48#405612
gnomeExtensions: include extensions for GNOME 48#405612jtojnar merged 3 commits intoNixOS:staging-nextfrom
Conversation
|
I guess we either need to remove the pano override, convert it to manually packaged extension, or keep GNOME 45 merged into the set. |
|
Also, we should probably sort the collisions by --- a/pkgs/desktops/gnome/extensions/update-extensions.py
+++ b/pkgs/desktops/gnome/extensions/update-extensions.py
@@ -351,7 +351,7 @@ def find_collisions(
package_name_registry.setdefault(pname, set()).add(uuid)
return {
pname: sorted(uuids)
- for pname, uuids in package_name_registry.items()
+ for pname, uuids in sorted(package_name_registry.items(), key=itemgetter(0))
if len(uuids) > 1
}
|
|
I still don't know why the order is changing. Fixed it anyway by sorting the items.. |
928c973 to
784c807
Compare
It's been a while since the Pano extension has been uploaded to EGO, and it's not in gnomeExtensions set after GNOME 48. So, package it manually.
In Python, the dictionaries are ordered based on the order of insertion. Since the , {"uuid": "Fuzzy_Clock@dallagi", "pname": "fuzzy-clock", "link": "https://extensions.gnome.org/extension/202/fuzzy-clock/", "shell_version_map": { "38": {} } }
, {"uuid": "[email protected]", "pname": "fuzzy-clock", "link": "https://extensions.gnome.org/extension/1281/fuzzy-clock/", "shell_version_map": { "38": {}, "40": {}, "41": {}, "42": {}, "43": {}, "45": {} } }
, {"uuid": "[email protected]", "pname": "battery-time", "link": "https://extensions.gnome.org/extension/1475/battery-time/", "shell_version_map": { "40": {}, "41": {}, "42": {}, "43": {}, "44": {}, "45": {}, "46": {}, "47": {}, "48": {} } }
, {"uuid": "FuzzyClock@johngoetz", "pname": "fuzzy-clock", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": { "40": {}, "41": {}, "42": {}, "43": {}, "44": {}, "45": {}, "46": {}, "47": {} } }
, {"uuid": "[email protected]", "pname": "battery-time", "link": "https://extensions.gnome.org/extension/5425/battery-time/", "shell_version_map": { "43": {}, "44": {}, "45": {}, "46": {}, "47": {}, "48": {} } }
, {"uuid": "FuzzyClock@fire-man-x", "pname": "fuzzy-clock", "link": "https://extensions.gnome.org/extension/7056/fuzzy-clock/", "shell_version_map": { "45": {}, "46": {}, "47": {}, "48": {} } }
, {"uuid": "[email protected]", "pname": "battery-time", "link": "https://extensions.gnome.org/extension/7999/battery-time/", "shell_version_map": { "47": {}, "48": {} } } |
|
Ah I see, so it makes sense to sort by pname rather than the id, as we did here |
784c807 to
8d62d25
Compare
8d62d25 to
e3e9b33
Compare
|
Thank you. |
gnomeExtensionsset includes extensions for GNOME 46, 47, and 48.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-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.