From 6d61004e4dced6d1a1a636841f742a5711f6512f Mon Sep 17 00:00:00 2001
From: GiggleSquid <jack.connors@gigglesquid.tech>
Date: Sat, 2 May 2026 18:01:51 +0100
Subject: [PATCH 1/2] gridcoin-research: 5.4.9.0 -> 5.5.0.0

---
 .../blockchains/gridcoin-research/default.nix | 83 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix
index a3c8c3f8e897..09fb71603d77 100644
--- a/pkgs/applications/blockchains/gridcoin-research/default.nix
+++ b/pkgs/applications/blockchains/gridcoin-research/default.nix
@@ -1,71 +1,76 @@
 {
-  fetchFromGitHub,
   stdenv,
   lib,
-  openssl,
+  fetchFromGitHub,
+  qt6,
+
+  # nativeBuildInputs
+  cmake,
+  pkg-config,
+
+  # buildInputs
   boost,
   curl,
   libevent,
   libzip,
-  qrencode,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
-  autoreconfHook,
-  pkg-config,
-  libtool,
   miniupnpc,
-  hexdump,
-  fetchpatch2,
+  openssl,
+  qrencode,
+
+  # options
+  withGui ? true,
+  withDbus ? withGui,
+  withQrencode ? withGui,
+  withUpnp ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gridcoin-research";
-  version = "5.4.9.0";
+  version = "5.5.0.0";
 
   src = fetchFromGitHub {
     owner = "gridcoin-community";
     repo = "Gridcoin-Research";
-    rev = "${finalAttrs.version}";
-    hash = "sha256-nupZB4nNbitpf5EBCNy0e+ovjayAszup/r7qxbxA5jI=";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-PN0yDVHlty+4CcRfMWe4LG6wHXaTOyLo7lxtrVCSLHA=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/gridcoin-community/Gridcoin-Research/commit/bab91e95ca8c83f06dcc505e6b3f8b44dc6d50d4.patch";
-      sha256 = "sha256-GzurVlR7Tk3pmQfgO9WtHXjX6xHqNzdYqOdbJND7MpA=";
-    })
-  ];
-
   nativeBuildInputs = [
+    cmake
     pkg-config
-    wrapQtAppsHook
-    autoreconfHook
-    libtool
-    hexdump
-  ];
+  ]
+  ++ lib.optionals withGui [ qt6.wrapQtAppsHook ];
 
   buildInputs = [
-    qttools
-    qtbase
-    qrencode
+    boost
+    curl
     libevent
     libzip
     openssl
-    boost
+  ]
+  ++ lib.optionals withGui [
+    qt6.qt5compat
+    qt6.qtbase
+    qt6.qtcharts
+    qt6.qttools
+  ]
+  ++ lib.optionals withQrencode [
+    qrencode
+  ]
+  ++ lib.optionals withUpnp [
     miniupnpc
-    curl
   ];
 
-  configureFlags = [
-    "--with-gui=qt5"
-    "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
-    "--with-qrencode"
-    "--with-boost-libdir=${boost.out}/lib"
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_PIE" true)
+    (lib.cmakeBool "ENABLE_GUI" withGui)
+    (lib.cmakeBool "USE_QT6" withGui)
+    (lib.cmakeBool "USE_DBUS" withDbus)
+    (lib.cmakeBool "ENABLE_QRENCODE" withQrencode)
+    (lib.cmakeBool "ENABLE_UPNP" withUpnp)
+    (lib.cmakeBool "DEFAULT_UPNP" withUpnp)
   ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "POS-based cryptocurrency that rewards users for participating on the BOINC network";
     longDescription = ''
@@ -77,5 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ gigglesquid ];
     platforms = lib.platforms.linux;
+    changelog = "https://github.com/gridcoin-community/Gridcoin-Research/releases/tag/${finalAttrs.src.tag}";
+    mainProgram = if withGui then "gridcoinresearch" else "gridcoinresearchd";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1822117c8035..0adc6f656365 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10796,9 +10796,7 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research {
-    boost = boost179;
-  };
+  gridcoin-research = callPackage ../applications/blockchains/gridcoin-research { };
 
   groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin {
     withGui = true;

From f6498328fca8e048bc57116bb670d56f9fc855e5 Mon Sep 17 00:00:00 2001
From: GiggleSquid <jack.connors@gigglesquid.tech>
Date: Sat, 2 May 2026 20:02:09 +0100
Subject: [PATCH 2/2] gridcoin-research: migrate to pkgs by-name

---
 .../default.nix => by-name/gr/gridcoin-research/package.nix} | 5 ++++-
 pkgs/top-level/all-packages.nix                              | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename pkgs/{applications/blockchains/gridcoin-research/default.nix => by-name/gr/gridcoin-research/package.nix} (94%)

diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/by-name/gr/gridcoin-research/package.nix
similarity index 94%
rename from pkgs/applications/blockchains/gridcoin-research/default.nix
rename to pkgs/by-name/gr/gridcoin-research/package.nix
index 09fb71603d77..a8df0e918ff6 100644
--- a/pkgs/applications/blockchains/gridcoin-research/default.nix
+++ b/pkgs/by-name/gr/gridcoin-research/package.nix
@@ -25,7 +25,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "gridcoin-research";
+  pname = if withGui then "gridcoin-research" else "gridcoin-researchd";
   version = "5.5.0.0";
 
   src = fetchFromGitHub {
@@ -35,6 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-PN0yDVHlty+4CcRfMWe4LG6wHXaTOyLo7lxtrVCSLHA=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0adc6f656365..61a2b39ac2b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10796,7 +10796,7 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  gridcoin-research = callPackage ../applications/blockchains/gridcoin-research { };
+  gridcoin-researchd = gridcoin-research.override { withGui = false; };
 
   groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin {
     withGui = true;