dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #302352 from Guanran928/mihomo

Browse Source 
nixos/mihomo: fix option description, use correct github homepage branch
This commit is contained in:
Aleksana 2024-04-07 22:32:09 +08:00 committed by GitHub
commit 017890319a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -98,7 +98,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
- [ollama](https://ollama.ai), server for running large language models locally. - [ollama](https://ollama.ai), server for running large language models locally.
- [Mihomo](https://github.com/MetaCubeX/mihomo), a rule-based proxy in Go. Available as [services.mihomo.enable](#opt-services.mihomo.enable). - [Mihomo](https://github.com/MetaCubeX/mihomo/tree/Alpha), a rule-based proxy in Go. Available as [services.mihomo.enable](#opt-services.mihomo.enable).
- [hebbot](https://github.com/haecker-felix/hebbot), a Matrix bot to generate "This Week in X" like blog posts. Available as [services.hebbot](#opt-services.hebbot.enable). - [hebbot](https://github.com/haecker-felix/hebbot), a Matrix bot to generate "This Week in X" like blog posts. Available as [services.hebbot](#opt-services.hebbot.enable).

8
nixos/modules/services/networking/mihomo.nix
View File

@ -12,7 +12,7 @@ let
in in
{ {
options.services.mihomo = { options.services.mihomo = {
enable = lib.mkEnableOption "Mihomo, A rule-based proxy in Go."; enable = lib.mkEnableOption "Mihomo, A rule-based proxy in Go";
package = lib.mkPackageOption pkgs "mihomo" { }; package = lib.mkPackageOption pkgs "mihomo" { };
@ -28,14 +28,14 @@ in
description = '' description = ''
Local web interface to use. Local web interface to use.
You can also use the following website, just in case: You can also use the following website:
- metacubexd: - metacubexd:
- https://d.metacubex.one - https://d.metacubex.one
- https://metacubex.github.io/metacubexd - https://metacubex.github.io/metacubexd
- https://metacubexd.pages.dev - https://metacubexd.pages.dev
- yacd: - yacd:
- https://yacd.haishan.me - https://yacd.haishan.me
- clash-dashboard (buggy): - clash-dashboard:
- https://clash.razord.top - https://clash.razord.top
''; '';
}; };
@ -49,7 +49,7 @@ in
tunMode = lib.mkEnableOption '' tunMode = lib.mkEnableOption ''
necessary permission for Mihomo's systemd service for TUN mode to function properly. necessary permission for Mihomo's systemd service for TUN mode to function properly.
Keep in mind, that you still need to enable TUN mode manually in Mihomo's configuration. Keep in mind, that you still need to enable TUN mode manually in Mihomo's configuration
''; '';
}; };

2
pkgs/by-name/mi/mihomo/package.nix
View File

@ -39,7 +39,7 @@ buildGoModule rec {
meta = with lib; { meta = with lib; {
description = "A rule-based tunnel in Go"; description = "A rule-based tunnel in Go";
homepage = "https://github.com/MetaCubeX/mihomo"; homepage = "https://github.com/MetaCubeX/mihomo/tree/Alpha";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ oluceps ]; maintainers = with maintainers; [ oluceps ];
mainProgram = "mihomo"; mainProgram = "mihomo";