Skip to content

Commit 36bce23

Browse files
akirakakirak
committed
feat!: Add explicit system argument
1 parent 0c2454e commit 36bce23

13 files changed

Lines changed: 96 additions & 72 deletions

File tree

‎dev/flake.nix‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,24 @@
2121
...
2222
}@inputs:
2323
let
24-
eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
24+
eachSystem =
25+
f: nixpkgs.lib.genAttrs (import systems) (system: f system nixpkgs.legacyPackages.${system});
2526

2627
treefmtEval = eachSystem (
27-
pkgs:
28+
system: pkgs:
2829
treefmt-nix.lib.evalModule pkgs {
2930
projectRootFile = "flake.nix";
3031
programs.nixfmt.enable = true;
3132
}
3233
);
3334
in
3435
{
35-
formatter = eachSystem (pkgs: treefmtEval.${pkgs.stdenv.hostPlatform.system}.config.build.wrapper);
36+
formatter = eachSystem (system: pkgs: treefmtEval.${system}.config.build.wrapper);
3637

37-
checks = eachSystem (pkgs: {
38-
treefmt = treefmtEval.${pkgs.stdenv.hostPlatform.system}.config.build.check self;
39-
});
38+
checks = eachSystem (
39+
system: pkgs: {
40+
treefmt = treefmtEval.${system}.config.build.check self;
41+
}
42+
);
4043
};
4144
}

‎doc/flake.nix‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
...
1919
}:
2020
let
21-
eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
21+
eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f system nixpkgs.legacyPackages.${system});
2222

23-
treefmtEval = eachSystem (pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
23+
treefmtEval = eachSystem (_system: pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
2424
in
2525
{
26-
devShells = eachSystem (pkgs: {
26+
devShells = eachSystem (_system: pkgs: {
2727
default = pkgs.mkShell {
2828
packages = [
2929
pkgs.nodejs
@@ -33,10 +33,10 @@
3333
};
3434
});
3535

36-
formatter = eachSystem (pkgs: treefmtEval.${pkgs.stdenv.hostPlatform.system}.config.build.wrapper);
36+
formatter = eachSystem (system: _pkgs: treefmtEval.${system}.config.build.wrapper);
3737

38-
checks = eachSystem (pkgs: {
39-
treefmt = treefmtEval.${pkgs.stdenv.hostPlatform.system}.config.build.check self;
38+
checks = eachSystem (system: _pkgs: {
39+
treefmt = treefmtEval.${system}.config.build.check self;
4040
});
4141
};
4242
}

‎elixir/flake.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
f:
2020
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
2121
system:
22-
f (
22+
f system (
2323
import nixpkgs {
2424
inherit system;
2525
overlays = [
@@ -41,10 +41,10 @@
4141
);
4242
in
4343
{
44-
# packages = eachSystem (pkgs:
44+
# packages = eachSystem (_system: pkgs:
4545
# );
4646

47-
devShells = eachSystem (pkgs: {
47+
devShells = eachSystem (_system: pkgs: {
4848
default = pkgs.mkShell {
4949
buildInputs = with pkgs; [
5050
erlang

‎gleam/flake.nix‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@
1010
let
1111
eachSystem =
1212
f:
13-
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: f nixpkgs.legacyPackages.${system});
13+
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
14+
system: f system nixpkgs.legacyPackages.${system}
15+
);
1416

1517
erlang_version = "erlang_27";
1618
in
1719
{
18-
packages = eachSystem (pkgs: { });
20+
packages = eachSystem (_system: pkgs: { });
1921

20-
devShells = eachSystem (pkgs: {
22+
devShells = eachSystem (_system: pkgs: {
2123
default = pkgs.mkShell {
2224
buildInputs =
2325
with pkgs;

‎go/flake.nix‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,35 +29,42 @@
2929
let
3030
inherit (nixpkgs) lib;
3131
eachSystem =
32-
f: lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: f nixpkgs.legacyPackages.${system});
32+
f:
33+
lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: f system nixpkgs.legacyPackages.${system});
3334

34-
treefmtEval = eachSystem (pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
35+
treefmtEval = eachSystem (_system: pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
3536
in
3637
{
3738
# Build executables. See https://nixos.org/manual/nixpkgs/stable/#sec-language-go
38-
packages = eachSystem (pkgs: {
39-
# default = pkgs.buildGoModule {
40-
# pname = "hello";
41-
# version = builtins.substring 0 8 (self.lastModifiedDate or "19700101");
42-
# src = self.outPath;
43-
# vendorHash = lib.fakeHash;
44-
# meta = { };
45-
# };
46-
});
39+
packages = eachSystem (
40+
system: pkgs: {
41+
# default = pkgs.buildGoModule {
42+
# pname = "hello";
43+
# version = builtins.substring 0 8 (self.lastModifiedDate or "19700101");
44+
# src = self.outPath;
45+
# vendorHash = lib.fakeHash;
46+
# meta = { };
47+
# };
48+
}
49+
);
4750

48-
devShells = eachSystem (pkgs: {
49-
default = pkgs.mkShell {
50-
packages = [
51-
pkgs.go
52-
pkgs.gopls
53-
];
54-
};
55-
});
51+
devShells = eachSystem (
52+
system: pkgs: {
53+
default = pkgs.mkShell {
54+
packages = [
55+
pkgs.go
56+
pkgs.gopls
57+
];
58+
};
59+
}
60+
);
5661

57-
formatter = eachSystem (pkgs: treefmtEval.${pkgs.stdenv.hostPlatform.system}.config.build.wrapper);
62+
formatter = eachSystem (system: pkgs: treefmtEval.${system}.config.build.wrapper);
5863

59-
checks = eachSystem (pkgs: {
60-
treefmt = treefmtEval.${pkgs.stdenv.hostPlatform.system}.config.build.check self;
61-
});
64+
checks = eachSystem (
65+
system: pkgs: {
66+
treefmt = treefmtEval.${system}.config.build.check self;
67+
}
68+
);
6269
};
6370
}

‎minimal/flake.nix‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@
88
outputs =
99
{ nixpkgs, ... }@inputs:
1010
let
11-
eachSystem = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: f nixpkgs.legacyPackages.${system});
11+
eachSystem =
12+
f:
13+
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
14+
system: f system nixpkgs.legacyPackages.${system}
15+
);
1216
in
1317
{
14-
packages = eachSystem (pkgs: {
18+
packages = eachSystem (_system: pkgs: {
1519
hello = pkgs.hello;
1620
});
1721

18-
devShells = eachSystem (pkgs: {
22+
devShells = eachSystem (_system: pkgs: {
1923
default = pkgs.mkShell {
2024
buildInputs = with pkgs; [
2125
# Add development dependencies here

‎node-typescript/flake.nix‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
let
1313
eachSystem =
1414
f:
15-
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: f nixpkgs.legacyPackages.${system});
15+
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
16+
system: f system nixpkgs.legacyPackages.${system}
17+
);
1618
in
1719
{
18-
devShells = eachSystem (pkgs: {
20+
devShells = eachSystem (_system: pkgs: {
1921
default = pkgs.mkShell {
2022
packages = [
2123
pkgs.nodejs

‎ocaml-basic/flake.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
f:
1313
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
1414
system:
15-
f (
15+
f system (
1616
nixpkgs.legacyPackages.${system}.extend (
1717
_self: super: {
1818
# You can set the OCaml version to a particular release. Also, you
@@ -25,7 +25,7 @@
2525
);
2626
in
2727
{
28-
devShells = eachSystem (pkgs: {
28+
devShells = eachSystem (_system: pkgs: {
2929
default = pkgs.mkShell {
3030
# If your project isn't using dune, it probably still depends on make,
3131
# opam, or something else.

‎ocaml-dune/flake.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
f:
1717
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
1818
system:
19-
f (
19+
f system (
2020
nixpkgs.legacyPackages.${system}.extend (
2121
_self: super: {
2222
# You can set the OCaml version to a particular release. Also, you
@@ -30,7 +30,7 @@
3030
in
3131
{
3232
packages = eachSystem (
33-
pkgs: with pkgs; {
33+
_system: pkgs: with pkgs; {
3434
default = ocamlPackages.buildDunePackage {
3535
pname = throw "Name your OCaml package";
3636
version = throw "Version your OCaml package";
@@ -62,9 +62,9 @@
6262
}
6363
);
6464

65-
devShells = eachSystem (pkgs: {
65+
devShells = eachSystem (system: pkgs: {
6666
default = pkgs.mkShell {
67-
inputsFrom = [ self.packages.${pkgs.stdenv.hostPlatform.system}.default ];
67+
inputsFrom = [ self.packages.${system}.default ];
6868
packages = (
6969
with pkgs.ocamlPackages;
7070
[

‎python-uv-simple/flake.nix‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
let
1111
eachSystem =
1212
f:
13-
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: f nixpkgs.legacyPackages.${system});
13+
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
14+
system: f system nixpkgs.legacyPackages.${system}
15+
);
1416
in
1517
{
16-
devShells = eachSystem (pkgs: {
18+
devShells = eachSystem (_system: pkgs: {
1719
default = pkgs.mkShell {
1820
buildInputs = [
1921
pkgs.python3

0 commit comments

Comments
 (0)