colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #294952 from SFrijters/arduino-cli-0.35.3

Browse Source 
arduino-cli: 0.35.2 -> 0.35.3, minor improvements
This commit is contained in:
Nick Cao 2024-03-12 14:16:27 -04:00 committed by GitHub
commit 7fda176bea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/embedded/arduino/arduino-cli/default.nix
View File

@ -4,13 +4,13 @@ let
pkg = buildGoModule rec { pkg = buildGoModule rec {
pname = "arduino-cli"; pname = "arduino-cli";
version = "0.35.2"; version = "0.35.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arduino"; owner = "arduino";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ctgDuWbNLMyQrxnarTbCtGXM5G+bPeS4Xa7eTbkFo0k="; hash = "sha256-brWWoIOQhU/isd48VCx6tczAJnamBuOa6e/xezuHN7E=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -38,7 +38,7 @@ let
]; ];
in '' in ''
substituteInPlace Taskfile.yml \ substituteInPlace Taskfile.yml \
--replace "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'" --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'"
''; '';
doCheck = stdenv.isLinux; doCheck = stdenv.isLinux;
@ -53,12 +53,12 @@ let
"-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown"
] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
postInstall = '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
export HOME="$(mktemp -d)" export HOME="$(mktemp -d)"
for s in {bash,zsh,fish}; do installShellCompletion --cmd arduino-cli \
$out/bin/arduino-cli completion $s > completion.$s --bash <($out/bin/arduino-cli completion bash) \
installShellCompletion --cmd arduino-cli --$s completion.$s --zsh <($out/bin/arduino-cli completion zsh) \
done --fish <($out/bin/arduino-cli completion fish)
unset HOME unset HOME
''; '';
@ -85,6 +85,7 @@ if stdenv.isLinux then
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/$name $out/bin/arduino-cli mv $out/bin/$name $out/bin/arduino-cli
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
cp -r ${pkg.outPath}/share $out/share cp -r ${pkg.outPath}/share $out/share
''; '';
passthru.pureGoPkg = pkg; passthru.pureGoPkg = pkg;