diff options
author | Kim Lindberger <kim.lindberger@gmail.com> | 2020-05-10 21:24:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-10 21:24:18 +0200 |
commit | 7451f11730f1a7584fa26ba068548a2ce714056b (patch) | |
tree | 5734eb7c75be203869c8a2faed026b9c0f3a3ce5 | |
parent | 1013153a591f65436e3272c70f5dac515899f921 (diff) | |
download | nixlib-7451f11730f1a7584fa26ba068548a2ce714056b.tar nixlib-7451f11730f1a7584fa26ba068548a2ce714056b.tar.gz nixlib-7451f11730f1a7584fa26ba068548a2ce714056b.tar.bz2 nixlib-7451f11730f1a7584fa26ba068548a2ce714056b.tar.lz nixlib-7451f11730f1a7584fa26ba068548a2ce714056b.tar.xz nixlib-7451f11730f1a7584fa26ba068548a2ce714056b.tar.zst nixlib-7451f11730f1a7584fa26ba068548a2ce714056b.zip |
google-drive-ocamlfuse: 0.7.2 -> 0.7.21 (#86469)
ocamlPackages.ocamlfuse: 2.7.1_cvs5 -> 2.7.1_cvs6_e35e76b
-rw-r--r-- | pkgs/applications/networking/google-drive-ocamlfuse/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ocamlfuse/default.nix | 17 |
2 files changed, 13 insertions, 22 deletions
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 5465a27bbf2d..ac6ad4f22fe9 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchFromGitHub, zlib -, ocaml, dune, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: +{ stdenv, buildDunePackage, fetchFromGitHub +, ocamlfuse, gapi_ocaml, ocaml_sqlite3 +}: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "google-drive-ocamlfuse"; - version = "0.7.2"; + version = "0.7.21"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "1l6b4bs5x373pw210nl8xal03ns2ib1ls49y64s3lqjfh5wjmnjy"; + sha256 = "0by3qnjrr1mbxyl2n99zggx8dxnqlicsq2b2hhhxb2d0k8qn47sw"; }; - nativeBuildInputs = [ dune ]; - - buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ]; - - buildPhase = "jbuilder build @install"; - installPhase = "mkdir $out && dune install --prefix $out"; + buildInputs = [ ocamlfuse gapi_ocaml ocaml_sqlite3 ]; meta = { homepage = "http://gdfuse.forge.ocamlcore.org/"; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 90c449e383fd..dabe7ae52a3e 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: +{ stdenv, buildDunePackage, fetchFromGitHub, camlidl, fuse }: -stdenv.mkDerivation rec { +buildDunePackage { pname = "ocamlfuse"; - version = "2.7.1_cvs5"; + version = "2.7.1_cvs6_e35e76b"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; - rev = "v${version}"; - sha256 = "01ayw2hzpxan95kncbxh9isj9g149cs8scq3xim1vy8bz085wb0m"; + rev = "e35e76bee3b06806256b5bfca108b7697267cd5c"; + sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff"; }; - buildInputs = [ocaml findlib]; - propagatedBuildInputs = [camlidl fuse]; - configurePhase = '' ocaml setup.ml -configure --prefix $out ''; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; - createFindlibDestdir = true; + propagatedBuildInputs = [ camlidl fuse ]; meta = { homepage = "https://sourceforge.net/projects/ocamlfuse"; |