Merge master into haskell-updates

2 files changed, 0 insertions, 120 deletions

diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
deleted file mode 100644
index 1ecf9be5d8d..00000000000
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, gcc-arm-embedded, binutils-arm-embedded, python2
-, skipTargets ? [
-  # These targets do not build, for the reasons listed, along with the last version checked.
-  # Probably all of the issues with these targets need to be addressed upstream.
-  "AG3X"       # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
-  "ALIENWHOOP" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
-  "FURYF3"     # 3.4.0-rc4: flash region overflow
-  "OMNINXT"    # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
-]}:
-
-stdenv.mkDerivation rec {
-
-  pname = "betaflight";
-  version = "3.4.0-rc4";
-
-  src = fetchFromGitHub {
-    owner = "betaflight";
-    repo = "betaflight";
-    rev = "8e9e7574481b1abba9354b24f41eb31054943785"; # Always use a commit id here!
-    sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5";
-  };
-
-  nativeBuildInputs = [
-    gcc-arm-embedded binutils-arm-embedded
-    python2
-  ];
-
-  postPatch = ''
-    sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
-    sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
-
-    substituteInPlace Makefile \
-      --replace "--specs=nano.specs" ""
-  '';
-
-  enableParallelBuilding = true;
-
-  preBuild = ''
-    buildFlagsArray=(
-      "NOBUILD_TARGETS=${toString skipTargets}"
-      "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)"
-      all
-    )
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp obj/*.hex $out
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft";
-    homepage = "https://github.com/betaflight/betaflight";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ elitak ];
-    broken = true;
-  };
-
-}
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
deleted file mode 100644
index c1f762e47d8..00000000000
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, gcc-arm-embedded, binutils-arm-embedded, ruby
-}:
-
-stdenv.mkDerivation rec {
-
-  pname = "inav";
-  version = "2.0.0-rc2";
-
-  src = fetchFromGitHub {
-    owner = "iNavFlight";
-    repo = "inav";
-    rev = "a8415e89c2956d133d8175827c079bcf3bc3766c"; # Always use a commit id here!
-    sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y";
-  };
-
-  nativeBuildInputs = [
-    gcc-arm-embedded binutils-arm-embedded
-    ruby
-  ];
-
-  postPatch = ''
-    sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
-    sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes
-    sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
-
-    substituteInPlace Makefile \
-      --replace "--specs=nano.specs" ""
-  '';
-
-  enableParallelBuilding = true;
-
-  preBuild = ''
-    buildFlagsArray=(
-      all
-    )
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp obj/*.hex $out
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Navigation-enabled flight control software";
-    homepage = "https://inavflight.github.io";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ elitak ];
-    broken = true;
-  };
-
-}