[wip] upgrade mkosi to v20

This commit is contained in:
Malte Poll 2024-01-12 10:10:27 +01:00
parent 2fea43a320
commit f796fc1392
2 changed files with 9 additions and 4 deletions

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -euo pipefail
set -xeuo pipefail
shopt -s inherit_errexit
export PATH=/run/wrappers/bin:/run/current-system/sw/bin:/bin:/usr/bin:/usr/local/bin
@ -22,6 +22,7 @@ enabled=1
gpgcheck=0
EOF
args+=("--package-manager-tree=${reposdir}:/etc/yum.repos.d")
args+=("--local-mirror=${LOCAL_MIRROR}")
fi
exec @@MKOSI@@ "${args[@]}" build
exec @@MKOSI@@ --debug "${args[@]}" build

View File

@ -26,8 +26,8 @@
src = pkgsUnstable.fetchFromGitHub {
owner = "systemd";
repo = "mkosi";
rev = "abf22cdc6ccb13f2cd84679ede77231455ec6813";
hash = "sha256-njtYWSXSLMcn6AtGfAeL/ncZQ6g+Vgpe7EaKLkzAOl4=";
rev = "0a4e1276af191e64c57cd3c1ab50271ab3b706c8";
hash = "sha256-vcXa+oc+5hpWPQvzloNPTM8ra7ShUTLtBiQjqoAB09Y=";
};
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pkgsUnstable; [
# package management
@ -35,6 +35,10 @@
rpm
# filesystem tools
bash # sh and bash for sandboxed scripts
coreutils # cp, rm, mkdir, chmod, chown, chgrp, ln, readlink, stat, ...
btrfs-progs # btrfs subvolumes
gnutar # tar
squashfsTools # mksquashfs
dosfstools # mkfs.vfat
mtools # mcopy