From 50dea18ce3a65881805a0ab1a0740be69fcf8a93 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Sun, 13 Oct 2024 23:15:54 +0300
Subject: [PATCH 1/2] CI: fix devshell loading
---
.github/workflows/cargo-build.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/cargo-build.yml b/.github/workflows/cargo-build.yml
index 1fa4145..782ae30 100644
--- a/.github/workflows/cargo-build.yml
+++ b/.github/workflows/cargo-build.yml
@@ -21,8 +21,7 @@ jobs:
- uses: cachix/install-nix-action@v26
- uses: DeterminateSystems/magic-nix-cache-action@main
- - name: Install dependencies
- run: nix develop --impure
+ - uses: nicknovitski/nix-develop@v1
- uses: actions-rs/toolchain@v1
name: Install rust toolchain
From bd8e62dd0a9552196a561d13d3ce729f87b2c578 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Sun, 13 Oct 2024 23:18:40 +0300
Subject: [PATCH 2/2] Nix: remove redundant enableParallelBuilding
---
nix/default.nix | 1 -
nix/plugins/default.nix | 1 -
2 files changed, 2 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index 2b231dc..b7e4849 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -33,7 +33,6 @@ in
name = "${pname}-${version}";
};
- enableParallelBuilding = true;
strictDeps = true;
cargoLock = {
diff --git a/nix/plugins/default.nix b/nix/plugins/default.nix
index b145819..06143df 100644
--- a/nix/plugins/default.nix
+++ b/nix/plugins/default.nix
@@ -31,7 +31,6 @@ in
inherit lockFile;
};
- enableParallelBuilding = true;
strictDeps = true;
nativeBuildInputs = [