diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5d18589..5c80f71 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -28,7 +28,7 @@ ADD --unpack https://www.boriel.com/files/zxb/zxbasic-1.19.0-linux64.tar.gz . ADD https://github.com/Mastodon-/inpaws.git /inpaws RUN cd /inpaws/ \ && make -j8 -RUN python3 -m pip install --break-system-packages skoolkit +RUN python3 -m pip install --force-reinstall --break-system-packages skoolkit==10.1 ADD https://github.com/gasman/hdfmonkey.git /hdfmonkey RUN cd /hdfmonkey/ \ && autoheader \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3824082..29b1cfa 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "ZX Spectrum dev tools", //"build": { "dockerfile": "Dockerfile" }, // The Dockerfile takes an age to build due to z88dk, so pull from prebuilt: - "image": "njmcphail/speccydev:v9.0", + "image": "njmcphail/speccydev:v9.1", "remoteUser": "ubuntu", "runArgs": [ "--network=host" diff --git a/README.md b/README.md index 2deccd0..dadd639 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Development tools for the ZX Spectrum v9.0 +# Development tools for the ZX Spectrum v9.1 The Dockerfile is the basis of the devcontainer and can be changed to add or remove tools. It will take a long time to build locally, so by default the devcontainer will pull a prebuilt version. Edit `.devcontainer/devcontainer.json` if you would rather build your own. @@ -36,7 +36,7 @@ The devcontainer contains: - various tools including nextcreator.py to build .nex files - ttttt (converts binaries into .tap blocks) - inpaws version 1.0.2 (interactive fiction compiler/extractor for Gilsoft's PAW) -- skoolkit version 10.0 (tools for creating browseable disassemblies of Spectrum games) +- skoolkit version 10.1 (tools for creating browseable disassemblies of Spectrum games) - sna2ctl.py - sna2skool.py - skool2html.py @@ -79,9 +79,9 @@ Thanks to the many authors of these wonderful tools and extensions; to think wha The base has been updated from Ubuntu 24.04 to Ubuntu 26.04, largely to bring in python 3.14 which is required for the current release of Boriel BASIC. This may cause some issues, so please report bugs. z88dk is still being built on 24.04 but should be ABI compatible. Again, please report any bugs you find. -## New additions from v8.3 +## New additions from v9.0 -Minor version update for Boriel BASIC. +Minor version update for skoolkit. ## Install