ledit: 2.04 → 2.06

equirosa · Aug 18, 2023 · e2a47ab · e2a47ab
1 parent d3fc723
commit e2a47ab
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/pkgs/tools/misc/ledit/default.nix b/pkgs/tools/misc/ledit/default.nix
@@ -1,31 +1,38 @@
-{ lib, stdenv, fetchzip, ocaml, camlp5}:
+{ lib, stdenv, fetchFromGitHub, ocamlPackages }:
 
 stdenv.mkDerivation {
   pname = "ledit";
-  version = "2.04";
+  version = "2.06";
 
-  src = fetchzip {
-    url = "http://pauillac.inria.fr/~ddr/ledit/distrib/src/ledit-2.04.tgz";
-    sha512 = "16vlv6rcsddwrvsqqiwxdfv5rxvblhrx0k84g7pjibi0an241yx8aqf8cj4f4sgl5xfs3frqrdf12zqwjf2h4jvk8jyhyar8n0nj3g0";
+  src = fetchFromGitHub {
+    owner = "chetmurthy";
+    repo = "ledit";
+    rev = "3dbd668d9c69aab5ccd61f6b906c14122ae3271d";
+    hash = "sha256-9+isvwOw5Iw5OToztqZ5PiQPj6Pxl2ZqAC7UMF+tCM4=";
   };
 
   preBuild = ''
-    mkdir -p $out/bin
-    substituteInPlace Makefile --replace /bin/rm rm --replace BINDIR=/usr/local/bin BINDIR=$out/bin
+    substituteInPlace Makefile --replace /bin/rm rm --replace /usr/local/ $out/
   '';
 
   strictDeps = true;
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with ocamlPackages; [
     ocaml
+    findlib
     camlp5
   ];
 
+  buildInputs = with ocamlPackages; [
+    camlp5
+    camlp-streams
+  ];
+
+
   meta = with lib; {
     homepage = "http://pauillac.inria.fr/~ddr/ledit/";
     description = "A line editor, allowing to use shell commands with control characters like in emacs";
     license = licenses.bsd3;
     maintainers = [ maintainers.delta ];
-    broken = lib.versionOlder ocaml.version "4.03";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -10174,9 +10174,7 @@ with pkgs;
 
   lact = callPackage ../tools/system/lact { };
 
-  ledit = callPackage ../tools/misc/ledit {
-    inherit (ocaml-ng.ocamlPackages_4_11) ocaml camlp5;
-  };
+  ledit = callPackage ../tools/misc/ledit { };
 
   ledmon = callPackage ../tools/system/ledmon { };