Commit 0ddb075c authored by Pierre Roux's avatar Pierre Roux Committed by Vincent Laporte
Browse files

coqPackages.*: fix formatting

parent 46968b2c
Loading
Loading
Loading
Loading
+6 −13
Original line number Diff line number Diff line
@@ -13,20 +13,13 @@
  inherit version;
  defaultVersion =
    with lib.versions;
    lib.switch coq.coq-version [
      {
        case = range "9.0" "9.0";
        out = "9.0.0+rocq${coq.coq-version}";
      }
      {
        case = range "8.13" "8.20";
        out = "9.0.0+coq${coq.coq-version}";
      }
      {
        case = range "8.6" "8.17";
        out = "${coq.coq-version}.0";
    lib.switch coq.coq-version (lib.lists.sort (x: y: isLe x.out y.out) (
      lib.mapAttrsToList (out: case: { inherit case out; }) {
        "9.0.0+rocq${coq.coq-version}" = range "9.0" "9.0";
        "9.0.0+coq${coq.coq-version}" = range "8.13" "8.20";
        "${coq.coq-version}.0" = range "8.6" "8.17";
      }
    ] null;
    )) null;

  release."9.0.0+rocq9.0".sha256 = "sha256-ctnwpyNVhryEUA5YEsAImrcJsNMhtBgDSOz+z5Z4R78=";
  release."9.0.0+coq8.20".sha256 = "sha256-pkvyDaMXRalc6Uu1eBTuiqTpRauRrzu946c6TavyTKY=";
+30 −92
Original line number Diff line number Diff line
@@ -14,52 +14,20 @@ let
    if elpi-version != null then
      elpi-version
    else
      (lib.switch coq.coq-version [
        {
          case = "8.11";
          out = "1.11.4";
        }
        {
          case = "8.12";
          out = "1.12.0";
        }
        {
          case = "8.13";
          out = "1.13.7";
        }
        {
          case = "8.14";
          out = "1.13.7";
        }
        {
          case = "8.15";
          out = "1.15.0";
        }
        {
          case = "8.16";
          out = "1.17.0";
        }
        {
          case = "8.17";
          out = "1.17.0";
        }
        {
          case = "8.18";
          out = "1.18.1";
        }
        {
          case = "8.19";
          out = "1.18.1";
        }
        {
          case = "8.20";
          out = "2.0.7";
        }
        {
          case = "9.0";
          out = "2.0.7";
        }
      ] { });
      (
        with lib.versions;
        lib.switch coq.coq-version (lib.lists.sort (x: y: lib.versions.isLe x.out y.out) (
          lib.mapAttrsToList (out: case: { inherit case out; }) {
            "1.11.4" = "8.11";
            "1.12.0" = "8.12";
            "1.13.7" = range "8.13" "8.14";
            "1.15.0" = "8.15";
            "1.17.0" = range "8.16" "8.17";
            "1.18.1" = range "8.18" "8.19";
            "2.0.7" = range "8.20" "9.0";
          }
        )) { }
      );
  elpi = coq.ocamlPackages.elpi.override { version = default-elpi-version; };
  propagatedBuildInputs_wo_elpi = [
    coq.ocamlPackages.findlib
@@ -69,52 +37,22 @@ let
    repo = "coq-elpi";
    owner = "LPCIC";
    inherit version;
    defaultVersion = lib.switch coq.coq-version [
      {
        case = "9.0";
        out = "2.5.2";
      }
      {
        case = "8.20";
        out = "2.5.2";
      }
      {
        case = "8.19";
        out = "2.0.1";
      }
      {
        case = "8.18";
        out = "2.0.0";
      }
      {
        case = "8.17";
        out = "1.18.0";
      }
      {
        case = "8.16";
        out = "1.15.6";
      }
      {
        case = "8.15";
        out = "1.14.0";
      }
      {
        case = "8.14";
        out = "1.11.2";
      }
      {
        case = "8.13";
        out = "1.11.1";
      }
      {
        case = "8.12";
        out = "1.8.3_8.12";
      }
      {
        case = "8.11";
        out = "1.6.3_8.11";
      }
    ] null;
    defaultVersion =
      with lib.versions;
      lib.switch coq.coq-version (lib.lists.sort (x: y: lib.versions.isLe x.out y.out) (
        lib.mapAttrsToList (out: case: { inherit case out; }) {
          "2.5.2" = range "8.20" "9.0";
          "2.0.1" = "8.19";
          "2.0.0" = "8.18";
          "1.18.0" = "8.17";
          "1.15.6" = "8.16";
          "1.14.0" = "8.15";
          "1.11.2" = "8.14";
          "1.11.1" = "8.13";
          "1.8.3_8.12" = "8.12";
          "1.6.3_8.11" = "8.11";
        }
      )) null;
    release."2.5.2".sha256 = "sha256-lLzjPrbVB3rrqox528YiheUb0u89R84Xmrgkn0oplOs=";
    release."2.5.0".sha256 = "sha256-Z5xjO83X/ZoTQlWnVupGXPH3HuJefr57Kv128I0dltg=";
    release."2.4.0".sha256 = "sha256-W2+vVGExLLux8e0nSZESSoMVvrLxhL6dmXkb+JuKiqc=";
+20 −75
Original line number Diff line number Diff line
@@ -18,81 +18,26 @@ let
    inherit version;
    defaultVersion =
      with lib.versions;
      lib.switch
        [ coq.version mathcomp.version ]
        [
          {
            cases = [
              (range "8.20" "9.0")
              (isGe "2.3.0")
            ];
            out = "2.1.0";
          }
          {
            cases = [
              (range "8.16" "8.20")
              (isGe "2.1.0")
            ];
            out = "2.0.3";
          }
          {
            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.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.10" "8.15")
              (range "1.12.0" "1.18.0")
            ];
            out = "1.1.0";
          }
          {
            cases = [
              (isGe "8.10")
              (range "1.11.0" "1.12.0")
            ];
            out = "1.0.5";
          }
          {
            cases = [
              (isGe "8.7")
              "1.11.0"
            ];
            out = "1.0.4";
          }
          {
            cases = [
              (isGe "8.7")
              "1.10.0"
      let
        cmc = c: mc: [
          c
          mc
        ];
            out = "1.0.3";
      in
      lib.switch [ coq.coq-version mathcomp.version ] (lib.lists.sort (x: y: isLe x.out y.out) (
        lib.mapAttrsToList (out: cases: { inherit cases out; }) {
          "2.1.0" = cmc (range "8.20" "9.0") (isGe "2.3.0");
          "2.0.3" = cmc (range "8.16" "8.20") (isGe "2.1.0");
          "2.0.1" = cmc (range "8.16" "8.20") (isGe "2.0.0");
          "2.0.0" = cmc (range "8.16" "8.17") (isGe "2.0.0");
          "1.1.3" = cmc (range "8.15" "8.18") (range "1.15.0" "1.18.0");
          "1.1.1" = cmc (range "8.13" "8.17") (range "1.13.0" "1.18.0");
          "1.1.0" = cmc (range "8.10" "8.15") (range "1.12.0" "1.18.0");
          "1.0.5" = cmc (isGe "8.10") (range "1.11.0" "1.12.0");
          "1.0.4" = cmc (isGe "8.7") "1.11.0";
          "1.0.3" = cmc (isGe "8.7") "1.10.0";
        }
        ]
        null;
      )) null;

    release."2.1.0".sha256 = "sha256-UoDxy2BKraDyRsO42GXRo26O74OF51biZQGkIMWLf8Y=";
    release."2.0.3".sha256 = "sha256-5lDq7IWlEW0EkNzYPu+dA6KOvRgy53W/alikpDr/Kd0=";
+10 −29
Original line number Diff line number Diff line
@@ -15,36 +15,17 @@ mkCoqDerivation {
  inherit version;
  defaultVersion =
    with lib.versions;
    lib.switch coq.coq-version [
      {
        case = range "8.12" "9.0";
        out = "3.4.3";
      }
      {
        case = range "8.12" "8.20";
        out = "3.4.2";
      }
      {
        case = range "8.12" "8.18";
        out = "3.4.0";
      }
      {
        case = range "8.12" "8.17";
        out = "3.3.0";
      }
      {
        case = range "8.8" "8.16";
        out = "3.2.0";
      }
      {
        case = range "8.8" "8.13";
        out = "3.1.0";
      }
      {
        case = range "8.5" "8.9";
        out = "3.0.2";
      }
    ] null;
    lib.switch coq.coq-version (lib.lists.sort (x: y: isLe x.out y.out) (
      lib.mapAttrsToList (out: case: { inherit case out; }) {
        "3.4.3" = range "8.12" "9.0";
        "3.4.2" = range "8.12" "8.20";
        "3.4.0" = range "8.12" "8.18";
        "3.3.0" = range "8.12" "8.17";
        "3.2.0" = range "8.8" "8.16";
        "3.1.0" = range "8.8" "8.13";
        "3.0.2" = range "8.5" "8.9";
      }
    )) null;
  release."3.4.3".sha256 = "sha256-bzzAIENU2OYTtmdBU9Xw8zyBvz9vqTiqjWSm7RnXXRA=";
  release."3.4.2".sha256 = "sha256-aBTF8ZKu67Rb3ryCqFyejUXf/65KgG8i5je/ZMFSrj4=";
  release."3.4.1".sha256 = "sha256-REhvIBl3EaL8CQqI34Gn7Xjf9NhPI3nrUAO26pSLbm0=";
+14 −33
Original line number Diff line number Diff line
@@ -14,39 +14,20 @@ mkCoqDerivation {
  inherit version;
  defaultVersion =
    with lib.versions;
    lib.switch
      [ coq.coq-version ssreflect.version ]
      [
        {
          cases = [
            (range "8.17" "9.0")
            (range "2.0.0" "2.4.0")
          ];
          out = "0.2.2";
        }
        {
          cases = [
            (range "8.17" "9.0")
            (range "2.0.0" "2.3.0")
          ];
          out = "0.2.1";
        }
        {
          cases = [
            (range "8.17" "8.20")
            (range "2.0.0" "2.2.0")
          ];
          out = "0.2.0";
        }
        {
          cases = [
            (range "8.11" "8.20")
            (isLe "2.0.0")
    let
      cmc = c: mc: [
        c
        mc
      ];
          out = "0.1.1";
    in
    lib.switch [ coq.coq-version ssreflect.version ] (lib.lists.sort (x: y: isLe x.out y.out) (
      lib.mapAttrsToList (out: cases: { inherit cases out; }) {
        "0.2.2" = cmc (range "8.17" "9.0") (range "2.0.0" "2.4.0");
        "0.2.1" = cmc (range "8.17" "9.0") (range "2.0.0" "2.3.0");
        "0.2.0" = cmc (range "8.17" "8.20") (range "2.0.0" "2.2.0");
        "0.1.1" = cmc (range "8.11" "8.20") (isLe "2.0.0");
      }
      ]
      null;
    )) null;

  releaseRev = v: "v${v}";

Loading