pyrox.dev / nixpkgs
lol
fork atom

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

authored by Sandro and committed by GitHub fb1b3055 3166f8c8

+33 -26
unified split
+4 -15
pkgs/by-name/li/lima-additional-guestagents/package.nix pkgs/by-name/li/lima/additional-guestagents.nix
··· 2 lib, 3 stdenv, 4 buildGoModule, 5 - fetchFromGitHub, 6 - nix-update-script, 7 apple-sdk_15, 8 findutils, 9 }: 10 11 buildGoModule (finalAttrs: { 12 pname = "lima-additional-guestagents"; 13 - version = "1.2.1"; 14 15 - src = fetchFromGitHub { 16 - owner = "lima-vm"; 17 - repo = "lima"; 18 - tag = "v${finalAttrs.version}"; 19 - hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k="; 20 - }; 21 - 22 - vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os="; 23 24 buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ 25 apple-sdk_15 ··· 62 63 runHook postInstallCheck 64 ''; 65 - 66 - passthru = { 67 - updateScript = nix-update-script { }; 68 - }; 69 70 meta = { 71 homepage = "https://github.com/lima-vm/lima";
··· 2 lib, 3 stdenv, 4 buildGoModule, 5 + callPackage, 6 apple-sdk_15, 7 findutils, 8 }: 9 10 buildGoModule (finalAttrs: { 11 pname = "lima-additional-guestagents"; 12 13 + # Because agents must use the same version as lima, lima's updateScript should also update the shared src. 14 + # nixpkgs-update: no auto update 15 + inherit (callPackage ./source.nix { }) version src vendorHash; 16 17 buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ 18 apple-sdk_15 ··· 55 56 runHook postInstallCheck 57 ''; 58 59 meta = { 60 homepage = "https://github.com/lima-vm/lima";
+8 -11
pkgs/by-name/li/lima/package.nix
··· 2 lib, 3 stdenv, 4 buildGoModule, 5 - fetchFromGitHub, 6 installShellFiles, 7 qemu, 8 darwin, ··· 22 23 buildGoModule (finalAttrs: { 24 pname = "lima"; 25 - version = "1.2.1"; 26 27 - src = fetchFromGitHub { 28 - owner = "lima-vm"; 29 - repo = "lima"; 30 - tag = "v${finalAttrs.version}"; 31 - hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k="; 32 - }; 33 - 34 - vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os="; 35 36 nativeBuildInputs = [ 37 makeWrapper ··· 159 }; 160 }; 161 162 - updateScript = nix-update-script { }; 163 }; 164 165 meta = {
··· 2 lib, 3 stdenv, 4 buildGoModule, 5 + callPackage, 6 installShellFiles, 7 qemu, 8 darwin, ··· 22 23 buildGoModule (finalAttrs: { 24 pname = "lima"; 25 26 + inherit (callPackage ./source.nix { }) version src vendorHash; 27 28 nativeBuildInputs = [ 29 makeWrapper ··· 151 }; 152 }; 153 154 + updateScript = nix-update-script { 155 + extraArgs = [ 156 + "--override-filename" 157 + ./source.nix 158 + ]; 159 + }; 160 }; 161 162 meta = {
+19
pkgs/by-name/li/lima/source.nix
···
··· 1 + { 2 + fetchFromGitHub, 3 + }: 4 + 5 + let 6 + version = "1.2.1"; 7 + in 8 + { 9 + inherit version; 10 + 11 + src = fetchFromGitHub { 12 + owner = "lima-vm"; 13 + repo = "lima"; 14 + tag = "v${version}"; 15 + hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k="; 16 + }; 17 + 18 + vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os="; 19 + }
+2
pkgs/top-level/all-packages.nix
··· 5361 withQt = true; 5362 }; 5363 5364 lld = llvmPackages.lld; 5365 5366 lldb = llvmPackages.lldb;
··· 5361 withQt = true; 5362 }; 5363 5364 + lima-additional-guestagents = callPackage ../by-name/li/lima/additional-guestagents.nix { }; 5365 + 5366 lld = llvmPackages.lld; 5367 5368 lldb = llvmPackages.lldb;