Skip to content

gnomeExtensions: auto-update#407195

Merged
jtojnar merged 1 commit intoNixOS:staging-nextfrom
fabianhjr:update-gnome-extensions
May 15, 2025
Merged

gnomeExtensions: auto-update#407195
jtojnar merged 1 commit intoNixOS:staging-nextfrom
fabianhjr:update-gnome-extensions

Conversation

@fabianhjr
Copy link
Member

@fabianhjr fabianhjr commented May 14, 2025

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label May 14, 2025
@nix-owners nix-owners bot requested a review from jtojnar May 14, 2025 23:11
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 14, 2025
@jtojnar
Copy link
Member

jtojnar commented May 15, 2025

I wonder how this interacts with #405612.

Should not be a git merge conflicts but there still might be conflict changes. We should check, and if so, target staging-next.

cc @honnip

@honnip
Copy link
Contributor

honnip commented May 15, 2025

I believe the changes are okay, as there's no more collisions for 46-48. fuzzy-clock is handled in e3e9b33.

./update-extensions.py --skip-fetch result:

diff --git a/pkgs/desktops/gnome/extensions/collisions.json b/pkgs/desktops/gnome/extensions/collisions.json
index 7aa61aa30e1d..aa244d164046 100644
--- a/pkgs/desktops/gnome/extensions/collisions.json
+++ b/pkgs/desktops/gnome/extensions/collisions.json
@@ -11,11 +11,6 @@
     "[email protected]",
     "[email protected]"
   ],
-  "fuzzy-clock": [
-    "FuzzyClock@fire-man-x",
-    "FuzzyClock@johngoetz",
-    "[email protected]"
-  ],
   "battery-time": [
     "[email protected]",
     "[email protected]",
@@ -29,6 +24,10 @@
     "[email protected]",
     "[email protected]"
   ],
+  "fuzzy-clock": [
+    "FuzzyClock@fire-man-x",
+    "FuzzyClock@johngoetz"
+  ],
   "power-profile-indicator": [
     "[email protected]",
     "power-profile@fthx"
diff --git a/pkgs/desktops/gnome/extensions/update-extensions.py b/pkgs/desktops/gnome/extensions/update-extensions.py
index 222d9b77c8f3..b7dccfb07068 100755
--- a/pkgs/desktops/gnome/extensions/update-extensions.py
+++ b/pkgs/desktops/gnome/extensions/update-extensions.py
@@ -35,7 +35,7 @@ supported_versions = {
 }
 
 # shell versions that we want to put into the gnomeExtensions attr set
-versions_to_merge = ["45", "46", "47"]
+versions_to_merge = ["46", "47", "48"]
 
 # Some type alias to increase readability of complex compound types
 PackageName = str

@fabianhjr fabianhjr changed the base branch from master to staging-next May 15, 2025 06:09
@fabianhjr
Copy link
Member Author

Changed the merge base (checked mergeability and not mass-pinging beforehand)

afaik this could go to either main or staging-next without issues

@jtojnar jtojnar merged commit e813564 into NixOS:staging-next May 15, 2025
38 of 39 checks passed
@fabianhjr fabianhjr deleted the update-gnome-extensions branch May 15, 2025 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants