Skip to content

Commit b47bda8

Browse files
authored
flake.nix: drop flake-utils, add formatter (#992)
1 parent 205fdf6 commit b47bda8

File tree

2 files changed

+24
-61
lines changed

2 files changed

+24
-61
lines changed

flake.lock

Lines changed: 7 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
{
22
description = "Nix flake for skim development";
33

4-
inputs = {
5-
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
6-
flake-utils.url = "github:numtide/flake-utils";
7-
};
4+
inputs.nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
85

9-
outputs = {
10-
self,
11-
nixpkgs,
12-
flake-utils,
13-
}:
14-
flake-utils.lib.eachDefaultSystem (
15-
system: let
16-
pkgs = nixpkgs.legacyPackages.${system};
17-
in {
18-
devShells.default = pkgs.mkShell {
19-
packages = with pkgs; [
6+
outputs =
7+
inputs:
8+
let
9+
inherit (inputs.nixpkgs) lib;
10+
systems = lib.systems.flakeExposed;
11+
eachSystem = lib.genAttrs systems;
12+
pkgsFor = inputs.nixpkgs.legacyPackages;
13+
in
14+
{
15+
devShells = eachSystem (system: {
16+
default = pkgsFor.${system}.mkShellNoCC {
17+
packages = with pkgsFor.${system}; [
2018
cargo-nextest
2119
cargo-insta
2220
cargo-llvm-cov
@@ -28,6 +26,8 @@
2826
hyperfine
2927
];
3028
};
31-
}
32-
);
29+
});
30+
31+
formatter = eachSystem (system: pkgsFor.${system}.nixfmt);
32+
};
3333
}

0 commit comments

Comments
 (0)