From 91473f20c477cf19ca49e04d125a8692ac882d52 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 27 May 2022 11:39:08 +0000 Subject: [PATCH] ejson: 1.2.1 -> 1.3.3 --- pkgs/development/tools/ejson/default.nix | 27 ++++++++++++------------ 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix index 05deb05ed7ec..55f51a3e798f 100644 --- a/pkgs/development/tools/ejson/default.nix +++ b/pkgs/development/tools/ejson/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby, buildGoPackage, fetchFromGitHub }: +{ lib, bundlerEnv, ruby, buildGoModule, fetchFromGitHub }: let # needed for manpage generation gems = bundlerEnv { @@ -6,27 +6,27 @@ let gemdir = ./.; inherit ruby; }; -in buildGoPackage rec { +in +buildGoModule rec { pname = "ejson"; - version = "1.2.1"; - rev = "v${version}"; - - nativeBuildInputs = [ gems ]; - - goPackagePath = "github.com/Shopify/ejson"; - subPackages = [ "cmd/ejson" ]; + version = "1.3.3"; src = fetchFromGitHub { owner = "Shopify"; repo = "ejson"; - inherit rev; - sha256 = "09356kp059hbzmqpzlz4b3agg93yqqygh5l5ddbxcsaqx4qiwdr7"; + rev = "v${version}"; + sha256 = "sha256-M2Gk+/l1tNlIAe1/fR1WLEOey+tjCUmMAujc76gmeZA="; }; + vendorSha256 = "sha256-9+x7HrbXRoS/7ZADWwhsbynQLr3SyCbcsp9QnSubov0="; + + nativeBuildInputs = [ gems ]; + + ldflags = [ "-s" "-w" ]; + # set HOME, otherwise bundler will insert stuff in the manpages postBuild = '' - cd go/src/$goPackagePath - HOME=$PWD make man + HOME=$PWD make man SHELL=$SHELL ''; postInstall = '' @@ -38,7 +38,6 @@ in buildGoPackage rec { description = "A small library to manage encrypted secrets using asymmetric encryption"; license = licenses.mit; homepage = "https://github.com/Shopify/ejson"; - platforms = platforms.unix; maintainers = [ maintainers.manveru ]; }; }