From 2923bd5d0669f1ec6ab03ddce052e9c5efb46d8f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 15 Mar 2019 14:12:42 +0000 Subject: [PATCH] coqPackages.coq-simple-io: 0.2 -> 1.0.0 coqPackages.QuickChick: 1.0.2 -> 20190311 --- pkgs/development/coq-modules/QuickChick/default.nix | 6 +++--- pkgs/development/coq-modules/simple-io/default.nix | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 96954eb43ace..ee1aeb1503e0 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -21,9 +21,9 @@ let params = }; "8.8" = rec { preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; - version = "1.0.2"; - rev = "v${version}"; - sha256 = "1mcbsp07ra3gdcmir36pf27ig3xv8nagyfp7w5pwqi4gj9w81ffn"; + version = "20190311"; + rev = "22af9e9a223d0038f05638654422e637e863b355"; + sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq"; buildInputs = with coq.ocamlPackages; [ ocamlbuild num ]; propagatedBuildInputs = [ coq-ext-lib simple-io ]; }; diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index b945e7c9a866..6ed343952f21 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub, coq }: +{ stdenv, fetchFromGitHub, coq, coq-ext-lib }: stdenv.mkDerivation rec { - version = "0.2"; + version = "1.0.0"; name = "coq${coq.coq-version}-simple-io-${version}"; src = fetchFromGitHub { owner = "Lysxia"; repo = "coq-simple-io"; rev = version; - sha256 = "1sbcf57gn134risiicpbxsf4kbzdq7klfn4vn8525kahlr82l65f"; + sha256 = "06gnbl8chv6ig18rlxnp8gg0np6863kxd7j15h46q0v1cnpx84lp"; }; buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]); - doCheck = !stdenv.lib.versionAtLeast coq.coq-version "8.9"; + propagatedBuildInputs = [ coq-ext-lib ]; + + doCheck = true; checkTarget = "test"; installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.7"; }; }