From ff1c9635cb0dae77bc88866b20980a736e254495 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Thu, 12 Aug 2021 23:27:57 +0430 Subject: [PATCH 01/25] openocd: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/openocd/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/openocd/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f71bf066f21..8ce4ba8f4f1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; From 9f62ba081e3f0d87227939c3453296fd65746842 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:06:53 +0430 Subject: [PATCH 02/25] arduino-ci, arduino-cli, arduino-core, arduino-mk, ino: move arduino/ directory to pkgs/development/embedded/ --- .../{ => embedded}/arduino/arduino-ci/default.nix | 0 .../{ => embedded}/arduino/arduino-cli/default.nix | 0 .../{ => embedded}/arduino/arduino-core/default.nix | 0 .../{ => embedded}/arduino/arduino-core/downloads.nix | 0 .../{ => embedded}/arduino/arduino-mk/default.nix | 0 .../development/{ => embedded}/arduino/ino/default.nix | 0 pkgs/top-level/all-packages.nix | 10 +++++----- 7 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/{ => embedded}/arduino/arduino-ci/default.nix (100%) rename pkgs/development/{ => embedded}/arduino/arduino-cli/default.nix (100%) rename pkgs/development/{ => embedded}/arduino/arduino-core/default.nix (100%) rename pkgs/development/{ => embedded}/arduino/arduino-core/downloads.nix (100%) rename pkgs/development/{ => embedded}/arduino/arduino-mk/default.nix (100%) rename pkgs/development/{ => embedded}/arduino/ino/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ce4ba8f4f1f..63238c71e619 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1146,13 +1146,13 @@ 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 { }; @@ -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 { }; From 08d9ac46db3304a6f10b015d04839c3b1d13aa36 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:02:33 +0430 Subject: [PATCH 03/25] platformio: move the directory to pkgs/development/embedded/ --- pkgs/development/{arduino => embedded}/platformio/chrootenv.nix | 0 pkgs/development/{arduino => embedded}/platformio/core.nix | 0 pkgs/development/{arduino => embedded}/platformio/default.nix | 0 .../{arduino => embedded}/platformio/fix-searchpath.patch | 0 .../platformio/missing-udev-rules-nixos.patch | 0 .../platformio/use-local-spdx-license-list.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{arduino => embedded}/platformio/chrootenv.nix (100%) rename pkgs/development/{arduino => embedded}/platformio/core.nix (100%) rename pkgs/development/{arduino => embedded}/platformio/default.nix (100%) rename pkgs/development/{arduino => embedded}/platformio/fix-searchpath.patch (100%) rename pkgs/development/{arduino => embedded}/platformio/missing-udev-rules-nixos.patch (100%) rename pkgs/development/{arduino => embedded}/platformio/use-local-spdx-license-list.patch (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63238c71e619..4ef662fd3969 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 1b76de8268ece6622d8bf19c634b456c0a2ca79a Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:08:34 +0430 Subject: [PATCH 04/25] blackmagic: move the directory to pkgs/development/embedded/ --- .../development/{tools/misc => embedded}/blackmagic/default.nix | 0 pkgs/development/{tools/misc => embedded}/blackmagic/helper.sh | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/blackmagic/default.nix (100%) rename pkgs/development/{tools/misc => embedded}/blackmagic/helper.sh (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ef662fd3969..60dca482826b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13369,7 +13369,7 @@ 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 { }; From 0fc6582466599de0589af3b13140f356d3454ccb Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:12:44 +0430 Subject: [PATCH 05/25] betaflight: move the directory to pkgs/development/embedded/stm32/ --- .../development/{misc => embedded}/stm32/betaflight/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{misc => embedded}/stm32/betaflight/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60dca482826b..871b63347fa8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; From 5194c3580c22d3eb9ee9ed52cfc74db4b30edd5b Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:14:46 +0430 Subject: [PATCH 06/25] inav: move the directory to pkgs/development/embedded/stm32/ --- pkgs/development/{misc => embedded}/stm32/inav/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{misc => embedded}/stm32/inav/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 871b63347fa8..803840ae0eaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; From 4c16ff4e4a09ab13cccecbe081e21822b250b835 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:19:02 +0430 Subject: [PATCH 07/25] stm32flash: move the directory to pkgs/development/embedded/stm32/ --- .../{tools/misc => embedded/stm32}/stm32flash/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/stm32}/stm32flash/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 803840ae0eaf..5500a64c1362 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14473,7 +14473,7 @@ with pkgs; stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; - stm32flash = callPackage ../development/tools/misc/stm32flash { }; + stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; From 6d250116f7bd98947ff6ae428fff88434787890f Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:22:30 +0430 Subject: [PATCH 08/25] openfpgaloader: move the directory to pkgs/development/embedded/fpga/ --- .../{tools/misc => embedded/fpga}/openfpgaloader/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/fpga}/openfpgaloader/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5500a64c1362..6af84fef3826 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 0aafe24e76fb8ca3e279d404dce550db6bf5ebdd Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:25:16 +0430 Subject: [PATCH 09/25] icestorm: move the directory to pkgs/development/embedded/fpga/ --- pkgs/development/{tools => embedded/fpga}/icestorm/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded/fpga}/icestorm/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6af84fef3826..6d8cff653f40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 8eec22ea678f25c3da08a7f7eef8eba28bc3a817 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:26:32 +0430 Subject: [PATCH 10/25] fujprog: move the directory to pkgs/development/embedded/fpga/ --- .../{tools/misc => embedded/fpga}/fujprog/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/fpga}/fujprog/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d8cff653f40..f6001e30035e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; From bef288e84ee964ad4e58e40eb16b10d914d4d54f Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:32:11 +0430 Subject: [PATCH 11/25] stm32cubemx: move the directory to pkgs/development/embedded/stm32/ --- .../{tools/misc => embedded/stm32}/stm32cubemx/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/stm32}/stm32cubemx/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6001e30035e..35788a325301 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14471,7 +14471,7 @@ with pkgs; sselp = callPackage ../tools/X11/sselp{ }; - stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; + stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { }; stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; From d8041d2084aa47ba254f1c5595fa3c594878e284 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:34:54 +0430 Subject: [PATCH 12/25] xc3sprog: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/xc3sprog/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/xc3sprog/default.nix (100%) 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 35788a325301..4c9ed9ceabe2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 48d9e57d0f3a10a7f0fffff3a770140c7b494839 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:37:55 +0430 Subject: [PATCH 13/25] lattice-diamond: move the directory to pkgs/development/embedded/fpga/ --- .../{tools => embedded/fpga}/lattice-diamond/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded/fpga}/lattice-diamond/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c9ed9ceabe2..498d8db67211 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 864adb1a08cf2303569e4c8f9aa4fc306782704b Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:46:37 +0430 Subject: [PATCH 14/25] ecpdap: move the directory to pkgs/development/embedded/fpga/ --- pkgs/development/{tools => embedded/fpga}/ecpdap/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded/fpga}/ecpdap/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 498d8db67211..860c3c16579c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; From 5e0993a300ee6fd3a19a034b23e355705e41c1d6 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:48:47 +0430 Subject: [PATCH 15/25] apio: move the directory to pkgs/development/embedded/fpga/ --- pkgs/development/{tools/misc => embedded/fpga}/apio/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/fpga}/apio/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 860c3c16579c..31663f1f2b4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1154,7 +1154,7 @@ with pkgs; 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 {}; From 87c7e516bdc5601b17a2fad6c76a43d566251353 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:54:21 +0430 Subject: [PATCH 16/25] tinyprog: move the directory to pkgs/development/embedded/fpga/ --- .../{tools/misc => embedded/fpga}/tinyprog/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/fpga}/tinyprog/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31663f1f2b4d..6e6adb97e250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From f46e3cbf67b6e2c6514df178f6bdbc5718f002e7 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:56:45 +0430 Subject: [PATCH 17/25] trellis: move the directory to pkgs/development/embedded/fpga/ --- pkgs/development/{tools => embedded/fpga}/trellis/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded/fpga}/trellis/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6adb97e250..d74b6510f4d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 5a87ddfe6401560d8a788eaf2e913341560cf8b7 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:59:50 +0430 Subject: [PATCH 18/25] avrdude: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/avrdude/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/avrdude/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d74b6510f4d3..b5b0eed416e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From f60a6512a398f01841316559460132e25e6b4089 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:01:02 +0430 Subject: [PATCH 19/25] easypdkprog: move the directory to pkgs/development/embedded/ --- .../{tools/misc => embedded}/easypdkprog/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/easypdkprog/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5b0eed416e3..92a39242d65b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 7a069de4684bcbdd3f2f12596acb9e778e7b909e Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:02:19 +0430 Subject: [PATCH 20/25] teensy-loader-cli: move the directory to pkgs/development/embedded/ --- .../{tools/misc => embedded}/teensy-loader-cli/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/teensy-loader-cli/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92a39242d65b..5b30721f4143 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From fd49ef2d0ada0ba385090fc8bb0c89c4697cbf6b Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:03:23 +0430 Subject: [PATCH 21/25] bossa: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/bossa/bin2c.c | 0 .../{tools/misc => embedded}/bossa/bossa-no-applet-build.patch | 0 pkgs/development/{tools/misc => embedded}/bossa/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/bossa/bin2c.c (100%) rename pkgs/development/{tools/misc => embedded}/bossa/bossa-no-applet-build.patch (100%) rename pkgs/development/{tools/misc => embedded}/bossa/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b30721f4143..461eee64f034 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13375,7 +13375,7 @@ with pkgs; bloop = callPackage ../development/tools/build-managers/bloop { }; - bossa = callPackage ../development/tools/misc/bossa { + bossa = callPackage ../development/embedded/bossa { wxGTK = wxGTK30; }; From 61b0840054f5a375ef5bf929a61fb2ff8ae8236c Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:04:11 +0430 Subject: [PATCH 22/25] gputils: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/gputils/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/gputils/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 461eee64f034..422386212971 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 4ed61ca8bcad6e4631ece7b892bddb390b0ca82b Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:04:51 +0430 Subject: [PATCH 23/25] uisp: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/uisp/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/uisp/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 422386212971..6eaa1b778ac9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 832cdd2850ed1d646f681655d8db87123f6f656a Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:06:04 +0430 Subject: [PATCH 24/25] cc-tool: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/cc-tool/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/cc-tool/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6eaa1b778ac9..fa02513a1807 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; From 7bb75b3c41a0f82de80641fb033eae57c7e36622 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Mon, 16 Aug 2021 12:20:30 +0430 Subject: [PATCH 25/25] rshell: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools => embedded}/rshell/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded}/rshell/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa02513a1807..983c8f8ae7d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18474,7 +18474,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 { };