diff --git a/pkgs/tools/misc/esptool/3.nix b/pkgs/tools/misc/esptool/3.nix deleted file mode 100644 index a0b13ece1646..000000000000 --- a/pkgs/tools/misc/esptool/3.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch, python3 }: - -python3.pkgs.buildPythonApplication rec { - pname = "esptool"; - version = "3.3.2"; - - src = fetchFromGitHub { - owner = "espressif"; - repo = "esptool"; - rev = "v${version}"; - hash = "sha256-hpPL9KNPA+S57SJoKnQewBCOybDbKep0t5RKw9a9GjM="; - }; - - patches = [ - # https://github.com/espressif/esptool/pull/802 - (fetchpatch { - name = "bitstring-4-compatibility.patch"; - url = "https://github.com/espressif/esptool/commit/16fa58415be2a7ff059ece40d4545288565d0a23.patch"; - hash = "sha256-FYa9EvyET4P8VkdyMzJBkdxVYm0tFt2GPnfsjzBnevE="; - excludes = [ "setup.py" ]; - }) - ]; - - postPatch = '' - substituteInPlace test/test_imagegen.py \ - --replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY" - ''; - - propagatedBuildInputs = with python3.pkgs; [ - bitstring - cryptography - ecdsa - pyserial - reedsolo - ]; - - # wrapPythonPrograms will overwrite esptool.py with a bash script, - # but espefuse.py tries to import it. Since we don't add any binary paths, - # use patchPythonScript directly. - dontWrapPythonPrograms = true; - postFixup = '' - buildPythonPath "$out $pythonPath" - for f in $out/bin/*.py; do - echo "Patching $f" - patchPythonScript "$f" - done - ''; - - nativeCheckInputs = with python3.pkgs; [ - pyelftools - ]; - - # tests mentioned in `.github/workflows/test_esptool.yml` - checkPhase = '' - runHook preCheck - - export ESPTOOL_PY=$out/bin/esptool.py - ${python3.interpreter} test/test_imagegen.py - ${python3.interpreter} test/test_espsecure.py - ${python3.interpreter} test/test_merge_bin.py - ${python3.interpreter} test/test_modules.py - - runHook postCheck - ''; - - meta = with lib; { - description = "ESP8266 and ESP32 serial bootloader utility"; - homepage = "https://github.com/espressif/esptool"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ hexa ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3519439bcdc3..4a53cacef4ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5305,8 +5305,6 @@ with pkgs; esptool = callPackage ../tools/misc/esptool { }; - esptool_3 = callPackage ../tools/misc/esptool/3.nix { }; - esptool-ck = callPackage ../tools/misc/esptool-ck { }; ephemeralpg = callPackage ../development/tools/database/ephemeralpg { };