Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9f0f5392745f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60940d7dde0e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 5, 2020

  1. coqPackages.QuickChick: 1.2.0 → 1.2.1, 1.3.1

    @vbgl
    vbgl committed Jul 5, 2020
    Copy the full SHA
    60940d7 View commit details
Showing with 20 additions and 8 deletions.
  1. +20 −8 pkgs/development/coq-modules/QuickChick/default.nix
28 changes: 20 additions & 8 deletions pkgs/development/coq-modules/QuickChick/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,15 +27,23 @@ let params =
};

"8.10" = rec {
version = "1.2.0";
version = "1.2.1";
rev = "v${version}";
sha256 = "1xs4mr3rdb0g44736jb40k370hw3maxdk12jiq1w1dl3q5gfrhah";
sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46";
};

"8.11" = rec {
version = "1.3.1";
rev = "v${version}";
sha256 = "0cajan9w52faqrg42r9rxai4wzsggs86qar88w7lcb928jvcakml";
};
};
param = params.${coq.coq-version};
in

let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
let inherit (stdenv.lib) maintainers optional optionals versionAtLeast; in

let recent = versionAtLeast coq.coq-version "8.8"; in

stdenv.mkDerivation {

@@ -51,20 +59,24 @@ stdenv.mkDerivation {
"substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";

buildInputs = [ coq ]
++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ])
++ stdenv.lib.optionals recent
(with coq.ocamlPackages; [ ocamlbuild num ])
++ (with coq.ocamlPackages; [ ocaml findlib ])
++ optionals (recent && !versionAtLeast coq.coq-version "8.10")
(with coq.ocamlPackages; [ camlp5 ocamlbuild ])
++ optional recent coq.ocamlPackages.num
;
propagatedBuildInputs = [ ssreflect ]
++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ];
++ optionals recent [ coq-ext-lib simple-io ]
++ optional (versionAtLeast coq.coq-version "8.10")
coq.ocamlPackages.ocamlbuild
;

enableParallelBuilding = false;

installPhase = ''
make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
'';

meta = with stdenv.lib; {
meta = {
homepage = "https://github.com/QuickChick/QuickChick";
description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
maintainers = with maintainers; [ jwiegley ];