diff options
author | Paul Meyer <49727155+katexochen@users.noreply.github.com> | 2024-06-07 22:13:20 +0200 |
---|---|---|
committer | Paul Meyer <49727155+katexochen@users.noreply.github.com> | 2024-06-07 22:15:40 +0200 |
commit | 87934e2ea73f06cd23f673f477655648347db778 (patch) | |
tree | 75292ee374780682b264e073ad7402e6f013195a /pkgs/by-name/sn | |
parent | ed61e2bd1b21a2afadc6ac57c5429f555cf77fdc (diff) |
snicat: migrate to buildGoModule
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Diffstat (limited to 'pkgs/by-name/sn')
-rw-r--r-- | pkgs/by-name/sn/snicat/deps.nix | 12 | ||||
-rw-r--r-- | pkgs/by-name/sn/snicat/package.nix | 26 |
2 files changed, 15 insertions, 23 deletions
diff --git a/pkgs/by-name/sn/snicat/deps.nix b/pkgs/by-name/sn/snicat/deps.nix deleted file mode 100644 index dca575f883443..0000000000000 --- a/pkgs/by-name/sn/snicat/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - goPackagePath = "github.com/therootcompany/sclient"; - fetch = { - type = "FromGitHub"; - owner = "therootcompany"; - repo = "sclient"; - rev = "v1.5.0"; - sha256 = "sha256-NAFTOx2sm92K+d746Z5UpB1HGsJI6cJgmh+YTyVkJ0w="; - }; - } -] diff --git a/pkgs/by-name/sn/snicat/package.nix b/pkgs/by-name/sn/snicat/package.nix index bbc3fded5b2f1..d38a45f593899 100644 --- a/pkgs/by-name/sn/snicat/package.nix +++ b/pkgs/by-name/sn/snicat/package.nix @@ -1,8 +1,9 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub +, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "snicat"; version = "0.0.1"; @@ -13,18 +14,21 @@ buildGoPackage rec { hash = "sha256-fFlTBOz127le2Y7F9KKhbcldcyFEpAU5QiJ4VCAPs9Y="; }; - goPackagePath = "github.com/CTFd/snicat"; + patches = [ + # Migrate to Go modules + (fetchpatch { + url = "https://github.com/CTFd/snicat/commit/098a5ce3141bae5d2e188338d78517d710d10f70.patch"; + hash = "sha256-pIdXViUz14nkvL1H3u3oFkm308XA2POtKIGZOKDO6p8="; + }) + ]; - goDeps = ./deps.nix; + vendorHash = "sha256-27ykI9HK1jFanxwa6QrN6ZS548JbFNSZHaXr4ciCVOE="; + proxyVendor = true; - ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; + ldflags = [ "-s" "-X main.version=v${version}" ]; - installPhase = '' - runHook preInstall - - install -Dm555 go/bin/snicat $out/bin/sc - - runHook postInstall + postInstall = '' + mv $out/bin/snicat $out/bin/sc ''; meta = with lib; { |