@@ -1146,15 +1146,15 @@ with pkgs;
11461146
11471147 arduino = arduino-core.override { withGui = true; };
11481148
1149− arduino-ci = callPackage ../development/arduino/arduino-ci { };
1149+ arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { };
11501150
1151− arduino-cli = callPackage ../development/arduino/arduino-cli { };
1151+ arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { };
11521152
1153− arduino-core = callPackage ../development/arduino/arduino-core { };
1153+ arduino-core = callPackage ../development/embedded/arduino/arduino-core { };
11541154
1155− arduino-mk = callPackage ../development/arduino/arduino-mk {};
1155+ arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {};
11561156
1157− apio = python3Packages.callPackage ../development/tools/misc/apio { };
1157+ apio = python3Packages.callPackage ../development/embedded/fpga/apio { };
11581158
11591159 apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {};
11601160
@@ -7641,7 +7641,7 @@ with pkgs;
76417641
76427642 opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
76437643
7644− openfpgaloader = callPackage ../development/tools/misc/openfpgaloader { };
7644+ openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { };
76457645
76467646 openfortivpn = callPackage ../tools/networking/openfortivpn { };
76477647
@@ -8100,7 +8100,7 @@ with pkgs;
81008100
81018101 plan9port = callPackage ../tools/system/plan9port { };
81028102
8103− platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { });
8103+ platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { });
81048104 platformio = platformioPackages.platformio-chrootenv;
81058105
81068106 platinum-searcher = callPackage ../tools/text/platinum-searcher { };
@@ -9445,7 +9445,7 @@ with pkgs;
94459445
94469446 tinyobjloader = callPackage ../development/libraries/tinyobjloader { };
94479447
9448− tinyprog = callPackage ../development/tools/misc/tinyprog { };
9448+ tinyprog = callPackage ../development/embedded/fpga/tinyprog { };
94499449
94509450 tinyproxy = callPackage ../tools/networking/tinyproxy { };
94519451
@@ -13003,7 +13003,7 @@ with pkgs;
1300313003
1300413004 avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
1300513005
13006− betaflight = callPackage ../development/misc/stm32/betaflight {
13006+ betaflight = callPackage ../development/embedded/stm32/betaflight {
1300713007 gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
1300813008 binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
1300913009 };
@@ -13061,7 +13061,7 @@ with pkgs;
1306113061 guile = guile_2_0;
1306213062 };
1306313063
13064− inav = callPackage ../development/misc/stm32/inav {
13064+ inav = callPackage ../development/embedded/stm32/inav {
1306513065 gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
1306613066 binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
1306713067 };
@@ -13215,7 +13215,7 @@ with pkgs;
1321513215
1321613216 automoc4 = callPackage ../development/tools/misc/automoc4 { };
1321713217
13218− avrdude = callPackage ../development/tools/misc/avrdude { };
13218+ avrdude = callPackage ../development/embedded/avrdude { };
1321913219
1322013220 b4 = callPackage ../development/tools/b4 { };
1322113221
@@ -13369,13 +13369,13 @@ with pkgs;
1336913369
1337013370 black-macchiato = with python3Packages; toPythonApplication black-macchiato;
1337113371
13372− blackmagic = callPackage ../development/tools/misc/blackmagic { };
13372+ blackmagic = callPackage ../development/embedded/blackmagic { };
1337313373
1337413374 bloaty = callPackage ../development/tools/bloaty { };
1337513375
1337613376 bloop = callPackage ../development/tools/build-managers/bloop { };
1337713377
13378− bossa = callPackage ../development/tools/misc/bossa {
13378+ bossa = callPackage ../development/embedded/bossa {
1337913379 wxGTK = wxGTK30;
1338013380 };
1338113381
@@ -13403,7 +13403,7 @@ with pkgs;
1340313403
1340413404 cbrowser = callPackage ../development/tools/misc/cbrowser { };
1340513405
13406− cc-tool = callPackage ../development/tools/misc/cc-tool { };
13406+ cc-tool = callPackage ../development/embedded/cc-tool { };
1340713407
1340813408 ccache = callPackage ../development/tools/misc/ccache {
1340913409 asciidoc = asciidoc-full;
@@ -13628,7 +13628,7 @@ with pkgs;
1362813628
1362913629 ddd = callPackage ../development/tools/misc/ddd { };
1363013630
13631− lattice-diamond = callPackage ../development/tools/lattice-diamond { };
13631+ lattice-diamond = callPackage ../development/embedded/fpga/lattice-diamond { };
1363213632
1363313633 direvent = callPackage ../development/tools/misc/direvent { };
1363413634
@@ -13689,7 +13689,7 @@ with pkgs;
1368913689
1369013690 drush = callPackage ../development/tools/misc/drush { };
1369113691
13692− easypdkprog = callPackage ../development/tools/misc/easypdkprog { };
13692+ easypdkprog = callPackage ../development/embedded/easypdkprog { };
1369313693
1369413694 editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
1369513695
@@ -13762,7 +13762,7 @@ with pkgs;
1376213762
1376313763 fsearch = callPackage ../tools/misc/fsearch { };
1376413764
13765− fujprog = callPackage ../development/tools/misc/fujprog {
13765+ fujprog = callPackage ../development/embedded/fpga/fujprog {
1376613766 inherit (darwin.apple_sdk.frameworks) IOKit;
1376713767 };
1376813768
@@ -13855,7 +13855,7 @@ with pkgs;
1385513855
1385613856 gprbuild = callPackage ../development/tools/build-managers/gprbuild { };
1385713857
13858− gputils = callPackage ../development/tools/misc/gputils { };
13858+ gputils = callPackage ../development/embedded/gputils { };
1385913859
1386013860 gpuvis = callPackage ../development/tools/misc/gpuvis { };
1386113861
@@ -13915,7 +13915,7 @@ with pkgs;
1391513915 iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { };
1391613916 iaca = iaca_3_0;
1391713917
13918− icestorm = callPackage ../development/tools/icestorm { };
13918+ icestorm = callPackage ../development/embedded/fpga/icestorm { };
1391913919
1392013920 icmake = callPackage ../development/tools/build-managers/icmake { };
1392113921
@@ -13931,7 +13931,7 @@ with pkgs;
1393113931
1393213932 indent = callPackage ../development/tools/misc/indent { };
1393313933
13934− ino = callPackage ../development/arduino/ino { };
13934+ ino = callPackage ../development/embedded/arduino/ino { };
1393513935
1393613936 inotify-tools = callPackage ../development/tools/misc/inotify-tools { };
1393713937
@@ -14180,7 +14180,7 @@ with pkgs;
1418014180
1418114181 opengrok = callPackage ../development/tools/misc/opengrok { };
1418214182
14183− openocd = callPackage ../development/tools/misc/openocd { };
14183+ openocd = callPackage ../development/embedded/openocd { };
1418414184
1418514185 oprofile = callPackage ../development/tools/profiling/oprofile {
1418614186 libiberty_static = libiberty.override { staticBuild = true; };
@@ -14471,9 +14471,9 @@ with pkgs;
1447114471
1447214472 sselp = callPackage ../tools/X11/sselp{ };
1447314473
14474− stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { };
14474+ stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { };
1447514475
14476− stm32flash = callPackage ../development/tools/misc/stm32flash { };
14476+ stm32flash = callPackage ../development/embedded/stm32/stm32flash { };
1447714477
1447814478 strace = callPackage ../development/tools/misc/strace { };
1447914479
@@ -14528,7 +14528,7 @@ with pkgs;
1452814528
1452914529 teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; };
1453014530
14531− teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { };
14531+ teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { };
1453214532
1453314533 terracognita = callPackage ../development/tools/misc/terracognita { };
1453414534
@@ -14573,7 +14573,7 @@ with pkgs;
1457314573 inherit (darwin.apple_sdk.frameworks) Security;
1457414574 };
1457514575
14576− trellis = callPackage ../development/tools/trellis { };
14576+ trellis = callPackage ../development/embedded/fpga/trellis { };
1457714577
1457814578 ttyd = callPackage ../servers/ttyd { };
1457914579
@@ -14596,7 +14596,7 @@ with pkgs;
1459614596 boost = boost17x;
1459714597 };
1459814598
14599− uisp = callPackage ../development/tools/misc/uisp { };
14599+ uisp = callPackage ../development/embedded/uisp { };
1460014600
1460114601 uncrustify = callPackage ../development/tools/misc/uncrustify { };
1460214602
@@ -14650,7 +14650,7 @@ with pkgs;
1465014650
1465114651 webdis = callPackage ../development/tools/database/webdis { };
1465214652
14653− xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
14653+ xc3sprog = callPackage ../development/embedded/xc3sprog { };
1465414654
1465514655 xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
1465614656
@@ -18473,7 +18473,7 @@ with pkgs;
1847318473
1847418474 ronn = callPackage ../development/tools/ronn { };
1847518475
18476− rshell = python3.pkgs.callPackage ../development/tools/rshell { };
18476+ rshell = python3.pkgs.callPackage ../development/embedded/rshell { };
1847718477
1847818478 rttr = callPackage ../development/libraries/rttr { };
1847918479
@@ -24011,7 +24011,7 @@ with pkgs;
2401124011 jdk = jdk11;
2401224012 });
2401324013
24014− ecpdap = callPackage ../development/tools/ecpdap {
24014+ ecpdap = callPackage ../development/embedded/fpga/ecpdap {
2401524015 inherit (darwin.apple_sdk.frameworks) AppKit;
2401624016 };
2401724017