Merge staging-next into staging

2021-01-27 12:24:09 +00:00
parent 8f69090ba5 2137c13b40
commit 1b5da764a7
93 changed files with 461 additions and 238 deletions
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
+{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
 , readline

 , hardwarePlatform ? "PM3RDV4"
@@ -29,7 +29,7 @@ mkDerivation rec {
    install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Client for proxmark3, powerful general purpose RFID tool";
    homepage = "https://rfidresearchgroup.com/";
    license = licenses.gpl2Plus;