summary refs log tree commit diff
path: root/pkgs/applications/networking/cluster/nerdctl/default.nix
diff options
context:
space:
mode:
author06kellyjac <dev@j-k.io>2021-02-19 09:55:05 +0000
committer06kellyjac <dev@j-k.io>2021-02-19 09:55:12 +0000
commit1f1f14f523d62c68471565cd559ae18c95bc57b4 (patch)
treef0f5f1b02f28a9b91ab77a5f05dda20028c649b5 /pkgs/applications/networking/cluster/nerdctl/default.nix
parentad4db3f4d8ae54482c63c31c14921cb73953548d (diff)
downloadnixpkgs-1f1f14f523d62c68471565cd559ae18c95bc57b4.tar
nixpkgs-1f1f14f523d62c68471565cd559ae18c95bc57b4.tar.gz
nixpkgs-1f1f14f523d62c68471565cd559ae18c95bc57b4.tar.bz2
nixpkgs-1f1f14f523d62c68471565cd559ae18c95bc57b4.tar.lz
nixpkgs-1f1f14f523d62c68471565cd559ae18c95bc57b4.tar.xz
nixpkgs-1f1f14f523d62c68471565cd559ae18c95bc57b4.tar.zst
nixpkgs-1f1f14f523d62c68471565cd559ae18c95bc57b4.zip
nerdctl: 0.5.0 -> 0.6.0
- nixpkgs-fmt
- add installCheckPhase
- hardcode homepage
- add changelog
- sort meta
Diffstat (limited to 'pkgs/applications/networking/cluster/nerdctl/default.nix')
-rw-r--r--pkgs/applications/networking/cluster/nerdctl/default.nix25
1 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix
index 28f7b540722..d11461366b6 100644
--- a/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -4,17 +4,12 @@
 , makeWrapper
 , buildkit
 , cni-plugins
-, extraPackages ? []
+, extraPackages ? [ ]
 }:
 
-let
-  binPath = lib.makeBinPath ([
-    buildkit
-  ] ++ extraPackages);
-in
 buildGoModule rec {
   pname = "nerdctl";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "AkihiroSuda";
@@ -37,15 +32,25 @@ buildGoModule rec {
 
   postInstall = ''
     wrapProgram $out/bin/nerdctl \
-      --prefix PATH : "${binPath}" \
+      --prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \
       --prefix CNI_PATH : "${cni-plugins}/bin"
   '';
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/nerdctl --help
+    # --version will error without containerd.sock access
+    $out/bin/nerdctl --help | grep "${version}"
+    runHook postInstallCheck
+  '';
+
   meta = with lib; {
+    homepage = "https://github.com/AkihiroSuda/nerdctl/";
+    changelog = "https://github.com/AkihiroSuda/nerdctl/releases/tag/v${version}";
     description = "A Docker-compatible CLI for containerd";
-    homepage = src.meta.homepage;
     license = licenses.asl20;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ jk ];
+    platforms = platforms.linux;
   };
 }