From 45ddfc78e6d5603ebef9a16372300d8ae9c69e47 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Fri, 19 Jul 2024 01:41:39 +0200
Subject: [PATCH] tio: migrate to by-name and modernize

---
 .../misc/tio/default.nix => by-name/ti/tio/package.nix}   | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{tools/misc/tio/default.nix => by-name/ti/tio/package.nix} (90%)

diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/by-name/ti/tio/package.nix
similarity index 90%
rename from pkgs/tools/misc/tio/default.nix
rename to pkgs/by-name/ti/tio/package.nix
index e4db1320706c..d7de1ce210fc 100644
--- a/pkgs/tools/misc/tio/default.nix
+++ b/pkgs/by-name/ti/tio/package.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, inih, lua, bash-completion, darwin }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tio";
   version = "3.5";
 
   src = fetchFromGitHub {
     owner = "tio";
     repo = "tio";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-3d3TYHSERIQdw+Iw6qCydGpWRpWrhZwb4SnwV1nVtIk=";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "https://tio.github.io/";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ yana ];
-    platforms = platforms.unix;
     mainProgram = "tio";
+    platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6b058a97fd5..f3a8d5f70af1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13411,8 +13411,6 @@ with pkgs;
 
   timer = callPackage ../tools/misc/timer { };
 
-  tio = callPackage ../tools/misc/tio { };
-
   tiv = callPackage ../applications/misc/tiv { };
 
   tkman = callPackage ../tools/misc/tkman { };