diff options
| author | Théo Zimmermann | 2019-05-19 16:27:15 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2019-05-19 16:27:15 +0200 |
| commit | 06de7118123dba249b0148664c2cf236c1ef99e0 (patch) | |
| tree | 27971fbf8233fec108d26bc70d77f05a49fbc68c /dev/ci | |
| parent | 8bd60579d4768793c849b9b4cd46f14d33d0f71d (diff) | |
| parent | 5c1e7ae5e16803fd7bd19fbb343b57877b646119 (diff) | |
Merge PR #10184: A few nix-related updates
Reviewed-by: Zimmi48
Diffstat (limited to 'dev/ci')
| -rw-r--r-- | dev/ci/nix/bignums.nix | 2 | ||||
| -rw-r--r-- | dev/ci/nix/unicoq/unicoq-num.patch | 31 |
2 files changed, 1 insertions, 32 deletions
diff --git a/dev/ci/nix/bignums.nix b/dev/ci/nix/bignums.nix index 1d931c858e..d813ddd8d7 100644 --- a/dev/ci/nix/bignums.nix +++ b/dev/ci/nix/bignums.nix @@ -1,5 +1,5 @@ { ocamlPackages }: { - buildInputs = with ocamlPackages; [ ocaml findlib camlp5 ]; + buildInputs = [ ocamlPackages.ocaml ]; } diff --git a/dev/ci/nix/unicoq/unicoq-num.patch b/dev/ci/nix/unicoq/unicoq-num.patch index 6d96d94dfc..6d2f6470b1 100644 --- a/dev/ci/nix/unicoq/unicoq-num.patch +++ b/dev/ci/nix/unicoq/unicoq-num.patch @@ -4,19 +4,6 @@ Date: Thu Nov 29 08:59:22 2018 +0000 Make explicit dependency to num -diff --git a/Make b/Make -index 550dc6a..8aa1309 100644 ---- a/Make -+++ b/Make -@@ -9,7 +9,7 @@ src/logger.ml - src/munify.mli - src/munify.ml - src/unitactics.mlg --src/unicoq.mllib -+src/unicoq.mlpack - theories/Unicoq.v - test-suite/munifytest.v - test-suite/microtests.v diff --git a/Makefile.local b/Makefile.local new file mode 100644 index 0000000..88be365 @@ -24,21 +11,3 @@ index 0000000..88be365 +++ b/Makefile.local @@ -0,0 +1 @@ +CAMLPKGS += -package num -diff --git a/src/unicoq.mllib b/src/unicoq.mllib -deleted file mode 100644 -index 2b84e2d..0000000 ---- a/src/unicoq.mllib -+++ /dev/null -@@ -1,3 +0,0 @@ --Logger --Munify --Unitactics -diff --git a/src/unicoq.mlpack b/src/unicoq.mlpack -new file mode 100644 -index 0000000..2b84e2d ---- /dev/null -+++ b/src/unicoq.mlpack -@@ -0,0 +1,3 @@ -+Logger -+Munify -+Unitactics |