From 56ef85ba0c5caf58abbe6f94282d4943eabf18e9 Mon Sep 17 00:00:00 2001 From: oluceps Date: Fri, 7 Mar 2025 16:39:20 +0800 Subject: [PATCH 1/4] go-graft, gg: merge duplicated package --- pkgs/by-name/gg/gg/package.nix | 43 ---------------------------- pkgs/by-name/go/go-graft/package.nix | 31 ++++++++++++++++---- 2 files changed, 26 insertions(+), 48 deletions(-) delete mode 100644 pkgs/by-name/gg/gg/package.nix diff --git a/pkgs/by-name/gg/gg/package.nix b/pkgs/by-name/gg/gg/package.nix deleted file mode 100644 index f1a08af09d38..000000000000 --- a/pkgs/by-name/gg/gg/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - installShellFiles, -}: -buildGoModule rec { - pname = "gg"; - version = "0.2.19"; - - src = fetchFromGitHub { - owner = "mzz2017"; - repo = "gg"; - rev = "v${version}"; - hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU="; - }; - - vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14="; - - ldflags = [ - "-s" - "-w" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --cmd gg \ - --bash completion/bash/gg \ - --fish completion/fish/gg.fish \ - --zsh completion/zsh/_gg - ''; - - meta = with lib; { - homepage = "https://github.com/mzz2017/gg"; - changelog = "https://github.com/mzz2017/gg/releases/tag/${src.rev}"; - description = "Command-line tool for one-click proxy in your research and development"; - license = licenses.agpl3Only; - mainProgram = "gg"; - maintainers = with maintainers; [ oluceps ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/go/go-graft/package.nix b/pkgs/by-name/go/go-graft/package.nix index 29de38c5a38a..96bd24aa40a3 100644 --- a/pkgs/by-name/go/go-graft/package.nix +++ b/pkgs/by-name/go/go-graft/package.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ + lib, + fetchFromGitHub, + buildGoModule, + installShellFiles, +}: buildGoModule rec { pname = "go-graft"; @@ -8,20 +13,36 @@ buildGoModule rec { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU="; + hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU="; }; env.CGO_ENABLED = 0; - ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" ]; + ldflags = [ + "-X github.com/mzz2017/gg/cmd.Version=${version}" + "-s" + "-w" + ]; + vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14="; - subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd gg \ + --bash completion/bash/gg \ + --fish completion/fish/gg.fish \ + --zsh completion/zsh/_gg + ''; meta = with lib; { description = "Command-line tool for one-click proxy in your research and development without installing v2ray or anything else"; homepage = "https://github.com/mzz2017/gg"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ xyenon ]; + maintainers = with maintainers; [ + xyenon + oluceps + ]; mainProgram = "gg"; platforms = platforms.linux; }; From 7500cb1861202a8010bd51946a2f6b876687179d Mon Sep 17 00:00:00 2001 From: oluceps Date: Fri, 7 Mar 2025 16:43:05 +0800 Subject: [PATCH 2/4] go-graft: alias to gg --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 39160fd7420d..97990373f6fc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -529,6 +529,7 @@ mapAliases { gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 + gg = go-graft; # Added 2025-03-07 ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18 git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28 From b59729a0ae95c49ae352797acd166131df0225c2 Mon Sep 17 00:00:00 2001 From: oluceps Date: Fri, 7 Mar 2025 17:10:36 +0800 Subject: [PATCH 3/4] go-graft: clarify license to agpl3Only --- pkgs/by-name/go/go-graft/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/go/go-graft/package.nix b/pkgs/by-name/go/go-graft/package.nix index 96bd24aa40a3..d3aa64278372 100644 --- a/pkgs/by-name/go/go-graft/package.nix +++ b/pkgs/by-name/go/go-graft/package.nix @@ -38,7 +38,7 @@ buildGoModule rec { meta = with lib; { description = "Command-line tool for one-click proxy in your research and development without installing v2ray or anything else"; homepage = "https://github.com/mzz2017/gg"; - license = licenses.agpl3Plus; + license = licenses.agpl3Only; maintainers = with maintainers; [ xyenon oluceps From 2270999fd0b5b4542b9e549bf25a188bf1540a0e Mon Sep 17 00:00:00 2001 From: oluceps Date: Fri, 7 Mar 2025 17:11:15 +0800 Subject: [PATCH 4/4] go-graft: add changelog --- pkgs/by-name/go/go-graft/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/go/go-graft/package.nix b/pkgs/by-name/go/go-graft/package.nix index d3aa64278372..5f7d2d339cb2 100644 --- a/pkgs/by-name/go/go-graft/package.nix +++ b/pkgs/by-name/go/go-graft/package.nix @@ -37,6 +37,7 @@ buildGoModule rec { meta = with lib; { description = "Command-line tool for one-click proxy in your research and development without installing v2ray or anything else"; + changelog = "https://github.com/mzz2017/gg/releases/tag/${src.rev}"; homepage = "https://github.com/mzz2017/gg"; license = licenses.agpl3Only; maintainers = with maintainers; [