From 362236b674a7a4808f8413dd5ee9267a40d2ed60 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Tue, 26 Oct 2021 14:20:31 +0200 Subject: [PATCH] chore: update pop-shell --- pkgs/pop-shell/default.nix | 8 +++----- pkgs/pop-shell/gnome-41.patch | 15 --------------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 pkgs/pop-shell/gnome-41.patch diff --git a/pkgs/pop-shell/default.nix b/pkgs/pop-shell/default.nix index 13a7b43..6e12bc8 100644 --- a/pkgs/pop-shell/default.nix +++ b/pkgs/pop-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pop-shell"; - version = "2021-10-18"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "pop-os"; repo = "shell"; - rev = "1de4139c5739ff79d7a3ddef7a9a77988a358782"; - sha256 = "094siblqpsjj356s32dn3rqq0vd47xrmbklzzyx26nh4hxlvzkzb"; + rev = "d39f185ee16cb024f86163ea2f7d24c7e15b695d"; + sha256 = "2RsfW6uFVl2F3eVnezD2vrOqdA4Poap5wEgtgnse8aI="; }; nativeBuildInputs = [ glib nodePackages.typescript gjs ]; @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { find . -name '*.ts' -exec sed -i -E 's|`gjs $\{path}`|path|' \{\} \; ''; - patches = [ ./gnome-41.patch ]; - # the gschema doesn't seem to be installed properly (see dconf) makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" diff --git a/pkgs/pop-shell/gnome-41.patch b/pkgs/pop-shell/gnome-41.patch deleted file mode 100644 index da6f30d..0000000 --- a/pkgs/pop-shell/gnome-41.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/metadata.json b/metadata.json -index d877ff0..e6e3ce1 100644 ---- a/metadata.json -+++ b/metadata.json -@@ -6,6 +6,7 @@ - "settings-schema": "org.gnome.shell.extensions.pop-shell", - "shell-version": [ - "3.36", -- "40.beta" -+ "40.beta", -+ "41" - ] --} -\ No newline at end of file -+}