commit 4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/podman/default.nix

···

       126
        
                 podman.succeed("docker network create default")

     

       127
        
                 podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")

     

       128
        
                 podman.succeed(

     

       129
       -
                   "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"

     

       130
        
                 )

     

       131
        
                 podman.succeed("docker ps | grep sleeping")

     

       132
        
                 podman.succeed("podman ps | grep sleeping")

···

       126
        
                 podman.succeed("docker network create default")

     

       127
        
                 podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")

     

       128
        
                 podman.succeed(

     

       129
       +
                   "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"

     

       130
        
                 )

     

       131
        
                 podman.succeed("docker ps | grep sleeping")

     

       132
        
                 podman.succeed("podman ps | grep sleeping")

+1 -1

nixos/tests/podman/tls-ghostunnel.nix

···

       129
        
                 podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")

     

       130
        
       

     

       131
        
                 client.succeed(

     

       132
       -
                   "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"

     

       133
        
                 )

     

       134
        
                 client.succeed("docker ps | grep sleeping")

     

       135
        
                 podman.succeed("docker ps | grep sleeping")

···

       129
        
                 podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")

     

       130
        
       

     

       131
        
                 client.succeed(

     

       132
       +
                   "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"

     

       133
        
                 )

     

       134
        
                 client.succeed("docker ps | grep sleeping")

     

       135
        
                 podman.succeed("docker ps | grep sleeping")

+23 -19

pkgs/applications/virtualization/podman/default.nix

···

       17
        
       

     

       18
        
       buildGoModule rec {

     

       19
        
         pname = "podman";

     

       20
       -
         version = "3.4.4";

     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "containers";

     

       24
        
           repo = "podman";

     

       25
        
           rev = "v${version}";

     

       26
       -
           sha256 = "sha256-5Y0+xfoMCe3a6kX+OhmxURZXZLAnrS1t8TFyHqjGCeA=";

     

       27
        
         };

     

       28
        
       

     

       29
        
         vendorSha256 = null;

     

       30
        
       

     

       31
        
         doCheck = false;

     

       32
        
       

     

       33
       -
         outputs = [ "out" "man" ];

     

       34
        
       

     

       35
        
         nativeBuildInputs = [ pkg-config go-md2man installShellFiles ];

     

       36
        
       

     
···

       47
        
         buildPhase = ''

     

       48
        
           runHook preBuild

     

       49
        
           patchShebangs .

     

       50
       -
           ${if stdenv.isDarwin

     

       51
       -
             then "make podman-remote"

     

       52
       -
             else "make podman"}

     

       0
        
       
     

       0
        
       
     

       53
        
           make docs

     

       54
        
           runHook postBuild

     

       55
        
         '';

     

       56
        
       

     

       57
        
         installPhase = ''

     

       58
        
           runHook preInstall

     

       59
       -
         '' + lib.optionalString stdenv.isDarwin ''

     

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

     

       61
       -
         '' + ''

     

       62
       -
           install -Dm555 bin/podman $out/bin/podman

     

       63
       -
           installShellCompletion --bash completions/bash/*

     

       64
       -
           installShellCompletion --fish completions/fish/*

     

       65
       -
           installShellCompletion --zsh completions/zsh/*

     

       66
       -
           MANDIR=$man/share/man make install.man-nobuild

     

       67
       -
           install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d

     

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

     

       69
       -
           install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       70
        
           runHook postInstall

     

       71
        
         '';

     

       72
        
       

     
···

       87
        
         meta = with lib; {

     

       88
        
           homepage = "https://podman.io/";

     

       89
        
           description = "A program for managing pods, containers and container images";

     

       90
       -
           changelog = "https://github.com/containers/podman/blob/v${version}/changelog.txt";

     

       91
        
           license = licenses.asl20;

     

       92
        
           maintainers = with maintainers; [ marsam ] ++ teams.podman.members;

     

       93
       -
           platforms = platforms.unix;

     

       94
        
         };

     

       95
        
       }

···

       17
        
       

     

       18
        
       buildGoModule rec {

     

       19
        
         pname = "podman";

     

       20
       +
         version = "4.0.1";

     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "containers";

     

       24
        
           repo = "podman";

     

       25
        
           rev = "v${version}";

     

       26
       +
           sha256 = "sha256-DpSDMjUFA8coRInJO1jhMALOYG444WRFw1w7vJKc7cw=";

     

       27
        
         };

     

       28
        
       

     

       29
        
         vendorSha256 = null;

     

       30
        
       

     

       31
        
         doCheck = false;

     

       32
        
       

     

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

     

       34
        
       

     

       35
        
         nativeBuildInputs = [ pkg-config go-md2man installShellFiles ];

     

       36
        
       

     
···

       47
        
         buildPhase = ''

     

       48
        
           runHook preBuild

     

       49
        
           patchShebangs .

     

       50
       +
           ${if stdenv.isDarwin then ''

     

       51
       +
             make podman-remote # podman-mac-helper uses FHS paths

     

       52
       +
           '' else ''

     

       53
       +
             make bin/podman bin/rootlessport

     

       54
       +
           ''}

     

       55
        
           make docs

     

       56
        
           runHook postBuild

     

       57
        
         '';

     

       58
        
       

     

       59
        
         installPhase = ''

     

       60
        
           runHook preInstall

     

       61
       +
           ${if stdenv.isDarwin then ''

     

       62
       +
             mv bin/{darwin/podman,podman}

     

       63
       +
           '' else ''

     

       64
       +
             install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d

     

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

     

       66
       +
             for s in contrib/systemd/**/*.in; do

     

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

     

       68
       +
             done

     

       69
       +
             PREFIX=$out make install.systemd

     

       70
       +
             install -Dm555 bin/rootlessport -t $rootlessport/bin

     

       71
       +
           ''}

     

       72
       +
           install -Dm555 bin/podman -t $out/bin

     

       73
       +
           PREFIX=$out make install.completions

     

       74
       +
           MANDIR=$man/share/man make install.man

     

       75
        
           runHook postInstall

     

       76
        
         '';

     

       77
        
       

     
···

       92
        
         meta = with lib; {

     

       93
        
           homepage = "https://podman.io/";

     

       94
        
           description = "A program for managing pods, containers and container images";

     

       95
       +
           changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md";

     

       96
        
           license = licenses.asl20;

     

       97
        
           maintainers = with maintainers; [ marsam ] ++ teams.podman.members;

     

       0
        
       
     

       98
        
         };

     

       99
        
       }

+17

pkgs/applications/virtualization/podman/wrapper.nix

···

       1
        
       { podman-unwrapped

     

       2
        
       , runCommand

     

       3
        
       , makeWrapper

     

       0
        
       
     

       4
        
       , lib

     

       5
        
       , extraPackages ? []

     

       6
        
       , podman # Docker compat

     
···

       13
        
       , cni-plugins # not added to path

     

       14
        
       , iptables

     

       15
        
       , iproute2

     

       0
        
       
     

       16
        
       }:

     

       17
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
       let

     

       19
        
         podman = podman-unwrapped;

     

       20
        
       

     
···

       29
        
           iproute2

     

       30
        
         ] ++ extraPackages);

     

       31
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       32
        
       in runCommand podman.name {

     

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

     

       34
        
         inherit (podman) pname version passthru;

     
···

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

     

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

     

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

     

       0
        
       
     

       57
        
           --prefix PATH : ${binPath}

     

       58
        
       ''

···

       1
        
       { podman-unwrapped

     

       2
        
       , runCommand

     

       3
        
       , makeWrapper

     

       4
       +
       , symlinkJoin

     

       5
        
       , lib

     

       6
        
       , extraPackages ? []

     

       7
        
       , podman # Docker compat

     
···

       14
        
       , cni-plugins # not added to path

     

       15
        
       , iptables

     

       16
        
       , iproute2

     

       17
       +
       , catatonit

     

       18
        
       }:

     

       19
        
       

     

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

     

       21
       +
       

     

       22
       +
       # adding aardvark-dns/netavark to `helpersBin` requires changes to the modules and tests

     

       23
       +
       

     

       24
        
       let

     

       25
        
         podman = podman-unwrapped;

     

       26
        
       

     
···

       35
        
           iproute2

     

       36
        
         ] ++ extraPackages);

     

       37
        
       

     

       38
       +
         helpersBin = symlinkJoin {

     

       39
       +
           name = "${podman.pname}-helper-binary-wrapper-${podman.version}";

     

       40
       +
       

     

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

     

       42
       +
           paths = [

     

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

     

       44
       +
             podman.rootlessport

     

       45
       +
           ];

     

       46
       +
         };

     

       47
       +
       

     

       48
        
       in runCommand podman.name {

     

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

     

       50
        
         inherit (podman) pname version passthru;

     
···

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

     

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

     

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

     

       73
       +
           --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \

     

       74
        
           --prefix PATH : ${binPath}

     

       75
        
       ''