From af6ed084c724bd65fc3b40834931ab1f9a4564f0 Mon Sep 17 00:00:00 2001 From: krovuxdev <62192487+krovuxdev@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:13:58 -0500 Subject: [PATCH 1/2] fix: Refactor apps configuration to explicitly define program path and type --- default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index a37ae8c..297c8ff 100644 --- a/default.nix +++ b/default.nix @@ -57,8 +57,11 @@ in { # `nix run` apps = rec { - simpleCommits = simpleCommitsPkg.app; - default = simpleCommits; + simpleCommits = simpleCommitsPkg.pkg; + default = { + program = "${simpleCommits}/bin/sc"; + type = "app"; + }; }; # `nix build` packages = rec { From efcf3fd29d606104f390c900027da488669bedf4 Mon Sep 17 00:00:00 2001 From: krovuxdev <62192487+krovuxdev@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:17:58 -0500 Subject: [PATCH 2/2] fix: simplify Rust toolchain setup to avoid manual hash updates --- default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 297c8ff..3c243d7 100644 --- a/default.nix +++ b/default.nix @@ -24,10 +24,7 @@ in }: let # fenix: rustup replacement for reproducible builds - toolchain = fenix.${system}.fromToolchainFile { - file = ./rust-toolchain.toml; - sha256 = "sha256-6eN/GKzjVSjEhGO9FhWObkRFaE1Jf+uqMSdQnb8lcB4="; - }; + toolchain = fenix.${system}.stable.minimalToolchain; # crane: cargo and artifacts manager craneLib = crane.${system}.overrideToolchain toolchain; # cranix: extends crane building system with workspace bin building and Mold + Cranelift integrations