From 3465e1aa80ba2833c7759fc793aaaa72e855aad9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 10:09:52 +0000 Subject: [PATCH 1/2] balena-cli: 17.0.0 -> 17.4.9 --- pkgs/tools/admin/balena-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index bb674a83f322..50f4cfc0133a 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "balena-cli"; - version = "17.0.0"; + version = "17.4.9"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-sNpxjSumiP+4fX6b3j+HEl/lr4pvudrhfTzr2TYastE="; + hash = "sha256-0TWG90OB7tovfj4PB0qAiwdOtMss5ZqjSycAb4Vz5+A="; }; - npmDepsHash = "sha256-q2Yc6e5dEiP2Q4tFIeqj4mswM1/pX1pdGeoagyiupvs="; + npmDepsHash = "sha256-LSw/cNJ6kWYh477NAqLOx5bVZ6/qPoUM0V1Cksn7iDI="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 40b8d88dd5fefa670d0b2efe5107bd1dbfb618ac Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 25 Dec 2023 13:24:13 +0200 Subject: [PATCH 2/2] balena-cli: fix darwin build --- pkgs/tools/admin/balena-cli/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 50f4cfc0133a..862fcf7aa0eb 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildNpmPackage +, overrideSDK , fetchFromGitHub , testers , balena-cli @@ -10,7 +11,12 @@ , darwin }: -buildNpmPackage rec { +let + # Fix for: https://github.com/NixOS/nixpkgs/issues/272156 + buildNpmPackage' = buildNpmPackage.override { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; +in buildNpmPackage' rec { pname = "balena-cli"; version = "17.4.9";