Update dependencies

.github/workflows/dev.yaml

@@ -25,8 +25,6 @@ jobs:
           - nix: aarch64-darwin
             runner: arm64-darwin
             size: small
-    env:
-      IMAGE_REPOSITORY: public.ecr.aws/shopstic
     outputs:
       version: ${{ steps.determine-version.outputs.version }}
     steps:
@@ -87,8 +85,6 @@ jobs:
     runs-on: [self-hosted, nix, general, arm64-linux, small]
     timeout-minutes: 5
     needs: [build-runner]
-    env:
-      IMAGE_REPOSITORY: public.ecr.aws/shopstic
     steps:
       - uses: actions/checkout@v4
 
@@ -108,8 +104,6 @@ jobs:
     runs-on: [self-hosted, nix, general, arm64-linux, small]
     timeout-minutes: 5
     needs: [build-runner]
-    env:
-      IMAGE_REPOSITORY: public.ecr.aws/shopstic
     steps:
       - uses: actions/checkout@v4
 

charts/toothpick/charts/toothpick-master/values.yaml

@@ -1,6 +1,6 @@
 global:
   image:
-    repository: public.ecr.aws/shopstic/toothpick-server
+    repository: public.ecr.aws/z8i7w3s6/toothpick-server
     pullPolicy: IfNotPresent
     tag: ""
 

charts/toothpick/charts/toothpick-worker/values.yaml

@@ -2,7 +2,7 @@ replicaCount: 1
 
 global:
   image:
-    repository: public.ecr.aws/shopstic/toothpick-server
+    repository: public.ecr.aws/z8i7w3s6/toothpick-server
     pullPolicy: IfNotPresent
     tag: ""
 

charts/toothpick/values.yaml

@@ -1,6 +1,6 @@
 global:
   image:
-    repository: public.ecr.aws/shopstic/toothpick-server
+    repository: public.ecr.aws/z8i7w3s6/toothpick-server
     pullPolicy: IfNotPresent
     tag: ""
 

cli.sh

@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-TOOTHPICK_CONFIG="./toothpick-examples/src/test/resources/.toothpick.conf"
+DEFAULT_TOOTHPICK_CONFIG="./toothpick-examples/src/test/resources/.toothpick.conf"
 
 test_runner_create_stage() {
+  export TOOTHPICK_CONFIG=${TOOTHPICK_CONFIG:-"${DEFAULT_TOOTHPICK_CONFIG}"}
+
   local TEMP_FILE
   TEMP_FILE=$(mktemp)
   trap "rm -Rf ${TEMP_FILE}" EXIT
@@ -29,7 +31,8 @@ test_runner_create_stage() {
 }
 
 test_runner_run_stage() {
-  local STAGE_FILE=${1:?"Stage file is required"}
+  export TOOTHPICK_CONFIG=${TOOTHPICK_CONFIG:-"${DEFAULT_TOOTHPICK_CONFIG}"}
+
   local TEMP_FILE
   TEMP_FILE=$(mktemp)
   trap "rm -Rf ${TEMP_FILE}" EXIT
@@ -43,7 +46,7 @@ test_runner_run_stage() {
     "${RUNNER_CP}" \
     "-Dconfig.entry=${TOOTHPICK_CONFIG}" \
     dev.toothpick.app.TpConsoleRunnerApp \
-    "${STAGE_FILE}"
+    "$@"
 }
 
 "$@"

flake.nix

@@ -112,7 +112,14 @@
               "metals.sbtScript" = sbt + "/bin/sbt";
               "nix.enableLanguageServer" = true;
               "nix.formatterPath" = pkgs.nixpkgs-fmt + "/bin/nixpkgs-fmt";
-              "nix.serverPath" = pkgs.rnix-lsp + "/bin/rnix-lsp";
+              "nix.serverSettings" = {
+                "nil" = {
+                  "formatting" = {
+                    "command" = [ "nixpkgs-fmt" ];
+                  };
+                };
+              };
+              "nix.serverPath" = pkgs.nil + "/bin/nil";
             };
           };
           devShell = pkgs.mkShellNoCC {

nix/intellij-scala-runners.nix

@@ -1,12 +1,12 @@
 { stdenv, lib, fetchzip }:
 stdenv.mkDerivation rec {
   pname = "intellij-scala-runners";
-  version = "2022.1.11";
+  version = "2024.1.15";
 
   src = fetchzip {
     name = "${pname}-${version}";
-    url = "https://plugins.jetbrains.com/files/1347/166693/scala-intellij-bin-${version}.zip";
-    sha256 = "sha256-ExlENrcITS0LJJSu4H+d0JxunW5zdi285mVPZhCjbEw=";
+    url = "https://plugins.jetbrains.com/files/1347/516275/scala-intellij-bin-${version}.zip";
+    sha256 = "sha256-2g1pKR5F/K2KPzdTZolYp58REgLvbf606OkEB4l03L4=";
   };
 
   installPhase = ''

toothpick-examples/src/test/resources/.toothpick.conf

@@ -9,7 +9,7 @@ app {
     test-per-process-file-name-regex = ".*"
     containerizer {
       base-image {
-        name = "public.ecr.aws/shopstic/jre-fdb-test-base:17.0.4_8-7.1.21@sha256:0aacddb39e8e376f6ded603e5c2d6827e6b72146996839881886b109600eda4e"
+        name = "public.ecr.aws/z8i7w3s6/jre-fdb-test-base:17.0.7_7-7.1.57@sha256:2fe2270908a20f1f78bc849be7e910d7b68237971b03a2be0f3975466f4e3821"
         credentials {
           registry = "public.ecr.aws"
           docker-config-file = ${HOME}"/.docker/config.json"