diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-26 06:02:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 06:02:16 +0000 |
| commit | 8aaeccd6478e4d52663da15ed99705b46f099f4c (patch) | |
| tree | 7d11e618914f7bd89006b22248d3d8f109701cae /pkgs/applications/virtualization | |
| parent | 19fd1d7e903439d8ee4e9fe9d22c07df170c78cd (diff) | |
| parent | 30a1db43d3bc8d5b3b9533e922fbc5340f8b92ef (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/conmon/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman-tui/default.nix | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index d49ece5048832..c973673ac2f3e 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.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KDAm+Djk1AaA3zXhxywT6HknT0tVCEZLS27nO9j/WgM="; + sha256 = "sha256-/5HYEcJzdGAiaMAh82vlDjzwEc7bf9gAYOAz7fkysR0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index 6b563dc8b8e54..78da45fd854ac 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,6 +2,7 @@ , stdenv , pkg-config , fetchFromGitHub +, fetchpatch , buildGoModule , btrfs-progs , gpgme @@ -12,15 +13,23 @@ }: buildGoModule rec { pname = "podman-tui"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - sha256 = "sha256-2WugN5JdTkz3OOt3ggzT7HwMXy1jxn85RwF7409D8m8="; + sha256 = "sha256-XLC1DqOME9xMF4z+cOPe5H60JnxU9gGaSOQQIofdtj8="; }; + patches = [ + # Fix flaky tests. See https://github.com/containers/podman-tui/pull/129. + (fetchpatch { + url = "https://github.com/containers/podman-tui/commit/7fff27e95a3891163da79d86bbc796f29b523f80.patch"; + sha256 = "sha256-mETDXoMLq7vb8Qhpz/CmNG1LmY2DTaogI10Qav/qN9Q="; + }) + ]; + vendorSha256 = null; nativeBuildInputs = [ pkg-config ]; @@ -30,6 +39,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + preCheck = '' + export HOME=/home/$(whoami) + ''; + passthru.tests.version = testers.testVersion { package = podman-tui; command = "podman-tui version"; |