Unverified Commit 9c63777b authored by Vincent Laporte's avatar Vincent Laporte Committed by GitHub
Browse files

ocamlPackages.bos: 0.2.1 -> 0.3.0 (#512776)

parents c6ec40eb 6c568f32

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

+7 −2
Original line number Diff line number Diff line
@@ -15,11 +15,16 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "ocaml${ocaml.version}-bos";

  version = "0.2.1";

  version = if lib.versionAtLeast ocaml.version "4.14" then "0.3.0" else "0.2.1";



  src = fetchurl {

    url = "https://erratique.ch/software/bos/releases/bos-${finalAttrs.version}.tbz";

    sha256 = "sha256-2NYueGsQ1pfgRXIFqO7eqifrzJDxhV8Y3xkMrC49jzc=";

    hash =

      {

        "0.3.0" = "sha256-CJ82ntAJZ+kticxfzYSMVr2rXAJzfaTUg1UL9Wtaebw=";

        "0.2.1" = "sha256-2NYueGsQ1pfgRXIFqO7eqifrzJDxhV8Y3xkMrC49jzc=";

      }

      ."${finalAttrs.version}";

  };



  nativeBuildInputs = [

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

+0 −13
Original line number Diff line number Diff line
@@ -5,19 +5,13 @@ 
  buildDunePackage,

  eqaf,

  alcotest,

  astring,

  bos,

  crowbar,

  findlib,

  fpath,

}:



buildDunePackage (finalAttrs: {

  pname = "digestif";

  version = "1.3.0";



  minimalOCamlVersion = "4.08";



  src = fetchurl {

    url = "https://github.com/mirage/digestif/releases/download/v${finalAttrs.version}/digestif-${finalAttrs.version}.tbz";

    hash = "sha256-mmzcszJTnIf0cj/DvXNiayZ1p7EWH98P7TCRhs4Y9Cc=";
@@ -27,17 +21,10 @@ buildDunePackage (finalAttrs: { 


  checkInputs = [

    alcotest

    astring

    bos

    crowbar

    fpath

  ];

  doCheck = true;



  postCheck = ''

    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ test/test_runes.ml

  '';



  meta = {

    description = "Simple hash algorithms in OCaml";

    homepage = "https://github.com/mirage/digestif";

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

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

  fetchpatch,

  fetchFromGitHub,

  buildDunePackage,

  lib,
@@ -28,6 +29,13 @@ buildDunePackage (finalAttrs: { 
    hash = "sha256-I7u/n49WOnpc0EaagsjC4Ts/kz0Xj6YHZv6+QZKLrC4=";

  };



  patches = [

    (fetchpatch {

      url = "https://github.com/robur-coop/httpcats/commit/d8787555d4831e0488780d42bd2c65de662d1d38.patch";

      hash = "sha256-Mqam6Sxd2kkkHDm459u9uerifuHbvZUVy2khQffvvCE=";

    })

  ];



  propagatedBuildInputs = [

    h2

    h1