Merge pull request #113045 from zowoq/podman-systemd

podman: install systemd files

authored by

adisbladis and committed by
GitHub
83be4f8e 860a644e

+14
+10
nixos/modules/virtualisation/podman.nix
··· 105 105 })); 106 106 }; 107 107 108 + systemd.packages = [ cfg.package ]; 109 + 110 + systemd.services.podman.serviceConfig = { 111 + ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ]; 112 + }; 113 + 114 + systemd.sockets.podman.wantedBy = [ "sockets.target" ]; 115 + 116 + systemd.tmpfiles.packages = [ cfg.package ]; 117 + 108 118 assertions = [ 109 119 { 110 120 assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable;
+3
pkgs/applications/virtualization/podman/default.nix
··· 63 63 installShellCompletion --fish completions/fish/* 64 64 installShellCompletion --zsh completions/zsh/* 65 65 MANDIR=$man/share/man make install.man-nobuild 66 + '' + lib.optionalString stdenv.isLinux '' 67 + install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d 68 + install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system 66 69 ''; 67 70 68 71 passthru.tests = { inherit (nixosTests) podman; };
+1
pkgs/applications/virtualization/podman/wrapper.nix
··· 48 48 ln -s ${podman.man} $man 49 49 50 50 mkdir -p $out/bin 51 + ln -s ${podman-unwrapped}/lib $out/lib 51 52 ln -s ${podman-unwrapped}/share $out/share 52 53 makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ 53 54 --prefix PATH : ${binPath}