diff options
Diffstat (limited to 'pkgs/development/embedded')
19 files changed, 33 insertions, 26 deletions
diff --git a/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix b/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix index a97fa50aebf2c..2efab1f1e2f5b 100644 --- a/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix +++ b/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix @@ -14,7 +14,6 @@ buildFHSEnv { pyserial ])) ]); - multiArch = false; extraInstallCommands = '' ${lib.optionalString withGui '' diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index cf9e014310df6..43e6292143a4a 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -13,7 +13,7 @@ , readline , withGui ? false , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , withTeensyduino ? false /* Packages needed for Teensyduino */ , upx @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS # so 'save as...' works: - nativeBuildInputs = [ glib stripJavaArchivesHook wrapGAppsHook unzip ]; + nativeBuildInputs = [ glib stripJavaArchivesHook wrapGAppsHook3 unzip ]; buildInputs = [ jdk ant diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix index a1d330e4b9a7f..6c0a2885b433d 100644 --- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { ]; meta = with lib; { - description = "An Arduino Language Server based on Clangd to Arduino code autocompletion"; + description = "Arduino Language Server based on Clangd to Arduino code autocompletion"; mainProgram = "arduino-language-server"; homepage = "https://github.com/arduino/arduino-language-server"; changelog = "https://github.com/arduino/arduino-language-server/releases/tag/${version}"; diff --git a/pkgs/development/embedded/arduino/arduinoOTA/default.nix b/pkgs/development/embedded/arduino/arduinoOTA/default.nix index a8e1b481fde1b..0ae263ec6e9cd 100644 --- a/pkgs/development/embedded/arduino/arduinoOTA/default.nix +++ b/pkgs/development/embedded/arduino/arduinoOTA/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/arduino/arduinoOTA"; - description = "A tool for uploading programs to Arduino boards over a network"; + description = "Tool for uploading programs to Arduino boards over a network"; mainProgram = "arduinoOTA"; license = licenses.gpl3; maintainers = with maintainers; [ poelzi ]; diff --git a/pkgs/development/embedded/blackmagic/default.nix b/pkgs/development/embedded/blackmagic/default.nix index 893a0c889fada..bb09ade35f2ff 100644 --- a/pkgs/development/embedded/blackmagic/default.nix +++ b/pkgs/development/embedded/blackmagic/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/blacksphere/blackmagic"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pjones emily sorki ]; + maintainers = with maintainers; [ pjones sorki ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index 027ca82324f8a..ba1f42a90b0d4 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "An In-System-Programming (ISP) tool & library for Bouffalo Labs RISC-V Microcontrollers and SoCs"; + description = "In-System-Programming (ISP) tool & library for Bouffalo Labs RISC-V Microcontrollers and SoCs"; license = licenses.mit; mainProgram = "blisp"; homepage = "https://github.com/pine64/blisp"; diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index 58ee0642fb380..3f55ccdd2e8b2 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -5,6 +5,7 @@ , libX11 , readline , darwin +, fetchpatch }: let @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw="; }; + patches = [ + (fetchpatch { + # Required for building on Darwin with clang >=15. + name = "pr-172-fix.patch"; + url = "https://github.com/shumatech/BOSSA/commit/6e54973c3c758674c3d04b5e2cf12e097006f6a3.patch"; + hash = "sha256-2lp6Ej3IfofztC1n/yHLjabn0MH4BA/CM3dsnAw8klA="; + }) + ]; + postPatch = '' substituteInPlace Makefile \ --replace "-arch x86_64" "" @@ -60,7 +70,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers"; + description = "Flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers"; longDescription = '' BOSSA is a flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers. The motivation behind BOSSA is diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index b2d0b0e115310..ef1ba75c45b1f 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ecpdap"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "adamgreig"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KXfEQnbhUUKsCDKhPBjwjF9eJMuiCx5o7gOSzyWv36s="; + sha256 = "sha256-pgQqDRdewBSCm1/9/r8E9DBzwSKAaons3e6OLNv5gHM="; }; - cargoSha256 = "sha256-BEfsNSzrdV/tnzWk4oOwchOupW6PzZ8TEx7zUzwLBV8="; + cargoHash = "sha256-70Aq/gNfRv9JQyYWb7amYkfzFcNGCGbmCfJH4chbyyc="; nativeBuildInputs = [ pkg-config ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A tool to program ECP5 FPGAs"; + description = "Tool to program ECP5 FPGAs"; mainProgram = "ecpdap"; longDescription = '' ECPDAP allows you to program ECP5 FPGAs and attached SPI flash diff --git a/pkgs/development/embedded/fpga/icestorm/default.nix b/pkgs/development/embedded/fpga/icestorm/default.nix index b660571eb3e5f..f6f7e46db56c0 100644 --- a/pkgs/development/embedded/fpga/icestorm/default.nix +++ b/pkgs/development/embedded/fpga/icestorm/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/YosysHQ/icestorm/"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ shell thoughtpolice emily ]; + maintainers = with lib.maintainers; [ shell thoughtpolice ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/development/embedded/fpga/tinyprog/default.nix index e5a448b6fb3d3..b5a9937ad2af4 100644 --- a/pkgs/development/embedded/fpga/tinyprog/default.nix +++ b/pkgs/development/embedded/fpga/tinyprog/default.nix @@ -34,7 +34,7 @@ with python3Packages; buildPythonApplication rec { homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer"; description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; mainProgram = "tinyprog"; - maintainers = with maintainers; [ emily ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix index f0ff4a47b4c35..b652f57fa81a1 100644 --- a/pkgs/development/embedded/fpga/trellis/default.nix +++ b/pkgs/development/embedded/fpga/trellis/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/YosysHQ/prjtrellis"; license = licenses.isc; - maintainers = with maintainers; [ q3k thoughtpolice emily rowanG077 ]; + maintainers = with maintainers; [ q3k thoughtpolice rowanG077 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/embedded/gputils/default.nix b/pkgs/development/embedded/gputils/default.nix index 69a901ea80f76..8050368e0a95a 100644 --- a/pkgs/development/embedded/gputils/default.nix +++ b/pkgs/development/embedded/gputils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gputils.sourceforge.io"; - description = "A collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib"; + description = "Collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib"; license = licenses.gpl2; maintainers = with maintainers; [ yorickvp ]; platforms = platforms.linux; diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 55adb0edaa750..50be791a951e7 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -11,6 +11,7 @@ let git xdg-user-dirs ncurses + udev ]) ++ (with python.pkgs; [ python setuptools @@ -27,7 +28,7 @@ buildFHSEnv { # multiPkgs = pio-pkgs; meta = with lib; { - description = "An open source ecosystem for IoT development"; + description = "Open source ecosystem for IoT development"; homepage = "https://platformio.org"; maintainers = with maintainers; [ mog ]; license = licenses.asl20; diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index b36d5367e65e3..9013f39ad4244 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -199,7 +199,7 @@ with python3Packages; buildPythonApplication rec { meta = with lib; { changelog = "https://github.com/platformio/platformio-core/releases/tag/v${version}"; - description = "An open source ecosystem for IoT development"; + description = "Open source ecosystem for IoT development"; downloadPage = "https://github.com/platformio/platformio-core"; homepage = "https://platformio.org"; license = licenses.asl20; diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index 956d7dee06cd9..8843c36a9f6a7 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -1,4 +1,4 @@ -{ newScope, fetchFromGitHub, python3Packages }: +{ newScope, python3Packages }: let callPackage = newScope self; diff --git a/pkgs/development/embedded/rshell/default.nix b/pkgs/development/embedded/rshell/default.nix index 591331464e3ad..b42651aa1404c 100644 --- a/pkgs/development/embedded/rshell/default.nix +++ b/pkgs/development/embedded/rshell/default.nix @@ -3,15 +3,12 @@ , fetchPypi , pyserial , pyudev -, pythonOlder }: buildPythonApplication rec { pname = "rshell"; version = "0.0.32"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; sha256 = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8="; diff --git a/pkgs/development/embedded/stm8/stm8flash/default.nix b/pkgs/development/embedded/stm8/stm8flash/default.nix index c2bab12246b2c..a34be169816d7 100644 --- a/pkgs/development/embedded/stm8/stm8flash/default.nix +++ b/pkgs/development/embedded/stm8/stm8flash/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vdudouyt/stm8flash"; - description = "A tool for flashing STM8 MCUs via ST-LINK (V1 and V2)"; + description = "Tool for flashing STM8 MCUs via ST-LINK (V1 and V2)"; mainProgram = "stm8flash"; maintainers = with maintainers; [ pkharvey ]; license = licenses.gpl2; diff --git a/pkgs/development/embedded/teensy-cmake-macros/hook.nix b/pkgs/development/embedded/teensy-cmake-macros/hook.nix index 83a4e6828d4ae..b0abdbdc681ee 100644 --- a/pkgs/development/embedded/teensy-cmake-macros/hook.nix +++ b/pkgs/development/embedded/teensy-cmake-macros/hook.nix @@ -11,7 +11,7 @@ makeSetupHook { passthru = { inherit teensy-cmake-macros; }; meta = { - description = "A setup hook for teensy-cmake-macros"; + description = "Setup hook for teensy-cmake-macros"; inherit (teensy-cmake-macros.meta) maintainers platforms broken; }; } ./setup-hook.sh diff --git a/pkgs/development/embedded/teensy-loader-cli/default.nix b/pkgs/development/embedded/teensy-loader-cli/default.nix index cd318d7a1ca52..19f7051f0a302 100644 --- a/pkgs/development/embedded/teensy-loader-cli/default.nix +++ b/pkgs/development/embedded/teensy-loader-cli/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "teensy-loader-cli"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "PaulStoffregen"; repo = "teensy_loader_cli"; rev = finalAttrs.version; - sha256 = "sha256-C9Qhd6LhAES7X0sh4rofjAM+gxwuosahVQHeR76LyIo="; + sha256 = "sha256-NYqCNWO/nHEuNc9eOzsUqJEHJtZ3XaNz1VYNbeuqEk8="; }; nativeBuildInputs = [ |