From 498e5e982113fe5319e7ae0d81e9d8c671345d04 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 5 Nov 2024 15:47:56 +0100
Subject: [PATCH 1/2] rbenv: format using nixfmt and minor improvements

* Use finalAttrs rather than rec
* Improve meta.description
---
 pkgs/by-name/rb/rbenv/package.nix | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/rb/rbenv/package.nix b/pkgs/by-name/rb/rbenv/package.nix
index 6c080f4f2181..1ff5d6cd9ab4 100644
--- a/pkgs/by-name/rb/rbenv/package.nix
+++ b/pkgs/by-name/rb/rbenv/package.nix
@@ -1,6 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, installShellFiles }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  installShellFiles,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rbenv";
   version = "1.2.0";
 
@@ -9,13 +14,13 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rbenv";
     repo = "rbenv";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-m/Yy5EK8pLTBFcsgKCrNvQrPFFIlYklXXZbjN4Nmm9c=";
   };
 
   postPatch = ''
-     patchShebangs src/configure
-     pushd src
+    patchShebangs src/configure
+    pushd src
   '';
 
   installPhase = ''
@@ -27,16 +32,16 @@ stdenv.mkDerivation rec {
     installShellCompletion completions/rbenv.{bash,zsh}
   '';
 
-  meta = with lib; {
-    description = "Groom your app’s Ruby environment";
-    mainProgram = "rbenv";
+  meta = {
+    description = "Version manager tool for the Ruby programming language on Unix-like systems";
     longDescription = ''
       Use rbenv to pick a Ruby version for your application and guarantee that your development environment matches production.
       Put rbenv to work with Bundler for painless Ruby upgrades and bulletproof deployments.
     '';
     homepage = "https://github.com/rbenv/rbenv";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fzakaria ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fzakaria ];
+    mainProgram = "rbenv";
+    platforms = lib.platforms.all;
   };
-}
+})

From 3a44a90e924bad925376ad90a186ddf5c03fe623 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 5 Nov 2024 15:51:26 +0100
Subject: [PATCH 2/2] rbenv: 1.2.0 -> 1.3.0

---
 pkgs/by-name/rb/rbenv/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rb/rbenv/package.nix b/pkgs/by-name/rb/rbenv/package.nix
index 1ff5d6cd9ab4..1e69e874f573 100644
--- a/pkgs/by-name/rb/rbenv/package.nix
+++ b/pkgs/by-name/rb/rbenv/package.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rbenv";
-  version = "1.2.0";
+  version = "1.3.0";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rbenv";
     repo = "rbenv";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-m/Yy5EK8pLTBFcsgKCrNvQrPFFIlYklXXZbjN4Nmm9c=";
+    sha256 = "sha256-AO0z9QtCGHwUr2ji28sbvQmCBDIfjAqbiac+HTH3N7Q=";
   };
 
   postPatch = ''
@@ -29,7 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     mv libexec $out
     ln -s $out/libexec/rbenv $out/bin/rbenv
 
-    installShellCompletion completions/rbenv.{bash,zsh}
+    installShellCompletion --zsh completions/_rbenv
+    installShellCompletion --bash completions/rbenv.bash
   '';
 
   meta = {