From 3c5a9ba53eba0f09c26fa41c338faf929ed8aa33 Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Mon, 13 Jan 2020 20:00:55 +0100
Subject: [PATCH] upgrade to opam 2 package
---
Makefile | 10 ++--------
descr | 2 --
opam | 20 +++++++++++++-------
3 files changed, 15 insertions(+), 17 deletions(-)
delete mode 100644 descr
diff --git a/Makefile b/Makefile
index 474063da..8d615e4b 100644
--- a/Makefile
+++ b/Makefile
@@ -29,14 +29,8 @@ build-dep: build-dep/opam phony
@# that are incompatible with our build requirements.
@# To achieve this, we create a fake opam package that has our build-dependencies as
@# dependencies, but does not actually install anything itself.
- @echo "# Pinning build-dep package." && \
- if opam --version | grep "^1\." -q; then \
- BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')" && \
- opam pin add -k path $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE".dev build-dep && \
- opam reinstall $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE"; \
- else \
- opam install $(OPAMFLAGS) build-dep/; \
- fi
+ @echo "# Installing build-dep package."
+ @opam install $(OPAMFLAGS) build-dep/
# Some files that do *not* need to be forwarded to Makefile.coq
Makefile: ;
diff --git a/descr b/descr
deleted file mode 100644
index c5cec511..00000000
--- a/descr
+++ /dev/null
@@ -1,2 +0,0 @@
-A formal model of a Rust core langauge and type system, a logical relation for
-the type system, and safety proof for some Rust libraries.
diff --git a/opam b/opam
index 39c7f635..4b1891b8 100644
--- a/opam
+++ b/opam
@@ -1,15 +1,21 @@
-opam-version: "1.2"
+opam-version: "2.0"
name: "coq-lambda-rust"
-version: "dev"
maintainer: "Ralf Jung <jung@mpi-sws.org>"
authors: "The RustBelt Team"
license: "BSD"
-homepage: "http://plv.mpi-sws.org/rustbelt/"
+homepage: "https://plv.mpi-sws.org/rustbelt/"
bug-reports: "https://gitlab.mpi-sws.org/iris/lambda-rust/issues"
-dev-repo: "https://gitlab.mpi-sws.org/iris/lambda-rust.git"
-build: [make "-j%{jobs}%"]
-install: [make "install"]
-remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/lrust'" ]
+dev-repo: "git+https://gitlab.mpi-sws.org/iris/lambda-rust.git"
+
+synopsis: "LambdaRust Coq formalization"
+description: """
+A formal model of a Rust core langauge and type system, a logical relation for
+the type system, and safety proof for some Rust libraries.
+"""
+
depends: [
"coq-iris" { (= "dev.2019-12-13.0.335ff6d7") | (= "dev") }
]
+
+build: [make "-j%{jobs}%"]
+install: [make "install"]
--
GitLab