opensnitch: 1.4.3 -> 1.5.0

pkgs/tools/networking/opensnitch/daemon.nix

@@ -10,17 +10,18 @@
 , coreutils
 , iptables
 , makeWrapper
+, protoc-gen-go-grpc
 }:
 
 buildGoModule rec {
   pname = "opensnitch";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
     rev = "v${version}";
-    sha256 = "1c2v2x8hfqk524sa42vry74lda4lg6ii40ljk2qx9j2f69446sva";
+    sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I=";
   };
 
   patches = [
@@ -31,17 +32,15 @@ buildGoModule rec {
       url = "https://github.com/evilsocket/opensnitch/commit/8a3f63f36aa92658217bbbf46d39e6d20b2c0791.patch";
       sha256 = "sha256-WkwjKTQZppR0nqvRO4xiQoKZ307NvuUwoRx+boIpuTg=";
     })
-    # Upstream has inconsistent vendoring
-    ./go-mod.patch
   ];
 
   modRoot = "daemon";
 
   buildInputs = [ libnetfilter_queue libnfnetlink ];
 
-  nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper ];
+  nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper protoc-gen-go-grpc ];
 
-  vendorSha256 = "sha256-sTfRfsvyiFk1bcga009W6jD6RllrySRAU6B/8mF6+ow=";
+  vendorSha256 = "sha256-81BKMLuEXA/NeIjO7icBm48ROq6KxAxHtvP0nV5yM5A=";
 
   preBuild = ''
     make -C ../proto ../daemon/ui/protocol/ui.pb.go

pkgs/tools/networking/opensnitch/go-mod.patch

@@ -1,24 +0,0 @@
-diff --git a/daemon/go.mod b/daemon/go.mod
-index ec21c04..a859bfb 100644
---- a/daemon/go.mod
-+++ b/daemon/go.mod
-@@ -5,17 +5,12 @@ go 1.14
- require (
- 	github.com/evilsocket/ftrace v1.2.0
- 	github.com/fsnotify/fsnotify v1.4.7
--	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
--	github.com/golang/protobuf v1.5.0
- 	github.com/google/gopacket v1.1.14
- 	github.com/google/nftables v0.0.0-20210514154851-a285acebcad3
- 	github.com/iovisor/gobpf v0.2.0
- 	github.com/vishvananda/netlink v1.1.0
--	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
--	golang.org/x/net v0.0.0-20190311183353-d8887717615a
--	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
--	golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 // indirect
--	golang.org/x/text v0.3.0 // indirect
-+	golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
-+	golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c
- 	google.golang.org/grpc v1.27.0
- 	google.golang.org/protobuf v1.26.0
- )

pkgs/tools/networking/opensnitch/ui.nix

@@ -6,13 +6,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "opensnitch-ui";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
     rev = "v${version}";
-    sha256 = "sha256-amtDSDJOyNSxmJICEqN5lKhGyfF5C6I0EWViB1EXW7A=";
+    sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I=";
   };
 
   nativeBuildInputs = [
@@ -26,6 +26,8 @@ python3Packages.buildPythonApplication rec {
     unidecode
     unicode-slugify
     pyinotify
+    notify2
+    # pyasn # dpendency missing but not mandatory
   ];
 
   preBuild = ''
@@ -48,6 +50,9 @@ python3Packages.buildPythonApplication rec {
   dontWrapQtApps = true;
   makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
 
+  # All tests are sandbox-incompatible and disabled for now
+  doCheck = false;
+
   meta = with lib; {
     description = "An application firewall";
     homepage = "https://github.com/evilsocket/opensnitch/wiki";