diff --git a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix b/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix
index 846d6a045a99..e9b6bdf83c78 100644
--- a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix
+++ b/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix
@@ -8,31 +8,34 @@
 
 stdenv.mkDerivation rec {
   pname = "dbqn" + lib.optionalString buildNativeImage "-native";
-  version = "0.pre+unstable=2021-10-05";
+  version = "0.pre+date=2021-10-08";
 
   src = fetchFromGitHub {
     owner = "dzaima";
     repo = "BQN";
-    rev = "c31ceef52bbf380e747723f5ffd09c5f006b21c5";
-    sha256 = "1nzqgwpjawcky85mfrz5izs9lfb3aqlm96dc8syrxhgg20xrziwx";
+    rev = "0001109a1c5a420421b368c79d34b1e93bfe606e";
+    hash = "sha256-riHHclTLkrVbtzmcz9ungAIc7kaoFHS77+SNatsfNhc=";
   };
 
   nativeBuildInputs = [
-    makeWrapper
     jdk
+    makeWrapper
   ];
 
   dontConfigure = true;
 
+  postPatch = ''
+    patchShebangs --build ./build8
+  '';
+
   buildPhase = ''
     runHook preBuild
 
-    patchShebangs --build ./build8
     ./build8
   '' + lib.optionalString buildNativeImage ''
     native-image --report-unsupported-elements-at-runtime \
-      -H:CLibraryPath=${lib.getLib jdk}/lib \
-      -J-Dfile.encoding=UTF-8 -jar BQN.jar dbqn
+      -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \
+      -jar BQN.jar dbqn
   '' + ''
     runHook postBuild
   '';
diff --git a/pkgs/development/interpreters/dzaima-apl/default.nix b/pkgs/development/interpreters/dzaima-apl/default.nix
index 80458e1398ac..d061a6cb9cdf 100644
--- a/pkgs/development/interpreters/dzaima-apl/default.nix
+++ b/pkgs/development/interpreters/dzaima-apl/default.nix
@@ -8,32 +8,34 @@
 
 stdenv.mkDerivation rec {
   pname = "dapl" + lib.optionalString buildNativeImage "-native";
-  version = "0.2.0+unstable=2021-06-30";
+  version = "0.2.0+date=2021-10-16";
 
   src = fetchFromGitHub {
     owner = "dzaima";
     repo = "APL";
-    rev = "28b3667beb23c6472266bb2b6eb701708fa421c6";
-    hash = "sha256-2kM9XDMclxJNOZngwLvoDQG23UZQQ6ePK/j215UumCg=";
+    rev = "5eb0a4205e27afa6122096a25008474eec562dc0";
+    hash = "sha256-UdumMytqT909JRpNqzhYPuKPw644m/vRUsEbIVF2a7U=";
   };
 
   nativeBuildInputs = [
-    makeWrapper
     jdk
+    makeWrapper
   ];
 
   dontConfigure = true;
 
+  postPatch = ''
+    patchShebangs --build ./build
+  '';
+
   buildPhase = ''
     runHook preBuild
 
-    patchShebangs --build ./build
-    substituteInPlace ./build \
-      --replace "javac" "javac -encoding utf8"
     ./build
   '' + lib.optionalString buildNativeImage ''
     native-image --report-unsupported-elements-at-runtime \
-      -H:CLibraryPath=${lib.getLib jdk}/lib -jar APL.jar dapl
+      -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \
+      -jar APL.jar dapl
   '' + ''
     runHook postBuild
   '';