commit 971fbfd00a8e50c44d749b272c86bb54ff1b6576 · pyrox.dev/nixpkgs

+60 -42

nixos/modules/services/security/opensnitch.nix

··· 36 36 37 37 description = mdDoc '' 38 38 Declarative configuration of firewall rules. 39 - All rules will be stored in `/var/lib/opensnitch/rules`. 39 + All rules will be stored in `/var/lib/opensnitch/rules` by default. 40 + Rules path can be configured with `settings.Rules.Path`. 40 41 See [upstream documentation](https://github.com/evilsocket/opensnitch/wiki/Rules) 41 42 for available options. 42 43 ''; ··· 79 80 ''; 80 81 }; 81 82 82 - DefaultDuration = mkOption { 83 - type = types.enum [ 84 - "once" "always" "until restart" "30s" "5m" "15m" "30m" "1h" 85 - ]; 86 - description = mdDoc '' 87 - Default duration of firewall rule. 88 - ''; 89 - }; 90 - 91 83 InterceptUnknown = mkOption { 92 84 type = types.bool; 93 85 description = mdDoc '' ··· 134 126 }; 135 127 136 128 }; 129 + 130 + Ebpf.ModulesPath = mkOption { 131 + type = types.path; 132 + default = if cfg.settings.ProcMonitorMethod == "ebpf" then "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd" else null; 133 + defaultText = literalExpression '' 134 + if cfg.settings.ProcMonitorMethod == "ebpf" then 135 + "\\$\\{config.boot.kernelPackages.opensnitch-ebpf\\}/etc/opensnitchd" 136 + else null; 137 + ''; 138 + description = mdDoc '' 139 + Configure eBPF modules path. Used when 140 + `settings.ProcMonitorMethod` is set to `ebpf`. 141 + ''; 142 + }; 143 + 144 + Rules.Path = mkOption { 145 + type = types.path; 146 + default = "/var/lib/opensnitch/rules"; 147 + description = mdDoc '' 148 + Path to the directory where firewall rules can be found and will 149 + get stored by the NixOS module. 150 + ''; 151 + }; 152 + 137 153 }; 138 154 }; 139 155 description = mdDoc '' ··· 151 167 152 168 systemd = { 153 169 packages = [ pkgs.opensnitch ]; 154 - services.opensnitchd.wantedBy = [ "multi-user.target" ]; 170 + services.opensnitchd = { 171 + wantedBy = [ "multi-user.target" ]; 172 + serviceConfig = { 173 + ExecStart = [ 174 + "" 175 + "${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" cfg.settings}" 176 + ]; 177 + }; 178 + preStart = mkIf (cfg.rules != {}) (let 179 + rules = flip mapAttrsToList predefinedRules (file: content: { 180 + inherit (content) file; 181 + local = "${cfg.settings.Rules.Path}/${file}.json"; 182 + }); 183 + in '' 184 + # Remove all firewall rules from rules path (configured with 185 + # cfg.settings.Rules.Path) that are symlinks to a store-path, but aren't 186 + # declared in `cfg.rules` (i.e. all networks that were "removed" from 187 + # `cfg.rules`). 188 + find ${cfg.settings.Rules.Path} -type l -lname '${builtins.storeDir}/*' ${optionalString (rules != {}) '' 189 + -not $ ${concatMapStringsSep " -o " ({ local, ... }: 190 + "-name '${baseNameOf local}*'") 191 + rules} $ \ 192 + ''} -delete 193 + ${concatMapStrings ({ file, local }: '' 194 + ln -sf '${file}' "${local}" 195 + '') rules} 196 + ''); 197 + }; 198 + tmpfiles.rules = [ 199 + "d ${cfg.settings.Rules.Path} 0750 root root - -" 200 + "L+ /etc/opensnitchd/system-fw.json - - - - ${pkgs.opensnitch}/etc/opensnitchd/system-fw.json" 201 + ]; 155 202 }; 156 203 157 - systemd.services.opensnitchd.preStart = mkIf (cfg.rules != {}) (let 158 - rules = flip mapAttrsToList predefinedRules (file: content: { 159 - inherit (content) file; 160 - local = "/var/lib/opensnitch/rules/${file}.json"; 161 - }); 162 - in '' 163 - # Remove all firewall rules from `/var/lib/opensnitch/rules` that are symlinks to a store-path, 164 - # but aren't declared in `cfg.rules` (i.e. all networks that were "removed" from 165 - # `cfg.rules`). 166 - find /var/lib/opensnitch/rules -type l -lname '${builtins.storeDir}/*' ${optionalString (rules != {}) '' 167 - -not $ ${concatMapStringsSep " -o " ({ local, ... }: 168 - "-name '${baseNameOf local}*'") 169 - rules} $ \ 170 - ''} -delete 171 - ${concatMapStrings ({ file, local }: '' 172 - ln -sf '${file}' "${local}" 173 - '') rules} 204 + }; 174 205 175 - if [ ! -f /etc/opensnitchd/system-fw.json ]; then 176 - cp "${pkgs.opensnitch}/etc/opensnitchd/system-fw.json" "/etc/opensnitchd/system-fw.json" 177 - fi 178 - ''); 179 - 180 - environment.etc = mkMerge [ ({ 181 - "opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings; 182 - }) (mkIf (cfg.settings.ProcMonitorMethod == "ebpf") { 183 - "opensnitchd/opensnitch.o".source = "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd/opensnitch.o"; 184 - "opensnitchd/opensnitch-dns.o".source = "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd/opensnitch-dns.o"; 185 - "opensnitchd/opensnitch-procs.o".source = "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd/opensnitch-procs.o"; 186 - })]; 187 - 188 - }; 206 + meta.maintainers = with lib.maintainers; [ onny ]; 189 207 } 190 208

+1 -1

nixos/tests/opensnitch.nix

··· 31 31 enable = true; 32 32 settings.DefaultAction = "deny"; 33 33 rules = { 34 - opensnitch = { 34 + curl = { 35 35 name = "curl"; 36 36 enabled = true; 37 37 action = "allow";

+13 -8

pkgs/tools/networking/opensnitch/daemon.nix pkgs/by-name/op/opensnitch/package.nix

··· 18 18 19 19 buildGoModule rec { 20 20 pname = "opensnitch"; 21 - version = "1.6.4"; 21 + version = "1.6.5"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "evilsocket"; 25 25 repo = "opensnitch"; 26 - rev = "v${version}"; 27 - hash = "sha256-fkRykhcjWZ4MDl2HZ1ZFaQmEeRYhiCBeUxG/Eu7D8NA="; 26 + rev = "refs/tags/v${version}"; 27 + hash = "sha256-2HHyecgiodWhQkkn3eo0RJNroD7HaK6Je/+x9IqZfWE="; 28 28 }; 29 29 30 30 postPatch = '' ··· 47 47 protoc-gen-go-grpc 48 48 ]; 49 49 50 - vendorHash = "sha256-bUzGWpQxeXzvkzQ7G53ljQJq6wwqiXqbi6bgeFlNvvM="; 50 + vendorHash = "sha256-PX41xeUJb/WKv3+z5kbRmJNP1vFu8x35NZvN2Dgp4CQ="; 51 51 52 52 preBuild = '' 53 53 # Fix inconsistent vendoring build error ··· 64 64 cp system-fw.json $out/etc/opensnitchd/ 65 65 substitute default-config.json $out/etc/opensnitchd/default-config.json \ 66 66 --replace "/var/log/opensnitchd.log" "/dev/stdout" 67 + # Do not mkdir rules path 68 + sed -i '8d' opensnitchd.service 69 + # Fixup hardcoded paths 67 70 substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ 68 - --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ 69 - --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ 70 - --replace "/bin/mkdir" "${coreutils}/bin/mkdir" 71 + --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" 71 72 ''; 72 73 73 - ldflags = [ "-s" "-w" "-X github.com/evilsocket/opensnitch/daemon/core.Version=${version}" ]; 74 + ldflags = [ 75 + "-s" 76 + "-w" 77 + "-X github.com/evilsocket/opensnitch/daemon/core.Version=${version}" 78 + ]; 74 79 75 80 postInstall = '' 76 81 wrapProgram $out/bin/opensnitchd \

+8 -9

pkgs/tools/networking/opensnitch/go.mod pkgs/by-name/op/opensnitch/go.mod

··· 1 1 module github.com/evilsocket/opensnitch/daemon 2 2 3 - go 1.14 3 + go 1.17 4 4 5 5 require ( 6 6 github.com/fsnotify/fsnotify v1.4.7 7 7 github.com/golang/protobuf v1.5.0 8 - github.com/google/gopacket v1.1.14 8 + github.com/google/gopacket v1.1.19 9 9 github.com/google/nftables v0.1.0 10 10 github.com/google/uuid v1.3.0 11 11 github.com/iovisor/gobpf v0.2.0 12 12 github.com/varlink/go v0.4.0 13 - github.com/vishvananda/netlink v0.0.0-20210811191823-e1a867c6b452 13 + github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4 14 14 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae 15 - golang.org/x/net v0.0.0-20211209124913-491a49abca63 16 - golang.org/x/sys v0.0.0-20211205182925-97ca703d548d 15 + golang.org/x/net v0.17.0 16 + golang.org/x/sys v0.13.0 17 17 google.golang.org/grpc v1.32.0 18 18 google.golang.org/protobuf v1.26.0 19 19 ) ··· 24 24 github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect 25 25 github.com/mdlayher/netlink v1.4.2 // indirect 26 26 github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb // indirect 27 - golang.org/x/mod v0.5.1 // indirect 28 - golang.org/x/text v0.3.7 // indirect 29 - golang.org/x/tools v0.1.8 // indirect 30 - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect 27 + golang.org/x/mod v0.8.0 // indirect 28 + golang.org/x/text v0.13.0 // indirect 29 + golang.org/x/tools v0.6.0 // indirect 31 30 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect 32 31 honnef.co/go/tools v0.2.2 // indirect 33 32 )

+39 -9

pkgs/tools/networking/opensnitch/go.sum pkgs/by-name/op/opensnitch/go.sum

··· 29 29 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 30 30 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= 31 31 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 32 - github.com/google/gopacket v1.1.14 h1:1+TEhSu8Mh154ZBVjyd1Nt2Bb7cnyOeE3GQyb1WGLqI= 33 - github.com/google/gopacket v1.1.14/go.mod h1:UCLx9mCmAwsVbn6qQl1WIEt2SO7Nd2fD0th1TBAsqBw= 32 + github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= 33 + github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= 34 34 github.com/google/nftables v0.1.0 h1:T6lS4qudrMufcNIZ8wSRrL+iuwhsKxpN+zFLxhUWOqk= 35 35 github.com/google/nftables v0.1.0/go.mod h1:b97ulCCFipUC+kSin+zygkvUVpx0vyIAwxXFdY3PlNc= 36 36 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= ··· 76 76 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= 77 77 github.com/varlink/go v0.4.0 h1:+/BQoUO9eJK/+MTSHwFcJch7TMsb6N6Dqp6g0qaXXRo= 78 78 github.com/varlink/go v0.4.0/go.mod h1:DKg9Y2ctoNkesREGAEak58l+jOC6JU2aqZvUYs5DynU= 79 - github.com/vishvananda/netlink v0.0.0-20210811191823-e1a867c6b452 h1:xe1bLd/sNkKVWdZuAb2+4JeMQMYyQ7Av38iRrE1lhm8= 80 - github.com/vishvananda/netlink v0.0.0-20210811191823-e1a867c6b452/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= 79 + github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4 h1:fB26rIBlWTVJyEB6ONHdoEvUbvwoudH0/cMEXHiD1RU= 80 + github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= 81 81 github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= 82 82 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns= 83 83 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= 84 84 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 85 85 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= 86 86 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= 87 + github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 87 88 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= 88 89 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= 89 90 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 91 + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= 92 + golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= 90 93 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= 91 94 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= 92 95 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= 93 96 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= 97 + golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= 98 + golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= 94 99 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 95 100 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 96 - golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= 97 101 golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= 102 + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= 103 + golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= 104 + golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= 98 105 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 99 106 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 100 107 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ··· 117 124 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 118 125 golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 119 126 golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 120 - golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY= 121 127 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 128 + golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= 129 + golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= 130 + golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= 131 + golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= 132 + golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= 122 133 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= 123 134 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 124 135 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 125 136 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 126 137 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 127 138 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 139 + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 140 + golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= 141 + golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 128 142 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 129 143 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 130 144 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ··· 148 162 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 149 163 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 150 164 golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 165 + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 151 166 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 152 167 golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 153 168 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 154 169 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 155 170 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 156 171 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 157 - golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E= 158 172 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 173 + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 174 + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 175 + golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 176 + golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 177 + golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= 178 + golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 159 179 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= 180 + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= 181 + golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= 182 + golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= 183 + golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= 160 184 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 161 185 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= 162 186 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= 163 - golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= 164 187 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= 188 + golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= 189 + golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= 190 + golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= 191 + golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= 165 192 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 166 193 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 167 194 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= 168 195 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= 169 196 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= 170 197 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= 198 + golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= 171 199 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= 172 200 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= 173 - golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w= 174 201 golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= 202 + golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= 203 + golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= 204 + golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= 175 205 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 176 206 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 177 207 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

+10 -10

pkgs/tools/networking/opensnitch/ui.nix pkgs/by-name/op/opensnitch-ui/package.nix

··· 1 1 { python3Packages 2 2 , fetchFromGitHub 3 - , qtwayland 4 - , wrapQtAppsHook 3 + , qt5 5 4 , lib 6 5 }: 7 6 8 7 python3Packages.buildPythonApplication rec { 9 8 pname = "opensnitch-ui"; 10 - version = "1.6.4"; 9 + version = "1.6.5.1"; 11 10 12 11 src = fetchFromGitHub { 13 12 owner = "evilsocket"; 14 13 repo = "opensnitch"; 15 14 rev = "refs/tags/v${version}"; 16 - hash = "sha256-fkRykhcjWZ4MDl2HZ1ZFaQmEeRYhiCBeUxG/Eu7D8NA="; 15 + hash = "sha256-IVrAAHzLS7A7cYhRk+IUx8/5TGKeqC7M/7iXOpPe2ZA="; 17 16 }; 18 17 19 18 postPatch = '' ··· 23 22 24 23 nativeBuildInputs = [ 25 24 python3Packages.pyqt5 26 - wrapQtAppsHook 25 + qt5.wrapQtAppsHook 27 26 ]; 28 27 29 28 buildInputs = [ 30 - qtwayland 29 + qt5.qtwayland 31 30 ]; 32 31 33 32 propagatedBuildInputs = with python3Packages; [ 34 33 grpcio-tools 35 - pyqt5 36 - unidecode 37 - unicode-slugify 38 - pyinotify 39 34 notify2 40 35 pyasn 36 + pyinotify 37 + pyqt5 38 + qt-material 39 + unicode-slugify 40 + unidecode 41 41 ]; 42 42 43 43 preBuild = ''

-4

pkgs/top-level/all-packages.nix

··· 11476 11476 11477 11477 openfortivpn = callPackage ../tools/networking/openfortivpn { }; 11478 11478 11479 - opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; 11480 - 11481 - opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; 11482 - 11483 11479 obexfs = callPackage ../tools/bluetooth/obexfs { }; 11484 11480 11485 11481 obexftp = callPackage ../tools/bluetooth/obexftp { };