From 5f3bdeb82e939214844aa5a7e78ccce36185aabb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 11 May 2025 14:21:21 +0000
Subject: [PATCH 1/2] timetrap: 1.15.2 -> 1.15.5

---
 .../applications/office/timetrap/Gemfile.lock | 16 +++++----
 pkgs/applications/office/timetrap/default.nix | 22 +++++++-----
 pkgs/applications/office/timetrap/gemset.nix  | 36 +++++++++++++++----
 3 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock
index 30e48b7febbe..15e399079253 100644
--- a/pkgs/applications/office/timetrap/Gemfile.lock
+++ b/pkgs/applications/office/timetrap/Gemfile.lock
@@ -1,13 +1,17 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    bigdecimal (3.1.9)
     chronic (0.10.2)
-    sequel (5.30.0)
-    sqlite3 (1.4.2)
-    timetrap (1.15.2)
+    mini_portile2 (2.8.8)
+    sequel (5.90.0)
+      bigdecimal
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
+    timetrap (1.15.5)
       chronic (~> 0.10.2)
-      sequel (~> 5.30.0)
-      sqlite3 (~> 1.4.2)
+      sequel (~> 5.90.0)
+      sqlite3 (~> 1.4)
 
 PLATFORMS
   ruby
@@ -16,4 +20,4 @@ DEPENDENCIES
   timetrap
 
 BUNDLED WITH
-   2.1.4
+   2.6.6
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix
index cfb1c0a62fc9..9e172d7e1866 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/pkgs/applications/office/timetrap/default.nix
@@ -34,18 +34,18 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ installShellFiles ];
 
   installPhase = ''
-    mkdir $out;
-    cd $out;
+    mkdir $out
+    cd $out
 
-    mkdir bin; pushd bin;
-    ln -vs ${ttBundlerApp}/bin/t;
-    ln -vs ${ttBundlerApp}/bin/timetrap;
-    popd;
+    mkdir bin; pushd bin
+    ln -vs ${ttBundlerApp}/bin/t
+    ln -vs ${ttBundlerApp}/bin/timetrap
+    popd
 
     for c in t timetrap; do
-      installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/*;
-      installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/*;
-    done;
+      installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/*
+      installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/*
+    done
   '';
 
   meta = with lib; {
@@ -59,4 +59,8 @@ stdenv.mkDerivation {
     ];
     platforms = platforms.unix;
   };
+
+  passthru = {
+    updateScript = ttBundlerApp.passthru.updateScript;
+  };
 }
diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix
index 16419444ee25..81c9b13ae61c 100644
--- a/pkgs/applications/office/timetrap/gemset.nix
+++ b/pkgs/applications/office/timetrap/gemset.nix
@@ -1,4 +1,14 @@
 {
+  bigdecimal = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
+      type = "gem";
+    };
+    version = "3.1.9";
+  };
   chronic = {
     groups = [ "default" ];
     platforms = [ ];
@@ -9,25 +19,37 @@
     };
     version = "0.10.2";
   };
-  sequel = {
+  mini_portile2 = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gqqnqrfayhwhkp0vy3frv68sgc7klyd6mfisx1j3djjvlyc7hmr";
+      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
       type = "gem";
     };
-    version = "5.30.0";
+    version = "2.8.8";
+  };
+  sequel = {
+    dependencies = [ "bigdecimal" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz";
+      type = "gem";
+    };
+    version = "5.90.0";
   };
   sqlite3 = {
+    dependencies = [ "mini_portile2" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
+      sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs";
       type = "gem";
     };
-    version = "1.4.2";
+    version = "1.7.3";
   };
   timetrap = {
     dependencies = [
@@ -39,9 +61,9 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pfg5c3kmh1jfaaszw253bi93ixa6cznqmsafrcpccrdg9r8j2k8";
+      sha256 = "0gcs9vyg1i3nsiiwrkqza14qj7h3chlg6w5icbf0ggjzswz3rwd2";
       type = "gem";
     };
-    version = "1.15.2";
+    version = "1.15.5";
   };
 }

From 4eefc796b003d92abbd3ede14a5acdf2f0419ea7 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 11 May 2025 14:23:48 +0000
Subject: [PATCH 2/2] timetrap: Migrate to by-name

---
 pkgs/{applications/office => by-name/ti}/timetrap/Gemfile       | 0
 pkgs/{applications/office => by-name/ti}/timetrap/Gemfile.lock  | 0
 pkgs/{applications/office => by-name/ti}/timetrap/gemset.nix    | 0
 .../timetrap/default.nix => by-name/ti/timetrap/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{applications/office => by-name/ti}/timetrap/Gemfile (100%)
 rename pkgs/{applications/office => by-name/ti}/timetrap/Gemfile.lock (100%)
 rename pkgs/{applications/office => by-name/ti}/timetrap/gemset.nix (100%)
 rename pkgs/{applications/office/timetrap/default.nix => by-name/ti/timetrap/package.nix} (100%)

diff --git a/pkgs/applications/office/timetrap/Gemfile b/pkgs/by-name/ti/timetrap/Gemfile
similarity index 100%
rename from pkgs/applications/office/timetrap/Gemfile
rename to pkgs/by-name/ti/timetrap/Gemfile
diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/by-name/ti/timetrap/Gemfile.lock
similarity index 100%
rename from pkgs/applications/office/timetrap/Gemfile.lock
rename to pkgs/by-name/ti/timetrap/Gemfile.lock
diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/by-name/ti/timetrap/gemset.nix
similarity index 100%
rename from pkgs/applications/office/timetrap/gemset.nix
rename to pkgs/by-name/ti/timetrap/gemset.nix
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/by-name/ti/timetrap/package.nix
similarity index 100%
rename from pkgs/applications/office/timetrap/default.nix
rename to pkgs/by-name/ti/timetrap/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb4bfd837e90..16a51f6cf728 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4590,8 +4590,6 @@ with pkgs;
 
   tiled = libsForQt5.callPackage ../applications/editors/tiled { };
 
-  timetrap = callPackage ../applications/office/timetrap { };
-
   tinc = callPackage ../tools/networking/tinc { };
 
   tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };