Skip to content

Commit

Permalink
Add nix flake and lib updates
Browse files Browse the repository at this point in the history
  • Loading branch information
cquiroz committed Nov 8, 2022
1 parent 58d710d commit da319af
Show file tree
Hide file tree
Showing 7 changed files with 179 additions and 7 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"
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.11.12, 2.12.17, 2.13.10, 3.2.0]
scala: [2.11.12, 2.12.17, 2.13.10, 3.2.1]
java: [temurin@8, temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -149,12 +149,12 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.2.0)
- name: Download target directories (3.2.1)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.2.0-${{ matrix.java }}
name: target-${{ matrix.os }}-3.2.1-${{ matrix.java }}

- name: Inflate target directories (3.2.0)
- name: Inflate target directories (3.2.1)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ target/
.idea
metals.sbt
node_modules/
.direnv/
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.5.9"
version = "3.6.1"
style = default

maxColumn = 100
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import locales._
import sbt.Keys._
import sbtcrossproject.CrossPlugin.autoImport.{ CrossType, crossProject }

lazy val cldrApiVersion = "3.1.0"
lazy val cldrApiVersion = "4.0.0"

Global / onChangedBuildSource := ReloadOnSourceChanges

lazy val scalaVersion213 = "2.13.10"
lazy val scalaVersion3 = "3.2.0"
lazy val scalaVersion3 = "3.2.1"
ThisBuild / scalaVersion := scalaVersion213
ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.17", scalaVersion213, scalaVersion3)

Expand Down
137 changes: 137 additions & 0 deletions flake.lock

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

31 changes: 31 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
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.overlay scala-cli-overlay ];
};
in {
devShell = pkgs.devshell.mkShell {
imports = [ typelevel-nix.typelevelShell ];
packages = [
pkgs.nodePackages.vscode-langservers-extracted
];
typelevelShell = {
nodejs.enable = true;
jdk.package = pkgs.jdk17;
};
};
}

);
}

0 comments on commit da319af

Please sign in to comment.