JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37385 from coreyoconnor/google-drive-ocamlfuse-update

Browse Source 
google-drive-ocamlfuse and gapi-ocaml update
This commit is contained in:
Jörg Thalheim 2018-03-20 00:17:43 +00:00 committed by GitHub
commit f71a636d3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/google-drive-ocamlfuse/default.nix
View File

@ -1,24 +1,23 @@
{ stdenv, fetchFromGitHub, zlib
, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
, ocaml, jbuilder, opam, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
stdenv.mkDerivation rec {
name = "google-drive-ocamlfuse-${version}";
version = "0.6.21";
version = "0.6.25";
src = fetchFromGitHub {
owner = "astrada";
repo = "google-drive-ocamlfuse";
rev = "v${version}";
sha256 = "14qvhz18pzxdgxk5vcs024ajbkxccfwc9p3z5r6vfkc9mm851v59";
sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp";
};
nativeBuildInputs = [ ocamlbuild ];
nativeBuildInputs = [ jbuilder opam ];
buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ];
configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
buildPhase = "jbuilder build @install";
installPhase = "mkdir $out && jbuilder install --prefix $out";
meta = {
homepage = http://gdfuse.forge.ocamlcore.org/;

13
pkgs/development/ocaml-modules/gapi-ocaml/default.nix
View File

@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
stdenv.mkDerivation rec {
name = "gapi-ocaml-${version}";
version = "0.3.4";
version = "0.3.6";
src = fetchFromGitHub {
owner = "astrada";
repo = "gapi-ocaml";
rev = "v${version}";
sha256 = "07p6p108fyf9xz54jbcld40k3r9zyybxmr5i3rrkhgwm8gb6sbhv";
sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4";
};
buildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ ocaml jbuilder findlib ];
propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
createFindlibDestdir = true;
meta = {