diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 4b756bb720a0..6b6d1364f753 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,43 +1,47 @@ { lib -, buildGo118Module +, buildGoModule , fetchFromGitHub , installShellFiles , lima , makeWrapper +, qemu +, testers +, colima }: -buildGo118Module rec { +buildGoModule rec { pname = "colima"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-66nKH5jxTzLB9bg2lH1E8Cc0GZ6C/N/+yPYhCVEKOBY="; - + sha256 = "bSBaSS+rVkFqTSdyegdE/F0X5u7yvF/nHslAO3xgD6I="; # We need the git revision leaveDotGit = true; postFetch = '' - git -C $out rev-parse HEAD > $out/.git-revision + git -C $out rev-parse --short HEAD > $out/.git-revision rm -rf $out/.git ''; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-91Ex3RPWxOHyZcR3Bo+bRdDAFw2mEGiC/uNKjdX2kuw="; + vendorSha256 = "sha256-jDzDwK7qA9lKP8CfkKzfooPDrHuHI4OpiLXmX9vOpOg="; - doCheck = false; + CGO_ENABLED = 1; preConfigure = '' - ldflags="-X github.com/abiosoft/colima/config.appVersion=${version} - -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" + ldflags="-s -w -X github.com/abiosoft/colima/config.appVersion=${version} \ + -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" ''; + subPackages = [ "cmd/colima" ]; + postInstall = '' wrapProgram $out/bin/colima \ - --prefix PATH : ${lib.makeBinPath [ lima ]} + --prefix PATH : ${lib.makeBinPath [ lima qemu ]} installShellCompletion --cmd colima \ --bash <($out/bin/colima completion bash) \ @@ -45,10 +49,15 @@ buildGo118Module rec { --zsh <($out/bin/colima completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = colima; + command = "HOME=$(mktemp -d) colima version"; + }; + meta = with lib; { - description = "Container runtimes on MacOS with minimal setup"; + description = "Container runtimes with minimal setup"; homepage = "https://github.com/abiosoft/colima"; license = licenses.mit; - maintainers = with maintainers; [ aaschmid ]; + maintainers = with maintainers; [ aaschmid tricktron ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6414df64fe7a..3770016107c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34527,7 +34527,7 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; - colima = callPackage ../applications/virtualization/colima { }; + colima = callPackage ../applications/virtualization/colima { buildGoModule = buildGo118Module; }; lima = callPackage ../applications/virtualization/lima { };