commit 48642c634e51b949d3ea01f09c28c83f9aa824d9 · pyrox.dev/nixpkgs

-8

nixos/modules/virtualisation/podman/default.nix

···

       183
       183
        
       

     

       184
       184
        
             systemd.packages = [ cfg.package ];

     

       185
       185
        
       

     

       186
       186
       -
             systemd.services.podman.serviceConfig = {

     

       187
       187
       -
               ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];

     

       188
       188
       -
             };

     

       189
       189
       -
       

     

       190
       186
        
             systemd.services.podman-prune = {

     

       191
       187
        
               description = "Prune podman resources";

     

       192
       188
        
       

     
···

       206
       202
        
       

     

       207
       203
        
             systemd.sockets.podman.wantedBy = [ "sockets.target" ];

     

       208
       204
        
             systemd.sockets.podman.socketConfig.SocketGroup = "podman";

     

       209
       209
       -
       

     

       210
       210
       -
             systemd.user.services.podman.serviceConfig = {

     

       211
       211
       -
               ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];

     

       212
       212
       -
             };

     

       213
       205
        
       

     

       214
       206
        
             systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];

     

       215
       207

+57 -16

pkgs/applications/virtualization/podman/default.nix

···

       14
       14
        
       , go-md2man

     

       15
       15
        
       , nixosTests

     

       16
       16
        
       , python3

     

       17
       17
       +
       , makeWrapper

     

       18
       18
       +
       , symlinkJoin

     

       19
       19
       +
       , extraPackages ? [ ]

     

       20
       20
       +
       , runc

     

       21
       21
       +
       , crun

     

       22
       22
       +
       , conmon

     

       23
       23
       +
       , slirp4netns

     

       24
       24
       +
       , fuse-overlayfs

     

       25
       25
       +
       , util-linux

     

       26
       26
       +
       , iptables

     

       27
       27
       +
       , iproute2

     

       28
       28
       +
       , catatonit

     

       29
       29
       +
       , gvproxy

     

       30
       30
       +
       , aardvark-dns

     

       31
       31
       +
       , netavark

     

       17
       32
        
       , testers

     

       18
       33
        
       , podman

     

       19
       34
        
       }:

     

       35
       35
       +
       let

     

       36
       36
       +
         # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed

     

       20
       37
        
       

     

       38
       38
       +
         binPath = lib.makeBinPath ([

     

       39
       39
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       40
       40
       +
           runc

     

       41
       41
       +
           crun

     

       42
       42
       +
           conmon

     

       43
       43
       +
           slirp4netns

     

       44
       44
       +
           fuse-overlayfs

     

       45
       45
       +
           util-linux

     

       46
       46
       +
           iptables

     

       47
       47
       +
           iproute2

     

       48
       48
       +
         ] ++ extraPackages);

     

       49
       49
       +
       

     

       50
       50
       +
         helpersBin = symlinkJoin {

     

       51
       51
       +
           name = "podman-helper-binary-wrapper";

     

       52
       52
       +
       

     

       53
       53
       +
           # this only works for some binaries, others may need to be be added to `binPath` or in the modules

     

       54
       54
       +
           paths = [

     

       55
       55
       +
             gvproxy

     

       56
       56
       +
           ] ++ lib.optionals stdenv.isLinux [

     

       57
       57
       +
             aardvark-dns

     

       58
       58
       +
             catatonit # added here for the pause image and also set in `containersConf` for `init_path`

     

       59
       59
       +
             netavark

     

       60
       60
       +
           ];

     

       61
       61
       +
         };

     

       62
       62
       +
       in

     

       21
       63
        
       buildGoModule rec {

     

       22
       64
        
         pname = "podman";

     

       23
       65
        
         version = "4.4.2";

     
···

       38
       80
        
       

     

       39
       81
        
         doCheck = false;

     

       40
       82
        
       

     

       41
       41
       -
         outputs = [ "out" "man" ] ++ lib.optionals stdenv.isLinux [ "rootlessport" ];

     

       83
       83
       +
         outputs = [ "out" "man" ];

     

       42
       84
        
       

     

       43
       43
       -
         nativeBuildInputs = [ pkg-config go-md2man installShellFiles python3 ];

     

       85
       85
       +
         nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper python3 ];

     

       44
       86
        
       

     

       45
       87
        
         buildInputs = lib.optionals stdenv.isLinux [

     

       46
       88
        
           btrfs-progs

     
···

       52
       94
        
           systemd

     

       53
       95
        
         ];

     

       54
       96
        
       

     

       97
       97
       +
         HELPER_BINARIES_DIR = "${PREFIX}/libexec/podman"; # used in buildPhase & installPhase

     

       98
       98
       +
         PREFIX = "${placeholder "out"}";

     

       99
       99
       +
       

     

       55
       100
        
         buildPhase = ''

     

       56
       101
        
           runHook preBuild

     

       57
       102
        
           patchShebangs .

     

       58
       103
        
           ${if stdenv.isDarwin then ''

     

       59
       104
        
             make podman-remote # podman-mac-helper uses FHS paths

     

       60
       105
        
           '' else ''

     

       61
       61
       -
             make bin/podman bin/rootlessport

     

       106
       106
       +
             make bin/podman bin/rootlessport bin/quadlet

     

       62
       107
        
           ''}

     

       63
       108
        
           make docs

     

       64
       109
        
           runHook postBuild

     
···

       66
       111
        
       

     

       67
       112
        
         installPhase = ''

     

       68
       113
        
           runHook preInstall

     

       69
       69
       -
           mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper

     

       70
       114
        
           ${if stdenv.isDarwin then ''

     

       71
       71
       -
             mv bin/{darwin/podman,podman}

     

       115
       115
       +
             install bin/darwin/podman -Dt $out/bin

     

       72
       116
        
           '' else ''

     

       73
       73
       -
             install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d

     

       74
       74
       -
             for s in contrib/systemd/**/*.in; do

     

       75
       75
       -
               substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary

     

       76
       76
       -
             done

     

       77
       77
       -
             PREFIX=$out make install.systemd

     

       78
       78
       -
             install -Dm555 bin/rootlessport -t $rootlessport/bin

     

       117
       117
       +
             make install.bin install.systemd

     

       79
       118
        
           ''}

     

       80
       80
       -
           install -Dm555 bin/podman -t $out/bin

     

       81
       81
       -
           PREFIX=$out make install.completions

     

       82
       82
       -
           MANDIR=$man/share/man make install.man

     

       119
       119
       +
           make install.completions install.man

     

       120
       120
       +
           mkdir -p ${HELPER_BINARIES_DIR}

     

       121
       121
       +
           ln -s ${helpersBin}/bin/* ${HELPER_BINARIES_DIR}

     

       122
       122
       +
           wrapProgram $out/bin/podman \

     

       123
       123
       +
             --prefix PATH : ${lib.escapeShellArg binPath}

     

       83
       124
        
           runHook postInstall

     

       84
       125
        
         '';

     

       85
       126
        
       

     

       86
       127
        
         postFixup = lib.optionalString stdenv.isLinux ''

     

       87
       87
       -
           RPATH=$(patchelf --print-rpath $out/bin/podman)

     

       88
       88
       -
           patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman

     

       128
       128
       +
           RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped)

     

       129
       129
       +
           patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped

     

       89
       130
        
         '';

     

       90
       131
        
       

     

       91
       132
        
         passthru.tests = {

-78

pkgs/applications/virtualization/podman/wrapper.nix

···

       1
       1
       -
       { podman-unwrapped

     

       2
       2
       -
       , runCommand

     

       3
       3
       -
       , makeWrapper

     

       4
       4
       -
       , symlinkJoin

     

       5
       5
       -
       , lib

     

       6
       6
       -
       , stdenv

     

       7
       7
       -
       , extraPackages ? []

     

       8
       8
       -
       , runc # Default container runtime

     

       9
       9
       -
       , crun # Container runtime (default with cgroups v2 for podman/buildah)

     

       10
       10
       -
       , conmon # Container runtime monitor

     

       11
       11
       -
       , slirp4netns # User-mode networking for unprivileged namespaces

     

       12
       12
       -
       , fuse-overlayfs # CoW for images, much faster than default vfs

     

       13
       13
       -
       , util-linux # nsenter

     

       14
       14
       -
       , iptables

     

       15
       15
       -
       , iproute2

     

       16
       16
       -
       , catatonit

     

       17
       17
       -
       , gvproxy

     

       18
       18
       -
       , aardvark-dns

     

       19
       19
       -
       , netavark

     

       20
       20
       -
       }:

     

       21
       21
       -
       

     

       22
       22
       -
       # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed

     

       23
       23
       -
       

     

       24
       24
       -
       let

     

       25
       25
       -
         binPath = lib.makeBinPath ([

     

       26
       26
       -
         ] ++ lib.optionals stdenv.isLinux [

     

       27
       27
       -
           runc

     

       28
       28
       -
           crun

     

       29
       29
       -
           conmon

     

       30
       30
       -
           slirp4netns

     

       31
       31
       -
           fuse-overlayfs

     

       32
       32
       -
           util-linux

     

       33
       33
       -
           iptables

     

       34
       34
       -
           iproute2

     

       35
       35
       -
         ] ++ extraPackages);

     

       36
       36
       -
       

     

       37
       37
       -
         helpersBin = symlinkJoin {

     

       38
       38
       -
           name = "${podman-unwrapped.pname}-helper-binary-wrapper-${podman-unwrapped.version}";

     

       39
       39
       -
       

     

       40
       40
       -
           # this only works for some binaries, others may need to be be added to `binPath` or in the modules

     

       41
       41
       -
           paths = [

     

       42
       42
       -
             gvproxy

     

       43
       43
       -
           ] ++ lib.optionals stdenv.isLinux [

     

       44
       44
       -
             aardvark-dns

     

       45
       45
       -
             catatonit # added here for the pause image and also set in `containersConf` for `init_path`

     

       46
       46
       -
             netavark

     

       47
       47
       -
             podman-unwrapped.rootlessport

     

       48
       48
       -
           ];

     

       49
       49
       -
         };

     

       50
       50
       -
       

     

       51
       51
       -
       in runCommand podman-unwrapped.name {

     

       52
       52
       -
         name = "${podman-unwrapped.pname}-wrapper-${podman-unwrapped.version}";

     

       53
       53
       -
         inherit (podman-unwrapped) pname version passthru;

     

       54
       54
       -
       

     

       55
       55
       -
         preferLocalBuild = true;

     

       56
       56
       -
       

     

       57
       57
       -
         meta = builtins.removeAttrs podman-unwrapped.meta [ "outputsToInstall" ];

     

       58
       58
       -
       

     

       59
       59
       -
         outputs = [

     

       60
       60
       -
           "out"

     

       61
       61
       -
           "man"

     

       62
       62
       -
         ];

     

       63
       63
       -
       

     

       64
       64
       -
         nativeBuildInputs = [

     

       65
       65
       -
           makeWrapper

     

       66
       66
       -
         ];

     

       67
       67
       -
       

     

       68
       68
       -
       } ''

     

       69
       69
       -
         ln -s ${podman-unwrapped.man} $man

     

       70
       70
       -
       

     

       71
       71
       -
         mkdir -p $out/bin

     

       72
       72
       -
         ln -s ${podman-unwrapped}/etc $out/etc

     

       73
       73
       -
         ln -s ${podman-unwrapped}/lib $out/lib

     

       74
       74
       -
         ln -s ${podman-unwrapped}/share $out/share

     

       75
       75
       -
         makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \

     

       76
       76
       -
           --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \

     

       77
       77
       -
           --prefix PATH : ${lib.escapeShellArg binPath}

     

       78
       78
       -
       ''

+1 -2

pkgs/top-level/all-packages.nix

···

       11074
       11074
        
       

     

       11075
       11075
        
         pocketbase = callPackage ../servers/pocketbase { };

     

       11076
       11076
        
       

     

       11077
       11077
       -
         podman = callPackage ../applications/virtualization/podman/wrapper.nix { };

     

       11078
       11078
       -
         podman-unwrapped = callPackage ../applications/virtualization/podman { };

     

       11077
       11077
       +
         podman = callPackage ../applications/virtualization/podman { };

     

       11079
       11078
        
       

     

       11080
       11079
        
         podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};

     

       11081
       11080