From e476434fb8e14f74c339f094ad6a810e9fc0f89c Mon Sep 17 00:00:00 2001
From: Florent Hivert <Florent.Hivert@lri.fr>
Date: Fri, 19 Jan 2024 19:33:22 +0100
Subject: [PATCH] Tentative Nix FIX

---
 .nix/config.nix                         | 11 +++--
 .nix/coq-overlays/coq-combi/default.nix | 65 -------------------------
 2 files changed, 7 insertions(+), 69 deletions(-)
 delete mode 100644 .nix/coq-overlays/coq-combi/default.nix

diff --git a/.nix/config.nix b/.nix/config.nix
index 626a33d..f112d20 100644
--- a/.nix/config.nix
+++ b/.nix/config.nix
@@ -7,7 +7,7 @@
   ## The attribute to build from the local sources,
   ## either using nixpkgs data or the overlays located in `.nix/coq-overlays`
   ## Will determine the default main-job of the bundles defined below
-  attribute = "coq-combi";
+  attribute = "Coq-Combi";
 
   ## If you want to select a different attribute (to build from the local sources as well)
   ## when calling `nix-shell` and `nix-build` without the `--argstr job` argument
@@ -31,17 +31,18 @@
 
   ## select an entry to build in the following `bundles` set
   ## defaults to "default"
-  default-bundle = "8.15";
+  default-bundle = "8.18";
 
   ## write one `bundles.name` attribute set per
   ## alternative configuration
   ## When generating GitHub Action CI, one workflow file
   ## will be created per bundle
-  bundles."8.15" = {
+  bundles."8.18" = {
 
     ## You can override Coq and other Coq coqPackages
     ## through the following attribute
-    coqPackages.coq.override.version = "8.15";
+    # coqPackages.coq.override.version = "8.11";
+    coqPackages.coq.override.version = "8.18";
 
     ## In some cases, light overrides are not available/enough
     ## in which case you can use either
@@ -77,6 +78,8 @@
     ## via the command genNixActions only if it is a dependency or a
     ## reverse dependency of a job flagged as "main-job" (see above).
 
+    ## Run on push on following branches (default [ "master" ])
+    # push-branches = [ "master" "branch2" ];
   };
 
   ## Cachix caches to use in CI
diff --git a/.nix/coq-overlays/coq-combi/default.nix b/.nix/coq-overlays/coq-combi/default.nix
deleted file mode 100644
index ed6616a..0000000
--- a/.nix/coq-overlays/coq-combi/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-## File initially generated by createOverlay
-## and then supposedly modified manually.
-## Some hints for manual modifications are in the file,
-## but the full doc is on nixos / nix packages website:
-## https://nixos.org/manual/nixpkgs/stable/#sec-language-coq
-
-{ lib, mkCoqDerivation, which, coq
-  , mathcomp-ssreflect, mathcomp-fingroup
-  , mathcomp-algebra, multinomials
-  , mathcomp-character, mathcomp-field
-  ## declare extra dependencies here, to be used in propagateBuildInputs e.g.
-  # , mathcomp, coq-elpi
-  , version ? null }:
-
-with lib; mkCoqDerivation {
-  pname = "coq-combi";
-  ## you can configure the domain, owner and repository, the default are:
-  # repo = "coq-combi";
-  # owner = "coq-community";
-  # domain = "github.com";
-
-  inherit version;
-## The `defaultVersion` attribute is important for nixpkgs but can be kept unchanged
-## for local usage since it will be ignored locally if
-## - this derivation corresponds to the main attribute,
-## - or its version is overridden (by a branch, PR, url or path) in `.nix/config.nix`.
-  defaultVersion = with versions; switch coq.coq-version [
-    ## Example of possible dependencies
-    # { case = range "8.13" "8.14"; out = "1.2.0"; }
-    ## other predicates are `isLe v`, `isLt v`, `isGe v`, `isGt v`, `isEq v` etc
-  ] null;
-
-  ## Declare existing releases
-  ## leave sha256 empty at first and then copy paste
-  ## the resulting sha given by the error message
-  # release."1.1.1".sha256 = "";
-  ## if the tag is not exactly the version number you can amend like this
-  # release."1.1.1".rev = "v1.1.1";
-  ## if a consistent scheme gives the tag from the release number, you can do like this:
-  # releaseRev = v: "v${v}";
-
-  ## Add dependencies in here. In particular you can add
-  ## - arbitrary nix packages (you need to require them at the beginning of the file)
-  ## - Coq packages (require them at the beginning of the file)
-  ## - OCaml packages (use `coq.ocamlPackages.xxx`, no need to require them at the beginning of the file)
-  propagatedBuildInputs =
-    [ mathcomp-ssreflect mathcomp-fingroup mathcomp-algebra multinomials
-      mathcomp-character mathcomp-field];
-
-  ## Does the package contain OCaml code?
-  # mlPlugin = false;
-
-  ## Give some meta data
-  ## This is needed for submitting the package to nixpkgs but not required for local use.
-  meta = {
-    ## Describe your package in one sentence
-    # description = "";
-    ## Kindly ask one of these people if they want to be an official maintainer.
-    ## (You might also consider adding yourself to the list of maintainers)
-    # maintainers = with maintainers; [ cohencyril siraben vbgl Zimmi48 ];
-    ## Pick a license from
-    ## https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix
-    # license = licenses.mit;
-  };
-}