Skip to content

Commit

Permalink
Merge pull request #644 from gemini-hlsw/updates
Browse files Browse the repository at this point in the history
Lib updates
  • Loading branch information
cquiroz authored Aug 21, 2024
2 parents f2ef3c2 + d355fc6 commit e752dc6
Show file tree
Hide file tree
Showing 4 changed files with 149 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
use flake
layout node
eval "$shellHook"
109 changes: 109 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
inputs = {
typelevel-nix.url = "github:typelevel/typelevel-nix";
nixpkgs.follows = "typelevel-nix/nixpkgs";
flake-utils.follows = "typelevel-nix/flake-utils";
};

outputs = { self, nixpkgs, flake-utils, typelevel-nix }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs-x86_64 = import nixpkgs {
system = "x86_64-darwin";
};
scala-cli-overlay = final: prev: {
scala-cli = pkgs-x86_64.scala-cli;
};
pkgs = import nixpkgs {
inherit system;
overlays = [ typelevel-nix.overlays.default scala-cli-overlay];
};
in
{
devShell = pkgs.devshell.mkShell {
imports = [ typelevel-nix.typelevelShell ];
typelevelShell = {
nodejs.enable = true;
jdk.package = pkgs.jdk17;
};
};
}

);
}
7 changes: 4 additions & 3 deletions project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ object Settings {
val disciplineMUnit = "2.0.0"
val fs2 = "3.10.2"
val log4Cats = "2.7.0"
val lucumaReact = "0.69.1"
val lucumaReact = "0.71.0"
val monocle = "3.3.0"
val mUnit = "1.0.0"
val mUnit = "1.0.1"
val mUnitScalacheck = "1.0.0"
val mUnitCatsEffect = "2.0.0"
val scalaCheck = "1.18.0"
val scalajsReact = "3.0.0-beta6"
Expand Down Expand Up @@ -91,7 +92,7 @@ object Settings {
val MUnit = Def.setting(
Seq[ModuleID](
"org.scalameta" %%% "munit" % mUnit,
"org.scalameta" %%% "munit-scalacheck" % mUnit,
"org.scalameta" %%% "munit-scalacheck" % mUnitScalacheck,
"org.typelevel" %%% "munit-cats-effect" % mUnitCatsEffect
)
)
Expand Down

0 comments on commit e752dc6

Please sign in to comment.