diff options
Diffstat (limited to 'pkgs/development/embedded')
10 files changed, 75 insertions, 74 deletions
diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index 8fd4cf0a35ae3..dc463c9fc4dbb 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -4,18 +4,18 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.18.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - sha256 = "sha256-EtkONrP/uaetsdC47WsyQOE71Gsz0wKUiTiYThj8Kq8="; + sha256 = "sha256-q2uaJTfCcS/kv6xU5NjafzfcM3TixJlH5KzgEpLJKkQ="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-kPIhG6lsH+0IrYfdlzdv/X/cUQb22Xza9Q6ywjKae/4="; + vendorSha256 = "sha256-VWoKHIRQfs4dbsOzV3AQpqWsCPDm/rVKGMsc4xZvbhU="; doCheck = false; diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 6b2c6203a3921..71f3c884868b2 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -79,33 +79,33 @@ let in stdenv.mkDerivation rec { pname = (if withTeensyduino then "teensyduino" else "arduino") + lib.optionalString (!withGui) "-core"; - version = "1.8.16"; + version = "1.8.19"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = version; - sha256 = "sha256-6d+y0Lgr+h0qYpCsa/ihvSMNuAdRMNQRuxZFpkWLDvg="; + sha256 = "sha256-I+PvfGc5F8H/NJOGRa18z7dKyKcO8I8Cg7Tj5yxkYAQ="; }; - teensyduino_version = "155"; + teensyduino_version = "156"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = { - linux64 = "sha256-DypCbCm4RKYgnFJRwoHyPht6dFG48YvWM4RzEDdJE6U="; - linux32 = "sha256-MJ4xsTAZPO8BhO/VWSjBAjBVLrKM+3PNi1fiF8dsuVQ="; - linuxarm = "sha256-x5JdYflLThohos9RTAWt4XrzvksB7VWfXTKqgXZ1d6Q="; - linuxaarch64 = "sha256-N18nvavEMhvt2jOrdI+tsXtbWIdsj1n4aMVeaaBlcT4="; + linux64 = "sha256-4DbhmmYrx+rCBpDrYFaC0A88Qv9UEeNlQAkFi3zAstk="; + linux32 = "sha256-DlRPOtDxmMPv2Qzhib7vNZdKNZCxmm9YmVNnwUKXK/E="; + linuxarm = "sha256-d+DbpER/4lFPcPDFeMG5f3WaUGn8pFchdIDo7Hm0XWs="; + linuxaarch64 = "sha256-8keQzhWq7QlAGIbfHEe3lfxpJleMMvBORuPaNrLmM6Y="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = { - linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po="; - linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE="; - linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM="; - linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ="; + linux64 = "sha256-62i93B0cASC+L8oTUKA+40Uxzzf1GEeyEhC25wVFvJs="; + linux32 = "sha256-wSxtx3BqXMQCeWQDK8PHkWLlQqQM1Csao8bIk98FrFg="; + linuxarm = "sha256-lJ/R1ePq7YtDk3bvloFcn8jswrJH+L63tvH5QpTqfXs="; + linuxaarch64 = "sha256-gm8cDjLKNfpcaeO7fw6Kyv1TnWV/ZmH4u++nun9X6jo="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; diff --git a/pkgs/development/embedded/arduino/ino/default.nix b/pkgs/development/embedded/arduino/ino/default.nix deleted file mode 100644 index e25a7b83e9c77..0000000000000 --- a/pkgs/development/embedded/arduino/ino/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, fetchurl, python2Packages, picocom -, avrdude, arduino-core }: - -python2Packages.buildPythonApplication rec { - pname = "ino"; - version = "0.3.6"; - - src = fetchurl { - url = "mirror://pypi/i/ino/ino-${version}.tar.gz"; - sha256 = "0k6lzfcn55favbj0w4afrvnmwyskf7bgzg9javv2ycvskp35srwv"; - }; - - # TODO: add avrgcclibc, it must be rebuild with C++ support - propagatedBuildInputs = with python2Packages; [ - arduino-core - avrdude - picocom - configobj - jinja2 - pyserial - six - ]; - - patchPhase = '' - echo "Patching Arduino distribution path" - sed -i 's@/usr/local/share/arduino@${arduino-core}/share/arduino@g' \ - ino/environment.py - sed -i -e 's@argparse@@' -e 's@ordereddict@@' \ - requirements.txt - sed -i -e 's@from ordereddict@from collections@' \ - ino/environment.py ino/utils.py - - # Patch the upload command so it uses the correct avrdude - substituteInPlace ino/commands/upload.py \ - --replace "self.e['avrdude']" "'${avrdude}/bin/avrdude'" \ - --replace "'-C', self.e['avrdude.conf']," "" - ''; - - meta = with lib; { - description = "Command line toolkit for working with Arduino hardware"; - homepage = "http://inotool.org/"; - license = licenses.mit; - maintainers = with maintainers; [ antono ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index db2ffce50cec3..995af6bb92b31 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -7,11 +7,11 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null; stdenv.mkDerivation rec { pname = "avrdude"; - version = "6.3"; + version = "6.4"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg"; + sha256 = "sha256-qb5wZvcKnc9L8HNvz1MdtqMlCu0aJMxkOt0nZBtxEPk="; }; configureFlags = lib.optionals docSupport "--enable-doc"; diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix new file mode 100644 index 0000000000000..fac10a28107fd --- /dev/null +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }: + +rustPlatform.buildRustPackage rec { + pname = "elf2uf2-rs"; + version = "unstable-2021-12-12"; + + src = fetchFromGitHub { + owner = "JoNil"; + repo = pname; + rev = "91ae98873ed01971ab1543b98266a5ad2ec09210"; + sha256 = "sha256-DGrT+YdDLdTYy5SWcQ+DNbpifGjrF8UTXyEeE/ug564="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + udev + ]; + + cargoSha256 = "sha256-5ui1+987xICP2wUSHy4YzKskn52W51Pi4DbEh+GbSPE="; + + meta = with lib; { + description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; + homepage = "https://github.com/JoNil/elf2uf2-rs"; + license = with licenses; [ bsd0 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ polygon ]; + }; +} diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix index 95de28113f84e..1bb5f336f1ebd 100644 --- a/pkgs/development/embedded/fpga/apio/default.nix +++ b/pkgs/development/embedded/fpga/apio/default.nix @@ -7,6 +7,7 @@ , colorama , pyserial , wheel +, scons , setuptools , tinyprog , pytestCheckHook @@ -14,17 +15,20 @@ buildPythonApplication rec { pname = "apio"; - version = "0.7.6"; + version = "0.8.0"; format = "flit"; src = fetchFromGitHub { owner = "FPGAwars"; repo = "apio"; rev = "v${version}"; - sha256 = "sha256-KmqxwYKsvcTSuUSVXgegR47y9VeU/vICbYWD7z3aDRM="; + sha256 = "sha256-nOZI+FHdZRnkJF/No8z0mZ4Q5aHFnF7c20ajTPI00N4="; }; postPatch = '' + substituteInPlace pyproject.toml --replace \ + 'scons==4.2.0' 'scons' + substituteInPlace apio/managers/scons.py --replace \ 'return "tinyprog --libusb --program"' \ 'return "${tinyprog}/bin/tinyprog --libusb --program"' @@ -49,6 +53,7 @@ buildPythonApplication rec { colorama pyserial wheel + scons setuptools # needs pkg_resources at runtime (technically not needed when tinyprog is also in this list because of the propagatedBuildInputs of tinyprog) tinyprog # needed for upload to TinyFPGA diff --git a/pkgs/development/embedded/gputils/default.nix b/pkgs/development/embedded/gputils/default.nix index c07949e80968d..69a901ea80f76 100644 --- a/pkgs/development/embedded/gputils/default.nix +++ b/pkgs/development/embedded/gputils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gputils"; - version = "1.5.0-1"; + version = "1.5.2"; src = fetchurl { url = "mirror://sourceforge/gputils/${pname}-${version}.tar.bz2"; - sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g"; + sha256 = "sha256-j7iCCzHXwffHdhQcyzxPBvQK+RXaY3QSjXUtHu463fI="; }; meta = with lib; { diff --git a/pkgs/development/embedded/rshell/default.nix b/pkgs/development/embedded/rshell/default.nix index bcda3c02dd638..a537af3692b48 100644 --- a/pkgs/development/embedded/rshell/default.nix +++ b/pkgs/development/embedded/rshell/default.nix @@ -1,15 +1,26 @@ -{ lib, buildPythonApplication, fetchPypi, pyserial, pyudev }: +{ lib +, buildPythonApplication +, fetchPypi +, pyserial +, pyudev +, pythonOlder +}: buildPythonApplication rec { pname = "rshell"; - version = "0.0.30"; + version = "0.0.31"; + + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "d2002d40d735204037d6142a6c2d51beecc763c124faaf759cabf7acd945be95"; + sha256 = "7942b758a9ae5c6ff46516b0317f437dfce9f0721f3a3b635ebd501c9cd38fb9"; }; - propagatedBuildInputs = [ pyserial pyudev ]; + propagatedBuildInputs = [ + pyserial + pyudev + ]; meta = with lib; { homepage = "https://github.com/dhylands/rshell"; diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index bca4f87f9a550..9652a95ee27fb 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.2.1"; + version = "6.4.0"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "0m5h01iq0mgrr9svj4gmykfi9lsyjpqzrkvlizff26c8dqad59c5"; + sha256 = "sha256-5qotjAyaNFtYUjHlNKwywmBJGAzS/IM9bF+dmONE4bk="; stripRoot = false; }; diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix index 027cfde2669a7..23bab058c594d 100644 --- a/pkgs/development/embedded/tytools/default.nix +++ b/pkgs/development/embedded/tytools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tytools"; - version = "0.9.3"; + version = "0.9.7"; src = fetchFromGitHub { owner = "Koromix"; repo = pname; rev = "v${version}"; - sha256 = "0ax6j17f5nm0q4sp8sg1412hd48qp7whdy7dd699kwjcm763bl5j"; + sha256 = "sha256-iF2XyWSBBCO23iY/ni+QlpgtOuWKN2JTMTz+9OLEadk="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; |