Hemera/nix-dylint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use mkLib pattern

Browse source 
Signed-off-by: Marcel Müller <neikos@neikos.email>
This commit is contained in:
Marcel Müller 2025-03-04 10:53:57 +01:00
parent 89f5401e5d
commit 85ba1e39cc
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
flake.nix
View file

@ -24,29 +24,22 @@
}; };
rustTarget = pkgs.rust-bin.stable.latest.default.override { }; rustTarget = pkgs.rust-bin.stable.latest.default.override { };
craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustTarget;
lib = import ./lib { dylintLib = import ./mk-lib.nix {
inherit inherit pkgs;
inputs inherit (inputs) crane;
craneLib
pkgs
;
}; };
lints = [ lints = [
{ {
toolchain = "2025-01-09"; toolchain = "2025-01-09";
package = lib.cargo-dylint-general; package = dylintLib.cargo-dylint-general;
} }
]; ];
dylint = lib.mkDylint { inherit lints; }; dylint = dylintLib.mkDylint { inherit lints; };
in in
{ {
packages = lib // { mkLib = import ./mk-lib.nix;
inherit craneLib;
rust = rustTarget;
};
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [

3
lib/default.nix
View file

@ -1,12 +1,11 @@
{ {
pkgs, pkgs,
inputs,
craneLib, craneLib,
... ...
}: }:
let let
callPackage = pkgs.lib.callPackageWith (pkgs // packages // { inherit inputs craneLib; }); callPackage = pkgs.lib.callPackageWith (pkgs // packages // { inherit craneLib; });
packages = { packages = {
cargo-dylint = callPackage ./cargo-dylint.nix { }; cargo-dylint = callPackage ./cargo-dylint.nix { };
cargo-dylint-general = callPackage ./cargo-dylint-general.nix { }; cargo-dylint-general = callPackage ./cargo-dylint-general.nix { };

6
mk-lib.nix Normal file
View file

@ -0,0 +1,6 @@
{ pkgs, crane }:
import ./lib {
inherit pkgs;
craneLib = (crane.mkLib pkgs).overrideToolchain pkgs.rust-bin.stable.latest.default;
}