summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-09-04 11:00:56 +0200
committerVladimír Čunát <v@cunat.cz>2019-09-04 11:00:56 +0200
commit4aad2947f8d680f18e5b01e115cf8cff22186998 (patch)
treea7a3d020efc6ec7be822bc06e08eca3ac311c9e2 /pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
parent2c5835b09a1d4966756212902d36b1b8ab242da6 (diff)
parent1d8a3973f46a2d1360f855eaa0f3a19859771793 (diff)
downloadnixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar
nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.gz
nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.bz2
nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.lz
nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.xz
nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.zst
nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.zip
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules/ocplib-json-typed/default.nix')
-rw-r--r--pkgs/development/ocaml-modules/ocplib-json-typed/default.nix18
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
index cadb65bcbed..6a1b906d7f2 100644
--- a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocplib-endian, js_of_ocaml, uri }:
+{ lib, buildDunePackage, fetchFromGitHub, uri }:
 
-stdenv.mkDerivation rec {
-	name = "ocaml${ocaml.version}-ocplib-json-typed-${version}";
-	version = "0.5";
+buildDunePackage rec {
+	pname = "ocplib-json-typed";
+	version = "0.7.1";
 	src = fetchFromGitHub {
 		owner = "OCamlPro";
 		repo = "ocplib-json-typed";
 		rev = "v${version}";
-		sha256 = "02c600wm2wdpzb66pivxzwjhqa2dm7dqyfvw3mbvkv1g2jj7kn2q";
+		sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
 	};
 
-	buildInputs = [ ocaml findlib ocplib-endian js_of_ocaml ];
 	propagatedBuildInputs = [ uri ];
 
-	createFindlibDestdir = true;
-
 	meta = {
 		description = "A collection of type-aware JSON utilities for OCaml";
-		license = stdenv.lib.licenses.lgpl21;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		license = lib.licenses.lgpl21;
+		maintainers = [ lib.maintainers.vbgl ];
 		inherit (src.meta) homepage;
-		inherit (ocaml.meta) platforms;
 	};
 }