From d8912db092aca760bbfcb31a9a51c0b12112ac7d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 28 Feb 2015 16:48:16 +0100
Subject: [PATCH] ocsigen-deriving: update from 0.6.2 to 0.7
---
.../ocsigen-deriving/default.nix | 25 ++++++++-----------
pkgs/top-level/all-packages.nix | 4 ++-
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
index 544d85c6f5fc..89efb58ecbb5 100644
--- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -1,30 +1,25 @@
-{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp, camlp4}:
+{ stdenv, fetchzip, ocaml, findlib, oasis, ocaml_optcomp, camlp4 }:
+
+let version = "0.7"; in
stdenv.mkDerivation {
- name = "ocsigen-deriving";
- src = fetchgit {
- url = "git://github.com/ocsigen/deriving";
- rev = "refs/tags/0.6.2";
- sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662";
+ name = "ocsigen-deriving-${version}";
+ src = fetchzip {
+ url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";
+ sha256 = "05z606gly1iyan292x3mflg3zasgg68n8i2mivz0zbshx2hz2jbw";
};
- buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp camlp4];
-
- configurePhase = ''
- make setup-dev.exe
- ./setup-dev.exe -configure --prefix $out
- '';
+ buildInputs = [ ocaml findlib oasis ocaml_optcomp camlp4 ];
createFindlibDestdir = true;
-
meta = {
homepage = https://github.com/ocsigen/deriving;
description = "Extension to OCaml for deriving functions from type declarations";
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms;
- maintainers = [
- stdenv.lib.maintainers.gal_bolle
+ maintainers = with stdenv.lib.maintainers; [
+ gal_bolle vbgl
];
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6018d647d53f..aa0b0d32fb8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4103,7 +4103,9 @@ let
zed = callPackage ../development/ocaml-modules/zed { };
- ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { };
+ ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving {
+ oasis = ocaml_oasis;
+ };
};