nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

coq-elpi: 2.0.1 -> 2.2.0 (#323590)

Browse Source 
elpi: 1.18.1 -> 1.19.2
This commit is contained in:
Pierre Roux 2024-07-01 08:04:15 +02:00 committed by GitHub
parent 2b753fb3c6
commit 383e9b5696
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/coq-modules/coq-elpi/default.nix
View File

@ -10,14 +10,15 @@ let
{ case = "8.16"; out = { version = "1.17.0"; };} { case = "8.16"; out = { version = "1.17.0"; };}
{ case = "8.17"; out = { version = "1.17.0"; };} { case = "8.17"; out = { version = "1.17.0"; };}
{ case = "8.18"; out = { version = "1.18.1"; };} { case = "8.18"; out = { version = "1.18.1"; };}
{ case = "8.19"; out = { version = "1.18.1"; };} { case = "8.20"; out = { version = "1.19.2"; };}
] {} ); ] {} );
in mkCoqDerivation { in (mkCoqDerivation {
pname = "elpi"; pname = "elpi";
repo = "coq-elpi"; repo = "coq-elpi";
owner = "LPCIC"; owner = "LPCIC";
inherit version; inherit version;
defaultVersion = lib.switch coq.coq-version [ defaultVersion = lib.switch coq.coq-version [
{ case = "8.20"; out = "2.2.0"; }
{ case = "8.19"; out = "2.0.1"; } { case = "8.19"; out = "2.0.1"; }
{ case = "8.18"; out = "2.0.0"; } { case = "8.18"; out = "2.0.0"; }
{ case = "8.17"; out = "1.18.0"; } { case = "8.17"; out = "1.18.0"; }
@ -28,6 +29,7 @@ in mkCoqDerivation {
{ case = "8.12"; out = "1.8.3_8.12"; } { case = "8.12"; out = "1.8.3_8.12"; }
{ case = "8.11"; out = "1.6.3_8.11"; } { case = "8.11"; out = "1.6.3_8.11"; }
] null; ] null;
release."2.2.0".sha256 = "sha256-rADEoqTXM7/TyYkUKsmCFfj6fjpWdnZEOK++5oLfC/I=";
release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc="; release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc=";
release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM="; release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM=";
release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ="; release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ=";
@ -67,6 +69,7 @@ in mkCoqDerivation {
buildFlags = [ "OCAMLWARN=" ]; buildFlags = [ "OCAMLWARN=" ];
mlPlugin = true; mlPlugin = true;
useDuneifVersion = v: lib.versions.isGe "2.2.0" v || v == "dev";
propagatedBuildInputs = [ coq.ocamlPackages.findlib elpi ]; propagatedBuildInputs = [ coq.ocamlPackages.findlib elpi ];
meta = { meta = {
@ -74,4 +77,9 @@ in mkCoqDerivation {
maintainers = [ lib.maintainers.cohencyril ]; maintainers = [ lib.maintainers.cohencyril ];
license = lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
}; };
} }).overrideAttrs (o:
lib.optionalAttrs (o.version != null
&& (o.version == "dev" || lib.versions.isGe "2.2.0" o.version))
{
propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.ppx_optcomp ];
})

2
pkgs/development/coq-modules/coqeal/default.nix
View File

@ -8,7 +8,7 @@
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "2.0.1"; } { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "2.0.1"; }
{ cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; }
{ cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; }
{ cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; } { cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; }

2
pkgs/development/coq-modules/deriving/default.nix
View File

@ -8,7 +8,7 @@ mkCoqDerivation {
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [
{ cases = [(range "8.17" "8.19") (isGe "2.0.0")] ; out = "0.2.0"; } { cases = [(range "8.17" "8.20") (isGe "2.0.0")] ; out = "0.2.0"; }
{ cases = [(range "8.11" "8.20") (isLe "2.0.0")] ; out = "0.1.1"; } { cases = [(range "8.11" "8.20") (isLe "2.0.0")] ; out = "0.1.1"; }
] null; ] null;

2
pkgs/development/coq-modules/extructures/default.nix
View File

@ -9,7 +9,7 @@
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [
{ cases = [(range "8.17" "8.19") (isGe "2.0.0") ]; out = "0.4.0"; } { cases = [(range "8.17" "8.20") (isGe "2.0.0") ]; out = "0.4.0"; }
{ cases = [(range "8.11" "8.20") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.20") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }
{ cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }

2
pkgs/development/coq-modules/graph-theory/default.nix
View File

@ -14,7 +14,7 @@ mkCoqDerivation {
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [
{ cases = [ (isGe "8.16") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; } { cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; }
{ cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0" ) ]; out = "0.9.3"; } { cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0" ) ]; out = "0.9.3"; }
{ cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; } { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; }
{ cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; } { cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; }

2
pkgs/development/coq-modules/hierarchy-builder/default.nix
View File

@ -5,7 +5,7 @@ let hb = mkCoqDerivation {
owner = "math-comp"; owner = "math-comp";
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [ defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.18" "8.19"; out = "1.7.0"; } { case = range "8.18" "8.20"; out = "1.7.0"; }
{ case = range "8.16" "8.18"; out = "1.6.0"; } { case = range "8.16" "8.18"; out = "1.6.0"; }
{ case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.18"; out = "1.5.0"; }
{ case = range "8.15" "8.17"; out = "1.4.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; }

2
pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix
View File

@ -9,7 +9,7 @@ mkCoqDerivation {
defaultVersion = with lib.versions; defaultVersion = with lib.versions;
lib.switch [ coq.coq-version mathcomp-algebra.version ] [ lib.switch [ coq.coq-version mathcomp-algebra.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "1.2.3"; } { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "1.2.3"; }
{ cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; } { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; }
{ cases = [ (range "8.16" "8.19") (isGe "1.15") ]; out = "1.1.1"; } { cases = [ (range "8.16" "8.19") (isGe "1.15") ]; out = "1.1.1"; }
{ cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; }

2
pkgs/development/coq-modules/mathcomp-analysis/default.nix
View File

@ -32,7 +32,7 @@ let
defaultVersion = let inherit (lib.versions) range; in defaultVersion = let inherit (lib.versions) range; in
lib.switch [ coq.version mathcomp.version ] [ lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.17" "8.19") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; } { cases = [ (range "8.17" "8.20") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; }
{ cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; } { cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; }
{ cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; }
{ cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; }

2
pkgs/development/coq-modules/mathcomp-finmap/default.nix
View File

@ -7,7 +7,7 @@ mkCoqDerivation {
owner = "math-comp"; owner = "math-comp";
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "2.1.0"; }
{ cases = [ (range "8.16" "8.18") (range "2.0" "2.1") ]; out = "2.0.0"; } { cases = [ (range "8.16" "8.18") (range "2.0" "2.1") ]; out = "2.0.0"; }
{ cases = [ (range "8.13" "8.20") (range "1.12" "1.19") ]; out = "1.5.2"; } { cases = [ (range "8.13" "8.20") (range "1.12" "1.19") ]; out = "1.5.2"; }
{ cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; }

2
pkgs/development/coq-modules/mathcomp-infotheo/default.nix
View File

@ -7,7 +7,7 @@
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [
{ cases = [ (isGe "8.17") (isGe "1.0") ]; out = "0.7.1"; } { cases = [ (range "8.17" "8.19") (isGe "1.0") ]; out = "0.7.1"; }
{ cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; } { cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; }
{ cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; } { cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; }
{ cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; }

4
pkgs/development/coq-modules/mathcomp-real-closed/default.nix
View File

@ -8,6 +8,7 @@ mkCoqDerivation {
owner = "math-comp"; owner = "math-comp";
inherit version; inherit version;
release = { release = {
"2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic=";
"2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8="; "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8=";
"1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4="; "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4=";
"1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7"; "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7";
@ -20,7 +21,8 @@ mkCoqDerivation {
}; };
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (isGe "8.17") (isGe "2.0.0") ]; out = "2.0.1"; }
{ cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "2.0.0"; }
{ cases = [ (range "8.13" "8.19") (range "1.13.0" "1.19.0") ]; out = "1.1.4"; } { cases = [ (range "8.13" "8.19") (range "1.13.0" "1.19.0") ]; out = "1.1.4"; }
{ cases = [ (isGe "8.13") (range "1.12.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.13") (range "1.12.0" "1.18.0") ]; out = "1.1.3"; }
{ cases = [ (isGe "8.10") (range "1.12.0" "1.18.0") ]; out = "1.1.2"; } { cases = [ (isGe "8.10") (range "1.12.0" "1.18.0") ]; out = "1.1.2"; }

2
pkgs/development/coq-modules/mathcomp-tarjan/default.nix
View File

@ -10,7 +10,7 @@ mkCoqDerivation {
inherit version; inherit version;
defaultVersion = with lib.versions; defaultVersion = with lib.versions;
lib.switch [ coq.version mathcomp-ssreflect.version ] [ lib.switch [ coq.version mathcomp-ssreflect.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.0.2"; } { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.0.2"; }
{ cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; } { cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; }
{ cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; }
] null; ] null;

2
pkgs/development/coq-modules/mathcomp-word/default.nix
View File

@ -29,7 +29,7 @@ mkCoqDerivation {
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.2"; } { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "3.2"; }
{ cases = [ (range "8.12" "8.20") (range "1.12" "1.19") ]; out = "2.4"; } { cases = [ (range "8.12" "8.20") (range "1.12" "1.19") ]; out = "2.4"; }
] null; ] null;

2
pkgs/development/coq-modules/mathcomp-zify/default.nix
View File

@ -9,7 +9,7 @@ mkCoqDerivation rec {
defaultVersion = with lib.versions; defaultVersion = with lib.versions;
lib.switch [ coq.coq-version mathcomp-algebra.version ] [ lib.switch [ coq.coq-version mathcomp-algebra.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; }
{ cases = [ (range "8.13" "8.20") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; } { cases = [ (range "8.13" "8.20") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; }
{ cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; }
] null; ] null;

2
pkgs/development/coq-modules/mathcomp/default.nix
View File

@ -23,7 +23,7 @@ let
{ case = range "8.19" "8.20"; out = "1.19.0"; } { case = range "8.19" "8.20"; out = "1.19.0"; }
{ case = range "8.17" "8.18"; out = "1.18.0"; } { case = range "8.17" "8.18"; out = "1.18.0"; }
{ case = range "8.15" "8.18"; out = "1.17.0"; } { case = range "8.15" "8.18"; out = "1.17.0"; }
{ case = range "8.16" "8.19"; out = "2.2.0"; } { case = range "8.16" "8.20"; out = "2.2.0"; }
{ case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.1.0"; }
{ case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; }
{ case = range "8.13" "8.18"; out = "1.16.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; }

2
pkgs/development/coq-modules/multinomials/default.nix
View File

@ -9,7 +9,7 @@
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.17" "8.19") (isGe "2.1.0") ]; out = "2.2.0"; } { cases = [ (range "8.17" "8.20") (isGe "2.1.0") ]; out = "2.2.0"; }
{ cases = [ (range "8.16" "8.18") "2.1.0" ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") "2.1.0" ]; out = "2.1.0"; }
{ cases = [ (range "8.16" "8.18") "2.0.0" ]; out = "2.0.0"; } { cases = [ (range "8.16" "8.18") "2.0.0" ]; out = "2.0.0"; }
{ cases = [ (isGe "8.15") (range "1.15.0" "1.19.0") ]; out = "1.6.0"; } { cases = [ (isGe "8.15") (range "1.15.0" "1.19.0") ]; out = "1.6.0"; }

1
pkgs/development/ocaml-modules/elpi/default.nix
View File

@ -16,6 +16,7 @@ let p5 = camlp5; in
let camlp5 = p5.override { legacy = true; }; in let camlp5 = p5.override { legacy = true; }; in
let fetched = coqPackages.metaFetch ({ let fetched = coqPackages.metaFetch ({
release."1.19.2".sha256 = "sha256-7VTUbsFVoNT6srLwcAn5WNSsWC7cVUdphKRWBHHiH5M=";
release."1.18.1".sha256 = "sha256-zgBJefQDe3JyCGbC0wvMcx/9iMVbftBJ43NPogkNeHY="; release."1.18.1".sha256 = "sha256-zgBJefQDe3JyCGbC0wvMcx/9iMVbftBJ43NPogkNeHY=";
release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w="; release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w=";
release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A=";