Flake fix (BloopAI#203)

eltociear · Feb 22, 2023 · fda5afe · fda5afe
1 parent 3367e6e
commit fda5afe
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/server-test.yml b/.github/workflows/server-test.yml
@@ -25,23 +25,23 @@ jobs:
       - name: Dummy Qdrant binary
         run: touch apps/desktop/src-tauri/bin/qdrant-x86_64-unknown-linux-gnu
 
-      - name: Restore cache
-        run: cp -r /sccache/cargo_target target || true
+      # - name: Restore cache
+      #   run: cp -r /sccache/target target || echo "failed to restore target cache"
 
       - name: Rustfmt
-        run: nix develop --no-update-lock-file -c bash -c 'cargo --locked fmt -p bleep -- --check'
+        run: nix develop -c bash -c 'cargo --locked fmt -p bleep -- --check'
 
       - name: Clippy
-        run: nix develop --no-update-lock-file -c bash -c 'cargo --locked clippy -p bleep --all-features'
+        run: nix develop -c bash -c 'cargo --locked clippy -p bleep --all-features'
 
       - name: Tests
-        run: nix develop --no-update-lock-file -c bash -c 'cargo --locked test -p bleep --all-features --release'
+        run: nix develop -c bash -c 'cargo --locked test -p bleep --all-features --release'
 
       - name: Sccache stats
-        run: nix develop --no-update-lock-file -c bash -c 'sccache --show-stats'
+        run: nix develop -c bash -c 'sccache --show-stats'
 
-      - name: Store cache
-        run: rm -rf /sccache/cargo_target && cp -r target /sccache/cargo_target
+      # - name: Store cache
+      #   run: cp -r target /sccache || echo "storing cache failed"
 
   # benchmark:
   #   runs-on: [self-hosted, benchmark]

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -20,32 +20,31 @@
         lib = pkgs.lib;
 
         llvm = pkgs.llvmPackages_14;
-        clang = llvm.clang;
         libclang = llvm.libclang;
         stdenv = llvm.stdenv;
 
         # Get a specific rust version
         rust = pkgs.rust-bin.stable.latest.default;
         buildDeps = with pkgs;
           ([
+            stdenv.cc.cc.lib
             rust
             git-lfs
-            stdenv
-            libclang
-            clang
             rustup
+            rocksdb
             nodePackages.pnpm
             pkg-config
             openssl
+            openssl.dev
             glib.dev
             cmake
             python3
             protobuf
             automake
             autoconf
-            rocksdb
             universal-ctags
           ] ++ lib.optionals pkgs.stdenv.isLinux [
+            perl
             dbus.dev
             libsoup.dev
             gtk3.dev