diff --git a/pkgs/development/arduino/arduino-ci/default.nix b/pkgs/development/embedded/arduino/arduino-ci/default.nix similarity index 100% rename from pkgs/development/arduino/arduino-ci/default.nix rename to pkgs/development/embedded/arduino/arduino-ci/default.nix diff --git a/pkgs/development/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix similarity index 100% rename from pkgs/development/arduino/arduino-cli/default.nix rename to pkgs/development/embedded/arduino/arduino-cli/default.nix diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix similarity index 100% rename from pkgs/development/arduino/arduino-core/default.nix rename to pkgs/development/embedded/arduino/arduino-core/default.nix diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/embedded/arduino/arduino-core/downloads.nix similarity index 100% rename from pkgs/development/arduino/arduino-core/downloads.nix rename to pkgs/development/embedded/arduino/arduino-core/downloads.nix diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/embedded/arduino/arduino-mk/default.nix similarity index 100% rename from pkgs/development/arduino/arduino-mk/default.nix rename to pkgs/development/embedded/arduino/arduino-mk/default.nix diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/embedded/arduino/ino/default.nix similarity index 100% rename from pkgs/development/arduino/ino/default.nix rename to pkgs/development/embedded/arduino/ino/default.nix diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix similarity index 100% rename from pkgs/development/tools/misc/avrdude/default.nix rename to pkgs/development/embedded/avrdude/default.nix diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/embedded/blackmagic/default.nix similarity index 100% rename from pkgs/development/tools/misc/blackmagic/default.nix rename to pkgs/development/embedded/blackmagic/default.nix diff --git a/pkgs/development/tools/misc/blackmagic/helper.sh b/pkgs/development/embedded/blackmagic/helper.sh similarity index 100% rename from pkgs/development/tools/misc/blackmagic/helper.sh rename to pkgs/development/embedded/blackmagic/helper.sh diff --git a/pkgs/development/tools/misc/bossa/bin2c.c b/pkgs/development/embedded/bossa/bin2c.c similarity index 100% rename from pkgs/development/tools/misc/bossa/bin2c.c rename to pkgs/development/embedded/bossa/bin2c.c diff --git a/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch b/pkgs/development/embedded/bossa/bossa-no-applet-build.patch similarity index 100% rename from pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch rename to pkgs/development/embedded/bossa/bossa-no-applet-build.patch diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix similarity index 100% rename from pkgs/development/tools/misc/bossa/default.nix rename to pkgs/development/embedded/bossa/default.nix diff --git a/pkgs/development/tools/misc/cc-tool/default.nix b/pkgs/development/embedded/cc-tool/default.nix similarity index 100% rename from pkgs/development/tools/misc/cc-tool/default.nix rename to pkgs/development/embedded/cc-tool/default.nix diff --git a/pkgs/development/tools/misc/easypdkprog/default.nix b/pkgs/development/embedded/easypdkprog/default.nix similarity index 100% rename from pkgs/development/tools/misc/easypdkprog/default.nix rename to pkgs/development/embedded/easypdkprog/default.nix diff --git a/pkgs/development/tools/misc/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix similarity index 100% rename from pkgs/development/tools/misc/apio/default.nix rename to pkgs/development/embedded/fpga/apio/default.nix diff --git a/pkgs/development/tools/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix similarity index 100% rename from pkgs/development/tools/ecpdap/default.nix rename to pkgs/development/embedded/fpga/ecpdap/default.nix diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/embedded/fpga/fujprog/default.nix similarity index 100% rename from pkgs/development/tools/misc/fujprog/default.nix rename to pkgs/development/embedded/fpga/fujprog/default.nix diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/embedded/fpga/icestorm/default.nix similarity index 100% rename from pkgs/development/tools/icestorm/default.nix rename to pkgs/development/embedded/fpga/icestorm/default.nix diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/embedded/fpga/lattice-diamond/default.nix similarity index 100% rename from pkgs/development/tools/lattice-diamond/default.nix rename to pkgs/development/embedded/fpga/lattice-diamond/default.nix diff --git a/pkgs/development/tools/misc/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix similarity index 100% rename from pkgs/development/tools/misc/openfpgaloader/default.nix rename to pkgs/development/embedded/fpga/openfpgaloader/default.nix diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/embedded/fpga/tinyprog/default.nix similarity index 100% rename from pkgs/development/tools/misc/tinyprog/default.nix rename to pkgs/development/embedded/fpga/tinyprog/default.nix diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix similarity index 100% rename from pkgs/development/tools/trellis/default.nix rename to pkgs/development/embedded/fpga/trellis/default.nix diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/embedded/gputils/default.nix similarity index 100% rename from pkgs/development/tools/misc/gputils/default.nix rename to pkgs/development/embedded/gputils/default.nix diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix similarity index 100% rename from pkgs/development/tools/misc/openocd/default.nix rename to pkgs/development/embedded/openocd/default.nix diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix similarity index 100% rename from pkgs/development/arduino/platformio/chrootenv.nix rename to pkgs/development/embedded/platformio/chrootenv.nix diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix similarity index 100% rename from pkgs/development/arduino/platformio/core.nix rename to pkgs/development/embedded/platformio/core.nix diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix similarity index 100% rename from pkgs/development/arduino/platformio/default.nix rename to pkgs/development/embedded/platformio/default.nix diff --git a/pkgs/development/arduino/platformio/fix-searchpath.patch b/pkgs/development/embedded/platformio/fix-searchpath.patch similarity index 100% rename from pkgs/development/arduino/platformio/fix-searchpath.patch rename to pkgs/development/embedded/platformio/fix-searchpath.patch diff --git a/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch b/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch similarity index 100% rename from pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch rename to pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch similarity index 100% rename from pkgs/development/arduino/platformio/use-local-spdx-license-list.patch rename to pkgs/development/embedded/platformio/use-local-spdx-license-list.patch diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/embedded/rshell/default.nix similarity index 100% rename from pkgs/development/tools/rshell/default.nix rename to pkgs/development/embedded/rshell/default.nix diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/embedded/stm32/betaflight/default.nix similarity index 100% rename from pkgs/development/misc/stm32/betaflight/default.nix rename to pkgs/development/embedded/stm32/betaflight/default.nix diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/embedded/stm32/inav/default.nix similarity index 100% rename from pkgs/development/misc/stm32/inav/default.nix rename to pkgs/development/embedded/stm32/inav/default.nix diff --git a/pkgs/development/tools/misc/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix similarity index 100% rename from pkgs/development/tools/misc/stm32cubemx/default.nix rename to pkgs/development/embedded/stm32/stm32cubemx/default.nix diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/embedded/stm32/stm32flash/default.nix similarity index 100% rename from pkgs/development/tools/misc/stm32flash/default.nix rename to pkgs/development/embedded/stm32/stm32flash/default.nix diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/embedded/teensy-loader-cli/default.nix similarity index 100% rename from pkgs/development/tools/misc/teensy-loader-cli/default.nix rename to pkgs/development/embedded/teensy-loader-cli/default.nix diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/embedded/uisp/default.nix similarity index 100% rename from pkgs/development/tools/misc/uisp/default.nix rename to pkgs/development/embedded/uisp/default.nix diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/embedded/xc3sprog/default.nix similarity index 100% rename from pkgs/development/tools/misc/xc3sprog/default.nix rename to pkgs/development/embedded/xc3sprog/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bafd4ea2c58d..bd28e8416125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1146,15 +1146,15 @@ with pkgs; arduino = arduino-core.override { withGui = true; }; - arduino-ci = callPackage ../development/arduino/arduino-ci { }; + arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { }; - arduino-cli = callPackage ../development/arduino/arduino-cli { }; + arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { }; - arduino-core = callPackage ../development/arduino/arduino-core { }; + arduino-core = callPackage ../development/embedded/arduino/arduino-core { }; - arduino-mk = callPackage ../development/arduino/arduino-mk {}; + arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {}; - apio = python3Packages.callPackage ../development/tools/misc/apio { }; + apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; @@ -7641,7 +7641,7 @@ with pkgs; opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; - openfpgaloader = callPackage ../development/tools/misc/openfpgaloader { }; + openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { }; openfortivpn = callPackage ../tools/networking/openfortivpn { }; @@ -8100,7 +8100,7 @@ with pkgs; plan9port = callPackage ../tools/system/plan9port { }; - platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { }); + platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -9445,7 +9445,7 @@ with pkgs; tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; - tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyprog = callPackage ../development/embedded/fpga/tinyprog { }; tinyproxy = callPackage ../tools/networking/tinyproxy { }; @@ -13003,7 +13003,7 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/misc/stm32/betaflight { + betaflight = callPackage ../development/embedded/stm32/betaflight { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; @@ -13061,7 +13061,7 @@ with pkgs; guile = guile_2_0; }; - inav = callPackage ../development/misc/stm32/inav { + inav = callPackage ../development/embedded/stm32/inav { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; @@ -13215,7 +13215,7 @@ with pkgs; automoc4 = callPackage ../development/tools/misc/automoc4 { }; - avrdude = callPackage ../development/tools/misc/avrdude { }; + avrdude = callPackage ../development/embedded/avrdude { }; b4 = callPackage ../development/tools/b4 { }; @@ -13369,13 +13369,13 @@ with pkgs; black-macchiato = with python3Packages; toPythonApplication black-macchiato; - blackmagic = callPackage ../development/tools/misc/blackmagic { }; + blackmagic = callPackage ../development/embedded/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; bloop = callPackage ../development/tools/build-managers/bloop { }; - bossa = callPackage ../development/tools/misc/bossa { + bossa = callPackage ../development/embedded/bossa { wxGTK = wxGTK30; }; @@ -13403,7 +13403,7 @@ with pkgs; cbrowser = callPackage ../development/tools/misc/cbrowser { }; - cc-tool = callPackage ../development/tools/misc/cc-tool { }; + cc-tool = callPackage ../development/embedded/cc-tool { }; ccache = callPackage ../development/tools/misc/ccache { asciidoc = asciidoc-full; @@ -13628,7 +13628,7 @@ with pkgs; ddd = callPackage ../development/tools/misc/ddd { }; - lattice-diamond = callPackage ../development/tools/lattice-diamond { }; + lattice-diamond = callPackage ../development/embedded/fpga/lattice-diamond { }; direvent = callPackage ../development/tools/misc/direvent { }; @@ -13689,7 +13689,7 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; - easypdkprog = callPackage ../development/tools/misc/easypdkprog { }; + easypdkprog = callPackage ../development/embedded/easypdkprog { }; editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; @@ -13762,7 +13762,7 @@ with pkgs; fsearch = callPackage ../tools/misc/fsearch { }; - fujprog = callPackage ../development/tools/misc/fujprog { + fujprog = callPackage ../development/embedded/fpga/fujprog { inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -13855,7 +13855,7 @@ with pkgs; gprbuild = callPackage ../development/tools/build-managers/gprbuild { }; - gputils = callPackage ../development/tools/misc/gputils { }; + gputils = callPackage ../development/embedded/gputils { }; gpuvis = callPackage ../development/tools/misc/gpuvis { }; @@ -13915,7 +13915,7 @@ with pkgs; iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { }; iaca = iaca_3_0; - icestorm = callPackage ../development/tools/icestorm { }; + icestorm = callPackage ../development/embedded/fpga/icestorm { }; icmake = callPackage ../development/tools/build-managers/icmake { }; @@ -13931,7 +13931,7 @@ with pkgs; indent = callPackage ../development/tools/misc/indent { }; - ino = callPackage ../development/arduino/ino { }; + ino = callPackage ../development/embedded/arduino/ino { }; inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; @@ -14180,7 +14180,7 @@ with pkgs; opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { }; + openocd = callPackage ../development/embedded/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; @@ -14471,9 +14471,9 @@ with pkgs; sselp = callPackage ../tools/X11/sselp{ }; - stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; + stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { }; - stm32flash = callPackage ../development/tools/misc/stm32flash { }; + stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; @@ -14528,7 +14528,7 @@ with pkgs; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; - teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; + teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { }; terracognita = callPackage ../development/tools/misc/terracognita { }; @@ -14573,7 +14573,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - trellis = callPackage ../development/tools/trellis { }; + trellis = callPackage ../development/embedded/fpga/trellis { }; ttyd = callPackage ../servers/ttyd { }; @@ -14596,7 +14596,7 @@ with pkgs; boost = boost17x; }; - uisp = callPackage ../development/tools/misc/uisp { }; + uisp = callPackage ../development/embedded/uisp { }; uncrustify = callPackage ../development/tools/misc/uncrustify { }; @@ -14650,7 +14650,7 @@ with pkgs; webdis = callPackage ../development/tools/database/webdis { }; - xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; + xc3sprog = callPackage ../development/embedded/xc3sprog { }; xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; @@ -18473,7 +18473,7 @@ with pkgs; ronn = callPackage ../development/tools/ronn { }; - rshell = python3.pkgs.callPackage ../development/tools/rshell { }; + rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; rttr = callPackage ../development/libraries/rttr { }; @@ -24011,7 +24011,7 @@ with pkgs; jdk = jdk11; }); - ecpdap = callPackage ../development/tools/ecpdap { + ecpdap = callPackage ../development/embedded/fpga/ecpdap { inherit (darwin.apple_sdk.frameworks) AppKit; };