From 7beab0f407b735bb9a9be2c753ab2946a81cccdf Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sun, 26 Nov 2023 15:30:00 +0100
Subject: [PATCH 1/3] otus-lisp: move to by-name structure

---
 .../otus-lisp/default.nix => by-name/ot/otus-lisp/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/compilers/otus-lisp/default.nix => by-name/ot/otus-lisp/package.nix} (100%)

diff --git a/pkgs/development/compilers/otus-lisp/default.nix b/pkgs/by-name/ot/otus-lisp/package.nix
similarity index 100%
rename from pkgs/development/compilers/otus-lisp/default.nix
rename to pkgs/by-name/ot/otus-lisp/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 573dbfd78d5b5..e6b438fd50bff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3306,8 +3306,6 @@ with pkgs;
 
   owl-lisp = callPackage ../development/compilers/owl-lisp { };
 
-  otus-lisp = callPackage ../development/compilers/otus-lisp { };
-
   ascii = callPackage ../tools/text/ascii { };
 
   asciinema = callPackage ../tools/misc/asciinema { };

From a73f29ddcfcfd6cdf63774d4f6456d9e117fb05b Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sun, 26 Nov 2023 15:38:05 +0100
Subject: [PATCH 2/3] otus-lisp: 2.4 -> 2.5

Diff: https://github.com/yuriy-chumak/ol/compare/2.4...2.5
---
 pkgs/by-name/ot/otus-lisp/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ot/otus-lisp/package.nix b/pkgs/by-name/ot/otus-lisp/package.nix
index 5338734e6c6d0..e122b601b71a2 100644
--- a/pkgs/by-name/ot/otus-lisp/package.nix
+++ b/pkgs/by-name/ot/otus-lisp/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "otus-lisp";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "yuriy-chumak";
     repo = "ol";
     rev = version;
-    sha256 = "sha256-+6qH1BhvMkuG2rUOfo9qMjMjhCib9KONQTBWS27c3Ts=";
+    sha256 = "sha256-xwn2cvtw3co7MJ4J0FraEtZhKWVaaaoJYMrohyFF+us=";
   };
 
   nativeBuildInputs = [ xxd ];
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     license = with lib.licenses; [ mit lgpl3Only ]; # dual licensed
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ nagy ];
+    mainProgram = "ol";
   };
 }

From 196dbefbaa56481ea99ad3d7346a9d77951482ca Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Mon, 27 Nov 2023 00:15:00 +0100
Subject: [PATCH 3/3] otus-lisp: use finalAttrs pattern

---
 pkgs/by-name/ot/otus-lisp/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ot/otus-lisp/package.nix b/pkgs/by-name/ot/otus-lisp/package.nix
index e122b601b71a2..ba51c417fdb85 100644
--- a/pkgs/by-name/ot/otus-lisp/package.nix
+++ b/pkgs/by-name/ot/otus-lisp/package.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, xxd }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "otus-lisp";
   version = "2.5";
 
   src = fetchFromGitHub {
     owner = "yuriy-chumak";
     repo = "ol";
-    rev = version;
-    sha256 = "sha256-xwn2cvtw3co7MJ4J0FraEtZhKWVaaaoJYMrohyFF+us=";
+    rev = finalAttrs.version;
+    hash = "sha256-xwn2cvtw3co7MJ4J0FraEtZhKWVaaaoJYMrohyFF+us=";
   };
 
   nativeBuildInputs = [ xxd ];
@@ -23,4 +23,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ nagy ];
     mainProgram = "ol";
   };
-}
+})