Unverified Commit c98f2c15 authored by Vincent Laporte's avatar Vincent Laporte
Browse files

ocamlPackages.tcs-lib: 0.3 → 0.6

parent 20578871

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

+9 −2
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 
  fetchpatch,

  buildOasisPackage,

  ounit,

  tcslib,

  tcs-lib,

  extlib,

  ocaml-sat-solvers,

}:
@@ -29,9 +30,15 @@ buildOasisPackage rec { 
    ];

  };



  # Compatibility with tcs-lib ≥ 0.6

  postPatch = ''

    substituteInPlace _oasis --replace-fail TCSLib tcs-lib

  '';



  buildInputs = [ ounit ];

  propagatedBuildInputs = [

    tcslib

    extlib

    tcs-lib

    ocaml-sat-solvers

  ];

pkgs/development/ocaml-modules/tcslib/default.nix→pkgs/development/ocaml-modules/tcs-lib/default.nix

+29 −0
Original line number Diff line number Diff line 
{

  lib,

  fetchFromGitHub,

  buildOasisPackage,

  extlib,

  fetchurl,

  buildDunePackage,

  num,

}:



buildOasisPackage rec {

  pname = "tcslib";

  version = "0.3";

buildDunePackage (finalAttrs: {

  pname = "tcs-lib";

  version = "0.6";



  minimumOCamlVersion = "4.03.0";

  minimalOCamlVersion = "4.03";



  src = fetchFromGitHub {

    owner = "tcsprojects";

    repo = "tcslib";

    rev = "v${version}";

    sha256 = "05g6m82blsccq8wx8knxv6a5fzww7hi624jx91f9h87nk2fsplhi";

  src = fetchurl {

    url = "https://github.com/tcsprojects/tcslib/releases/download/v${finalAttrs.version}/tcs-lib-${finalAttrs.version}.tbz";

    hash = "sha256-DBjdIOUrYbfN3VlTaQMIGezPpOpzv9vtmDmBVYZigSI=";

  };



  propagatedBuildInputs = [

    extlib

    num

  ];
@@ -30,4 +26,4 @@ buildOasisPackage rec { 
    license = lib.licenses.bsd3;

    maintainers = with lib.maintainers; [ mgttlinger ];

  };

}
 
})

pkgs/top-level/ocaml-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -2001,7 +2001,7 @@ let 


        tcpip = callPackage ../development/ocaml-modules/tcpip { };



        tcslib = callPackage ../development/ocaml-modules/tcslib { };

        tcs-lib = callPackage ../development/ocaml-modules/tcs-lib { };



        tdigest = callPackage ../development/ocaml-modules/tdigest { };