Skip to content

Commit 7dd2ebb

Browse files
committed
flake: Use nixos-24.11, refactor, drop inputs.systems
1 parent db3c4dc commit 7dd2ebb

File tree

2 files changed

+31
-39
lines changed

2 files changed

+31
-39
lines changed

flake.lock

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

flake.nix

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
11
{
2-
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
3-
inputs.systems.url = "github:nix-systems/default";
2+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
43
inputs.devshell.url = "github:numtide/devshell";
54
inputs.devshell.inputs.nixpkgs.follows = "nixpkgs";
6-
inputs.devshell.inputs.systems.follows = "systems";
75

8-
outputs = inputs@{ ... }:
6+
outputs =
7+
inputs@{ ... }:
98
let
10-
eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems);
9+
systems = [
10+
"aarch64-darwin"
11+
"aarch64-linux"
12+
"x86_64-darwin"
13+
"x86_64-linux"
14+
];
15+
eachSystem =
16+
f:
17+
inputs.nixpkgs.lib.genAttrs systems (
18+
system:
19+
f rec {
20+
inherit system;
21+
pkgs = inputs.nixpkgs.legacyPackages.${system};
22+
devshell = import inputs.devshell { nixpkgs = pkgs; };
23+
}
24+
);
1125
in
1226
{
13-
devShells = eachSystem (system:
27+
devShells = eachSystem (
28+
{ pkgs, devshell, ... }:
1429
let
15-
pkgs = inputs.nixpkgs.legacyPackages.${system};
16-
devshell = import inputs.devshell {
17-
inherit inputs system;
18-
nixpkgs = pkgs;
19-
};
2030
nodeModules = pkgs.mkYarnModules {
2131
pname = "zigbee2mqtt-networkmap-node-modules";
2232
version = "1.0";
@@ -33,6 +43,7 @@
3343
yarn
3444
];
3545
};
36-
});
46+
}
47+
);
3748
};
3849
}

0 commit comments

Comments
 (0)