From bec9150f645ac954bcafd496d6c3b74ddab2838d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 14 May 2022 08:44:24 +0000 Subject: [PATCH] lazydocker: 0.13 -> 0.18.1 --- pkgs/tools/misc/lazydocker/default.nix | 18 ++++++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index cfdce8e3c0b..985cc472138 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,19 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "lazydocker"; - version = "0.13"; + version = "0.18.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-thUm33AdP9Huc2vcTRatC1ULHZd0edEQggEGTqOV3a0="; + sha256 = "sha256-qtGPsfZVu5ZuCusO5nYgxR/qHiwyhzMmBMLMDpKzKDA="; }; - goPackagePath = "github.com/jesseduffield/lazydocker"; + vendorSha256 = null; - subPackages = [ "." ]; + postPatch = '' + rm -f pkg/config/app_config_test.go + ''; + + excludedPackages = [ "scripts" "test/printrandom" ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A simple terminal UI for both docker and docker-compose"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb1ed2c4b0d..7af9936acd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -750,7 +750,9 @@ with pkgs; installShellFiles = callPackage ../build-support/install-shell-files {}; - lazydocker = callPackage ../tools/misc/lazydocker { }; + lazydocker = callPackage ../tools/misc/lazydocker { + buildGoModule = buildGo118Module; + }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } ../build-support/setup-hooks/ld-is-cc-hook.sh;