From e7513aca60a0cac2ca3ded5d0a0452bd9b72ab55 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Mon, 8 Sep 2025 03:57:25 +0100
Subject: [PATCH 1/2] speedcrunch: migrate to pkgs/by-name

---
 .../sp/speedcrunch/package.nix}               | 25 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 14 deletions(-)
 rename pkgs/{applications/science/math/speedcrunch/default.nix => by-name/sp/speedcrunch/package.nix} (77%)

diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/by-name/sp/speedcrunch/package.nix
similarity index 77%
rename from pkgs/applications/science/math/speedcrunch/default.nix
rename to pkgs/by-name/sp/speedcrunch/package.nix
index 0dde53043f80..4f3b79eb1982 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/by-name/sp/speedcrunch/package.nix
@@ -1,14 +1,12 @@
 {
   stdenv,
-  mkDerivation,
   lib,
   fetchFromBitbucket,
   cmake,
-  qtbase,
-  qttools,
+  libsForQt5,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "speedcrunch";
   version = "unstable-2021-10-09";
 
@@ -19,19 +17,22 @@ mkDerivation {
     sha256 = "sha256-XxQv+A5SfYXFIRK7yacxGHHne1Q93pwCGeHhchIKizU=";
   };
 
-  buildInputs = [
+  sourceRoot = "source/src";
+
+  buildInputs = with libsForQt5; [
     qtbase
     qttools
   ];
 
-  nativeBuildInputs = [ cmake ];
-
-  preConfigure = ''
-    cd src
-  '';
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ [
+    libsForQt5.wrapQtAppsHook
+  ];
 
   meta = with lib; {
-    homepage = "http://speedcrunch.org";
+    homepage = "https://speedcrunch.org";
     license = licenses.gpl2Plus;
     description = "Fast power user calculator";
     mainProgram = "speedcrunch";
@@ -44,7 +45,7 @@ mkDerivation {
     maintainers = with maintainers; [
       j0hax
     ];
-    inherit (qtbase.meta) platforms;
+    inherit (libsForQt5.qtbase.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7a82f49c6f7..d3de0b25a3be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14525,8 +14525,6 @@ with pkgs;
     enableJupyter = false;
   };
 
-  speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };
-
   ### SCIENCE / MISC
 
   boinc-headless = boinc.override { headless = true; };

From 280635f07c968e5ee58cdbf205cc1741c468b5fb Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Mon, 8 Sep 2025 04:28:23 +0100
Subject: [PATCH 2/2] speedcrunch: unstable-2021-10-09 ->
 0.12-unstable-2024-12-02

Upstream:
https://bitbucket.org/heldercorreia/speedcrunch/commits/branch/master

- Update the version of Speedcrunch to the penultimate latest upstream
  commit. The actual latest upstream commit enforces the use of Qt6, and
  the build fails if Qt6 is used.
---
 pkgs/by-name/sp/speedcrunch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/speedcrunch/package.nix b/pkgs/by-name/sp/speedcrunch/package.nix
index 4f3b79eb1982..5bfe19feb52a 100644
--- a/pkgs/by-name/sp/speedcrunch/package.nix
+++ b/pkgs/by-name/sp/speedcrunch/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation {
   pname = "speedcrunch";
-  version = "unstable-2021-10-09";
+  version = "0.12-unstable-2024-12-02";
 
   src = fetchFromBitbucket {
     owner = "heldercorreia";
     repo = "speedcrunch";
-    rev = "74756f3438149c01e9edc3259b0f411fa319a22f";
-    sha256 = "sha256-XxQv+A5SfYXFIRK7yacxGHHne1Q93pwCGeHhchIKizU=";
+    rev = "db51fc5e547aa83834761d874d3518c06d0fec9e";
+    hash = "sha256-rnl4z/HU3lAF9Y1JvdM8LZWIV1NGfR4q5gOMxlNU2EA=";
   };
 
   sourceRoot = "source/src";