WIP: feat(systemd): switch to systemd #33

Draft
lbailly wants to merge 8 commits from lbailly/liminix:systemd into main
3 changed files with 101 additions and 3 deletions
Showing only changes of commit 109c577084 - Show all commits

View file

@ -57,7 +57,7 @@ let
]; ];
}).config.system; }).config.system;
in { in {
inherit evalModules; inherit evalModules config;
outputs = config.system.outputs // { outputs = config.system.outputs // {
default = config.system.outputs.${config.hardware.defaultOutput}; default = config.system.outputs.${config.hardware.defaultOutput};

View file

@ -186,8 +186,11 @@ in {
}; };
}; };
}; };
# bin = dir {
# init = symlink "${s6-init-bin}/bin/init";
# };
bin = dir { bin = dir {
init = symlink "${s6-init-bin}/bin/init"; init = symlink "${pkgs.systemd}/bin/init";
}; };
}; };
}; };

View file

@ -259,7 +259,7 @@ extraPkgs // {
patches = o.patches ++ [ patches = o.patches ++ [
./pkgs/qemu/arm-image-friendly-load-addr.patch ./pkgs/qemu/arm-image-friendly-load-addr.patch
]; ];
}); in q.override { nixosTestRunner = true; sdlSupport = false; }; }); in q.override { nixosTestRunner = true; sdlSupport = false; hostCpuTargets = [ "mips-softmmu" ]; };
rsyncSmall = rsyncSmall =
let r = prev.rsync.overrideAttrs(o: { let r = prev.rsync.overrideAttrs(o: {
@ -284,6 +284,101 @@ extraPkgs // {
strace = prev.strace.override { libunwind = null; }; strace = prev.strace.override { libunwind = null; };
getent =
prev.callPackage ({
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
pname = "musl-utils";
version = "1.1.12-r7";
src = fetchFromGitHub {
owner = "boltlinux";
repo = "musl-utils";
rev = version;
hash = "sha256-q9CbOyK0Psw3YJnIT3yPRWuwr40nxLZt4RexuOHAUuw=";
};
nativeBuildInputs = [
prev.autoconf
prev.automake
];
preConfigure = ''
autoreconf -i
'';
buildPhase = ''
make -C src getent
'';
installPhase = ''
mkdir -p $out/bin/
cp src/getent $out/bin/
'';
meta = {
description = "Alpine Linux' getconf, getent and iconv implementations";
homepage = "https://github.com/boltlinux/musl-utils";
license = lib.licenses.free; # FIXME: nix-init did not find a license
maintainers = with lib.maintainers; [ ];
mainProgram = "musl-utils";
platforms = lib.platforms.all;
};
}) { };
systemd = prev.systemd.override {
withAcl = false;
withAnalyze = false;
withApparmor = false;
withAudit = false;
withBootloader = false;
# withCompression = true;
withCoredump = false;
withCryptsetup = false;
withRepart = false;
withDocumentation = false;
withEfi = false;
withFido2 = false;
withHomed = false;
# withHostnamed = true;
withHwdb = false;
withImportd = false;
withIptables = false;
withKmod = false;
withLibBPF = false;
withLibidn2 = false;
withLocaled = false;
# withLogind = true;
withMachined = false;
# withNetworkd = true;
withNss = false;
withOomd = false;
# withPam = true;
# withPasswordQuality = true;
withPCRE2 = false;
withPolkit = false;
withPortabled = false;
withQrencode = false;
withRemote = false;
# withResolved = true;
# withShellCompletions = true;
# withSysusers = true;
withSysupdate = false;
# withTimedated = true;
# withTimesyncd = true;
withTpm2Tss = false;
withUkify = false;
withUserDb = false;
withUtmp = false;
withVmspawn = false;
withKernelInstall = false;
withLibarchive = false;
};
ubootQemuAarch64 = final.buildUBoot { ubootQemuAarch64 = final.buildUBoot {
defconfig = "qemu_arm64_defconfig"; defconfig = "qemu_arm64_defconfig";
extraMeta.platforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];