Skip to content

Commit 9c1e6db

Browse files
authored
Align 'mantis-extvm-pb' module in nix with submodule (#1121)
* Bump 'mantis-extvm-pb' module in nix * Bump extvm submodule
1 parent 51d9282 commit 9c1e6db

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

build.sbt

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,20 @@ val baseScalacOptions = Seq(
5757
// https://www.scala-lang.org/2021/01/12/configuring-and-suppressing-warnings.html
5858
// cat={warning-name}:ws prints a summary with the number of warnings of the given type
5959
// any:e turns all remaining warnings into errors
60-
val fatalWarnings = Seq(
61-
if (sys.env.get("MANTIS_FULL_WARNS").contains("true")) {
62-
"-Wconf:any:w"
63-
}
64-
else {
65-
"-Wconf:" ++ Seq(
66-
// Let's turn those gradually into errors:
67-
"cat=deprecation:ws",
68-
"cat=lint-package-object-classes:ws",
69-
"cat=unused:ws",
70-
"cat=lint-infer-any:ws",
71-
"cat=lint-byname-implicit:ws",
72-
"cat=other-match-analysis:ws",
73-
"any:e").mkString(",")
74-
}) ++ Seq("-Ypatmat-exhaust-depth", "off")
60+
val fatalWarnings = Seq(if (sys.env.get("MANTIS_FULL_WARNS").contains("true")) {
61+
"-Wconf:any:w"
62+
} else {
63+
"-Wconf:" ++ Seq(
64+
// Let's turn those gradually into errors:
65+
"cat=deprecation:ws",
66+
"cat=lint-package-object-classes:ws",
67+
"cat=unused:ws",
68+
"cat=lint-infer-any:ws",
69+
"cat=lint-byname-implicit:ws",
70+
"cat=other-match-analysis:ws",
71+
"any:e"
72+
).mkString(",")
73+
}) ++ Seq("-Ypatmat-exhaust-depth", "off")
7574

7675
def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
7776
name := projectName,

nix/overlay.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rev: final: prev: {
1414
# ourselves instead.
1515
mantis-extvm-pb = builtins.fetchGit {
1616
url = "https://github.com/input-output-hk/mantis-extvm-pb";
17-
rev = "53eb31f3c59f7200994915b834e626bd292df7ed";
17+
rev = "8f52caba70afc95ce669e9d61f773468db54557e";
1818
};
1919

2020
writeBashChecked = final.writers.makeScriptWriter {

src/main/protobuf/extvm

Submodule extvm updated from aa7d74d to 8f52cab

0 commit comments

Comments
 (0)