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

Merge pull request #281274 from vbgl/ocaml-gapi-ocaml-0.4.5 

ocamlPackages.gapi-ocaml: 0.4.4 → 0.4.5
parents 1e361026 515daaad

pkgs/applications/networking/google-drive-ocamlfuse/default.nix

+4 −5
Original line number Diff line number Diff line 
{ lib, buildDunePackage, fetchFromGitHub

{ lib, ocaml, buildDunePackage, fetchFromGitHub

, extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3

, tiny_httpd

, ounit2
@@ -6,17 +6,16 @@ 


buildDunePackage rec {

  pname = "google-drive-ocamlfuse";

  version = "0.7.30";

  duneVersion = "3";

  version = "0.7.31";



  src = fetchFromGitHub {

    owner = "astrada";

    repo = "google-drive-ocamlfuse";

    rev = "v${version}";

    sha256 = "sha256-DWG0nBiqeVHaYQfGzU43gGwL4m8X61x5/RT5jD4AwYA=";

    hash = "sha256-4Fs4e4rXSeumaMDXRqGLpPuFs6DC8dmkywGaBqR5sFA=";

  };



  doCheck = true;

  doCheck = lib.versionOlder ocaml.version "5.0";

  checkInputs = [ ounit2 ];



  buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];

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

+6 −5
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, buildDunePackage, ocaml

, cryptokit, ocamlnet, ocurl, yojson

, camlp-streams, cppo, cryptokit, ocurl, yojson

, ounit2

}:



buildDunePackage rec {

  pname = "gapi-ocaml";

  version = "0.4.4";

  duneVersion = "3";

  version = "0.4.5";



  minimalOCamlVersion = "4.08";
@@ -14,10 +13,12 @@ buildDunePackage rec { 
    owner = "astrada";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-+UNFW5tmIh5dVyTDEOfOmy1j+gV4P28jlnBTdpQNAjE=";

    hash = "sha256-qlQEE8l/H22bb1VcK9YehR+9L5XepMu8JY7OLw1OIXg=";

  };



  propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];

  nativeBuildInputs = [ cppo ];



  propagatedBuildInputs = [ camlp-streams cryptokit ocurl yojson ];



  doCheck = true;

  checkInputs = [ ounit2 ];

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -31716,7 +31716,7 @@ with pkgs; 














  gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };



























  inherit (ocaml-ng.ocamlPackages_4_12) google-drive-ocamlfuse;













  inherit (ocamlPackages) google-drive-ocamlfuse;





























  googler = callPackage ../applications/misc/googler {















    python = python3;