philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #142071 from Zimmi48/hydras-0.5

conduit-nginx
Ben Siraphob 2021-10-21 01:27:10 -05:00 committed by GitHub
parent 3897b34444 8797af5eb7
commit 01d46974a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/coq-modules/addition-chains/default.nix
View File

@ -6,12 +6,14 @@ mkCoqDerivation {
pname = "addition-chains";
repo = "hydra-battles";
release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "0.4"; }
{ case = range "8.13" "8.14"; out = "0.5"; }
{ case = range "8.11" "8.12"; out = "0.4"; }
] null;
propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra paramcoq ];

33
pkgs/development/coq-modules/gaia-hydras/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, mkCoqDerivation, coq, hydra-battles, gaia, mathcomp-zify, version ? null }:
with lib; mkCoqDerivation rec {
pname = "gaia-hydras";
repo = "hydra-battles";
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.14"; out = "0.5"; }
] null;
propagatedBuildInputs = [
hydra-battles
gaia
mathcomp-zify
];
useDune2 = true;
meta = {
description = "Comparison between ordinals in Gaia and Hydra battles";
longDescription = ''
The Gaia and Hydra battles projects develop different notions of ordinals.
This development bridges the different notions.
'';
maintainers = with maintainers; [ Zimmi48 ];
license = licenses.mit;
platforms = platforms.unix;
};
}

6
pkgs/development/coq-modules/hydra-battles/default.nix
View File

@ -5,12 +5,14 @@ mkCoqDerivation {
pname = "hydra-battles";
owner = "coq-community";
release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "0.4"; }
{ case = range "8.13" "8.14"; out = "0.5"; }
{ case = range "8.11" "8.12"; out = "0.4"; }
] null;
propagatedBuildInputs = [ equations ];

1
pkgs/top-level/coq-packages.nix
View File

@ -43,6 +43,7 @@ let
flocq = callPackage ../development/coq-modules/flocq {};
fourcolor = callPackage ../development/coq-modules/fourcolor {};
gaia = callPackage ../development/coq-modules/gaia {};
gaia-hydras = callPackage ../development/coq-modules/gaia-hydras {};
gappalib = callPackage ../development/coq-modules/gappalib {};
goedel = callPackage ../development/coq-modules/goedel {};
graph-theory = callPackage ../development/coq-modules/graph-theory {};