Merge branch 'master' into staging-next

... to resolve a trivial conflict in libpcap.
This commit is contained in:
Vladimír Čunát
2020-06-10 20:00:44 +02:00
55 changed files with 498 additions and 277 deletions
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "joker";
version = "0.15.3";
version = "0.15.4";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn";
sha256 = "1ad6cdqadd1zs9zh85zyhdiiv6ir28k28w034vzsx5zaipvy4kml";
};
vendorSha256 = "1rn8ijq3v3fzlbyvm7g4i3qpwcl3vrl4rbcvlbzv05wxrgcw9iqb";
vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl";
preBuild = ''
go generate ./...