colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #196424 from flokli/gnome-update-extensions

Browse Source 
gnome: bump extensions, expose gnome43Extensions
This commit is contained in:
Florian Klink 2022-10-18 18:29:56 +02:00 committed by GitHub
commit 7a2a652430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome/extensions/collisions.json
View File

@ -40,6 +40,10 @@
"transparent-window@pbxqdown.github.com",
"transparentwindows.mdirshad07"
],
"azan-islamic-prayer-times": [
"azan@faissal.bensefia.id",
"azan@hatem.masmoudi.org"
],
"floating-dock": [
"floatingDock@sun.wxg@gmail.com",
"floating-dock@nandoferreira_prof@hotmail.com"

1
pkgs/desktops/gnome/extensions/default.nix
View File

@ -55,6 +55,7 @@ let
];
in rec {
# Remember to import all these in all-packages.nix
gnome38Extensions = mapUuidNames (produceExtensionsList "38");
gnome40Extensions = mapUuidNames (produceExtensionsList "40");
gnome41Extensions = mapUuidNames (produceExtensionsList "41");

4
pkgs/desktops/gnome/extensions/extensionRenames.nix
View File

@ -12,6 +12,10 @@
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
# forks of each other, azan@faissal.bensefia.id is more recent
"azan@faissal.bensefia.id" = "azan-islamic-prayer-times";
"azan@hatem.masmoudi.org" = null;
# ############################################################################
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
# Make sure to move them up once they are updated

87
pkgs/desktops/gnome/extensions/extensions.json
View File

File diff suppressed because one or more lines are too long

6
pkgs/desktops/gnome/extensions/pop-shell/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-pop-shell";
version = "unstable-2022-03-25";
version = "unstable-2022-10-11";
src = fetchFromGitHub {
owner = "pop-os";
repo = "shell";
rev = "a317816d02dd2cb20d31aeca81bf09eccc63e370";
hash = "sha256-uxoeCv25ew5+NkTpsKjQqDFrqw6ZA/+iYhyCHoCb6jM=";
rev = "886a069c0582b371e90ac3602b1747ea5fba616c";
hash = "sha256-DwJ3IFhYuEW0LQrmN/mOspEiudj4X5BCLhdOyP74EVs=";
};
nativeBuildInputs = [ glib nodePackages.typescript gjs ];

20
pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/extension.ts b/src/extension.ts
index 7417c46..00d5829 100644
index c3833e9..611e84c 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -534,7 +534,7 @@ export class Ext extends Ecs.System<ExtEvent> {
@@ -544,7 +544,7 @@ export class Ext extends Ecs.System<ExtEvent> {
return true
}
@ -12,22 +12,18 @@ index 7417c46..00d5829 100644
if (ipc) {
const generator = (stdout: any, res: any) => {
diff --git a/src/panel_settings.ts b/src/panel_settings.ts
index 83ff56c..1bc1e98 100644
index 5d02d33..1cd70d0 100644
--- a/src/panel_settings.ts
+++ b/src/panel_settings.ts
@@ -338,7 +338,7 @@ function color_selector(ext: Ext, menu: any) {
@@ -348,7 +348,7 @@ function color_selector(ext: Ext, menu: any) {
color_selector_item.add_child(color_button);
color_button.connect('button-press-event', () => {
let path = Me.dir.get_path() + "/color_dialog/main.js";
- let resp = GLib.spawn_command_line_async(`gjs ${path}`);
+ let resp = GLib.spawn_command_line_async(path);
+ let resp = GLib.spawn_command_line_async(`${path}`);
if (!resp) {
return null;
@@ -353,4 +353,4 @@ function color_selector(ext: Ext, menu: any) {
});
return color_selector_item;
-}
\ No newline at end of file
+}
--
2.37.3

1
pkgs/top-level/all-packages.nix
View File

@ -34677,6 +34677,7 @@ with pkgs;
gnome40Extensions
gnome41Extensions
gnome42Extensions
gnome43Extensions
;
gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { };