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

Commits on Oct 24, 2018

  1. coqPackages.category-theory: fix build

    @vbgl
    vbgl committed Oct 24, 2018
    Copy the full SHA
    ab95faa View commit details
Showing with 19 additions and 15 deletions.
  1. +19 −15 pkgs/development/coq-modules/category-theory/default.nix
34 changes: 19 additions & 15 deletions pkgs/development/coq-modules/category-theory/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
{ stdenv, fetchgit, coq, ssreflect }:
{ stdenv, fetchgit, coq, ssreflect, equations }:

let param =
{
"8.6" = {
let
params =
let
v20180709 = {
version = "20180709";
rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
};

"8.7" = {
version = "20180709";
rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
v20181016 = {
version = "20181016";
rev = "8049479c5aee00ed0b92e5edc7c8996aebf48208";
sha256 = "14f9rlwh8vgmcl6njykvsiwxx0jn623375afixk26mzpy12zdcph";
};

}."${coq.coq-version}"
; in
in {
"8.6" = v20180709;
"8.7" = v20180709;
"8.8" = v20181016;
};
param = params."${coq.coq-version}";
in

stdenv.mkDerivation rec {

@@ -26,8 +30,8 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};

buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
propagatedBuildInputs = [ coq ssreflect ];
buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]);
propagatedBuildInputs = [ ssreflect equations ];

enableParallelBuilding = false;

@@ -43,7 +47,7 @@ stdenv.mkDerivation rec {
};

passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
compatibleCoqVersions = v: builtins.hasAttr v params;
};

}