Updating nixpkgs + nix-direnv

profunktor · May 14, 2020 · 8f924c5 · 8f924c5
1 parent 2270f15
commit 8f924c5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/build.sbt b/build.sbt
@@ -3,12 +3,9 @@ import com.scalapenos.sbt.prompt._
 import Dependencies._
 import microsites.ExtraMdFileConfig
 
-name := """redis4cats-root"""
-
-organization in ThisBuild := "dev.profunktor"
-
-scalaVersion in ThisBuild := "2.13.1"
-crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.12.10")
+ThisBuild / name := """redis4cats-root"""
+ThisBuild / organization := "dev.profunktor"
+ThisBuild / crossScalaVersions := Seq("2.12.10", "2.13.2")
 
 sonatypeProfileName := "dev.profunktor"
 

diff --git a/shell.nix b/shell.nix
@@ -1,8 +1,9 @@
 let
-  pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs-channels/archive/10100a97c89.tar.gz") {};
+  # unstable packages on May 13th
+  pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs-channels/archive/6bcb1dec8ea.tar.gz") {};
 in
-pkgs.mkShell {
-  buildInputs = [
-    pkgs.jekyll
-  ];
-}
+  pkgs.mkShell {
+    buildInputs = [
+      pkgs.jekyll # v4.0.1
+    ];
+  }