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

ocamlPackages.ppx_deriving: 5.2.1 → 6.0.3 (#355378)

parents 6981abc6 23bb0ee1

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

+8 −6
Original line number Diff line number Diff line
@@ -13,7 +13,10 @@ 
}:



let params =

  if lib.versionAtLeast ppxlib.version "0.20" then {

  if lib.versionAtLeast ppxlib.version "0.32" then {

    version = "6.0.3";

    sha256 = "sha256-N0qpezLF4BwJqXgQpIv6IYwhO1tknkRSEBRVrBnJSm0=";

  } else if lib.versionAtLeast ppxlib.version "0.20" then {

    version = "5.2.1";

    sha256 = "11h75dsbv3rs03pl67hdd3lbim7wjzh257ij9c75fcknbfr5ysz9";

  } else if lib.versionAtLeast ppxlib.version "0.15" then {
@@ -30,7 +33,7 @@ buildDunePackage rec { 
  inherit (params) version;



  src = fetchurl {

    url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-v${version}.tbz";

    url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-${lib.optionalString (lib.versionOlder version "6.0") "v"}${version}.tbz";

    inherit (params) sha256;

  };
@@ -41,11 +44,10 @@ buildDunePackage rec { 
  propagatedBuildInputs =

    lib.optional (lib.versionOlder version "5.2") ocaml-migrate-parsetree ++ [

    ppx_derivers

    result

  ];

  ] ++ lib.optional (lib.versionOlder version "6.0") result

  ;



  doCheck = lib.versionAtLeast ocaml.version "4.08"

    && lib.versionOlder ocaml.version "5.0";

  doCheck = lib.versionAtLeast ocaml.version "4.08";

  checkInputs = [

    (if lib.versionAtLeast version "5.2" then ounit2 else ounit)

  ];

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

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
, cmdliner

, ppx_deriving

, ppxlib

, result

, gitUpdater

}:
@@ -14,7 +15,6 @@ buildDunePackage rec { 
  version = "0.6.1";



  minimalOCamlVersion = "4.11";

  duneVersion = "3";



  src = fetchFromGitHub {

    owner = "hammerlab";
@@ -36,6 +36,7 @@ buildDunePackage rec { 
    cmdliner

    ppx_deriving

    ppxlib

    result

  ];



  doCheck = true;