recipes/netutils/recipe.toml

 [source]
 git = "https://gitlab.redox-os.org/redox-os/netutils.git"
-branch = "redox-unix"
 
 [build]
 template = "cargo"

recipes/perg/recipe.toml

+[source]
+git = "https://github.com/guerinoni/perg.git"
+
+[build]
+template = "cargo"

recipes/prboom/recipe.sh

@@ -17,9 +17,10 @@ function recipe_build {
         --prefix=/ \
         --build=${BUILD} \
         --host=${HOST} \
-        --disable-sdltest \
         --disable-cpu-opt \
+        --disable-i386-asm \
         --disable-gl \
+        --disable-sdltest \
         --without-net \
         --with-sdl-prefix="$sysroot" \
         ac_cv_lib_SDL_mixer_Mix_OpenAudio=yes

recipes/procedural-wallpapers-rs/recipe.toml

+[source]
+git = "https://github.com/lukas-kirschner/procedural-wallpapers-rs.git"
+
+[build]
+template = "cargo"

recipes/relibc-tests/recipe.sh

 GIT=https://gitlab.redox-os.org/redox-os/relibc.git
 
 function recipe_build {
-    "$REDOX_MAKE" CARGO=xargo NATIVE_RELIBC=1 -C tests -j"$($NPROC)"
+    "$REDOX_MAKE" NATIVE_RELIBC=1 -C tests -j"$($NPROC)"
     skip=1
 }
 

recipes/rust-cairo-demo/recipe.sh

@@ -3,7 +3,6 @@ BUILD_DEPENDS=(cairo expat fontconfig freetype libpng pixman zlib)
 
 function recipe_build {
     sysroot="$(realpath ../sysroot)"
-    cp -p "$ROOT/Xargo.toml" "Xargo.toml"
     cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
         -- \
         -L "${sysroot}/lib" \

recipes/rust-cairo/recipe.sh

@@ -4,7 +4,6 @@ CARGOFLAGS="--example gui"
 
 function recipe_build {
     sysroot="$(realpath ../sysroot)"
-    cp -p "$ROOT/Xargo.toml" "Xargo.toml"
     cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
         -- \
         -L "${sysroot}/lib" \

recipes/rust/config.toml

 [llvm]
+download-ci-llvm = false
 static-libstdcpp = true
 
 [build]

recipes/rust/recipe.sh

 GIT=https://gitlab.redox-os.org/redox-os/rust.git
-BRANCH=redox-2022-03-18
+BRANCH=redox-2023-01-21
 BUILD_DEPENDS=(llvm)
 DEPENDS="gcc cargo"
 PREPARE_COPY=0
@@ -23,6 +23,7 @@ function recipe_clean {
 function recipe_stage {
     rsync -av --delete "install/" "$1/"
     # Cannot use STRIP because it is unset in recipe_build
-    "${HOST}-strip" -v "$1/bin/"{rustc,rustdoc}
+    #TODO: rustdoc
+    "${HOST}-strip" -v "$1/bin/rustc"
     skip=1
 }

recipes/sdl/recipe.toml

 [source]
-tar = "https://www.libsdl.org/release/SDL-1.2.15.tar.gz"
-patches = [
-    "redox.patch"
-]
-script = "./autogen.sh"
+git = "https://gitlab.redox-os.org/redox-os/sdl1.2.git"
 
 [build]
 template = "custom"

recipes/sdl2/recipe.toml

@@ -25,4 +25,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
     --enable-cdrom
 )
 cookbook_configure
+
+# Hack to add OSMesa
+sed -i "s/Requires:/Requires: osmesa >= 8.0.0/" "${COOKBOOK_STAGE}/lib/pkgconfig/sdl2.pc"
 """

recipes/shellharden/recipe.toml

+[source]
+git = "https://github.com/anordal/shellharden.git"
+
+[build]
+template = "cargo"

recipes/sopwith/recipe.sh

 VERSION=1.8.4
-TAR=https://sourceforge.net/projects/sdl-sopwith/files/sdl_sopwith/$VERSION/sopwith-$VERSION.tar.gz
+TAR=https://sourceforge.net/projects/sdl-sopwith/files/sdl_sopwith/$VERSION/sopwith-$VERSION.tar.gz/download
 BUILD_DEPENDS=(sdl liborbital libiconv)
 
 function recipe_version {

recipes/tokei/recipe.toml

+[source]
+git = "https://github.com/XAMPPRocky/tokei.git"
+[build]
+template = "cargo"

recipes/vttest/recipe.sh

 VERSION=20140305
-TAR=http://invisible-island.net/datafiles/release/vttest.tar.gz
+TAR="https://invisible-island.net/archives/vttest/vttest-${VERSION}.tgz"
 
 function recipe_version {
     echo "$VERSION"

setup.sh

@@ -16,10 +16,5 @@ then
     echo "Installing cargo-config"
     cargo install -f cargo-config
 fi
-if [ -z "$(which xargo)" ]
-then
-    echo "Installing xargo"
-    cargo install -f xargo
-fi
 
 echo "cook.sh is ready to use"