diff --git a/pkgs/by-name/li/lima-additional-guestagents/package.nix b/pkgs/by-name/li/lima/additional-guestagents.nix similarity index 82% rename from pkgs/by-name/li/lima-additional-guestagents/package.nix rename to pkgs/by-name/li/lima/additional-guestagents.nix index 2733e990996d..ad80a7aad745 100644 --- a/pkgs/by-name/li/lima-additional-guestagents/package.nix +++ b/pkgs/by-name/li/lima/additional-guestagents.nix @@ -2,24 +2,17 @@ lib, stdenv, buildGoModule, - fetchFromGitHub, - nix-update-script, + callPackage, apple-sdk_15, findutils, }: buildGoModule (finalAttrs: { pname = "lima-additional-guestagents"; - version = "1.2.1"; - src = fetchFromGitHub { - owner = "lima-vm"; - repo = "lima"; - tag = "v${finalAttrs.version}"; - hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k="; - }; - - vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os="; + # Because agents must use the same version as lima, lima's updateScript should also update the shared src. + # nixpkgs-update: no auto update + inherit (callPackage ./source.nix { }) version src vendorHash; 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"; diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix index 12ff0ee0705e..377a20665201 100644 --- a/pkgs/by-name/li/lima/package.nix +++ b/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 { - owner = "lima-vm"; - repo = "lima"; - tag = "v${finalAttrs.version}"; - hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k="; - }; - - vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os="; + inherit (callPackage ./source.nix { }) version src vendorHash; nativeBuildInputs = [ makeWrapper @@ -159,7 +151,12 @@ buildGoModule (finalAttrs: { }; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--override-filename" + ./source.nix + ]; + }; }; meta = { diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix new file mode 100644 index 000000000000..aa1134c22f91 --- /dev/null +++ b/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="; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd93bce55693..66d97faa35c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5433,6 +5433,8 @@ with pkgs; withQt = true; }; + lima-additional-guestagents = callPackage ../by-name/li/lima/additional-guestagents.nix { }; + lld = llvmPackages.lld; lld_12 = llvmPackages_12.lld; lld_13 = llvmPackages_13.lld;