Merge branch 'develop' into fix-update-nix

input-output-hk · Jan 19, 2021 · e2ee790 · e2ee790
2 parents ab9da92 + 3c9842a
commit e2ee790
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/nix/pkgs/mantis.nix b/nix/pkgs/mantis.nix
@@ -50,7 +50,7 @@ in sbt.mkDerivation {
 
   # This sha represents the change dependencies of mantis.
   # Update this sha whenever you change the dependencies
-  depsSha256 = "1zsf8yykr8a7p9za4lyw8l1rhqa7ppas049lawp9pn90sj0xkjh5";
+  depsSha256 = "0gppwz6dvligrrgjmramyrm9723pwhg89cqfpxj22z2d86brwas2";
 
   # this is the command used to to create the fixed-output-derivation
   depsWarmupCommand = "sbt compile --debug -Dnix=true";

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -80,7 +80,7 @@ object Dependencies {
   )
 
   val network: Seq[ModuleID] = {
-    val scalanetVersion = "0.5.1-SNAPSHOT"
+    val scalanetVersion = "0.6.0"
     Seq(
       "io.iohk" %% "scalanet" % scalanetVersion,
       "io.iohk" %% "scalanet-discovery" % scalanetVersion

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.4.0
+sbt.version = 1.4.6