From e5bf465aca1c29df4fc8d08c83ae7c0ad3ea2f9b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 1 Oct 2025 11:15:06 +0800
Subject: [PATCH 1/3] pantheon.granite7: 7.6.0 -> 7.7.0

https://github.com/elementary/granite/compare/7.6.0...7.7.0
---
 .../pantheon/libraries/granite/7/default.nix  | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/pantheon/libraries/granite/7/default.nix b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
index c749c9262053..a1c65b89f474 100644
--- a/pkgs/desktops/pantheon/libraries/granite/7/default.nix
+++ b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   nix-update-script,
   meson,
   ninja,
@@ -10,6 +9,7 @@
   vala,
   pkg-config,
   libgee,
+  libshumate,
   gtk4,
   glib,
   gettext,
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation rec {
   pname = "granite";
-  version = "7.6.0";
+  version = "7.7.0";
 
   outputs = [
     "out"
@@ -31,18 +31,9 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = "granite";
     rev = version;
-    sha256 = "sha256-bv2rOq16xg9lCWfcLzAFN4LjBTJBxPhXvEJzutkdYzs=";
+    sha256 = "sha256-ypSkzz9BaVweR1C0OkkfwDl8tehMK1S5iExL14LuKmI=";
   };
 
-  patches = [
-    # Init: Avoid crash with Gtk >= 4.17
-    # https://github.com/elementary/granite/pull/893
-    (fetchpatch {
-      url = "https://github.com/elementary/granite/commit/60cb8c4119b579592e6c7f3b1476e4d729f58699.patch";
-      hash = "sha256-6NB/Tu3mdmiBd77SOi4twdY/HidyhMn7mNN+54iFLIc=";
-    })
-  ];
-
   nativeBuildInputs = [
     gettext
     gobject-introspection
@@ -54,6 +45,10 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
   ];
 
+  buildInputs = [
+    libshumate # demo
+  ];
+
   propagatedBuildInputs = [
     glib
     gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format"

From 126480b1b080fa9f8667594820b9dd63a8238ffd Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 1 Oct 2025 11:35:53 +0800
Subject: [PATCH 2/3] pantheon.elementary-maps: init at 8.1.0

---
 .../pantheon/apps/elementary-maps/default.nix | 64 +++++++++++++++++++
 pkgs/desktops/pantheon/default.nix            |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/desktops/pantheon/apps/elementary-maps/default.nix

diff --git a/pkgs/desktops/pantheon/apps/elementary-maps/default.nix b/pkgs/desktops/pantheon/apps/elementary-maps/default.nix
new file mode 100644
index 000000000000..f6fb16c8e54f
--- /dev/null
+++ b/pkgs/desktops/pantheon/apps/elementary-maps/default.nix
@@ -0,0 +1,64 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  glib,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  wrapGAppsHook4,
+  geoclue2,
+  geocode-glib_2,
+  granite7,
+  gtk4,
+  libadwaita,
+  libshumate,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "elementary-maps";
+  version = "8.1.0";
+
+  src = fetchFromGitHub {
+    owner = "elementary";
+    repo = "maps";
+    tag = finalAttrs.version;
+    hash = "sha256-tS8UnW/oNjLaUZ1XgGuAmeMrHEa2jbtBc0xMcTKki1k=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    glib
+    meson
+    ninja
+    pkg-config
+    vala
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    geoclue2
+    geocode-glib_2
+    glib
+    granite7
+    gtk4
+    libadwaita
+    libshumate
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    homepage = "https://github.com/elementary/maps";
+    description = "Map viewer designed for elementary OS";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.pantheon ];
+    mainProgram = "io.elementary.maps";
+  };
+})
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index 04050a28e6d1..3d15f9b9f72b 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -74,6 +74,8 @@ lib.makeScope pkgs.newScope (
 
     elementary-mail = callPackage ./apps/elementary-mail { };
 
+    elementary-maps = callPackage ./apps/elementary-maps { };
+
     elementary-music = callPackage ./apps/elementary-music { };
 
     elementary-photos = callPackage ./apps/elementary-photos { };

From 843fa0fa28579ec26a79450a7edf96e3ba303e16 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 1 Oct 2025 11:52:29 +0800
Subject: [PATCH 3/3] nixos/pantheon: add elementary-maps

---
 nixos/modules/services/desktop-managers/pantheon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix
index 2384cda86c50..5b24304b4993 100644
--- a/nixos/modules/services/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/desktop-managers/pantheon.nix
@@ -321,6 +321,7 @@ in
             elementary-code
             elementary-files
             elementary-mail
+            elementary-maps
             elementary-music
             elementary-photos
             elementary-screenshot