diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-02 21:32:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-02 21:32:05 +0200 |
commit | 67249523f02ebcf34fc908b688a3149e3f3e1722 (patch) | |
tree | 7dea48198749566b4d605784c695f2b44c830610 | |
parent | bbf3ea106761b7a6595d0a0f496970ee3f31dba0 (diff) | |
parent | c68dc856712ecde77a647568e94eb1a6b346fb66 (diff) | |
download | nixpkgs-67249523f02ebcf34fc908b688a3149e3f3e1722.tar nixpkgs-67249523f02ebcf34fc908b688a3149e3f3e1722.tar.gz nixpkgs-67249523f02ebcf34fc908b688a3149e3f3e1722.tar.bz2 nixpkgs-67249523f02ebcf34fc908b688a3149e3f3e1722.tar.lz nixpkgs-67249523f02ebcf34fc908b688a3149e3f3e1722.tar.xz nixpkgs-67249523f02ebcf34fc908b688a3149e3f3e1722.tar.zst nixpkgs-67249523f02ebcf34fc908b688a3149e3f3e1722.zip |
Merge pull request #118324 from dotlambda/qmk_firmware-drop
qmk_firmware: drop
-rw-r--r-- | pkgs/development/misc/qmk_firmware/default.nix | 39 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
3 files changed, 1 insertions, 46 deletions
diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix deleted file mode 100644 index 38b1df3ca3b..00000000000 --- 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 d0c7c0ee93c..2e22497a8a0 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 bf6bf91dcc1..2865e0ab8f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30615,13 +30615,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 { }; |