Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tezos compatibility with uri 4.0 #17429

Merged
merged 2 commits into from
Oct 20, 2020
Merged

Fix tezos compatibility with uri 4.0 #17429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88238e3
tezos-stdlib-unix needs Re
pirbo Oct 18, 2020
21199e0
tezos-clic needs re explicitely
pirbo Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/tezos-base/tezos-base.7.4/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ depends: [
"ptime" { >= "0.8.4" }
"ezjsonm" { >= "0.5.0" }
"ipaddr" { >= "4.0.0" & < "5.0.0" }
"re" { >= "1.7.2" }
]
build: [
["dune" "build" "-p" name "-j" jobs]
Expand Down
18 changes: 18 additions & 0 deletions packages/tezos-clic/tezos-clic.7.4/files/with-re.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
commit 2d04838fcff65c494316562bd415ec98e4a82703
Author: Pierre Boutillier <pierre.boutillier@nomadic-labs.com>
Date: Fri Oct 16 18:05:19 2020 +0200

Opam: clic requires re

diff --git a/src/lib_clic/dune b/src/lib_clic/dune
index 421a42c891..22f96d5f10 100644
--- a/src/lib_clic/dune
+++ b/src/lib_clic/dune
@@ -5,6 +5,7 @@
-open Tezos_error_monad))
(libraries tezos-stdlib
lwt
+ re
tezos-error-monad))

(rule
4 changes: 4 additions & 0 deletions packages/tezos-clic/tezos-clic.7.4/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ depends: [
"tezos-stdlib-unix" { = version }
"re" { >= "1.7.2" }
]
patches: [ "with-re.patch" ]
build: [
["dune" "build" "-p" name "-j" jobs]
["mv" "src/lib_clic/%{name}%.install" "./"]
Expand All @@ -25,3 +26,6 @@ url {
"sha512=c6d927a821faec5c09864a8945be37e9e7d0b1b6b6ee02c11fccd1fd0b81dcf04ec8c591adc89aefdbf5603192e6e1fb41bbaff097c935130362fbaf9069667a"
]
}
extra-files: [
[ "with-re.patch" "sha256=96ca06d5e11337ce9cac4cde13d05965f698946223a592e0c03c3abd4461ca3f" ]
]
30 changes: 30 additions & 0 deletions packages/tezos-stdlib-unix/tezos-stdlib-unix.7.4/files/with-re.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
commit 11a5454ad16e0fa7c9ce74905609fbed9db18e1b
Author: Pierre Boutillier <pierre.boutillier@nomadic-labs.com>
Date: Fri Oct 16 17:35:04 2020 +0200

Build: tezos-stdlib-unix needs Re

diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune
index 4539125cf5..bbfbd85a28 100644
--- a/src/lib_stdlib_unix/dune
+++ b/src/lib_stdlib_unix/dune
@@ -11,6 +11,7 @@
tezos-stdlib
lwt.unix
ipaddr.unix
+ re
ptime
ptime.clock.os
mtime
diff --git a/src/lib_stdlib_unix/tezos-stdlib-unix.opam b/src/lib_stdlib_unix/tezos-stdlib-unix.opam
index 9ecebc4440..30b5d93df1 100644
--- a/src/lib_stdlib_unix/tezos-stdlib-unix.opam
+++ b/src/lib_stdlib_unix/tezos-stdlib-unix.opam
@@ -13,6 +13,7 @@ depends: [
"tezos-error-monad"
"tezos-event-logging"
"tezos-stdlib"
+ "re"
"lwt" { >= "3.0.0" }
"ptime" { >= "0.8.4" }
"mtime" { >= "1.0.0" }
5 changes: 5 additions & 0 deletions packages/tezos-stdlib-unix/tezos-stdlib-unix.7.4/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ depends: [
"mtime" { >= "1.0.0" }
"conf-libev"
"ipaddr" { >= "4.0.0" }
"re" { >= "1.7.2" }
]
patches: [ "with-re.patch" ]
build: [
["dune" "build" "-p" name "-j" jobs]
["mv" "src/lib_stdlib_unix/%{name}%.install" "./"]
Expand All @@ -31,3 +33,6 @@ url {
"sha512=c6d927a821faec5c09864a8945be37e9e7d0b1b6b6ee02c11fccd1fd0b81dcf04ec8c591adc89aefdbf5603192e6e1fb41bbaff097c935130362fbaf9069667a"
]
}
extra-files: [
[ "with-re.patch" "sha256=0d784d64fa2aa4059aa72dbbce8b064bab908a15a04322272130d2c361c039ac" ]
]