Unverified Commit 17286d35 authored by Morgan Jones's avatar Morgan Jones Committed by GitHub
Browse files

podman: replace `util-linux` with `util-linuxMinimal` (#439435)

parents bbcfd18b a062fca7

pkgs/by-name/po/podman/package.nix

+8 −13
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
  nixosTests,

  python3,

  makeWrapper,

  runtimeShell,

  symlinkJoin,

  replaceVars,

  extraPackages ? [ ],
@@ -25,7 +24,7 @@ 
  conmon,

  extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ], # e.g.: runc, gvisor, youki

  fuse-overlayfs,

  util-linux,

  util-linuxMinimal,

  iptables,

  iproute2,

  catatonit,
@@ -34,8 +33,7 @@ 
  netavark,

  passt,

  vfkit,

  testers,

  podman,

  versionCheckHook,

}:

let

  # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
@@ -43,7 +41,7 @@ let 
  binPath = lib.makeBinPath (

    lib.optionals stdenv.hostPlatform.isLinux [

      fuse-overlayfs

      util-linux

      util-linuxMinimal

      iptables

      iproute2

    ]
@@ -124,7 +122,6 @@ buildGoModule rec { 
  buildPhase = ''

    runHook preBuild

    patchShebangs .

    substituteInPlace Makefile --replace "/bin/bash" "${runtimeShell}"

    ${

      if stdenv.hostPlatform.isDarwin then

        ''
@@ -164,13 +161,11 @@ buildGoModule rec { 
    patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped

  '';



  passthru.tests = {

    version = testers.testVersion {

      package = podman;

      command = "HOME=$TMPDIR podman --version";

    };

  }

  // lib.optionalAttrs stdenv.hostPlatform.isLinux {

  doInstallCheck = true;

  nativeInstallCheckInputs = [ versionCheckHook ];

  versionCheckProgramArg = "--version";



  passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {

    inherit (nixosTests) podman;

    # related modules

    inherit (nixosTests)