nix: dev shell update (#1002)

Author: gvolpe

.github/workflows/ci.yml

@@ -26,19 +26,19 @@ jobs:
         uses: coursier/cache-action@v6
 
       - name: "Install Nix ❄️"
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@v31.2.0
 
       - name: "Install Cachix ❄️"
-        uses: cachix/cachix-action@v15
+        uses: cachix/cachix-action@v16
         with:
-          name: redis4cats
-          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
+          name: profunktor
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: "Run tests and compile documentation 🚀"
-        run: nix develop -c sbt 'buildRedis4Cats'
+        run: nix run .#sbt -- buildRedis4Cats
 
       - name: "Test for Binary Compatibility 📦"
-        run: nix develop -c sbt 'mimaReportBinaryIssuesIfRelevant'
+        run: nix run .#sbt mimaReportBinaryIssuesIfRelevant
 
       - name: "Shutting down Valkey 🐳"
         run: docker compose down

.github/workflows/publish-site.yml

@@ -21,13 +21,13 @@ jobs:
           fetch-depth: 0 # fetch all branches & tags
 
       - name: "Install Nix ❄️"
-        uses: cachix/install-nix-action@v22
+        uses: cachix/install-nix-action@v31.2.0
 
       - name: "Install Cachix ❄️"
-        uses: cachix/cachix-action@v12
+        uses: cachix/cachix-action@v16
         with:
-          name: redis4cats
-          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
+          name: profunktor
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: "Building and publishing microsite 🚧"
-        run: nix develop -c sbt 'publishSite'
+        run: nix run .#sbt -- publishSite

.github/workflows/release.yml

@@ -18,18 +18,18 @@ jobs:
           fetch-depth: 0 # fetch all branches & tags
 
       - name: "Install Nix ❄️"
-        uses: cachix/install-nix-action@v22
+        uses: cachix/install-nix-action@v31.2.0
 
       - name: "Install Cachix ❄️"
-        uses: cachix/cachix-action@v12
+        uses: cachix/cachix-action@v16
         with:
-          name: redis4cats
-          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
+          name: profunktor
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: "Publish ${{ github.ref }} 🚀"
         env:
           PGP_PASSPHRASE: "${{ secrets.PGP_PASSPHRASE }}"
           PGP_SECRET: "${{ secrets.PGP_SECRET }}"
           SONATYPE_PASSWORD: "${{ secrets.SONATYPE_PASSWORD }}"
           SONATYPE_USERNAME: "${{ secrets.SONATYPE_USERNAME }}"
-        run: nix develop -c sbt 'ci-release'
+        run: nix run .#sbt -- ci-release

build.sbt

@@ -20,11 +20,12 @@ promptTheme := PromptTheme(
 ThisBuild / organization := "dev.profunktor"
 ThisBuild / homepage := Some(url("https://redis4cats.profunktor.dev/"))
 ThisBuild / licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
+ThisBuild / sonatypeCredentialHost := xerial.sbt.Sonatype.sonatypeCentralHost
 ThisBuild / developers := List(
   Developer(
     "gvolpe",
     "Gabriel Volpe",
-    "[email protected]",
+    "[email protected]",
     url("https://gvolpe.com")
   )
 )
@@ -40,7 +41,7 @@ val commonSettings = Seq(
   organizationName := "Redis client for Cats Effect & Fs2",
   startYear := Some(2018),
   licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")),
-  headerLicense := Some(HeaderLicense.ALv2("2018-2021", "ProfunKtor")),
+  headerLicense := Some(HeaderLicense.ALv2("2018-2025", "ProfunKtor")),
   testFrameworks += new TestFramework("munit.Framework"),
   libraryDependencies ++= Seq(
     Libraries.catsEffectKernel,

flake.lock

@@ -2,43 +2,47 @@
   description = "Scala development shell";
 
   inputs = {
-    nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
+    nixpkgs.url = "nixpkgs/nixos-unstable";
     flake-utils.url = github:numtide/flake-utils;
   };
 
   outputs = { nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        # Setting SBT_OPTS because of this bug: https://github.com/sbt/sbt-site/issues/169
-        sbt-overlay = self: super: {
-          sbt = super.sbt.overrideAttrs (
-            old: {
-              nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ super.makeWrapper ];
-              postInstall = ''
-                wrapProgram $out/bin/sbt --suffix SBT_OPTS : '--add-opens java.base/java.lang=ALL-UNNAMED'
-              '';
-            }
-          );
-        };
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ sbt-overlay ];
-        };
-        jdk = pkgs.jdk19_headless;
+        overlays = [
+          (self: super: {
+            jre = super.jdk21_headless;
+            sbt = super.sbt.overrideAttrs (
+              old: {
+                nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ super.makeWrapper ];
+                # Setting SBT_OPTS because of this bug: https://github.com/sbt/sbt-site/issues/169
+                postInstall = ''
+                  wrapProgram $out/bin/sbt --suffix SBT_OPTS : '--add-opens java.base/java.lang=ALL-UNNAMED'
+                '';
+              }
+            );
+          })
+        ];
+        pkgs = import nixpkgs { inherit system overlays; };
       in
       {
         devShell = pkgs.mkShell {
           name = "scala-dev-shell";
-          buildInputs = [
-            jdk
-            pkgs.gnupg
-            pkgs.jekyll
-            pkgs.sbt
+
+          buildInputs = with pkgs; [
+            gnupg
+            jekyll
+            jre
+            sbt
           ];
 
           shellHook = ''
-            JAVA_HOME="${jdk}"
+            JAVA_HOME="${pkgs.jre}"
           '';
         };
+
+        packages = {
+          inherit (pkgs) sbt;
+        };
       });
 }

flake.nix

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 ProfunKtor
+ * Copyright 2018-2025 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/core/src/main/scala-2.13+/dev.profunktor.redis4cats/JavaConversions.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 ProfunKtor
+ * Copyright 2018-2025 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/core/src/main/scala-2/dev/profunktor/redis4cats/TypeInqualityCompat.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 ProfunKtor
+ * Copyright 2018-2025 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/core/src/main/scala-2/dev/profunktor/redis4cats/syntax/RedisURIOps.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 ProfunKtor
+ * Copyright 2018-2025 ProfunKtor
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.