lima, lima-additional-guestagents: share source (#437460)

pkgs/by-name/li/lima/additional-guestagents.nix

@@ -2,24 +2,17 @@
   lib,
   stdenv,
   buildGoModule,
-  fetchFromGitHub,
+  callPackage,
-  nix-update-script,
   apple-sdk_15,
   findutils,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "lima-additional-guestagents";
-  version = "1.2.1";
 
-  src = fetchFromGitHub {
+  # Because agents must use the same version as lima, lima's updateScript should also update the shared src.
-    owner = "lima-vm";
+  # nixpkgs-update: no auto update
-    repo = "lima";
+  inherit (callPackage ./source.nix { }) version src vendorHash;
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k=";
-  };
-
-  vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     apple-sdk_15
@@ -63,10 +56,6 @@ buildGoModule (finalAttrs: {
     runHook postInstallCheck
   '';
 
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
   meta = {
     homepage = "https://github.com/lima-vm/lima";
     description = "Lima Guest Agents for emulating non-native architectures";

pkgs/by-name/li/lima/package.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   buildGoModule,
-  fetchFromGitHub,
+  callPackage,
   installShellFiles,
   qemu,
   darwin,
@@ -22,16 +22,8 @@
 
 buildGoModule (finalAttrs: {
   pname = "lima";
-  version = "1.2.1";
 
-  src = fetchFromGitHub {
+  inherit (callPackage ./source.nix { }) version src vendorHash;
-    owner = "lima-vm";
-    repo = "lima";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k=";
-  };
-
-  vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -159,7 +151,12 @@ buildGoModule (finalAttrs: {
         };
       };
 
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--override-filename"
+        ./source.nix
+      ];
+    };
   };
 
   meta = {

pkgs/by-name/li/lima/source.nix

@@ -0,0 +1,19 @@
+{
+  fetchFromGitHub,
+}:
+
+let
+  version = "1.2.1";
+in
+{
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "lima-vm";
+    repo = "lima";
+    tag = "v${version}";
+    hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k=";
+  };
+
+  vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os=";
+}

pkgs/top-level/all-packages.nix

@@ -5361,6 +5361,8 @@ with pkgs;
     withQt = true;
   };
 
+  lima-additional-guestagents = callPackage ../by-name/li/lima/additional-guestagents.nix { };
+
   lld = llvmPackages.lld;
 
   lldb = llvmPackages.lldb;