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

ocamlPackages.zed: 3.1.0 -> 3.2.0, ocamlPackages.lambdaterm: 3.2.0 -> 3.3.1 (#196362) 

* ocamlPackage.zed: 3.1.0 -> 3.2.0

* ocamlPackages.lambda-term: 3.2.0 -> 3.3.1

* ocamlPackages.utop: 2.9.2 -> 2.10.0

* ocamlPackages.prof_spacetime: mark as broken
parent 2a43d36a

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

+8 −5
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi }:

{ lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi, uucp, logs }:



let params =

  if lib.versionAtLeast ocaml.version "4.08" then {

    version = "3.2.0";

    sha256 = "sha256:048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i";

    version = "3.3.1";

    sha256 = "sha256-C124bhdrY+XzL93zzNEbCr+U+7CYBZDm0hlAw+iqat4=";

  } else {

    version = "3.1.0";

    sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg";
@@ -14,7 +14,9 @@ buildDunePackage rec { 
  pname = "lambda-term";

  inherit (params) version;



  useDune2 = true;

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



  strictDeps = true;



  src = fetchFromGitHub {

    owner = "ocaml-community";
@@ -23,7 +25,8 @@ buildDunePackage rec { 
    inherit (params) sha256;

  };



  propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ];

  propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]

    ++ lib.optional (lib.versionAtLeast version "3.3.1") [ uucp logs ] ;



  meta = {

    description = "Terminal manipulation library for OCaml";

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

+2 −0
Original line number Diff line number Diff line 
{ buildDunePackage

, lib

, fetchFromGitHub

, ocaml

, cmdliner

, spacetime_lib

, yojson
@@ -38,6 +39,7 @@ buildDunePackage rec { 
    description = "A viewer for OCaml spacetime profiles";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.symphorien ];

    broken = true; # 2022-10-20, doesn't work with updated lambda-term

    inherit (src.meta) homepage;

  };

}

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

+22 −6
Original line number Diff line number Diff line 
{ lib, buildDunePackage, fetchFromGitHub, camomile, react, charInfo_width }:

{ lib, buildDunePackage, fetchFromGitHub, ocaml, react, charInfo_width, result, uchar, uutf, uucp, uuseg }:



let

  switch =

    if lib.versionAtLeast ocaml.version "4.08"

    then

      {

        version = "3.2.0";

        sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w=";

        duneVersion = "3";

        propagatedBuildInputs = [ react result uchar uutf uucp uuseg ];

      }

    else

      {

        version = "3.1.0";

        sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p";

        duneVersion = "2";

        propagatedBuildInputs = [ charInfo_width react ];

      };

in



buildDunePackage rec {

  pname = "zed";

  version = "3.1.0";



  useDune2 = true;

  inherit (switch) version duneVersion propagatedBuildInputs;



  src = fetchFromGitHub {

    owner = "ocaml-community";

    repo = pname;

    rev = version;

    sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p";

    sha256 = switch.sha256;

  };



  propagatedBuildInputs = [ charInfo_width react ];



  meta = {

    description = "Abstract engine for text edition in OCaml";

    longDescription = ''

pkgs/development/tools/ocaml/utop/default.nix

+23 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, ocaml, findlib

, lambda-term, cppo, makeWrapper, buildDunePackage

, zed, logs, lwt, react, lwt_react

}:



let

  switch =

    if lib.versionAtLeast ocaml.version "4.08"

    then

      {

        version = "2.10.0";

        sha256 = "sha256-R10WovnqYcYCrDJnPuIQx2zHaPchSYfXDAaVMsJ4LQA=";

        duneVersion = "3";

        propagatedBuildInputs = [ lambda-term zed logs ];

      }

    else

      {

        version = "2.9.2";

        sha256 = "sha256-kvFBCe69TRQIWvZV47SH7ISus9k8afGRw5WLKzKqw08=";

        duneVersion = "2";

        propagatedBuildInputs = [ lambda-term ];

      };

in



buildDunePackage rec {

  pname = "utop";

  version = "2.9.2";



  inherit (switch) version duneVersion propagatedBuildInputs;



  minimalOCamlVersion = "4.03";



  src = fetchurl {

    url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";

    sha256 = "sha256-kvFBCe69TRQIWvZV47SH7ISus9k8afGRw5WLKzKqw08=";

    sha256 = switch.sha256;

  };



  nativeBuildInputs = [ makeWrapper cppo ];



  propagatedBuildInputs = [ lambda-term ];



  postFixup =

   let

     path = "etc/utop/env";