From 72542147a19e3a6387eb9c9b12f24a0bf8cdb66c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 9 May 2025 20:37:10 -0500
Subject: [PATCH 1/2] vimgolf: migrate to by-name

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

diff --git a/pkgs/games/vimgolf/Gemfile b/pkgs/by-name/vi/vimgolf/Gemfile
similarity index 100%
rename from pkgs/games/vimgolf/Gemfile
rename to pkgs/by-name/vi/vimgolf/Gemfile
diff --git a/pkgs/games/vimgolf/Gemfile.lock b/pkgs/by-name/vi/vimgolf/Gemfile.lock
similarity index 100%
rename from pkgs/games/vimgolf/Gemfile.lock
rename to pkgs/by-name/vi/vimgolf/Gemfile.lock
diff --git a/pkgs/games/vimgolf/gemset.nix b/pkgs/by-name/vi/vimgolf/gemset.nix
similarity index 100%
rename from pkgs/games/vimgolf/gemset.nix
rename to pkgs/by-name/vi/vimgolf/gemset.nix
diff --git a/pkgs/games/vimgolf/default.nix b/pkgs/by-name/vi/vimgolf/package.nix
similarity index 100%
rename from pkgs/games/vimgolf/default.nix
rename to pkgs/by-name/vi/vimgolf/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43ecd33124f6..a8619d14ab05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14387,8 +14387,6 @@ with pkgs;
 
   qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { };
 
-  vimgolf = callPackage ../games/vimgolf { };
-
   # this is a lower-level alternative to wrapNeovim conceived to handle
   # more usecases when wrapping neovim. The interface is being actively worked on
   # so expect breakage. use wrapNeovim instead if you want a stable alternative

From 00e35049baaed30d386699ca9a16146b25d9c2e0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 9 May 2025 20:44:03 -0500
Subject: [PATCH 2/2] vimgolf: update ruby gems and add abbrev to prepare for
 ruby 3.40

---
 pkgs/by-name/vi/vimgolf/Gemfile      |  2 ++
 pkgs/by-name/vi/vimgolf/Gemfile.lock | 10 ++++++----
 pkgs/by-name/vi/vimgolf/gemset.nix   | 22 ++++++++++++++++------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/vi/vimgolf/Gemfile b/pkgs/by-name/vi/vimgolf/Gemfile
index a375239ffc82..3d727426a51a 100644
--- a/pkgs/by-name/vi/vimgolf/Gemfile
+++ b/pkgs/by-name/vi/vimgolf/Gemfile
@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
 gem 'vimgolf'
+
+gem "abbrev", "~> 0.1.2"
diff --git a/pkgs/by-name/vi/vimgolf/Gemfile.lock b/pkgs/by-name/vi/vimgolf/Gemfile.lock
index 9eaf1172d05e..e9c451a72d7a 100644
--- a/pkgs/by-name/vi/vimgolf/Gemfile.lock
+++ b/pkgs/by-name/vi/vimgolf/Gemfile.lock
@@ -1,9 +1,10 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    highline (2.0.3)
-    json_pure (2.6.1)
-    thor (1.2.1)
+    abbrev (0.1.2)
+    highline (2.1.0)
+    json_pure (2.8.1)
+    thor (1.3.2)
     vimgolf (0.5.0)
       highline (~> 2.0, >= 2.0.3)
       json_pure (~> 2.3, >= 2.3.1)
@@ -13,7 +14,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  abbrev (~> 0.1.2)
   vimgolf
 
 BUNDLED WITH
-   2.1.4
+   2.6.6
diff --git a/pkgs/by-name/vi/vimgolf/gemset.nix b/pkgs/by-name/vi/vimgolf/gemset.nix
index f2c7c7c0d735..1008e128e6b6 100644
--- a/pkgs/by-name/vi/vimgolf/gemset.nix
+++ b/pkgs/by-name/vi/vimgolf/gemset.nix
@@ -1,33 +1,43 @@
 {
+  abbrev = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0hj2qyx7rzpc7awhvqlm597x7qdxwi4kkml4aqnp5jylmsm4w6xd";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
   highline = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
+      sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn";
       type = "gem";
     };
-    version = "2.0.3";
+    version = "2.1.0";
   };
   json_pure = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05ddn30jkpw6anfakfm7lffnrl2i0265ryrrwa4j0ivihjr95y82";
+      sha256 = "1kks889ymaq5xqvj18qamar3il8m3dnnaf6cij0a0kwxp8lpk1va";
       type = "gem";
     };
-    version = "2.6.1";
+    version = "2.8.1";
   };
   thor = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
+      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.3.2";
   };
   vimgolf = {
     dependencies = [