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

authored by Ulrik Strid and committed by GitHub 8920ea68 2a43d36a

+55 -15
+8 -5
pkgs/development/ocaml-modules/lambda-term/default.nix
··· 1 - { lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi }: 1 + { lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi, uucp, logs }: 2 2 3 3 let params = 4 4 if lib.versionAtLeast ocaml.version "4.08" then { 5 - version = "3.2.0"; 6 - sha256 = "sha256:048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i"; 5 + version = "3.3.1"; 6 + sha256 = "sha256-C124bhdrY+XzL93zzNEbCr+U+7CYBZDm0hlAw+iqat4="; 7 7 } else { 8 8 version = "3.1.0"; 9 9 sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; ··· 14 14 pname = "lambda-term"; 15 15 inherit (params) version; 16 16 17 - useDune2 = true; 17 + duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "3" else "2"; 18 + 19 + strictDeps = true; 18 20 19 21 src = fetchFromGitHub { 20 22 owner = "ocaml-community"; ··· 23 25 inherit (params) sha256; 24 26 }; 25 27 26 - propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; 28 + propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ] 29 + ++ lib.optional (lib.versionAtLeast version "3.3.1") [ uucp logs ] ; 27 30 28 31 meta = { 29 32 description = "Terminal manipulation library for OCaml";
+2
pkgs/development/ocaml-modules/prof_spacetime/default.nix
··· 1 1 { buildDunePackage 2 2 , lib 3 3 , fetchFromGitHub 4 + , ocaml 4 5 , cmdliner 5 6 , spacetime_lib 6 7 , yojson ··· 38 39 description = "A viewer for OCaml spacetime profiles"; 39 40 license = lib.licenses.mit; 40 41 maintainers = [ lib.maintainers.symphorien ]; 42 + broken = true; # 2022-10-20, doesn't work with updated lambda-term 41 43 inherit (src.meta) homepage; 42 44 }; 43 45 }
+22 -6
pkgs/development/ocaml-modules/zed/default.nix
··· 1 - { lib, buildDunePackage, fetchFromGitHub, camomile, react, charInfo_width }: 1 + { lib, buildDunePackage, fetchFromGitHub, ocaml, react, charInfo_width, result, uchar, uutf, uucp, uuseg }: 2 + 3 + let 4 + switch = 5 + if lib.versionAtLeast ocaml.version "4.08" 6 + then 7 + { 8 + version = "3.2.0"; 9 + sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w="; 10 + duneVersion = "3"; 11 + propagatedBuildInputs = [ react result uchar uutf uucp uuseg ]; 12 + } 13 + else 14 + { 15 + version = "3.1.0"; 16 + sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; 17 + duneVersion = "2"; 18 + propagatedBuildInputs = [ charInfo_width react ]; 19 + }; 20 + in 2 21 3 22 buildDunePackage rec { 4 23 pname = "zed"; 5 - version = "3.1.0"; 6 24 7 - useDune2 = true; 25 + inherit (switch) version duneVersion propagatedBuildInputs; 8 26 9 27 src = fetchFromGitHub { 10 28 owner = "ocaml-community"; 11 29 repo = pname; 12 30 rev = version; 13 - sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; 31 + sha256 = switch.sha256; 14 32 }; 15 - 16 - propagatedBuildInputs = [ charInfo_width react ]; 17 33 18 34 meta = { 19 35 description = "Abstract engine for text edition in OCaml";
+23 -4
pkgs/development/tools/ocaml/utop/default.nix
··· 1 1 { lib, stdenv, fetchurl, ocaml, findlib 2 2 , lambda-term, cppo, makeWrapper, buildDunePackage 3 + , zed, logs, lwt, react, lwt_react 3 4 }: 4 5 6 + let 7 + switch = 8 + if lib.versionAtLeast ocaml.version "4.08" 9 + then 10 + { 11 + version = "2.10.0"; 12 + sha256 = "sha256-R10WovnqYcYCrDJnPuIQx2zHaPchSYfXDAaVMsJ4LQA="; 13 + duneVersion = "3"; 14 + propagatedBuildInputs = [ lambda-term zed logs ]; 15 + } 16 + else 17 + { 18 + version = "2.9.2"; 19 + sha256 = "sha256-kvFBCe69TRQIWvZV47SH7ISus9k8afGRw5WLKzKqw08="; 20 + duneVersion = "2"; 21 + propagatedBuildInputs = [ lambda-term ]; 22 + }; 23 + in 24 + 5 25 buildDunePackage rec { 6 26 pname = "utop"; 7 - version = "2.9.2"; 27 + 28 + inherit (switch) version duneVersion propagatedBuildInputs; 8 29 9 30 minimalOCamlVersion = "4.03"; 10 31 11 32 src = fetchurl { 12 33 url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; 13 - sha256 = "sha256-kvFBCe69TRQIWvZV47SH7ISus9k8afGRw5WLKzKqw08="; 34 + sha256 = switch.sha256; 14 35 }; 15 36 16 37 nativeBuildInputs = [ makeWrapper cppo ]; 17 - 18 - propagatedBuildInputs = [ lambda-term ]; 19 38 20 39 postFixup = 21 40 let