Merge pull request NixOS#270157 from nagy/otus-lisp-2-5

otus-lisp: 2.4 -> 2.5
khaneliman · Nov 27, 2023 · e6bff45 · e6bff45
2 parents b342acf + 196dbef
commit e6bff45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/...velopment/compilers/otus-lisp/default.nix → pkgs/by-name/ot/otus-lisp/package.nix b/...velopment/compilers/otus-lisp/default.nix → 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.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "yuriy-chumak";
     repo = "ol";
-    rev = version;
-    sha256 = "sha256-+6qH1BhvMkuG2rUOfo9qMjMjhCib9KONQTBWS27c3Ts=";
+    rev = finalAttrs.version;
+    hash = "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";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -3310,8 +3310,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 { };