Skip to content

Commit e23ff50

Browse files
committed
stop destructuring inputs argument
1 parent 7bcef7a commit e23ff50

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

flake.gen.nix

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,18 @@
1414
};
1515
};
1616

17-
outputs =
18-
{ self
19-
, nixpkgs
20-
, flake-utils
21-
22-
, fenix
23-
, crane
24-
}: flake-utils.lib.eachDefaultSystem (system:
17+
outputs = inputs: inputs.flake-utils.lib.eachDefaultSystem (system:
2518
let
26-
pkgs = nixpkgs.legacyPackages.${system};
19+
pkgs = inputs.nixpkgs.legacyPackages.${system};
2720
stdenv =
2821
if pkgs.stdenv.isLinux then
2922
pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv
3023
else
3124
pkgs.stdenv;
3225

33-
mkToolchain = fenix.packages.${system}.combine;
26+
mkToolchain = inputs.fenix.packages.${system}.combine;
3427

35-
toolchain = fenix.packages.${system}.stable;
28+
toolchain = inputs.fenix.packages.${system}.stable;
3629

3730
buildToolchain = mkToolchain (with toolchain; [
3831
cargo
@@ -47,11 +40,12 @@
4740
rustc
4841

4942
# Always use nightly rustfmt because most of its options are unstable
50-
fenix.packages.${system}.latest.rustfmt
43+
inputs.fenix.packages.${system}.latest.rustfmt
5144
]);
5245

53-
builder =
54-
((crane.mkLib pkgs).overrideToolchain buildToolchain).buildPackage;
46+
builder = (
47+
(inputs.crane.mkLib pkgs).overrideToolchain buildToolchain
48+
).buildPackage;
5549
in
5650
{
5751
packages.default = builder {

flake.nix

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@
44
flake-utils.url = "github:numtide/flake-utils?ref=main";
55
};
66

7-
outputs =
8-
{ self
9-
, nixpkgs
10-
, flake-utils
11-
,
12-
}: flake-utils.lib.eachDefaultSystem (system:
7+
outputs = inputs: inputs.flake-utils.lib.eachDefaultSystem (system:
138
let
14-
pkgs = nixpkgs.legacyPackages.${system};
9+
pkgs = inputs.nixpkgs.legacyPackages.${system};
1510
in
1611
{
1712
devShells.default = pkgs.mkShell {

0 commit comments

Comments
 (0)