From 163ffe2fe41b9b0c757733388761c713e9457f39 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Thu, 11 Mar 2021 22:47:41 +0100 Subject: [PATCH] coqPackages.mathcomp-analysis: 0.3.1 -> 0.3.6 --- .../coq-modules/mathcomp-analysis/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 7d63c903795..003727c608f 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -1,17 +1,24 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, mathcomp-real-closed, - lib, version ? null }: + hierarchy-builder, lib, version ? null }: -with lib; mkCoqDerivation { +with lib; +let mca = mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "analysis"; owner = "math-comp"; + release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5"; + release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c"; + release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867"; release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.6"; } + { cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; } + { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } { cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } { cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; } ] null; @@ -25,4 +32,12 @@ with lib; mkCoqDerivation { maintainers = [ maintainers.cohencyril ]; license = licenses.cecill-c; }; -} +}; in +mca.overrideAttrs (o: + let ext = { propagatedBuildInputs = o.propagatedBuildInputs + ++ [ hierarchy-builder ]; }; + in with versions; switch o.version [ + {case = "dev"; out = ext;} + {case = isGe "0.3.4"; out = ext;} + ] {} +)