Merge pull request #63 from coq-community/v8.12+update-boilerplate

update meta.yml and regenerate files from templates, bump dune to 2.5
coq-community · Jul 26, 2020 · 4f8d29e · 4f8d29e
2 parents ba10dce + 3d8ca00
commit 4f8d29e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,10 @@ language: shell
 
 .nix: &NIX
   language: nix
-  nix: 2.3.5
+  install:
+  # for cachix we need travis to be a trusted nix user
+  - echo "trusted-users = $USER" | sudo tee -a /etc/nix/nix.conf
+  - sudo systemctl restart nix-daemon
   script:
   - nix-build --argstr coq-version-or-url "$COQ" --extra-substituters https://coq.cachix.org --trusted-public-keys "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= coq.cachix.org-1:5QW/wwEnD+l2jvN6QRbRRsa4hBHG3QiQQ26cxu1F5tI="
 
@@ -44,7 +47,7 @@ jobs:
 
   # Test supported versions of Coq via Nix
   - env:
-    - COQ=https://github.com/coq/coq-on-cachix/tarball/v8.12
+    - COQ=8.12
     <<: *NIX
 
   # Test supported versions of Coq via OPAM

diff --git a/coq-aac-tactics.opam b/coq-aac-tactics.opam
@@ -19,7 +19,7 @@ provided with the plugin."""
 build: ["dune" "build" "-p" name "-j" jobs]
 depends: [
   "ocaml" {>= "4.05.0"}
-  "dune" {>= "2.4"}
+  "dune" {>= "2.5"}
   "coq" {>= "8.12" & < "8.13~"}
 ]
 

diff --git a/dune-project b/dune-project
@@ -1,3 +1,3 @@
-(lang dune 2.4)
-(using coq 0.1)
+(lang dune 2.5)
+(using coq 0.2)
 (name coq-aac-tactics)
diff --git a/meta.yml b/meta.yml
@@ -55,7 +55,7 @@ supported_ocaml_versions:
     opam: '{>= "4.05.0"}'
 
 tested_coq_nix_versions:
-- version_or_url: https://github.com/coq/coq-on-cachix/tarball/v8.12
+- version_or_url: '8.12'
 
 tested_coq_opam_versions:
 - version: '8.12'