Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_deriving/files/
Date: Thu, 28 Sep 2017 08:08:22
Message-Id: 1506586091.5b14e0ecdf376d237c14d7c83ff2935f2cead796.aballier@gentoo
1 commit: 5b14e0ecdf376d237c14d7c83ff2935f2cead796
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Sep 27 18:34:21 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 28 08:08:11 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b14e0ec
7
8 dev-ml/ppx_deriving: remove unused patch
9
10 dev-ml/ppx_deriving/files/ocaml405.patch | 21 ---------------------
11 1 file changed, 21 deletions(-)
12
13 diff --git a/dev-ml/ppx_deriving/files/ocaml405.patch b/dev-ml/ppx_deriving/files/ocaml405.patch
14 deleted file mode 100644
15 index 6f0a5c56f46..00000000000
16 --- a/dev-ml/ppx_deriving/files/ocaml405.patch
17 +++ /dev/null
18 @@ -1,21 +0,0 @@
19 -Index: ppx_deriving-4.1/src/ppx_deriving.cppo.ml
20 -===================================================================
21 ---- ppx_deriving-4.1.orig/src/ppx_deriving.cppo.ml
22 -+++ ppx_deriving-4.1/src/ppx_deriving.cppo.ml
23 -@@ -310,6 +310,7 @@ let free_vars_in_core_type typ =
24 - List.map free_in xs |> List.concat
25 - | { ptyp_desc = Ptyp_alias (x, name) } -> [name] @ free_in x
26 - | { ptyp_desc = Ptyp_poly (bound, x) } ->
27 -+ let bound = List.map (fun x -> x.Location.txt) bound in
28 - List.filter (fun y -> not (List.mem y bound)) (free_in x)
29 - | { ptyp_desc = Ptyp_variant (rows, _, _) } ->
30 - List.map (
31 -@@ -401,7 +402,7 @@ let binop_reduce x a b =
32 - [%expr [%e x] [%e a] [%e b]]
33 -
34 - let strong_type_of_type ty =
35 -- let free_vars = free_vars_in_core_type ty in
36 -+ let free_vars = List.map Location.mknoloc (free_vars_in_core_type ty) in
37 - Typ.force_poly @@ Typ.poly free_vars ty
38 -
39 - let derive path pstr_loc item attributes fn arg =