diff --git a/.gitignore b/.gitignore index 2bbdbfe..92b2793 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ .direnv -result diff --git a/flake.nix b/flake.nix index fede805..e4379ba 100644 --- a/flake.nix +++ b/flake.nix @@ -18,26 +18,13 @@ let pkgs = import inputs.nixpkgs { inherit system; - overlays = [ - inputs.rust-overlay.overlays.default - ]; + overlays = [ inputs.rust-overlay.overlays.default ]; }; - rustTarget = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; - craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustTarget; - - lib = import ./lib { - inherit - inputs - craneLib - pkgs - ; - }; + lib = import ./lib { inherit inputs; }; in { - packages = lib // { - rust = rustTarget; - }; + inherit lib; devShells.default = pkgs.mkShell { nativeBuildInputs = [ diff --git a/lib/cargo-dylint.nix b/lib/cargo-dylint.nix index 8c6aa17..aeb7798 100644 --- a/lib/cargo-dylint.nix +++ b/lib/cargo-dylint.nix @@ -1,39 +1,7 @@ { - pkgs, - craneLib, - - pkg-config, - openssl, + inputs, }: -let - pname = "cargo-dylint"; - version = "4.0.0"; +{ - src = pkgs.fetchFromGitHub { - owner = "trailofbits"; - repo = "dylint"; - tag = "v${version}"; - sha256 = "sha256-Z8uuewp7Buoadayc0oTafmfvwNT36KukWKiHxL/mQfI="; - }; -in - -craneLib.buildPackage { - inherit - pname - version - src - ; - - buildInputs = [ - openssl - ]; - - nativeBuildInputs = [ - pkg-config - ]; - - RUSTUP_TOOLCHAIN = "nightly-2025-02-28"; - - doCheck = false; } diff --git a/lib/default.nix b/lib/default.nix index ef77125..6109231 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,15 +1,5 @@ { - pkgs, - inputs, - craneLib, - ... + }: -let - callPackage = pkgs.lib.callPackageWith (pkgs // packages // { inherit inputs craneLib; }); - packages = { - cargo-dylint = callPackage ./cargo-dylint.nix { }; - }; -in -packages diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index 168d4fd..0000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,2 +0,0 @@ -[toolchain] -channel = "nightly-2025-03-01"