gnomeExtensions: auto-update#407195
Merged
jtojnar merged 1 commit intoNixOS:staging-nextfrom May 15, 2025
Merged
Conversation
Member
Contributor
|
I believe the changes are okay, as there's no more collisions for 46-48.
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 |
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 |
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
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.
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.