From 38bc5fa17ebec1aff2bef8efdec93109fd74a80c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 23 Jul 2024 11:05:29 +0200 Subject: [PATCH] arduino-cli: reformat according to nixpkgs RFC166 --- .../embedded/arduino/arduino-cli/default.nix | 90 +++++++++++-------- 1 file changed, 52 insertions(+), 38 deletions(-) diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index e83478457610..9d887c5f200b 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSEnv, installShellFiles, go-task }: +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + buildFHSEnv, + installShellFiles, + go-task, +}: let @@ -13,33 +21,31 @@ let hash = "sha256-/2GtWiks/d8sTJ6slX2nQtFpGkqm4PSfgDd0uVG+qN8="; }; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ - go-task - ]; + nativeCheckInputs = [ go-task ]; subPackages = [ "." ]; vendorHash = "sha256-OkilZMDTueHfn6T5Af8e+CVersSPDMcAUUB2o1ny6nc="; - postPatch = let - skipTests = [ - # tries to "go install" - "TestDummyMonitor" - # try to Get "https://downloads.arduino.cc/libraries/library_index.tar.bz2" - "TestDownloadAndChecksums" - "TestParseArgs" - "TestParseReferenceCores" - "TestPlatformSearch" - "TestPlatformSearchSorting" - ]; - in '' - substituteInPlace Taskfile.yml \ - --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'" - ''; + postPatch = + let + skipTests = [ + # tries to "go install" + "TestDummyMonitor" + # try to Get "https://downloads.arduino.cc/libraries/library_index.tar.bz2" + "TestDownloadAndChecksums" + "TestParseArgs" + "TestParseReferenceCores" + "TestPlatformSearch" + "TestPlatformSearchSorting" + ]; + in + '' + substituteInPlace Taskfile.yml \ + --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'" + ''; doCheck = stdenv.isLinux; @@ -50,7 +56,10 @@ let ''; ldflags = [ - "-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'" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -67,33 +76,38 @@ let description = "Arduino from the command line"; mainProgram = "arduino-cli"; changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; - license = [ licenses.gpl3Only licenses.asl20 ]; - maintainers = with maintainers; [ ryantm sfrijters ]; + license = [ + licenses.gpl3Only + licenses.asl20 + ]; + maintainers = with maintainers; [ + ryantm + sfrijters + ]; }; }; in if stdenv.isLinux then -# buildFHSEnv is needed because the arduino-cli downloads compiler -# toolchains from the internet that have their interpreters pointed at -# /lib64/ld-linux-x86-64.so.2 - buildFHSEnv - { + # buildFHSEnv is needed because the arduino-cli downloads compiler + # toolchains from the internet that have their interpreters pointed at + # /lib64/ld-linux-x86-64.so.2 + buildFHSEnv { inherit (pkg) name meta; runScript = "${pkg.outPath}/bin/arduino-cli"; - extraInstallCommands = '' - mv $out/bin/$name $out/bin/arduino-cli - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - cp -r ${pkg.outPath}/share $out/share - ''; + extraInstallCommands = + '' + mv $out/bin/$name $out/bin/arduino-cli + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + cp -r ${pkg.outPath}/share $out/share + ''; passthru.pureGoPkg = pkg; - targetPkgs = pkgs: with pkgs; [ - zlib - ]; + targetPkgs = pkgs: with pkgs; [ zlib ]; } else pkg