Skip to content

Commit 5e35bcc

Browse files
committed
Fix nix build
1 parent ef4317c commit 5e35bcc

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

nix/mantis.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ let
2020
version =
2121
let
2222
versionSbt = builtins.readFile ../version.sbt;
23-
captures = builtins.match ''.*version in ThisBuild := "([^"]+)".*'' versionSbt;
23+
captures = builtins.match ''.* := "([^"]+)".*'' versionSbt;
2424
in
2525
builtins.elemAt captures 0;
2626

nix/protoc.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff --git a/build.sbt b/build.sbt
2-
index 4ac21ff40..ccd34412e 100644
2+
index 59551123e..88eb70276 100644
33
--- a/build.sbt
44
+++ b/build.sbt
5-
@@ -43,6 +43,7 @@ def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
5+
@@ -50,6 +50,7 @@ def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
66
scalaVersion := `scala-2.13`,
7-
// Scalanet snapshots are published to Sonatype after each build.
8-
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
7+
semanticdbEnabled := true, // enable SemanticDB
8+
semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version
99
+ PB.runProtoc in Compile := (args => Process("@protobuf@/bin/protoc", args)!),
10-
testOptions in Test += Tests
11-
.Argument(TestFrameworks.ScalaTest, "-l", "EthashMinerSpec"), // miner tests disabled by default,
12-
scalacOptions := Seq(
10+
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value),
11+
ThisBuild / scalafixDependencies ++= List(
12+
"com.github.liancheng" %% "organize-imports" % "0.5.0",

0 commit comments

Comments
 (0)