From 1932f502892d03e7b4a2373606b63c923c249e28 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 14 Oct 2024 14:03:57 +0200 Subject: [PATCH 1/3] Fixing coqPackages_8_19.coq-elpi Was missing the elpi version --- pkgs/development/coq-modules/coq-elpi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index c9db564c1941..eacafcbe3809 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -10,6 +10,7 @@ let { case = "8.16"; out = { version = "1.17.0"; };} { case = "8.17"; out = { version = "1.17.0"; };} { 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 { From 320c35c793f494a8bfbe9633d777a3f6a043cf1b Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 14 Oct 2024 13:26:05 +0200 Subject: [PATCH 2/3] coqPackages.parsec: 0.1.2 -> 0.2.0 --- pkgs/development/coq-modules/parsec/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index 9b5d827eecd5..292e7e369b61 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -11,14 +11,18 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.14" "8.20"; out = "0.2.0"; } { case = range "8.14" "8.20"; out = "0.1.2"; } { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; + release."0.2.0".sha256 = "sha256-hM6LVFQ2VQ42QeHu8Ex+oz1VvJUr+g8/nZN+bYHEljQ="; release."0.1.2".sha256 = "sha256-QN0h1CsX86DQBDsluXLtNUvMh3r60/0iDSbYam67AhA="; release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189"; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; + useDuneifVersion = v: lib.versions.isGe "0.2.0" v || v == "dev"; + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.bsd3; From 0231e3b87721952176049a747b9b4d3c5e716428 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 14 Oct 2024 13:38:05 +0200 Subject: [PATCH 3/3] coqPackages.json: 0.1.3 -> 0.2.0 --- pkgs/development/coq-modules/json/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/json/default.nix b/pkgs/development/coq-modules/json/default.nix index 6638c8b211db..f30c238aafd0 100644 --- a/pkgs/development/coq-modules/json/default.nix +++ b/pkgs/development/coq-modules/json/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, parsec, MenhirLib, version ? null }: -mkCoqDerivation { +(mkCoqDerivation { pname = "json"; owner = "liyishuai"; repo = "coq-json"; @@ -8,19 +8,23 @@ mkCoqDerivation { defaultVersion = let inherit (lib.versions) range; in lib.switch coq.coq-version [ + { case = range "8.14" "8.20"; out = "0.2.0"; } { case = range "8.14" "8.20"; out = "0.1.3"; } ] null; release = { + "0.2.0".sha256 = "sha256-qDRTgWLUvu4x3/d3BDcqo2I4W5ZmLyRiwuY/Tm/FuKA="; "0.1.3".sha256 = "sha256-lElAzW4IuX+BB6ngDjlyKn0MytLRfbhQanB+Lct/WR0="; }; releaseRev = v: "v${v}"; propagatedBuildInputs = [ parsec MenhirLib coq.ocamlPackages.menhir ]; - buildFlags = [ "MENHIRFLAGS=--coq" "MENHIRFLAGS+=--coq-no-version-check" ]; + useDuneifVersion = v: lib.versions.isGe "0.2.0" v || v == "dev"; meta = { description = "From JSON to Coq, and vice versa."; license = lib.licenses.bsd3; }; -} +}).overrideAttrs (o: lib.optionalAttrs (o.version != null + && lib.versions.isLt "0.2.0" o.version) + { buildFlags = [ "MENHIRFLAGS=--coq" "MENHIRFLAGS+=--coq-no-version-check" ]; })