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: 8b0beaedd2ef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7044058ef779
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 24, 2019

  1. Verified

    This commit was signed with the committer’s verified signature.
    delroth Pierre Bourdon
    Copy the full SHA
    7044058 View commit details
Showing with 12 additions and 4 deletions.
  1. +12 −4 pkgs/development/coq-modules/ltac2/default.nix
16 changes: 12 additions & 4 deletions pkgs/development/coq-modules/ltac2/default.nix
Original file line number Diff line number Diff line change
@@ -11,11 +11,16 @@ let params = {
rev = "0.1";
sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7";
};
"8.9" = {
version = "0.1";
rev = "a69551a49543b22a7d4e6a2484356b56bd05068e";
"8.9" = rec {
version = "0.2";
rev = version;
sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73";
};
"8.10" = rec {
version = "0.3";
rev = version;
sha256 = "0pzs5nsakh4l8ffwgn4ryxbnxdv2x0r1i7bc598ij621haxdirrr";
};
};
param = params.${coq.coq-version};
in
@@ -31,7 +36,10 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ which ];
buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib ])
++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10")
coq.ocamlPackages.camlp5
;

installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";