From 5a19bf03d9c765f9c26be917dd3644b42c6c0b44 Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Wed, 22 Jan 2020 01:40:11 -0600 Subject: [PATCH 1/4] add jpas to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2730218f48f7..13b6793c816b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3492,6 +3492,12 @@ github = "jorsn"; githubId = 4646725; }; + jpas = { + name = "Jarrod Pas"; + email = "jarrod@jarrodpas.com"; + github = "jpas"; + githubId = 5689724; + }; jpdoyle = { email = "joethedoyle@gmail.com"; github = "jpdoyle"; From 4339f5803d9e23280108046565483a35e8588442 Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Wed, 22 Jan 2020 01:40:33 -0600 Subject: [PATCH 2/4] coqPackages.CoLoR 1.4.0 -> 1.6.0 The package is now developed on GitHub, so fetchurl was replace with fetchFromGithub. --- pkgs/development/coq-modules/CoLoR/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 82c6e58a7b03..a14eafd7236d 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, coq, bignums }: +{ stdenv, fetchFromGitHub, coq, bignums }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-CoLoR-1.4.0"; + name = "coq${coq.coq-version}-CoLoR-1.6.0"; - 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"; + rev = "328aa06270584b578edc0d2925e773cced4f14c8"; + sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd"; }; buildInputs = [ coq bignums ]; @@ -15,14 +17,14 @@ stdenv.mkDerivation { make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install ''; - meta = with stdenv.lib; { + 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.elem v [ "8.6" "8.7" "8.8" "8.9" ]; }; } From bebbc486d01f9aa66e6505c0d3ba8f3505d78934 Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Sat, 25 Jan 2020 16:37:09 -0600 Subject: [PATCH 3/4] Keeps older CoLoR available for older Coq --- .../development/coq-modules/CoLoR/default.nix | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index a14eafd7236d..c4a02162fa78 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,13 +1,34 @@ { 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"; + }; + params = { + "1.4.0" = { + version = "1.4.0"; + rev = "168c6b86c7d3f87ee51791f795a8828b1521589a"; + sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm"; + }; + "1.6.0" = { + version = "1.6.0"; + rev = "328aa06270584b578edc0d2925e773cced4f14c8"; + sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd"; + }; + }; + param = params.${coqVersions.${coq.coq-version}}; +in + stdenv.mkDerivation { - name = "coq${coq.coq-version}-CoLoR-1.6.0"; + name = "coq${coq.coq-version}-CoLoR-${param.version}"; src = fetchFromGitHub { owner = "fblanqui"; repo = "color"; - rev = "328aa06270584b578edc0d2925e773cced4f14c8"; - sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd"; + inherit (param) rev sha256; }; buildInputs = [ coq bignums ]; @@ -17,7 +38,7 @@ stdenv.mkDerivation { make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install ''; - meta = with stdenv.lib ; { + 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; [ jpas jwiegley ]; @@ -25,6 +46,6 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: builtins.hasAttr v coqVersions; }; } From b25a192755a4429fc65fefb38f4ebd213971b361 Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Sun, 26 Jan 2020 09:37:22 -0600 Subject: [PATCH 4/4] coqPackages.CoLoR support for Coq 8.10 --- pkgs/development/coq-modules/CoLoR/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index c4a02162fa78..d145586af43b 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -6,6 +6,7 @@ let "8.7" = "1.4.0"; "8.8" = "1.6.0"; "8.9" = "1.6.0"; + "8.10" = "1.7.0"; }; params = { "1.4.0" = { @@ -18,6 +19,11 @@ let rev = "328aa06270584b578edc0d2925e773cced4f14c8"; sha256 = "07sy9kw1qlynsqy251adgi8b3hghrc9xxl2rid6c82mxfsp329sd"; }; + "1.7.0" = { + version = "1.7.0"; + rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40"; + sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3"; + }; }; param = params.${coqVersions.${coq.coq-version}}; in