From 4f67556113644a04d9b60094bcb396fcbd83cd52 Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Thu, 15 Dec 2022 13:28:53 -0500 Subject: [PATCH 1/5] lima: 0.13.0 -> 0.14.1 --- .../applications/virtualization/lima/default.nix | 16 ++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 03d049477b5d..129927acedc8 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -1,31 +1,39 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , qemu +, xcbuild +, sigtool , makeWrapper }: buildGoModule rec { pname = "lima"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM="; + sha256 = "sha256-C1qJ3SAxtFSxbGrDlLvYDzUwdiJDcegzx5uXCSYNVJQ="; }; - vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY="; + vendorSha256 = "sha256-MaAdX7TKfBzvzz8r+cfKCSul/QZ0/AgHnBwhu0ZR0gY="; - 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:' ''; + # 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 887b29613371..8fa2336e1762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From dc05102a83562c077518e9758c0f97851b887883 Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:17:18 -0500 Subject: [PATCH 2/5] add _output cleaning before build --- pkgs/applications/virtualization/lima/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 129927acedc8..23d34f9d6e11 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -36,6 +36,7 @@ buildGoModule rec { buildPhase = '' runHook preBuild + rm -rf _output make "VERSION=v${version}" binaries runHook postBuild ''; From 1a5fda5f2b8dae7917ec323b81ccae92910fdd9e Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:49:22 -0500 Subject: [PATCH 3/5] remove rm, add --force to codesign --- pkgs/applications/virtualization/lima/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 23d34f9d6e11..4025d7e4e48a 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -28,6 +28,7 @@ buildGoModule rec { # clean fails with read only vendor dir postPatch = '' substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' + substituteInPlace Makefile --replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -' ''; # It attaches entitlements with codesign and strip removes those, @@ -36,7 +37,6 @@ buildGoModule rec { buildPhase = '' runHook preBuild - rm -rf _output make "VERSION=v${version}" binaries runHook postBuild ''; From 788a5c31da627258a538b1d7feee7ba61b666c3b Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Sun, 18 Dec 2022 01:13:08 +0100 Subject: [PATCH 4/5] Combine `substituteInPlace` on `Makefile` Co-authored-by: Sandro --- pkgs/applications/virtualization/lima/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 4025d7e4e48a..92b8de106639 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -27,8 +27,9 @@ buildGoModule rec { # clean fails with read only vendor dir postPatch = '' - substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' - substituteInPlace Makefile --replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -' + 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, From fa65a5e2a6b2cb42e3d3707a630fb9d1c75a6b50 Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:12:05 -0500 Subject: [PATCH 5/5] lima: 0.14.2 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 92b8de106639..29dd9b27232e 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C1qJ3SAxtFSxbGrDlLvYDzUwdiJDcegzx5uXCSYNVJQ="; + sha256 = "sha256-g4FvkjBviI1m8zlc+GK/09dIqVkTQ2MqqK1Wkyu4qBc="; }; - vendorSha256 = "sha256-MaAdX7TKfBzvzz8r+cfKCSul/QZ0/AgHnBwhu0ZR0gY="; + vendorSha256 = "sha256-l53MTxLY/uid+0U/eY96l0aBWKImST1gN2BARilh2K0="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ];