diff --git a/overlay.nix b/overlay.nix index bf0e63d..eb60e25 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,21 +1,15 @@ self: super: { gnome = super.gnome.overrideScope' (gself: gsuper: { gnome-shell = gsuper.gnome-shell.overrideAttrs (old: { - version = "unstable-2023-04-24"; + version = "unstable-2023-09-08"; src = super.fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "verdre"; - repo = "gnome-shell"; - rev = "034144c20f56039901969ae0ff3f9af0e3d79924"; - hash = "sha256-LwFy3Nh4djWjWt7cogsVGk7OlgOPV3gvvRBD7UFTSf8="; + repo = "mobile-shell"; + rev = "df3f6b4c512d2f181e86ff7f6b1646ce7b907344"; + hash = "sha256-s47z1q+MZWogT99OkzgQxKrqFT4I0yXyfGSww1IaaFs="; fetchSubmodules = true; }; - patches = builtins.filter (p: - (builtins.match ".*5766d4111ac065b37417bedcc1b998ab6bee5514.patch" (toString p) == null) && - (builtins.match ".*fix-paths.patch" (toString p) == null)) old.patches ++ [ (super.fetchpatch { - url = "https://github.com/NixOS/nixpkgs/raw/b632011615d783dfb62712e5ba8a2eff35800d28/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch"; - hash = "sha256-h5fcdXp2HUmlnxnQ6/56FpmvkxNYum+0i10rbN5XhTo="; - }) ]; # JS ERROR: Error: Requiring ModemManager, version none: Typelib file for namespace 'ModemManager' (any version) not found # @resource:///org/gnome/shell/misc/modemManager.js:4:49 buildInputs = old.buildInputs ++ [ super.modemmanager ]; @@ -35,13 +29,13 @@ self: super: { }); mutter = gsuper.mutter.overrideAttrs (old: { - version = "unstable-2022-12-12"; + version = "unstable-2023-09-08"; src = super.fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "verdre"; - repo = "mutter"; - rev = "780aadd4ed77ca6a8312acb3ab13decdb5b6d569"; - hash = "sha256-0B1HSwnjJHurOYg4iquXZKjbfyGM5xDIDh6FedlBuJI="; + repo = "mobile-mutter"; + rev = "0f08f5aba4c9b5ac34b2d5711182d50b719d838e"; + hash = "sha256-du56QMOlM7grN60eafoGTw2JGND6PK1gLrfWufihPO4="; }; }); }); diff --git a/update.sh b/update.sh index 8176049..888b676 100755 --- a/update.sh +++ b/update.sh @@ -2,7 +2,7 @@ #!nix-shell -i bash -p coreutils common-updater-scripts git tmpdir="$(mktemp -d)" -git clone --bare --depth=1 --branch=mobile-shell https://gitlab.gnome.org/verdre/gnome-shell.git "$tmpdir" +git clone --bare --depth=1 --branch=mobile-shell https://gitlab.gnome.org/verdre/mobile-shell.git "$tmpdir" pushd "$tmpdir" new_version="unstable-$(git show -s --pretty='format:%cs')" commit_sha="$(git show -s --pretty='format:%H')" @@ -10,7 +10,7 @@ popd update-source-version "gnome.gnome-shell" --file=overlay.nix "$new_version" --rev="$commit_sha" tmpdir="$(mktemp -d)" -git clone --bare --depth=1 --branch=mobile-shell https://gitlab.gnome.org/verdre/mutter.git "$tmpdir" +git clone --bare --depth=1 --branch=mobile-shell https://gitlab.gnome.org/verdre/mobile-mutter.git "$tmpdir" pushd "$tmpdir" new_version="unstable-$(git show -s --pretty='format:%cs')" commit_sha="$(git show -s --pretty='format:%H')"