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

Strip prefix rather than prepending nightly

Browse source 
Signed-off-by: Marcel Müller <neikos@neikos.email>
This commit is contained in:
Marcel Müller 2025-03-04 10:56:58 +01:00
parent 85ba1e39cc
commit 520a91a22e
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/mk-dylint.nix
View file

@ -13,8 +13,8 @@ let
driver_names = lib.groupBy (v: v.toolchain) lints; driver_names = lib.groupBy (v: v.toolchain) lints;
driverMap = builtins.mapAttrs ( driverMap = builtins.mapAttrs (
name: _: name: _:
mkCargoDylintDriver "nightly-${name}" ( mkCargoDylintDriver "${name}" (
pkgs.rust-bin.nightly."${name}".default.override { pkgs.rust-bin.nightly."${lib.removePrefix "nightly-" name}".default.override {
extensions = [ extensions = [
"rustc-dev" "rustc-dev"
]; ];
@ -25,8 +25,8 @@ let
mkdir -p $out mkdir -p $out
${lib.strings.concatMapAttrsStringSep "\n" (name: driver: '' ${lib.strings.concatMapAttrsStringSep "\n" (name: driver: ''
mkdir -p $out/nightly-${name} mkdir -p $out/${name}
ln -s ${driver}/bin/dylint_driver-nix $out/nightly-${name}/dylint-driver ln -s ${driver}/bin/dylint_driver-nix $out/${name}/dylint-driver
'') driverMap} '') driverMap}
''; '';
in in

3
rust-toolchain.toml
View file

@ -1,3 +0,0 @@
[toolchain]
channel = "nightly-2025-03-01"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]