Skip to content

Commit 89f9c2d

Browse files
simonswinesimonswine
committed
Use nixfmt
1 parent fe66468 commit 89f9c2d

3 files changed

Lines changed: 82 additions & 75 deletions

File tree

‎flake.nix‎

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -40,69 +40,73 @@
4040
builtins.elem (lib.getName pkg) [
4141
"claude-code"
4242
];
43-
packageOverrides = pkgs:
43+
packageOverrides =
44+
pkgs:
4445
let
4546
fluidcad = pkgs.callPackage ./pkgs/fluidcad {
4647
buildNpmPackage = pkgs.buildNpmPackage.override { nodejs = pkgs.nodejs_24; };
4748
};
4849
kandev = pkgs.callPackage ./pkgs/kandev { };
4950
in
5051
{
51-
austin = pkgs.callPackage ./pkgs/austin { };
52-
benchstat = pkgs.callPackage ./pkgs/benchstat { };
53-
cert-updater = pkgs.callPackage ./pkgs/cert-updater { };
54-
claude-code = pkgs.callPackage ./pkgs/claude-code { };
55-
devfiler = pkgs.callPackage ./pkgs/devfiler { };
56-
dezoomify-rs = pkgs.callPackage ./pkgs/dezoomify-rs { };
57-
dhclient = pkgs.callPackage ./pkgs/dhclient { };
58-
docker-machine = pkgs.callPackage ./pkgs/docker-machine { };
59-
docker-machine-driver-hetzner = pkgs.callPackage ./pkgs/docker-machine-driver-hetzner { };
60-
faillint = pkgs.callPackage ./pkgs/faillint { };
61-
inherit fluidcad;
62-
fluidcad-nvim = pkgs.callPackage ./pkgs/fluidcad-nvim { inherit fluidcad; nodejs = pkgs.nodejs_24; };
63-
inherit kandev;
64-
kandev-frontend = pkgs.callPackage ./pkgs/kandev-frontend {
65-
inherit (kandev) version src;
52+
austin = pkgs.callPackage ./pkgs/austin { };
53+
benchstat = pkgs.callPackage ./pkgs/benchstat { };
54+
cert-updater = pkgs.callPackage ./pkgs/cert-updater { };
55+
claude-code = pkgs.callPackage ./pkgs/claude-code { };
56+
devfiler = pkgs.callPackage ./pkgs/devfiler { };
57+
dezoomify-rs = pkgs.callPackage ./pkgs/dezoomify-rs { };
58+
dhclient = pkgs.callPackage ./pkgs/dhclient { };
59+
docker-machine = pkgs.callPackage ./pkgs/docker-machine { };
60+
docker-machine-driver-hetzner = pkgs.callPackage ./pkgs/docker-machine-driver-hetzner { };
61+
faillint = pkgs.callPackage ./pkgs/faillint { };
62+
inherit fluidcad;
63+
fluidcad-nvim = pkgs.callPackage ./pkgs/fluidcad-nvim {
64+
inherit fluidcad;
65+
nodejs = pkgs.nodejs_24;
66+
};
67+
inherit kandev;
68+
kandev-frontend = pkgs.callPackage ./pkgs/kandev-frontend {
69+
inherit (kandev) version src;
70+
};
71+
opencode = pkgs.callPackage ./pkgs/opencode { };
72+
version-check-home-hook = pkgs.callPackage ./pkgs/version-check-home-hook { };
73+
wrap-buddy = pkgs.callPackage ./pkgs/wrap-buddy { };
74+
fronius-exporter = pkgs.callPackage ./pkgs/fronius-exporter { };
75+
g810-led = pkgs.callPackage ./pkgs/g810-led { };
76+
get-focused-x-screen = pkgs.callPackage ./pkgs/get-focused-x-screen { };
77+
gimli-addr2line = pkgs.callPackage ./pkgs/gimli-addr2line { };
78+
gitlab-runner = pkgs.callPackage ./pkgs/gitlab-runner { };
79+
goda = pkgs.callPackage ./pkgs/goda { };
80+
growatt-proxy-exporter = pkgs.callPackage ./pkgs/growatt-proxy-exporter { };
81+
heatmiser-exporter = pkgs.callPackage ./pkgs/heatmiser-exporter { };
82+
inch-exporter = pkgs.callPackage ./pkgs/inch-exporter { };
83+
intel-gpu-exporter = pkgs.callPackage ./pkgs/intel-gpu-exporter { };
84+
jsonnet-language-server = pkgs.callPackage ./pkgs/jsonnet-language-server { };
85+
mi-flora-exporter = pkgs.callPackage ./pkgs/mi-flora-exporter { };
86+
miio = pkgs.callPackage ./pkgs/python-miio { };
87+
modbus-exporter = pkgs.callPackage ./pkgs/modbus-exporter { };
88+
modularise = pkgs.callPackage ./pkgs/modularise { };
89+
mtv-dl = pkgs.callPackage ./pkgs/mtv-dl { };
90+
nut-exporter = pkgs.callPackage ./pkgs/nut-exporter { };
91+
orangepi-firmware = pkgs.callPackage ./pkgs/orangepi-firmware { };
92+
phpspy = pkgs.callPackage ./pkgs/phpspy { };
93+
profilecli = pkgs.callPackage ./pkgs/profilecli { };
94+
prometheus-node-exporter-restic = pkgs.callPackage ./pkgs/prometheus-node-exporter-restic { };
95+
prometheus-node-exporter-smartmon = pkgs.callPackage ./pkgs/prometheus-node-exporter-smartmon { };
96+
prometheus-node-exporter-zfs = pkgs.callPackage ./pkgs/prometheus-node-exporter-zfs { };
97+
prometheus-snmp-exporter-config = pkgs.callPackage ./pkgs/prometheus-snmp-exporter-config { };
98+
pyroscope = pkgs.callPackage ./pkgs/pyroscope { };
99+
rift = pkgs.callPackage ./pkgs/rift { };
100+
roc-vad = pkgs.callPackage ./pkgs/roc-vad { };
101+
sleepwatcher = pkgs.callPackage ./pkgs/sleepwatcher { };
102+
sonnenbatterie-exporter = pkgs.callPackage ./pkgs/sonnenbatterie-exporter { };
103+
tod0 = pkgs.callPackage ./pkgs/tod0 { };
104+
tplink-switch-exporter = pkgs.callPackage ./pkgs/tplink-switch-exporter { };
105+
tz-cli = pkgs.callPackage ./pkgs/tz-cli { };
106+
vim-markdown-composer = pkgs.callPackage ./pkgs/vim-markdown-composer { };
107+
yasdi = pkgs.callPackage ./pkgs/yasdi { };
108+
yasdi-exporter = pkgs.callPackage ./pkgs/yasdi-exporter { };
66109
};
67-
opencode = pkgs.callPackage ./pkgs/opencode { };
68-
version-check-home-hook = pkgs.callPackage ./pkgs/version-check-home-hook { };
69-
wrap-buddy = pkgs.callPackage ./pkgs/wrap-buddy { };
70-
fronius-exporter = pkgs.callPackage ./pkgs/fronius-exporter { };
71-
g810-led = pkgs.callPackage ./pkgs/g810-led { };
72-
get-focused-x-screen = pkgs.callPackage ./pkgs/get-focused-x-screen { };
73-
gimli-addr2line = pkgs.callPackage ./pkgs/gimli-addr2line { };
74-
gitlab-runner = pkgs.callPackage ./pkgs/gitlab-runner { };
75-
goda = pkgs.callPackage ./pkgs/goda { };
76-
growatt-proxy-exporter = pkgs.callPackage ./pkgs/growatt-proxy-exporter { };
77-
heatmiser-exporter = pkgs.callPackage ./pkgs/heatmiser-exporter { };
78-
inch-exporter = pkgs.callPackage ./pkgs/inch-exporter { };
79-
intel-gpu-exporter = pkgs.callPackage ./pkgs/intel-gpu-exporter { };
80-
jsonnet-language-server = pkgs.callPackage ./pkgs/jsonnet-language-server { };
81-
mi-flora-exporter = pkgs.callPackage ./pkgs/mi-flora-exporter { };
82-
miio = pkgs.callPackage ./pkgs/python-miio { };
83-
modbus-exporter = pkgs.callPackage ./pkgs/modbus-exporter { };
84-
modularise = pkgs.callPackage ./pkgs/modularise { };
85-
mtv-dl = pkgs.callPackage ./pkgs/mtv-dl { };
86-
nut-exporter = pkgs.callPackage ./pkgs/nut-exporter { };
87-
orangepi-firmware = pkgs.callPackage ./pkgs/orangepi-firmware { };
88-
phpspy = pkgs.callPackage ./pkgs/phpspy { };
89-
profilecli = pkgs.callPackage ./pkgs/profilecli { };
90-
prometheus-node-exporter-restic = pkgs.callPackage ./pkgs/prometheus-node-exporter-restic { };
91-
prometheus-node-exporter-smartmon = pkgs.callPackage ./pkgs/prometheus-node-exporter-smartmon { };
92-
prometheus-node-exporter-zfs = pkgs.callPackage ./pkgs/prometheus-node-exporter-zfs { };
93-
prometheus-snmp-exporter-config = pkgs.callPackage ./pkgs/prometheus-snmp-exporter-config { };
94-
pyroscope = pkgs.callPackage ./pkgs/pyroscope { };
95-
rift = pkgs.callPackage ./pkgs/rift { };
96-
roc-vad = pkgs.callPackage ./pkgs/roc-vad { };
97-
sleepwatcher = pkgs.callPackage ./pkgs/sleepwatcher { };
98-
sonnenbatterie-exporter = pkgs.callPackage ./pkgs/sonnenbatterie-exporter { };
99-
tod0 = pkgs.callPackage ./pkgs/tod0 { };
100-
tplink-switch-exporter = pkgs.callPackage ./pkgs/tplink-switch-exporter { };
101-
tz-cli = pkgs.callPackage ./pkgs/tz-cli { };
102-
vim-markdown-composer = pkgs.callPackage ./pkgs/vim-markdown-composer { };
103-
yasdi = pkgs.callPackage ./pkgs/yasdi { };
104-
yasdi-exporter = pkgs.callPackage ./pkgs/yasdi-exporter { };
105-
};
106110
};
107111
nixosModulesPkgs = {
108112
nixpkgs = {

‎overlays/containerd/default.nix‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
self: super: {
2-
containerd = (super.containerd.override {
3-
buildGoModule = super.buildGoModule.override { go = super.go_1_26; };
4-
}).overrideAttrs (old: rec {
5-
version = "2.3.1";
6-
src = super.fetchFromGitHub {
7-
owner = "containerd";
8-
repo = "containerd";
9-
rev = "v${version}";
10-
hash = "sha256-BpKBrMluU5MmojJp/9Og5UrkUBLHav5qx6Re1SFhlhY=";
11-
};
12-
makeFlags =
13-
builtins.filter (
14-
x: (!super.lib.strings.hasPrefix "VERSION=" x) && (!super.lib.strings.hasPrefix "REVISION=" x)
15-
) old.makeFlags
16-
++ [
17-
"REVISION=${src.rev}"
18-
"VERSION=v${version}"
19-
];
20-
});
2+
containerd =
3+
(super.containerd.override {
4+
buildGoModule = super.buildGoModule.override { go = super.go_1_26; };
5+
}).overrideAttrs
6+
(old: rec {
7+
version = "2.3.1";
8+
src = super.fetchFromGitHub {
9+
owner = "containerd";
10+
repo = "containerd";
11+
rev = "v${version}";
12+
hash = "sha256-BpKBrMluU5MmojJp/9Og5UrkUBLHav5qx6Re1SFhlhY=";
13+
};
14+
makeFlags =
15+
builtins.filter (
16+
x: (!super.lib.strings.hasPrefix "VERSION=" x) && (!super.lib.strings.hasPrefix "REVISION=" x)
17+
) old.makeFlags
18+
++ [
19+
"REVISION=${src.rev}"
20+
"VERSION=v${version}"
21+
];
22+
});
2123
}

‎pkgs/claude-code/default.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
3636
nativeBuildInputs = [
3737
installShellFiles
3838
makeBinaryWrapper
39-
] ++ lib.optionals stdenvNoCC.hostPlatform.isElf [ autoPatchelfHook ];
39+
]
40+
++ lib.optionals stdenvNoCC.hostPlatform.isElf [ autoPatchelfHook ];
4041

4142
strictDeps = true;
4243

0 commit comments

Comments
 (0)