Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 99ebf5ba5bfb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 15812e11364a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 1, 2020

  1. ocamlPackages.google-drive-ocamlfuse: disable for OCaml < 4.06

    @vbgl @ehmry
    vbgl authored and ehmry committed Nov 1, 2020
    Copy the full SHA
    86c6683 View commit details

  2. ocamlPackages.gapi_ocaml: 0.3.19 → 0.4.1

    @vbgl @ehmry
    vbgl authored and ehmry committed Nov 1, 2020
    Copy the full SHA
    15812e1 View commit details
Showing with 15 additions and 8 deletions.
  1. +2 −0 pkgs/applications/networking/google-drive-ocamlfuse/default.nix
  2. +13 −8 pkgs/development/ocaml-modules/gapi-ocaml/default.nix
2 changes: 2 additions & 0 deletions pkgs/applications/networking/google-drive-ocamlfuse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ buildDunePackage rec {

useDune2 = true;

minimumOCamlVersion = "4.06";

src = fetchFromGitHub {
owner = "astrada";
repo = "google-drive-ocamlfuse";
21 changes: 13 additions & 8 deletions pkgs/development/ocaml-modules/gapi-ocaml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
{ stdenv, fetchFromGitHub, buildDunePackage
, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm
{ lib, fetchFromGitHub, buildDunePackage, ocaml
, cryptokit, ocamlnet, ocurl, yojson
, ounit
}:

buildDunePackage rec {
pname = "gapi-ocaml";
version = "0.3.19";
version = "0.4.1";

useDune2 = true;

minimumOCamlVersion = "4.02";

src = fetchFromGitHub {
owner = "astrada";
repo = pname;
rev = "v${version}";
sha256 = "04arif1p1vj5yr24cwicj70b7yx17hrgf4pl47vqg8ngcrdh71v9";
sha256 = "0riax23grjnq9pczmp1yv02ji0svvs2kbiqskj6f6yjviamnpa31";
};

propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib ocamlnet yojson ];
buildInputs = [ xmlm ];
propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];

doCheck = lib.versionAtLeast ocaml.version "4.04";
checkInputs = [ ounit ];

meta = {
description = "OCaml client for google services";
homepage = "http://gapi-ocaml.forge.ocamlcore.org";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ bennofs ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bennofs ];
};
}