From 3bcde63c68e18e5f6f678c6197c2a00b04424010 Mon Sep 17 00:00:00 2001 From: servius Date: Sat, 7 Feb 2026 00:36:30 +0530 Subject: [PATCH 1/3] feat: Update flake.nix to add sukr as a package --- flake.nix | 81 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 34 deletions(-) diff --git a/flake.nix b/flake.nix index 719cff7..8f5b915 100644 --- a/flake.nix +++ b/flake.nix @@ -9,36 +9,35 @@ }; }; - outputs = - { - self, - nixpkgs, - fenix, - }: - let - systems = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - forAllSystems = fn: nixpkgs.lib.genAttrs systems (system: fn system); - in - { - devShells = forAllSystems ( - system: - let - pkgs = nixpkgs.legacyPackages.${system}; - fenixPkgs = fenix.packages.${system}; - toolchain = fenixPkgs.fromToolchainFile { - file = ./rust-toolchain.toml; - sha256 = "sha256-vra6TkHITpwRyA5oBKAHSX0Mi6CBDNQD+ryPSpxFsfg="; - }; - in - { - default = pkgs.mkShell.override { stdenv = pkgs.clangStdenv; } { - RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library"; - packages = [ + outputs = { + self, + nixpkgs, + fenix, + }: let + systems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + forAllSystems = fn: nixpkgs.lib.genAttrs systems (system: fn (pkgsFor system) (toolchainFor system)); + pkgsFor = system: + import nixpkgs { + system = system; + }; + toolchainFor = system: + fenix.packages.${system}.fromToolchainFile { + file = ./rust-toolchain.toml; + sha256 = "sha256-vra6TkHITpwRyA5oBKAHSX0Mi6CBDNQD+ryPSpxFsfg="; + }; + cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); + in { + devShells = forAllSystems ( + pkgs: toolchain: { + default = pkgs.mkShell.override {stdenv = pkgs.clangStdenv;} { + RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library"; + packages = + [ toolchain pkgs.treefmt pkgs.shfmt @@ -53,8 +52,22 @@ pkgs.apple-sdk pkgs.libiconv ]; - }; - } - ); - }; + }; + } + ); + packages = forAllSystems (pkgs: toolchain: rec { + sukr = pkgs.rustPlatform.buildRustPackage { + pname = cargoToml.package.name; + version = cargoToml.package.version; + src = ./.; + buildInputs = [toolchain]; + cargoHash = "sha256-mPm8Pe4W9TyDuuXLHWqA9DzbkTyR1kkfLZ3SmEt+dUc="; + # installPhase = '' + # mkdir -p $out/bin + # cp target/release/sukr $out/bin/ + # ''; + }; + default = sukr; + }); + }; } From c151aa3b25bf6cb2d9d7a6c86be48ef33b541d7f Mon Sep 17 00:00:00 2001 From: servius Date: Sat, 7 Feb 2026 00:40:26 +0530 Subject: [PATCH 2/3] chore: Remove commented out installPhase --- flake.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flake.nix b/flake.nix index 8f5b915..605700d 100644 --- a/flake.nix +++ b/flake.nix @@ -62,10 +62,6 @@ src = ./.; buildInputs = [toolchain]; cargoHash = "sha256-mPm8Pe4W9TyDuuXLHWqA9DzbkTyR1kkfLZ3SmEt+dUc="; - # installPhase = '' - # mkdir -p $out/bin - # cp target/release/sukr $out/bin/ - # ''; }; default = sukr; }); From 14125025424fbc7885bf8fd9e8538acfacb88b9a Mon Sep 17 00:00:00 2001 From: servius Date: Sat, 7 Feb 2026 00:42:51 +0530 Subject: [PATCH 3/3] chore: Remove unused buildInputs --- flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake.nix b/flake.nix index 605700d..25cf2b3 100644 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,6 @@ pname = cargoToml.package.name; version = cargoToml.package.version; src = ./.; - buildInputs = [toolchain]; cargoHash = "sha256-mPm8Pe4W9TyDuuXLHWqA9DzbkTyR1kkfLZ3SmEt+dUc="; }; default = sukr;