fix: accept flake config

sdsc-ordes · Jul 18, 2024 · f3e7dac · f3e7dac
1 parent 55cc60a
commit f3e7dac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/justfile b/justfile
@@ -15,14 +15,14 @@ nix-develop *args:
     cd "{{root_dir}}" && \
     cmd=("$@") && \
     { [ -n "${cmd:-}" ] || cmd=("zsh"); } && \
-    nix develop ./tools/nix#default --command "${cmd[@]}"
+    nix develop ./tools/nix#default --accept-flake-config --command "${cmd[@]}"
 
 nix-develop-ci *args:
     #!/usr/bin/env bash
     set -eu
     cd "{{root_dir}}"
     cachix watch-exec "$CACHIX_CACHE_NAME" -- \
-        nix develop ./tools/nix#ci --command "$@"
+        nix develop ./tools/nix#ci --accept-flake-config --command "$@"
 
 ## Standard stuff =============================================================
 # Format the code.

diff --git a/tools/nix/flake.nix b/tools/nix/flake.nix
@@ -3,17 +3,21 @@
 
   nixConfig = {
     substituters = [
-      "https://cache.nixos.org/"
+      "https://cache.nixos.org"
     ];
     extra-substituters = [
-      "https://tripsu.cachix.org/"
+      "https://tripsu.cachix.org"
       # Nix community's cache server
       "https://nix-community.cachix.org"
     ];
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "tripsu.cachix.org-1:pWZmirIwlMxGMVWSDMjQm4R+zLp8gtaT8OfH0Sv/j4E="
     ];
+    extra-trusted-substituters = [
+      "https://tripsu.cachix.org"
+      "https://cache.nixos.org"
+    ];
   };
 
   inputs = {