Monorepo for Tangled
nix: add some common tools to the microvm images
Signed-off-by: dawn <dawn@tangled.org>
+25
-3
+19
-1
nix/microvm/base.nix
+19
-1
nix/microvm/base.nix
···
235
235
];
236
236
237
237
# add any common packages / services here
238
-
environment.systemPackages = [pkgs.gitMinimal];
238
+
environment.systemPackages = with pkgs; [
239
+
gitMinimal
240
+
curlMinimal
241
+
wget
242
+
coreutils-full
243
+
file
244
+
findutils
245
+
gnused
246
+
jq
247
+
yq
248
+
xxd
249
+
gnutar
250
+
zip
251
+
unzip
252
+
gz-utils
253
+
bzip2
254
+
lz4
255
+
p7zip
256
+
];
239
257
# disable default nixos packages ([perl rsync strace])
240
258
environment.defaultPackages = [];
241
259
# this removed nixos-rebuild-ng and nixos-generate-config, which lets us
+6
-2
nix/pkgs/spindle-alpine-image.nix
+6
-2
nix/pkgs/spindle-alpine-image.nix
···
15
15
}: let
16
16
nix = pkgsStatic.nixStatic;
17
17
bash = pkgsStatic.bashNonInteractive;
18
+
curl = pkgsStatic.curlMinimal;
19
+
jq = pkgsStatic.jq;
18
20
git =
19
21
(pkgsStatic.gitMinimal.override {
20
-
curl = pkgsStatic.curlMinimal;
22
+
inherit curl;
21
23
pythonSupport = false;
22
24
withManual = false;
23
25
nlsSupport = false;
···
26
28
doInstallCheck = false;
27
29
configureFlags = (old.configureFlags or []) ++ ["ac_cv_lib_curl_curl_global_init=yes"];
28
30
});
29
-
guestTools = [nix bash git];
31
+
# we don't include gnused, xxd etc. here because busybox has them
32
+
# we want to keep the image this image small!
33
+
guestTools = [nix bash git curl jq];
30
34
31
35
# run by busybox at sysinit
32
36
setupScript = writeText "spindle-setup" ''