From 3b37057eb982d1e41e7a02df623e20c457ca469d Mon Sep 17 00:00:00 2001
From: April John <waterdev@galaxycrow.de>
Date: Wed, 26 Jul 2023 22:27:59 +0200
Subject: [PATCH] fix nix dev enviroment

---
 Dockerfile |  4 ++--
 flake.lock | 24 ++++++++++++------------
 flake.nix  |  6 +++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 64ad26071..fc0578141 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ COPY packages/backend/native-utils/npm/linux-x64-musl/package.json packages/back
 COPY packages/backend/native-utils/npm/linux-arm64-musl/package.json packages/backend/native-utils/npm/linux-arm64-musl/package.json
 
 # Configure corepack and pnpm, and install dev mode dependencies for compilation
-RUN corepack enable && corepack prepare pnpm@latest --activate && pnpm i --frozen-lockfile
+RUN corepack enable && corepack prepare pnpm@latest --activate && pnpm i
 
 # Copy in the rest of the native-utils rust files
 COPY packages/backend/native-utils packages/backend/native-utils/
@@ -40,7 +40,7 @@ COPY . ./
 RUN env NODE_ENV=production sh -c "pnpm run --filter '!native-utils' build && pnpm run gulp"
 
 # Trim down the dependencies to only those for production
-RUN pnpm i --prod --frozen-lockfile
+RUN pnpm i --prod
 
 ## Runtime container
 FROM alpine:3.18
diff --git a/flake.lock b/flake.lock
index bebf231aa..ce4c90500 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1690021633,
-        "narHash": "sha256-6C6ASG6E0GaXU2THdcNy4SZgQDHE/QC0suh40KXUaWU=",
+        "lastModified": 1690391043,
+        "narHash": "sha256-8x5DkOaejES6C2JYX2A3riebbJHGFHBmJ+LwxXUIIVw=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "def76d0ba0d3743bdfa3a8fdb3903e0928b3c6f0",
+        "rev": "05240861ef3ae1bbe65b1acc88e2fad7dd24a84b",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1690093235,
-        "narHash": "sha256-78rST3nYLd0DxWo1l0ZqHoQ+jI0bkLp+pAElC/S01rU=",
+        "lastModified": 1690352427,
+        "narHash": "sha256-xCH8mt9eSikYb2P1ePYK6ygk/CExDdl7skgVv4RCWf8=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "5dc84891da35116d088496499292eebb9cd2f88b",
+        "rev": "5980b17ea7de165699f76be5f1a20a7306fc6970",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1690083312,
-        "narHash": "sha256-I3egwgNXavad1eIjWu1kYyi0u73di/sMmlnQIuzQASk=",
+        "lastModified": 1690327932,
+        "narHash": "sha256-Fv7PYZxN4eo0K6zXhHG/vOc+e2iuqQ5ywDrh0yeRjP0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "af8cd5ded7735ca1df1a1174864daab75feeb64a",
+        "rev": "a9b47d85504bdd199e90846622c76aa0bfeabfac",
         "type": "github"
       },
       "original": {
@@ -277,11 +277,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1690057540,
-        "narHash": "sha256-MKGhZsFTpJH3Sq+9dGFGqOje3A6PD6fKGO92tM23zuY=",
+        "lastModified": 1690216158,
+        "narHash": "sha256-TUF0YoWweQj0hNHWykC1vtBQVUncARlLLPmQP9hUeME=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "99718d0c8bc5aadd993acdcabc1778fc7b5cc572",
+        "rev": "b64e5b3919b24bc784f36248e6e1f921ee7bb71b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f089f9327..42e6c0dfe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
 					shells = {
 						# The default shell, used by nix-direnv
 						default = {
-							name = "firefish-dev-shell";
+							name = "iceshrimp-dev-shell";
 							# Add additional packages to our environment
 							packages = [
 								pkgs.nodePackages.pnpm
@@ -44,7 +44,7 @@
 							languages.javascript.package = pkgs.nodejs_18;
 							# Enable stable Rust for the backend
 							languages.rust.enable = true;
-							languages.rust.version = "stable";
+							languages.rust.channel = "stable";
 							processes = {
 								dev-server.exec = "pnpm run dev";
 							};
@@ -62,7 +62,7 @@
 									enable = true;
 									package = pkgs.postgresql_12;
 									initialDatabases = [{
-										name = "firefish";
+										name = "iceshrimp";
 									}];
 									initialScript = ''
 										CREATE USER firefish WITH PASSWORD 'firefish';