Minor dev script improvements

.github/workflows/lint.yml

@@ -19,17 +19,14 @@ jobs:
 
       - uses: cachix/install-nix-action@v22
         with:
-          nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/43862987c3cf2554a542c6dd81f5f37435eb1423.tar.gz # keep in sync with shell.nix
+          nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/880992dcc006a5e00dd0591446fdf723e6a51a64.tar.gz # keep in sync with shell.nix
 
       - name: Wait for nix daemon to start
         if: runner.os == 'macOS'
         run: wait4path /nix/var/nix/profiles/per-user
 
-      - name: setup direnv
-        uses: JRMurr/[email protected]
-        with:
-          install-nix: "false" # we already install nix
-          cache-store: "false" # turned out to be faster without the cache
+      - name: Initialize nix environment
+        run: nix-shell --run true
 
       - name: Setup backend pypackages cache
         uses: actions/cache@v3
@@ -46,7 +43,7 @@ jobs:
           key: ${{ runner.os }}-${{ runner.arch }}-pypackages-${{ hashFiles('worker/pdm.lock', 'proto/transcribee_proto/*.py') }}
 
       - name: install dependencies
-        run: ./packaging/install_dependencies.sh
+        run: nix-shell --run ./packaging/install_dependencies.sh
 
       - name: cache pre-commit env
         uses: actions/cache@v3
@@ -55,4 +52,4 @@ jobs:
           key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.pre-commit-config.yaml') }}
 
       - name: run pre-commit
-        run: pre-commit run --show-diff-on-failure --color=always --all-files
+        run: nix-shell --run 'pre-commit run --show-diff-on-failure --color=always --all-files'

packaging/Procfile

@@ -2,4 +2,4 @@ backend: ./start_backend.sh
 worker: pdm run -p ../worker/ start --coordinator http://127.0.0.1:8000 --token dev_worker --reload
 frontend: pnpm --prefix ../frontend/ dev --clearScreen false
 db: ./start_db.sh
-redis: redis-server
+redis: redis-server --dir "$(realpath ../backend/db)"

packaging/setup_backend.sh

@@ -3,6 +3,7 @@
 set -euxo pipefail
 
 echo -e "\033[1m# setting up backend:\033[0m\n"
+wait4x postgresql "postgres://@/transcribee?host=$(pwd)/../backend/db/sockets/"
 pdm run -p ../backend/ migrate
 pdm run -p ../backend/ create_user --user test --pass test
 pdm run -p ../backend/ create_worker --token dev_worker --name "Development Worker"

shell.nix

@@ -1,23 +1,11 @@
+{pkgs ? import <nixpkgs> {}}:
 let
-  # We use a fixed version of nixpkgs here, so we get a recent enough version of
-  # pdm (2.4.6 at the time of writing). The version shipped in current (as of 12-03-23)
-  # nixpkgs-stable does not support dependencies with relative paths
   pkgs = import
     (fetchTarball {
-      name = "nixpkgs-unstable-new-enough-pdm";
-      url = "https://github.com/NixOS/nixpkgs/archive/43862987c3cf2554a542c6dd81f5f37435eb1423.tar.gz"; # keep in sync with .github/workflows/lint.yml
-
+      name = "nixpkgs-stable-2024-03-08";
+      url = "https://github.com/NixOS/nixpkgs/archive/880992dcc006a5e00dd0591446fdf723e6a51a64.tar.gz"; # keep in sync with .github/workflows/lint.yml
     })
     { };
-  pdm = pkgs.pdm.overridePythonAttrs (old: rec {
-    version = "2.4.9";
-    pname = old.pname;
-    src = pkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "28b/sZXzmrJLS8tQf+mXiaYaMhWdi/In8xF7lPMn8vI=";
-    };
-    doCheck = false;
-  });
   ld_packages = [
     pkgs.file
     # for ctranslate2
@@ -28,12 +16,14 @@ in
 pkgs.mkShell {
   buildInputs = with pkgs; [
     overmind
+    wait4x
     pre-commit
 
     python310
     python310Packages.black
     pdm
 
+    nodejs_20
     nodePackages.pnpm
 
     # nix tooling
@@ -60,7 +50,7 @@ pkgs.mkShell {
     icu.dev
 
     # Our database
-    postgresql
+    postgresql_14
 
     # Our database2 ?
     redis