From c68dc856712ecde77a647568e94eb1a6b346fb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Apr 2021 15:41:09 +0200 Subject: [PATCH] qmk_firmware: drop It has not been touched in years, is lacking meta, and is marked as broken in release-20.09. --- .../development/misc/qmk_firmware/default.nix | 39 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 ---- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/development/misc/qmk_firmware/default.nix diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix deleted file mode 100644 index 38b1df3ca3b5..000000000000 --- a/pkgs/development/misc/qmk_firmware/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchFromGitHub -, avrgcc, avrbinutils -, gcc-arm-embedded, gcc-armhf-embedded -, teensy-loader-cli, dfu-programmer, dfu-util }: - -let version = "0.6.144"; - -in stdenv.mkDerivation { - pname = "qmk_firmware"; - inherit version; - src = fetchFromGitHub { - owner = "qmk"; - repo = "qmk_firmware"; - rev = version; - sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn"; - fetchSubmodules = true; - }; - postPatch = '' - substituteInPlace tmk_core/arm_atsam.mk \ - --replace arm-none-eabi arm-none-eabihf - rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk - ''; - buildFlags = [ "all:default" ]; - doCheck = true; - checkTarget = "test:all"; - installPhase = '' - mkdir $out - ''; - NIX_CFLAGS_COMPILE = "-Wno-error"; - nativeBuildInputs = [ - avrgcc - avrbinutils - gcc-arm-embedded - gcc-armhf-embedded - teensy-loader-cli - dfu-programmer - dfu-util - ]; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d0c7c0ee93ce..2e22497a8a0a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -584,6 +584,7 @@ mapAliases ({ python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 + qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c740d0e156ba..b02cc85e70f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30591,13 +30591,6 @@ in pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { }; - qmk_firmware = callPackage ../development/misc/qmk_firmware { - avrgcc = pkgsCross.avr.buildPackages.gcc; - avrbinutils = pkgsCross.avr.buildPackages.binutils; - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc; - }; - new-session-manager = callPackage ../applications/audio/new-session-manager { }; newlib = callPackage ../development/misc/newlib { };