From 7f1caf53226408a3d498ff4e71439a58209929db Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 20 Jun 2025 23:46:09 +0800
Subject: [PATCH] pantheon.elementary-code: 7.4.0 -> 8.0.0

https://github.com/elementary/code/compare/7.4.0...8.0.0
---
 .../pantheon/apps/elementary-code/default.nix | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 673d06b33bf7..1a838e61759e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -2,9 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   nix-update-script,
-  appstream,
-  desktop-file-utils,
   meson,
   ninja,
   pkg-config,
@@ -19,26 +18,35 @@
   libgee,
   libgit2-glib,
   libhandy,
-  libpeas,
-  libsoup_2_4,
+  libpeas2,
+  libsoup_3,
   vte,
   ctags,
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-code";
-  version = "7.4.0";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "code";
     rev = version;
-    sha256 = "sha256-KoRpGBYen1eOdMBHOTBMopC+mPMOkD+iYWV3JA21mKc=";
+    hash = "sha256-muW7K9cFITZaoNi3id+iplmokN5sSE8x1CVQ62+myUU=";
   };
 
+  patches = [
+    # Fix build with GCC 14
+    # https://github.com/elementary/code/pull/1606
+    (fetchpatch {
+      url = "https://github.com/elementary/code/commit/9b8347adcbb94f3186815413d927eecc51be2ccf.patch";
+      hash = "sha256-VhpvWgOGniOEjxBOjvX30DZIRGalxfPlb9j1VaOAJTA=";
+    })
+  ];
+
+  strictDeps = true;
+
   nativeBuildInputs = [
-    appstream
-    desktop-file-utils
     meson
     ninja
     pkg-config
@@ -56,8 +64,9 @@ stdenv.mkDerivation rec {
     libgee
     libgit2-glib
     libhandy
-    libpeas
-    libsoup_2_4
+    libpeas2
+    libsoup_3
+    vala # for ValaSymbolResolver provided by libvala
     vte
   ];