From bad66ee29ee5b51bd4a0e6513da82ca375a6977e Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Sun, 10 Nov 2024 22:59:43 -0800 Subject: [PATCH] update extensions for gnome 47 --- provision/overlays/default.nix | 2 +- provision/overlays/focus-changer.nix | 12 ------------ .../default.nix} | 4 ++++ .../version.patch | 17 +++++++++++++++++ provision/pkgs/gnome-set-panel-monitor.nix | 4 ++-- 5 files changed, 24 insertions(+), 15 deletions(-) delete mode 100644 provision/overlays/focus-changer.nix rename provision/pkgs/{gnome-fullscreen-to-empty-workspace.nix => gnome-fullscreen-to-empty-workspace/default.nix} (96%) create mode 100644 provision/pkgs/gnome-fullscreen-to-empty-workspace/version.patch diff --git a/provision/overlays/default.nix b/provision/overlays/default.nix index e1b3413c..3ad623e4 100644 --- a/provision/overlays/default.nix +++ b/provision/overlays/default.nix @@ -1,7 +1,7 @@ final: prev: { advcpmv = final.callPackage ../pkgs/advcpmv.nix {}; ftw = final.callPackage ../pkgs/ftw.nix {}; - gnome-fullscreen-to-empty-workspace = final.callPackage ../pkgs/gnome-fullscreen-to-empty-workspace.nix {}; + gnome-fullscreen-to-empty-workspace = final.callPackage ../pkgs/gnome-fullscreen-to-empty-workspace/default.nix {}; gnome-set-panel-monitor = final.callPackage ../pkgs/gnome-set-panel-monitor.nix {}; nx_tzdb = final.callPackage ../pkgs/nx_tzdb.nix {}; pySVS = final.callPackage ../pkgs/pySVS.nix {}; diff --git a/provision/overlays/focus-changer.nix b/provision/overlays/focus-changer.nix deleted file mode 100644 index 1d78c3cd..00000000 --- a/provision/overlays/focus-changer.nix +++ /dev/null @@ -1,12 +0,0 @@ -self: super: { - gnomeExtensions = super.gnomeExtensions // { - focus-changer = super.gnomeExtensions.focus-changer.overrideAttrs (old: { - src = super.fetchFromGitHub { - owner = "martinhjartmyr"; - repo = "gnome-shell-extension-focus-changer"; - rev = "4de5bc334a1624fd8eb22203ab229a6045320923"; - sha256 = "sha256-hvLDsLQl7+Flrlg26HNIuwLnWqpB09ZO1xNHRms22g0="; - }; - }); - }; -} diff --git a/provision/pkgs/gnome-fullscreen-to-empty-workspace.nix b/provision/pkgs/gnome-fullscreen-to-empty-workspace/default.nix similarity index 96% rename from provision/pkgs/gnome-fullscreen-to-empty-workspace.nix rename to provision/pkgs/gnome-fullscreen-to-empty-workspace/default.nix index 2adc694e..8d64645f 100644 --- a/provision/pkgs/gnome-fullscreen-to-empty-workspace.nix +++ b/provision/pkgs/gnome-fullscreen-to-empty-workspace/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation { hash = "sha256-S9mvODQqOBCmA+L1TBJm/c1v5Y+qVKuFpQf799LEwcI="; }; + patches = [ + ./version.patch + ]; + installPhase = '' runHook preInstall mkdir -p "$out/share/gnome-shell/extensions/fullscreen-to-empty-workspace@aiono.dev" diff --git a/provision/pkgs/gnome-fullscreen-to-empty-workspace/version.patch b/provision/pkgs/gnome-fullscreen-to-empty-workspace/version.patch new file mode 100644 index 00000000..bae98012 --- /dev/null +++ b/provision/pkgs/gnome-fullscreen-to-empty-workspace/version.patch @@ -0,0 +1,17 @@ +diff --git a/src/metadata.json b/src/metadata.json +index 66a2ea3..a98e00c 100644 +--- a/src/metadata.json ++++ b/src/metadata.json +@@ -4,8 +4,9 @@ + "url": "https://github.com/onsah/fullscreen-to-new-workspace", + "uuid": "fullscreen-to-empty-workspace@aiono.dev", + "shell-version": [ +- "46" ++ "47" + ], + "version": 15, + "settings-schema": "org.gnome.shell.extensions.fullscreen-to-empty-workspace" +-} +\ No newline at end of file ++} ++ diff --git a/provision/pkgs/gnome-set-panel-monitor.nix b/provision/pkgs/gnome-set-panel-monitor.nix index 7e5cad82..c79326b3 100644 --- a/provision/pkgs/gnome-set-panel-monitor.nix +++ b/provision/pkgs/gnome-set-panel-monitor.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "starr-dusT"; repo = "gnome-set-panel-monitor"; - rev = "62d1a7e7ed83d56b33e32f1ad948c99a559b6dbd"; - hash = "sha256-NB/DycA/VxIeFQk2l0MW7G5VVdJI/Zemy2l28VZx2Cc="; + rev = "89204ab29a4872c201f8185cee758384be073a73"; + hash = "sha256-MJVUjvrEe5b38MkRPt96NOH3cz1FzjoQWTPNtRFRVck="; }; installPhase = ''