@@ -223,23 +223,23 @@
       env:
         - config=amigaos
 
     # Nintendo 3DS
     - os: linux
-      dist: trusty
+      dist: bionic
       env:
         - config=nintendo_3ds
 
     # Nintendo DS
     - os: linux
-      dist: trusty
+      dist: bionic
       env:
         - config=nintendo_ds
 
     # Nintendo Wii
     - os: linux
-      dist: trusty
+      dist: bionic
       env:
         - config=wii
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" -a -z "$config" ]; then
@@ -266,12 +266,14 @@
             fi;
     fi
 
   - if [ "$config" = "nintendo_3ds" -o "$config" = "nintendo_ds"
         -o "$config" = "wii" ]; then
-            wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb;
-            sudo dpkg -i devkitpro-pacman.deb;
+            deb=devkitpro-pacman.amd64.deb;
+            wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/$deb;
+            sudo apt install gdebi;
+            sudo gdebi -n $deb;
     fi
 
   - if [ "$config" = "nintendo_3ds" ]; then
             sudo dkp-pacman --noconfirm -Syu 3ds-dev;
     fi
@@ -288,18 +290,10 @@
             wget -q https://franke.ms/download/amiga-gcc.tgz;
             tar -C / -xzf amiga-gcc.tgz;
     fi
 
 script:
-  # This needs to use ed on macOS, as it has no GNU sed, and sed on Linux, as
-  # some Travis hosts have no ed.
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-            echo -e '%s/-DSTDOUT$/&_SIMPLE/\nwq' | ed -s tests/Makefile;
-    else
-            sed -i 's/-DSTDOUT$/&_SIMPLE/' tests/Makefile;
-    fi
-
   - build() {
             if ! git clean -fxd >/tmp/clean_log 2>&1; then
                     cat /tmp/clean_log;
                     exit 1;
             fi;