From 70bcf62c0590d9aba12a1b3476dee16c0dd1d0d2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 18 Dec 2020 05:28:47 +1000 Subject: [PATCH] conmon: 2.0.21 -> 2.0.22 https://github.com/containers/conmon/releases/tag/v2.0.22 --- pkgs/applications/virtualization/conmon/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index d2f1f2debe54..e143ebcca755 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,20 +9,25 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.21"; + version = "2.0.22"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "13g436s00bcwzs31qsx5rpgkbbyxd4zvx8mbkq10gkrsv4r04q23"; + sha256 = "07wd3pns6x25dcnc1r84cwmrzg8xgzsfmidkclcpcagf97ad7jmc"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib systemd ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; - installFlags = [ "PREFIX=$(out)" ]; + # manpage requires building the vendored go-md2man + makeFlags = [ "bin/conmon" ]; + + installPhase = '' + install -D bin/conmon -t $out/bin + ''; passthru.tests = { inherit (nixosTests) cri-o podman; };