From 0fcc6ca51541223c799ea233aef1bccc80caf0cc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 20 Apr 2017 20:16:35 +0000 Subject: ocamlPackages.menhir: 20170101 -> 20170418 --- pkgs/development/ocaml-modules/menhir/default.nix | 4 ++-- pkgs/development/ocaml-modules/menhir/generic.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index e7e29c73a6b1..b02015e6d567 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170101" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170418" else "20140422" }@args: let sha256 = if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20170101" then "0ika46i9gn3sjvspa62fb5dnr20k783vg5fj30649q0ialv6yscr" + else if version == "20170418" then "0avxkighxfr9x3vh2dkc5r1k2w7q2dz005w7syyzr7qjybpavpii" else throw ("menhir: unknown version " ++ version); in diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index 9d4615a006b5..d52da82d6d76 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { and Yann Régis-Gianas. ''; license = with licenses; [ - qpl /* generator */ + (if versionAtLeast version "20170418" then gpl2 else qpl) /* generator */ lgpl2 /* library */ ]; platforms = ocaml.meta.platforms or []; -- cgit 1.4.1