conmon: 2.1.9 -> 2.1.10

Remove the patch as well since it's already integrated into the release.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
This commit is contained in:
Sascha Grunert 2023-12-20 11:11:42 +01:00
parent c2c09f5487
commit 96adedb62e
No known key found for this signature in database
GPG key ID: 09D97D153EF94D93

View file

@ -12,23 +12,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "conmon"; pname = "conmon";
version = "2.1.9"; version = "2.1.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GDbCjR3UWDo/AEKO3TZq29fxO9EUfymxWtvLBikJJ04="; hash = "sha256-WUXyx5OWIJDamzHUahN+0/rcn2pxQgCgYAE/d0mxk2A=";
}; };
patches = [
(fetchpatch2 {
# Fix regression with several upstream bug reports; also caused podman NixOS tests to fail
url = "https://github.com/containers/conmon/commit/53531ac78d35aa9e18a20cfff9f30b910e25ecaa.patch";
hash = "sha256-rbLoXDmRK8P94rrhx2r22/EHZVpCsGTWItd/GW1VqZA=";
})
];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libseccomp systemd ] buildInputs = [ glib libseccomp systemd ]
++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];