From 9111cbee3c94d0ada54a8983c27adc7f903b5cf1 Mon Sep 17 00:00:00 2001 From: Dan Nixon Date: Wed, 5 Jun 2024 09:10:02 +0100 Subject: [PATCH] Remove espup and ldproxy Both are available via Nix now. --- Containerfile | 15 --------------- README.md | 4 +--- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Containerfile b/Containerfile index 47ccb4f..3300599 100644 --- a/Containerfile +++ b/Containerfile @@ -6,18 +6,3 @@ RUN apt-get update && \ libxml2 \ python3.10 \ python3.10-venv - -RUN apt-get install --yes \ - curl \ - unzip && \ - curl -L 'https://github.com/esp-rs/espup/releases/latest/download/espup-x86_64-unknown-linux-gnu' -o /usr/bin/espup && \ - chmod a+x /usr/bin/espup && \ - curl -L 'https://github.com/esp-rs/embuild/releases/download/ldproxy-v0.3.2/ldproxy-x86_64-unknown-linux-gnu.zip' -o ldproxy.zip && \ - unzip ldproxy.zip ldproxy && \ - rm ldproxy.zip && \ - chmod a+x ldproxy && \ - mv ldproxy /usr/bin/ldproxy && \ - apt-get remove --yes \ - curl \ - unzip && \ - apt-get autoremove --yes diff --git a/README.md b/README.md index e4f0702..7b6232c 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,9 @@ Container images containing [esp-rs](https://github.com/esp-rs) related tooling, intended for use with [Distrobox](https://github.com/89luca89/distrobox). -Created as a result of much annoyance trying to get the ESP-IDF to build in Nix and (to a much lesser extent) the fact that some tools were not yet packaged. +Created as a result of much annoyance trying to get the ESP-IDF to build in Nix. Only the items that could not be managed via Nix are included. Included is: - clang - Python + venv (ESP-IDF's "is this a venv" check fails as it does not seem to like Nix directory prefixes) - - [espup](https://github.com/esp-rs/espup) (not packaged for Nix) - - [ldproxy](https://github.com/esp-rs/embuild/tree/master/ldproxy) (not packaged for Nix)