Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lima: 0.13.0 -> 0.14.2 #206285

Merged
merged 5 commits into from
Jan 23, 2023
Merged

lima: 0.13.0 -> 0.14.2 #206285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f67556
lima: 0.13.0 -> 0.14.1
jbgosselin Dec 15, 2022
dc05102
add _output cleaning before build
jbgosselin Dec 16, 2022
1a5fda5
remove rm, add --force to codesign
jbgosselin Dec 16, 2022
788a5c3
Combine `substituteInPlace` on `Makefile`
jbgosselin Dec 18, 2022
fa65a5e
lima: 0.14.2
jbgosselin Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions pkgs/applications/virtualization/lima/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,41 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, installShellFiles
, qemu
, xcbuild
, sigtool
, makeWrapper
}:

buildGoModule rec {
pname = "lima";
version = "0.13.0";
version = "0.14.2";

src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM=";
sha256 = "sha256-g4FvkjBviI1m8zlc+GK/09dIqVkTQ2MqqK1Wkyu4qBc=";
};

vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY=";
vendorSha256 = "sha256-l53MTxLY/uid+0U/eY96l0aBWKImST1gN2BARilh2K0=";

nativeBuildInputs = [ makeWrapper installShellFiles ];
nativeBuildInputs = [ makeWrapper installShellFiles ]
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ];

# clean fails with read only vendor dir
postPatch = ''
substituteInPlace Makefile --replace 'binaries: clean' 'binaries:'
substituteInPlace Makefile \
--replace 'binaries: clean' 'binaries:' \
--replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -'
'';

# It attaches entitlements with codesign and strip removes those,
# voiding the entitlements and making it non-operational.
dontStrip = stdenv.isDarwin;

buildPhase = ''
runHook preBuild
make "VERSION=v${version}" binaries
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36777,7 +36777,9 @@ with pkgs;

colima = callPackage ../applications/virtualization/colima { };

lima = callPackage ../applications/virtualization/lima { };
lima = callPackage ../applications/virtualization/lima {
inherit (darwin) sigtool;
};

logtop = callPackage ../tools/misc/logtop { };

Expand Down