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: 4bfbcdbe817b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b58ada326aa6
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 6, 2019

  1. coqPackages.QuickChick: init at 1.1.0 for Coq 8.9 

    Removes QuickChick for Coq 8.7 as it is broken
(probably due to a too recent ssreflect).
    @vbgl
    vbgl committed Jun 6, 2019

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    281b265 View commit details

  2. coqPackages.simple-io: 1.0.0 -> 1.2.0

    @vbgl
    vbgl committed Jun 6, 2019
    Copy the full SHA
    7af3554 View commit details

Commits on Jun 13, 2019

  1. Merge pull request #62776 from vbgl/coq-simple-io-1.2.0 

    [coq] simple-io: 1.0.0 -> 1.2.0; QuickChick: init at 1.1.0 for Coq 8.9
    @vbgl
    vbgl authored Jun 13, 2019
    Copy the full SHA
    b58ada3 View commit details
Showing with 17 additions and 14 deletions.
  1. +15 −12 pkgs/development/coq-modules/QuickChick/default.nix
  2. +2 −2 pkgs/development/coq-modules/simple-io/default.nix
27 changes: 15 additions & 12 deletions pkgs/development/coq-modules/QuickChick/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,23 +14,23 @@ let params =
sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
};

"8.7" = {
version = "20171212";
rev = "195e550a1cf0810497734356437a1720ebb6d744";
sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1";
};
"8.8" = rec {
preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
version = "20190311";
rev = "22af9e9a223d0038f05638654422e637e863b355";
sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
buildInputs = with coq.ocamlPackages; [ ocamlbuild num ];
propagatedBuildInputs = [ coq-ext-lib simple-io ];
};

"8.9" = rec {
version = "1.1.0";
rev = "v${version}";
sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
};
};
param = params."${coq.coq-version}";
in

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

stdenv.mkDerivation rec {

name = "coq${coq.coq-version}-QuickChick-${param.version}";
@@ -41,16 +41,19 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};

preConfigure = stdenv.lib.optionalString recent
"substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";

buildInputs = [ coq ]
++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ])
++ (param.buildInputs or [])
++ stdenv.lib.optionals recent
(with coq.ocamlPackages; [ ocamlbuild num ])
;
propagatedBuildInputs = [ ssreflect ] ++ (param.propagatedBuildInputs or []);
propagatedBuildInputs = [ ssreflect ]
++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ];

enableParallelBuilding = false;

preConfigure = param.preConfigure or null;

installPhase = ''
make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
'';
4 changes: 2 additions & 2 deletions pkgs/development/coq-modules/simple-io/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, coq, coq-ext-lib }:

stdenv.mkDerivation rec {
version = "1.0.0";
version = "1.2.0";
name = "coq${coq.coq-version}-simple-io-${version}";
src = fetchFromGitHub {
owner = "Lysxia";
repo = "coq-simple-io";
rev = version;
sha256 = "06gnbl8chv6ig18rlxnp8gg0np6863kxd7j15h46q0v1cnpx84lp";
sha256 = "1im1vwp7l7ha8swnhgbih0qjg187n8yx14i003nf6yy7p0ryxc9m";
};

buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);