Skip to content

Commit 6660a12

Browse files
jtojnarjtojnar
authored
Merge gnomeExtensions: include extensions for GNOME 48 (#405612)
2 parents 4d19b24 + e3e9b33 commit 6660a12

File tree

7 files changed

+81
-45
lines changed

7 files changed

+81
-45
lines changed

‎pkgs/desktops/gnome/extensions/collisions.json‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,41 @@
33
"Applications_Menu@rmy.pobox.com",
44
"apps-menu@gnome-shell-extensions.gcampax.github.com"
55
],
6-
"persian-calendar": [
7-
"PersianCalendar@oxygenws.com",
8-
"persian-calendar@iamrezamousavi.gmail.com"
6+
"battery-time": [
7+
"batime@martin.zurowietz.de",
8+
"battery-time@eetumos.github.com",
9+
"batterytime@typeof.pw"
910
],
10-
"system-monitor": [
11-
"System_Monitor@bghome.gmail.com",
12-
"system-monitor@gnome-shell-extensions.gcampax.github.com"
11+
"eur-usd": [
12+
"eur-usd-gshell@vezza.github.com",
13+
"usd-mxn-gshell@kinduff.github.com"
14+
],
15+
"fullscreen-to-empty-workspace": [
16+
"fullscreen-to-empty-workspace2@corgijan.dev",
17+
"fullscreen-to-empty-workspace@aiono.dev"
1318
],
1419
"fuzzy-clock": [
1520
"FuzzyClock@fire-man-x",
16-
"FuzzyClock@johngoetz",
17-
"fuzzy-clock@keepawayfromfire.co.uk"
21+
"FuzzyClock@johngoetz"
1822
],
19-
"battery-time": [
20-
"batime@martin.zurowietz.de",
21-
"battery-time@eetumos.github.com",
22-
"batterytime@typeof.pw"
23+
"mouse-follows-focus": [
24+
"mouse-follows-focus@crisidev.org",
25+
"mousefollowsfocus@matthes.biz"
2326
],
2427
"nepali-calendar": [
2528
"nepali-calendar-gs-extension@subashghimire.info.np",
2629
"nepali-date@biplab"
2730
],
28-
"mouse-follows-focus": [
29-
"mouse-follows-focus@crisidev.org",
30-
"mousefollowsfocus@matthes.biz"
31+
"persian-calendar": [
32+
"PersianCalendar@oxygenws.com",
33+
"persian-calendar@iamrezamousavi.gmail.com"
3134
],
3235
"power-profile-indicator": [
3336
"power-profile-indicator@laux.wtf",
3437
"power-profile@fthx"
3538
],
36-
"fullscreen-to-empty-workspace": [
37-
"fullscreen-to-empty-workspace2@corgijan.dev",
38-
"fullscreen-to-empty-workspace@aiono.dev"
39-
],
40-
"eur-usd": [
41-
"eur-usd-gshell@vezza.github.com",
42-
"usd-mxn-gshell@kinduff.github.com"
39+
"system-monitor": [
40+
"System_Monitor@bghome.gmail.com",
41+
"system-monitor@gnome-shell-extensions.gcampax.github.com"
4342
]
4443
}

‎pkgs/desktops/gnome/extensions/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ rec {
7979
gnome48Extensions = mapUuidNames (produceExtensionsList "48");
8080

8181
# Keep the last three versions in here
82-
gnomeExtensions = lib.trivial.pipe (gnome45Extensions // gnome46Extensions // gnome47Extensions) [
82+
gnomeExtensions = lib.trivial.pipe (gnome46Extensions // gnome47Extensions // gnome48Extensions) [
8383
(v: builtins.removeAttrs v [ "__attrsFailEvaluation" ])
8484
# Apply some custom patches for automatically packaged extensions
8585
(callPackage ./extensionOverrides.nix { })

‎pkgs/desktops/gnome/extensions/extensionOverrides.nix‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
{
22
lib,
33
fetchFromGitLab,
4-
fetchzip,
54
cpio,
65
ddcutil,
76
easyeffects,
87
gjs,
98
glib,
109
nautilus,
1110
gobject-introspection,
12-
gsound,
1311
hddtemp,
14-
libgda6,
1512
libgtop,
1613
libhandy,
1714
liquidctl,
@@ -171,22 +168,6 @@ lib.trivial.pipe super [
171168
}
172169
))
173170

174-
(patchExtension "pano@elhan.io" (
175-
final: prev: {
176-
version = "23-alpha3";
177-
src = fetchzip {
178-
url = "https://github.com/oae/gnome-shell-pano/releases/download/v${final.version}/pano@elhan.io.zip";
179-
hash = "sha256-LYpxsl/PC8hwz0ZdH5cDdSZPRmkniBPUCqHQxB4KNhc=";
180-
stripRoot = false;
181-
};
182-
preInstall = ''
183-
substituteInPlace extension.js \
184-
--replace-fail "import Gda from 'gi://Gda?version>=5.0'" "imports.gi.GIRepository.Repository.prepend_search_path('${libgda6}/lib/girepository-1.0'); const Gda = (await import('gi://Gda')).default" \
185-
--replace-fail "import GSound from 'gi://GSound'" "imports.gi.GIRepository.Repository.prepend_search_path('${gsound}/lib/girepository-1.0'); const GSound = (await import('gi://GSound')).default"
186-
'';
187-
}
188-
))
189-
190171
(patchExtension "system-monitor@gnome-shell-extensions.gcampax.github.com" (old: {
191172
patches = [
192173
(replaceVars

‎pkgs/desktops/gnome/extensions/extensionRenames.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"System_Monitor@bghome.gmail.com" = "system-monitor-2";
1515

1616
"FuzzyClock@fire-man-x" = "fuzzy-clock-3";
17-
"fuzzy-clock@keepawayfromfire.co.uk" = "fuzzy-clock-2";
1817
"FuzzyClock@johngoetz" = "fuzzy-clock";
1918

2019
"battery-time@eetumos.github.com" = "battery-time-3";

‎pkgs/desktops/gnome/extensions/manuallyPackaged.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@
2020
"unite@hardpixel.eu" = callPackage ./unite { };
2121
"valent@andyholmes.ca" = callPackage ./valent { };
2222
"window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { };
23+
# Can be removed when https://github.com/oae/gnome-shell-pano/issues/271 resolved
24+
"pano@elhan.io" = callPackage ./pano { };
2325
}

‎pkgs/desktops/gnome/extensions/pano/default.nix‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
lib,
3+
stdenv,
4+
fetchzip,
5+
glib,
6+
libgda6,
7+
gsound,
8+
}:
9+
10+
stdenv.mkDerivation (finalAttrs: {
11+
pname = "gnome-shell-extension-pano";
12+
version = "23-alpha5";
13+
14+
src = fetchzip {
15+
url = "https://github.com/oae/gnome-shell-pano/releases/download/v${finalAttrs.version}/pano@elhan.io.zip";
16+
hash = "sha256-kTaJOSyFtBa/fl3Mot8Q8qyhwJwhcbBY4FvdztqUP4w=";
17+
stripRoot = false;
18+
};
19+
20+
nativeBuildInputs = [
21+
glib
22+
];
23+
24+
buildPhase = ''
25+
runHook preBuild
26+
glib-compile-schemas --strict schemas
27+
runHook postBuild
28+
'';
29+
30+
preInstall = ''
31+
substituteInPlace extension.js \
32+
--replace-fail "import Gda from 'gi://Gda?version>=5.0'" "imports.gi.GIRepository.Repository.prepend_search_path('${libgda6}/lib/girepository-1.0'); const Gda = (await import('gi://Gda')).default" \
33+
--replace-fail "import GSound from 'gi://GSound'" "imports.gi.GIRepository.Repository.prepend_search_path('${gsound}/lib/girepository-1.0'); const GSound = (await import('gi://GSound')).default"
34+
'';
35+
36+
installPhase = ''
37+
runHook preInstall
38+
mkdir -p $out/share/gnome-shell/extensions
39+
cp -r -T . $out/share/gnome-shell/extensions/pano@elhan.io
40+
runHook postInstall
41+
'';
42+
43+
passthru = {
44+
extensionPortalSlug = "pano";
45+
extensionUuid = "pano@elhan.io";
46+
};
47+
48+
meta = with lib; {
49+
description = "Next-gen Clipboard Manager for Gnome Shell";
50+
homepage = "https://github.com/oae/gnome-shell-pano";
51+
license = licenses.gpl2Plus;
52+
maintainers = with maintainers; [ honnip ];
53+
platforms = platforms.linux;
54+
};
55+
})

‎pkgs/desktops/gnome/extensions/update-extensions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}
3636

3737
# shell versions that we want to put into the gnomeExtensions attr set
38-
versions_to_merge = ["45", "46", "47"]
38+
versions_to_merge = ["46", "47", "48"]
3939

4040
# Some type alias to increase readability of complex compound types
4141
PackageName = str
@@ -351,7 +351,7 @@ def find_collisions(
351351
package_name_registry.setdefault(pname, set()).add(uuid)
352352
return {
353353
pname: sorted(uuids)
354-
for pname, uuids in package_name_registry.items()
354+
for pname, uuids in sorted(package_name_registry.items())
355355
if len(uuids) > 1
356356
}
357357

0 commit comments

Comments
 (0)