From 19a18dab0ebe1039c92269ae0b4650a834b7f25e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 27 Jun 2023 12:18:33 +0800 Subject: [PATCH 01/10] sing-box: 1.2.7 -> 1.3.0 --- pkgs/tools/networking/sing-box/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index a93a973e4b39..5b978fb1a823 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -4,21 +4,22 @@ , fetchFromGitHub , installShellFiles , buildPackages +, coreutils , nix-update-script }: buildGoModule rec { pname = "sing-box"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-+pRG5nq0Be58at61qqu5QciHC2DMvw+wj7u8tZx8+eY="; + hash = "sha256-+zEjuoGFAZhajUCFPZXNr1SoAprjOsHf12nVCbDKOeY="; }; - vendorHash = "sha256-gHPMJ4/W2ZisG/jAtHSLH/NlHgBitg7Bwe95wGJAsOY="; + vendorHash = "sha256-KJEjqcwtsNEByTQjp+TU9Yct/CJD8F9fnGuq9eeGtpQ="; tags = [ "with_quic" @@ -50,6 +51,11 @@ buildGoModule rec { --bash <(${emulator} $out/bin/sing-box completion bash) \ --fish <(${emulator} $out/bin/sing-box completion fish) \ --zsh <(${emulator} $out/bin/sing-box completion zsh ) + + substituteInPlace release/config/sing-box{,@}.service \ + --replace "/usr/bin/sing-box" "$out/bin/sing-box" \ + --replace "/bin/kill" "${coreutils}/bin/kill" + install -Dm444 -t "$out/lib/systemd/system/" release/config/sing-box{,@}.service ''; passthru.updateScript = nix-update-script { }; From 8b849825019ae10da922cdd0d08ec2b5b546ea17 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Jul 2023 19:04:38 +0800 Subject: [PATCH 02/10] sing-box: 1.3.0 -> 1.3.3 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 5b978fb1a823..74eac363a13e 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.0"; + version = "1.3.3"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-+zEjuoGFAZhajUCFPZXNr1SoAprjOsHf12nVCbDKOeY="; + hash = "sha256-I6e0PkF52sCKPtQIOIlYdpWzySDnEqX8KmK/e29CQG8="; }; - vendorHash = "sha256-KJEjqcwtsNEByTQjp+TU9Yct/CJD8F9fnGuq9eeGtpQ="; + vendorHash = "sha256-CL+N2w8g5aMysFlPgPLszqjPu8MULoQ/xpz8Wd3lI6k="; tags = [ "with_quic" From 6399c9ba200d84bd45c081e9311e1fa008f2dc10 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 25 Jul 2023 14:00:55 +0800 Subject: [PATCH 03/10] sing-box: 1.3.3 -> 1.3.4 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 74eac363a13e..73ebc1673eaa 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-I6e0PkF52sCKPtQIOIlYdpWzySDnEqX8KmK/e29CQG8="; + hash = "sha256-0/3y9aIhKzWIvt8iWcrJwQreBkSLcoPQ55gyTp48ysg="; }; - vendorHash = "sha256-CL+N2w8g5aMysFlPgPLszqjPu8MULoQ/xpz8Wd3lI6k="; + vendorHash = "sha256-G6//YPNWhgTJf6nv+9KRExCclotsmk7TzzuxXmdiVVU="; tags = [ "with_quic" From 8538d8b23c89043c831b7f36a1605ce8b8993535 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 1 Aug 2023 12:44:28 +0800 Subject: [PATCH 04/10] sing-box: 1.3.4 -> 1.3.5 Diff: https://github.com/SagerNet/sing-box/compare/v1.3.4...v1.3.5 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 73ebc1673eaa..be954bb361cd 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-0/3y9aIhKzWIvt8iWcrJwQreBkSLcoPQ55gyTp48ysg="; + hash = "sha256-fSQuVvV2dL+cdPIAqyXbDB8OSW77gxaYaOHKElEbq6o="; }; - vendorHash = "sha256-G6//YPNWhgTJf6nv+9KRExCclotsmk7TzzuxXmdiVVU="; + vendorHash = "sha256-AMtDAAKNbKRFcu9OEW9E+S73gGgXK7HaroEdidrXS4Y="; tags = [ "with_quic" From 7cce3509c80b6cad92ef1aa2077aa3cddd7c0360 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 7 Aug 2023 10:58:01 +0800 Subject: [PATCH 05/10] sing-box: 1.3.5 -> 1.3.6 Diff: https://github.com/SagerNet/sing-box/compare/v1.3.5...v1.3.6 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index be954bb361cd..b031a1015e34 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-fSQuVvV2dL+cdPIAqyXbDB8OSW77gxaYaOHKElEbq6o="; + hash = "sha256-iVoouUEZ3dMv3sD7eljltsWrdhAn9L+YtG1bbB5YuPM="; }; - vendorHash = "sha256-AMtDAAKNbKRFcu9OEW9E+S73gGgXK7HaroEdidrXS4Y="; + vendorHash = "sha256-4Rr/ILnDLJ4x0uSDOzTX2cjT3kaIApLOCo2NEOzGoyA="; tags = [ "with_quic" From 8e4aa3157d988c2528a4e4660e36ca7e3f527ad0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 29 Aug 2023 21:51:40 +0800 Subject: [PATCH 06/10] sing-box: 1.3.6 -> 1.4.0 Diff: https://github.com/SagerNet/sing-box/compare/v1.3.6...v1.4.0 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index b031a1015e34..a8f87463a4c8 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.6"; + version = "1.4.0"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-iVoouUEZ3dMv3sD7eljltsWrdhAn9L+YtG1bbB5YuPM="; + hash = "sha256-i6Cpb4NQNsyIrMOihWYdR37BkSouSCWi3nxMnbODnZU="; }; - vendorHash = "sha256-4Rr/ILnDLJ4x0uSDOzTX2cjT3kaIApLOCo2NEOzGoyA="; + vendorHash = "sha256-6Mx8kdZL7EguQoh1upuu6wGZckczDoGmRjOFCpv756s="; tags = [ "with_quic" From 3f5efb3076da501a7c140775b27c2831527fc044 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Sep 2023 18:13:47 +0800 Subject: [PATCH 07/10] sing-box: 1.4.0 -> 1.4.1 Diff: https://github.com/SagerNet/sing-box/compare/v1.4.0...v1.4.1 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index a8f87463a4c8..63ef7149d30b 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-i6Cpb4NQNsyIrMOihWYdR37BkSouSCWi3nxMnbODnZU="; + hash = "sha256-AB+JNac9553Viw/XVqLFAQnEOwweCz3ltyUbB1gYMmM="; }; - vendorHash = "sha256-6Mx8kdZL7EguQoh1upuu6wGZckczDoGmRjOFCpv756s="; + vendorHash = "sha256-Je5852dIKjlTAym00V2gNz89Hrl8QygEfkybZlLVktY="; tags = [ "with_quic" From 050af14694add7f1421163a854be367900a64d21 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 11 Sep 2023 10:19:18 -0400 Subject: [PATCH 08/10] sing-box: 1.4.1 -> 1.4.2 Diff: https://github.com/SagerNet/sing-box/compare/v1.4.1...v1.4.2 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 63ef7149d30b..8a61d54531d0 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-AB+JNac9553Viw/XVqLFAQnEOwweCz3ltyUbB1gYMmM="; + hash = "sha256-OBLgAuZIqR+81rN886gIai8+uUxHDbOWnGz6jYZnGm8="; }; - vendorHash = "sha256-Je5852dIKjlTAym00V2gNz89Hrl8QygEfkybZlLVktY="; + vendorHash = "sha256-oDUjiMAG/vkSYS1c8lwqVlFzyvTIQrUSeJohHS9X9I0="; tags = [ "with_quic" From bce16b8e4dc4c4f7d19bf51da937418deac0ce6c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 13 Sep 2023 09:14:24 -0400 Subject: [PATCH 09/10] sing-box: 1.4.2 -> 1.4.3 Diff: https://github.com/SagerNet/sing-box/compare/v1.4.2...v1.4.3 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 8a61d54531d0..22767c6bd2ac 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-OBLgAuZIqR+81rN886gIai8+uUxHDbOWnGz6jYZnGm8="; + hash = "sha256-ptnppqh7f6Cn5pMrqtqM39zFh2nEpOSrZtTxhSzFXS0="; }; - vendorHash = "sha256-oDUjiMAG/vkSYS1c8lwqVlFzyvTIQrUSeJohHS9X9I0="; + vendorHash = "sha256-XHZoXnQJMfnaPbHHoC1toxqjq/jifAI2UqZ4cc6y034="; tags = [ "with_quic" From add4f1820e0930ffce461c88b25e6e6fbcfa49d5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 25 Sep 2023 10:18:37 -0400 Subject: [PATCH 10/10] sing-box: 1.4.3 -> 1.4.5 Diff: https://github.com/SagerNet/sing-box/compare/v1.4.3...v1.4.5 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 22767c6bd2ac..e7cf602487bf 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-ptnppqh7f6Cn5pMrqtqM39zFh2nEpOSrZtTxhSzFXS0="; + hash = "sha256-Tb+4k0fwb22gif4SSNDmIBDq346CinhyqxwE0fhkXq4="; }; - vendorHash = "sha256-XHZoXnQJMfnaPbHHoC1toxqjq/jifAI2UqZ4cc6y034="; + vendorHash = "sha256-EZ+ehh/FuQWNHqfXWMoSI+z9+OKDTVzRn51CYR/ezZw="; tags = [ "with_quic"