From 403f488b80fd97cf60e8e5924fdcedb82f09a082 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Thu, 2 Jan 2025 16:11:32 +0300
Subject: [PATCH 1/3] numbat: 1.14.0 -> 1.15.0

---
 pkgs/by-name/nu/numbat/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index bb0424d357e3..cd9248f39493 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -1,30 +1,24 @@
 {
   lib,
-  stdenv,
   testers,
   fetchFromGitHub,
   rustPlatform,
-  darwin,
   numbat,
   tzdata,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "numbat";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "numbat";
-    rev = "v${version}";
-    hash = "sha256-TmzM541S2W5Cy8zHEWKRE2Zj2bSgrM4vbsWw3zbi3LQ=";
+    tag = "v${version}";
+    hash = "sha256-5XsrOAvBrmCG6k7YRwGZZtBP/o1jVVtBBTrwIT5CDX8=";
   };
 
-  cargoHash = "sha256-exvJJsGIj6KhmMcwhPjXMELvisuUtl17BAO6XEJSJmI=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
+  cargoHash = "sha256-RMON7JThY6Ad1QHQFiNbTb2PUsfviR2t+55k1ZtlOd8=";
 
   env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";
 

From 6d17306e6761abb7175f7a090559a0453787a53e Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Thu, 2 Jan 2025 16:12:55 +0300
Subject: [PATCH 2/3] numbat: use version check hook, nix update script

---
 pkgs/by-name/nu/numbat/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index cd9248f39493..2b3c0ddea189 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  testers,
   fetchFromGitHub,
   rustPlatform,
-  numbat,
   tzdata,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -34,11 +34,12 @@ rustPlatform.buildRustPackage rec {
     export TZDIR=${tzdata}/share/zoneinfo
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = numbat;
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "--version" ];
 
   meta = with lib; {
+  passthru.updateScript = nix-update-script { };
     description = "High precision scientific calculator with full support for physical units";
     longDescription = ''
       A statically typed programming language for scientific computations

From 1514589aa6f001b1214afee2df9283fc06cdcd91 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Thu, 2 Jan 2025 16:14:39 +0300
Subject: [PATCH 3/3] numbat: refactor meta

---
 pkgs/by-name/nu/numbat/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index 2b3c0ddea189..da0e75d1a3a6 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -38,8 +38,9 @@ rustPlatform.buildRustPackage rec {
   doInstallCheck = true;
   versionCheckProgramArg = [ "--version" ];
 
-  meta = with lib; {
   passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "High precision scientific calculator with full support for physical units";
     longDescription = ''
       A statically typed programming language for scientific computations
@@ -47,14 +48,14 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://numbat.dev";
     changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    mainProgram = "numbat";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       giomf
       atemu
     ];
+    mainProgram = "numbat";
   };
 }