diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-12-23 08:37:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-23 08:37:58 -0500 |
| commit | f75138f3fc6c1a28b249f5ab163de96f489d464b (patch) | |
| tree | bec40884c37a208b5a6bc44cc1e46bf1c0b321f9 /pkgs/applications/virtualization | |
| parent | e9625089e24f8ff6fef9ff776262931d457f9ad2 (diff) | |
| parent | 96adedb62ec333c3bb78e67cd791f7802d56bf01 (diff) | |
Merge pull request #275611 from saschagrunert/conmon
conmon: 2.1.9 -> 2.1.10
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/conmon/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index ea729afb76f0b..124647e6ab7be 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -12,23 +12,15 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "containers"; repo = pname; 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 ]; buildInputs = [ glib libseccomp systemd ] ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; |