diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-01-24 23:49:19 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-01-24 23:49:19 -0800 |
| commit | e379e3d4bbaf7cbd8a44914ba4e200597a2505f1 (patch) | |
| tree | b8e0d7b8b4849df8d77c93183b245c63655172a3 /pkgs/applications/virtualization | |
| parent | 2cd72d57a3e2329a61b91e12e2e101b0d88935c5 (diff) | |
| parent | cfef27f7cfa05a59b768ae3c4aa0c54bb9572677 (diff) | |
| download | nixpkgs-e379e3d4bbaf7cbd8a44914ba4e200597a2505f1.tar nixpkgs-e379e3d4bbaf7cbd8a44914ba4e200597a2505f1.tar.gz nixpkgs-e379e3d4bbaf7cbd8a44914ba4e200597a2505f1.tar.bz2 nixpkgs-e379e3d4bbaf7cbd8a44914ba4e200597a2505f1.tar.lz nixpkgs-e379e3d4bbaf7cbd8a44914ba4e200597a2505f1.tar.xz nixpkgs-e379e3d4bbaf7cbd8a44914ba4e200597a2505f1.tar.zst nixpkgs-e379e3d4bbaf7cbd8a44914ba4e200597a2505f1.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/python-modules/googleapis-common-protos/default.nix
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/conmon/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 11df90ce6e6..6777b8d6c82 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.32"; + version = "2.1.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aj0RQVVJp2S8cIYT7fsbK1TLaK0auvdgEIgkZJktsdo="; + sha256 = "sha256-75Xyp25+JJtrXJO+cRFPkDj64zgdlVTAygGwFuJ7jKA="; }; nativeBuildInputs = [ pkg-config ]; |