From 9717c7ba7e48fbad9a8fb73e5d243789358c83d6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 31 Mar 2022 22:03:58 +0200 Subject: [PATCH] betaflight: remove after being marked broken for over two years It was marked in commit 5aa4b1994629ed0701b8b6d6e094da9d7d912721 by Linus Heckemann on 2019-10-07 (commited on 2019-10-08) --- .../embedded/stm32/betaflight/default.nix | 64 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 69 deletions(-) delete mode 100644 pkgs/development/embedded/stm32/betaflight/default.nix diff --git a/pkgs/development/embedded/stm32/betaflight/default.nix b/pkgs/development/embedded/stm32/betaflight/default.nix deleted file mode 100644 index 1ecf9be5d8d0..000000000000 --- a/pkgs/development/embedded/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97e90b04b4c7..4ba154e053a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14342,11 +14342,6 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/embedded/stm32/betaflight { - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - }; - sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; jruby = callPackage ../development/interpreters/jruby { };