Unverified Commit d2a217a6 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

ocamlPackages.lambda-term: small cleaning (#461340)

parents 131eeb34 2f8e1ab3

pkgs/development/ocaml-modules/lambda-term/default.nix

+7 −26
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  fetchFromGitHub,

  buildDunePackage,

  ocaml,

  zed,

  lwt_log,

  lwt_react,
@@ -11,31 +10,15 @@ 
  logs,

}:



let

  params =

    if lib.versionAtLeast ocaml.version "4.08" then

      {

        version = "3.3.2";

        sha256 = "sha256-T2DDpHqLar1sgmju0PLvhAZef5VzOpPWcFVhuZlPQmM=";

      }

    else

      {

        version = "3.1.0";

        sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg";

      };

in



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "lambda-term";

  inherit (params) version;



  duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "3" else "2";

  version = "3.3.2";



  src = fetchFromGitHub {

    owner = "ocaml-community";

    repo = pname;

    rev = version;

    inherit (params) sha256;

    repo = "lambda-term";

    tag = finalAttrs.version;

    hash = "sha256-T2DDpHqLar1sgmju0PLvhAZef5VzOpPWcFVhuZlPQmM=";

  };



  propagatedBuildInputs = [
@@ -43,8 +26,6 @@ buildDunePackage rec { 
    lwt_log

    lwt_react

    mew_vi

  ]

  ++ lib.optionals (lib.versionAtLeast version "3.3.1") [

    uucp

    logs

  ];
@@ -66,9 +47,9 @@ buildDunePackage rec { 
      console applications.

    '';



    inherit (src.meta) homepage;

    homepage = "https://github.com/ocaml-community/lambda-term";

    license = lib.licenses.bsd3;

    maintainers = [ lib.maintainers.gal_bolle ];

    mainProgram = "lambda-term-actions";

  };

}
 
})

pkgs/development/ocaml-modules/mew/default.nix

+6 −8
Original line number Diff line number Diff line
@@ -6,17 +6,15 @@ 
  trie,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "mew";

  version = "0.1.0";



  useDune2 = true;



  src = fetchFromGitHub {

    owner = "kandu";

    repo = pname;

    rev = version;

    sha256 = "0417xsghj92v3xa5q4dk4nzf2r4mylrx2fd18i7cg3nzja65nia2";

    repo = "mew";

    tag = finalAttrs.version;

    hash = "sha256-QkVbjJLfjsdORKE50TP1lWThviWzEVxUH1skCZ/uJxA=";

  };



  propagatedBuildInputs = [
@@ -25,10 +23,10 @@ buildDunePackage rec { 
  ];



  meta = {

    inherit (src.meta) homepage;

    homepage = "https://github.com/kandu/mew";

    license = lib.licenses.mit;

    description = "Modal Editing Witch";

    maintainers = [ lib.maintainers.vbgl ];

  };



}
 
})

pkgs/development/ocaml-modules/mew_vi/default.nix

+6 −8
Original line number Diff line number Diff line
@@ -6,17 +6,15 @@ 
  react,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "mew_vi";

  version = "0.5.0";



  useDune2 = true;



  src = fetchFromGitHub {

    owner = "kandu";

    repo = pname;

    rev = version;

    sha256 = "0lihbf822k5zasl60w5mhwmdkljlq49c9saayrws7g4qc1j353r8";

    repo = "mew_vi";

    tag = finalAttrs.version;

    hash = "sha256-KI8yZGCYvKN59krpxBLBVNLZKoe1cGCoVr9MIZBbMFI=";

  };



  propagatedBuildInputs = [
@@ -25,10 +23,10 @@ buildDunePackage rec { 
  ];



  meta = {

    inherit (src.meta) homepage;

    homepage = "https://github.com/kandu/mew_vi";

    license = lib.licenses.mit;

    description = "Modal Editing Witch, VI interpreter";

    maintainers = [ lib.maintainers.vbgl ];

  };



}
 
})