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

Commits on Jan 22, 2020

  1. add jpas to maintainers

    @jpas
    jpas committed Jan 22, 2020
    Copy the full SHA
    5a19bf0 View commit details

  2. coqPackages.CoLoR 1.4.0 -> 1.6.0 

    The package is now developed on GitHub, so fetchurl was replace with
fetchFromGithub.
    @jpas
    jpas committed Jan 22, 2020
    Copy the full SHA
    4339f58 View commit details

Commits on Jan 25, 2020

  1. Keeps older CoLoR available for older Coq

    @jpas
    jpas committed Jan 25, 2020
    Copy the full SHA
    bebbc48 View commit details

Commits on Jan 26, 2020

  1. coqPackages.CoLoR support for Coq 8.10

    @jpas
    jpas committed Jan 26, 2020
    Copy the full SHA
    b25a192 View commit details

Commits on Jan 27, 2020

  1. Merge pull request #78253 from jpas/CoLoR-1.6.0 

    coqPackages.CoLoR: 1.4.0 -> 1.7.0
    @vbgl
    vbgl authored Jan 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e59dcf8 View commit details
Showing with 42 additions and 7 deletions.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +36 −7 pkgs/development/coq-modules/CoLoR/default.nix
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -3498,6 +3498,12 @@
github = "jorsn";
githubId = 4646725;
};
jpas = {
name = "Jarrod Pas";
email = "jarrod@jarrodpas.com";
github = "jpas";
githubId = 5689724;
};
jpdoyle = {
email = "joethedoyle@gmail.com";
github = "jpdoyle";
43 changes: 36 additions & 7 deletions pkgs/development/coq-modules/CoLoR/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,40 @@
{ stdenv, fetchurl, coq, bignums }:
{ stdenv, fetchFromGitHub, coq, bignums }:

let
coqVersions = {
"8.6" = "1.4.0";
"8.7" = "1.4.0";
"8.8" = "1.6.0";
"8.9" = "1.6.0";
"8.10" = "1.7.0";
};
params = {
"1.4.0" = {
version = "1.4.0";
rev = "168c6b86c7d3f87ee51791f795a8828b1521589a";
sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";
};
"1.6.0" = {
version = "1.6.0";
rev = "328aa06270584b578edc0d2925e773cced4f14c8";
sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd";
};
"1.7.0" = {
version = "1.7.0";
rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40";
sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3";
};
};
param = params.${coqVersions.${coq.coq-version}};
in

stdenv.mkDerivation {
name = "coq${coq.coq-version}-CoLoR-1.4.0";
name = "coq${coq.coq-version}-CoLoR-${param.version}";

src = fetchurl {
url = https://gforge.inria.fr/frs/download.php/file/37205/color.1.4.0.tar.gz;
sha256 = "1jsp9adsh7w59y41ihbwchryjhjpajgs9bhf8rnb4b3hzccqxgag";
src = fetchFromGitHub {
owner = "fblanqui";
repo = "color";
inherit (param) rev sha256;
};

buildInputs = [ coq bignums ];
@@ -18,11 +47,11 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = http://color.inria.fr/;
description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant.";
maintainers = with maintainers; [ jwiegley ];
maintainers = with maintainers; [ jpas jwiegley ];
platforms = coq.meta.platforms;
};

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