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: ff43f0a7b51a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2923bd5d0669
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 18, 2019

  1. coqPackages.coq-simple-io: 0.2 -> 1.0.0 

    coqPackages.QuickChick: 1.0.2 -> 20190311
    @vbgl
    vbgl committed Mar 18, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 916062A1C4748647
    Learn about vigilant mode
    Copy the full SHA
    2923bd5 View commit details
Showing with 10 additions and 8 deletions.
  1. +3 −3 pkgs/development/coq-modules/QuickChick/default.nix
  2. +7 −5 pkgs/development/coq-modules/simple-io/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/coq-modules/QuickChick/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
12 changes: 7 additions & 5 deletions pkgs/development/coq-modules/simple-io/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};

}