Merge pull request #225302 from jollheef/master

out-of-tree: 2.0.4 > 2.1.1
This commit is contained in:
Doron Behar 2023-10-18 21:46:34 +00:00 committed by GitHub
commit f530ffbd45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,15 +1,15 @@
{ lib, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: { lib, buildGoModule, fetchgit, qemu, podman, makeWrapper }:
buildGoModule rec { buildGoModule rec {
pname = "out-of-tree"; pname = "out-of-tree";
version = "2.0.4"; version = "2.1.1";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
src = fetchgit { src = fetchgit {
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
url = "https://code.dumpstack.io/tools/${pname}.git"; url = "https://code.dumpstack.io/tools/${pname}.git";
sha256 = "sha256-D2LiSDnF7g1h0XTulctCnZ+I6FZSLA0XRd9LQLOMP9c="; sha256 = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo=";
}; };
vendorHash = "sha256-p1dqzng3ak9lrnzrEABhE1TP1lM2Ikc8bmvp5L3nUp0="; vendorHash = "sha256-p1dqzng3ak9lrnzrEABhE1TP1lM2Ikc8bmvp5L3nUp0=";
@ -18,7 +18,7 @@ buildGoModule rec {
postFixup = '' postFixup = ''
wrapProgram $out/bin/out-of-tree \ wrapProgram $out/bin/out-of-tree \
--prefix PATH : "${lib.makeBinPath [ qemu ]}" --prefix PATH : "${lib.makeBinPath [ qemu podman ]}"
''; '';
meta = with lib; { meta = with lib; {