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

Merge pull request #237479 from vbgl/ocaml-parmap-1.2.5 

ocamlPackages.parmap: 1.2.4 → 1.2.5; cudf: 0.9 → 0.10
parents 21fc5742 b4e057c8

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

+12 −31
Original line number Diff line number Diff line 
{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }:

{ lib, buildDunePackage, ocaml, fetchFromGitLab, extlib, ounit2 }:



stdenv.mkDerivation rec {

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

  version = "0.9";

buildDunePackage rec {

  pname = "cudf";

  version = "0.10";



  src = fetchurl {

    url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz";

    sha256 = "sha256-mTLk2V3OI1sUNIYv84nM3reiirf0AuozG5ZzLCmn4Rw=";

  };

  minimalOCamlVersion = "4.07";



  buildFlags = [

    "all"

    "opt"

  ];

  src = fetchFromGitLab {

    owner = "irill";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-E4KXKnso/Q3ZwcYpKPgvswNR9qd/lafKljPMxfStedM=";

  };



  nativeBuildInputs = [

    findlib

    ocaml

    ocamlbuild

    pkg-config

    perl

  ];

  buildInputs = [

    glib

    stdlib-shims

  ];

  propagatedBuildInputs = [

    extlib

  ];



  checkTarget = [

    "all"

    "test"

  ];

  checkInputs = [

    ounit

    ounit2

  ];

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



  preInstall = "mkdir -p $OCAMLFIND_DESTDIR";

  installFlags = [ "BINDIR=$(out)/bin" ];



  meta = with lib; {

    description = "A library for CUDF format";

    homepage = "https://www.mancoosi.org/cudf/";

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

+5 −15
Original line number Diff line number Diff line 
{ lib, buildDunePackage, fetchFromGitLab

, camlzip, ocamlgraph, parmap, re, stdlib-shims

, base64, bz2, extlib, cudf

, dpkg, git, ocaml, ounit, python39, python39Packages

, ocamlgraph, parmap, re, stdlib-shims

, base64, extlib, cudf

, ocaml, ounit

}:



buildDunePackage rec {
@@ -15,8 +15,7 @@ buildDunePackage rec { 
    sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE=";

  };



  minimalOCamlVersion = "4.03";

  useDune2 = true;

  minimalOCamlVersion = "4.07";



  buildInputs = [

    parmap
@@ -24,8 +23,6 @@ buildDunePackage rec { 


  propagatedBuildInputs = [

    base64

    bz2

    camlzip

    cudf

    extlib

    ocamlgraph
@@ -33,17 +30,10 @@ buildDunePackage rec { 
    stdlib-shims

  ];



  nativeCheckInputs = [

    python39                  # Replaces: conf-python-3

    python39Packages.pyyaml   # Replaces: conf-python3-yaml

    git

  ];

  checkInputs = [

    dpkg                      # Replaces: conf-dpkg

    ounit

  ];

  doCheck = false; # Tests are failing.

                   # To enable tests use: lib.versionAtLeast ocaml.version "4.04";

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



  meta = with lib; {

    description = "Dose library (part of Mancoosi tools)";

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

+7 −5
Original line number Diff line number Diff line 
{ lib, fetchurl, buildDunePackage, dune-configurator }:

{ lib, fetchFromGitHub, buildDunePackage, dune-configurator }:



buildDunePackage rec {

  pname = "parmap";

  version = "1.2.4";

  version = "1.2.5";



  src = fetchurl {

    url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz";

    sha256 = "sha256-BTkSEjIK3CVNloJACFo6eQ6Ob9o/cdrA9xuv87NKas4=";

  src = fetchFromGitHub {

    owner = "rdicosmo";

    repo = pname;

    rev = version;

    hash = "sha256-tBu7TGtDOe5FbxLZuz6nl+65aN9FHIngq/O4dJWzr3Q=";

  };



  minimalOCamlVersion = "4.03";