From 298ab049674b4f033aa6242ae849bb97627c6dee Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 9 Nov 2024 23:20:45 +0800 Subject: [PATCH 1/2] snet: format using nixfmt-rfc-style, remove `with lib` usage --- pkgs/by-name/sn/snet/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sn/snet/package.nix b/pkgs/by-name/sn/snet/package.nix index 47f70a21d33b..793c3285bd55 100644 --- a/pkgs/by-name/sn/snet/package.nix +++ b/pkgs/by-name/sn/snet/package.nix @@ -1,6 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: -buildGoModule rec { +buildGoModule { pname = "snet"; version = "unstable-2021-11-26"; @@ -13,11 +17,11 @@ buildGoModule rec { vendorHash = "sha256-dubmCLeD8Fwe1msfLN+5WzdbFkfTRnZDU3F49gjWTS4="; - meta = with lib; { + meta = { description = "Transparent proxy works on linux desktop, MacOS, router"; homepage = "https://github.com/monsterxx03/snet"; - license = licenses.mit; - maintainers = with maintainers; [ azuwis ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ azuwis ]; mainProgram = "snet"; }; } From 35cc8ee6c68501cc1b7d7ac602ccecbc6deb726f Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Wed, 9 Oct 2024 19:57:59 +0800 Subject: [PATCH 2/2] snet: disable flaky test --- pkgs/by-name/sn/snet/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sn/snet/package.nix b/pkgs/by-name/sn/snet/package.nix index 793c3285bd55..6b58ee56338b 100644 --- a/pkgs/by-name/sn/snet/package.nix +++ b/pkgs/by-name/sn/snet/package.nix @@ -17,6 +17,9 @@ buildGoModule { vendorHash = "sha256-dubmCLeD8Fwe1msfLN+5WzdbFkfTRnZDU3F49gjWTS4="; + # flaky test, random failures + checkFlags = [ "-skip=TestBloomfilter" ]; + meta = { description = "Transparent proxy works on linux desktop, MacOS, router"; homepage = "https://github.com/monsterxx03/snet";