Merge pull request #141930 from AndersonTorres/new-misc

Misc updates

dapl: 0.2.0+unstable=2021-06-30 -> 0.2.0+date=2021-10-16
dbqn: 0.pre+unstable=2021-10-05 -> 0.pre+date=2021-10-08

authored by

Anderson Torres and committed by
GitHub
bcfe04dc 6836bff5

+20 -15
+10 -7
pkgs/development/interpreters/bqn/dzaima-bqn/default.nix
··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 pname = "dbqn" + lib.optionalString buildNativeImage "-native"; 11 - version = "0.pre+unstable=2021-10-05"; 11 + version = "0.pre+date=2021-10-08"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "dzaima"; 15 15 repo = "BQN"; 16 - rev = "c31ceef52bbf380e747723f5ffd09c5f006b21c5"; 17 - sha256 = "1nzqgwpjawcky85mfrz5izs9lfb3aqlm96dc8syrxhgg20xrziwx"; 16 + rev = "0001109a1c5a420421b368c79d34b1e93bfe606e"; 17 + hash = "sha256-riHHclTLkrVbtzmcz9ungAIc7kaoFHS77+SNatsfNhc="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ 21 - makeWrapper 22 21 jdk 22 + makeWrapper 23 23 ]; 24 24 25 25 dontConfigure = true; 26 26 27 + postPatch = '' 28 + patchShebangs --build ./build8 29 + ''; 30 + 27 31 buildPhase = '' 28 32 runHook preBuild 29 33 30 - patchShebangs --build ./build8 31 34 ./build8 32 35 '' + lib.optionalString buildNativeImage '' 33 36 native-image --report-unsupported-elements-at-runtime \ 34 - -H:CLibraryPath=${lib.getLib jdk}/lib \ 35 - -J-Dfile.encoding=UTF-8 -jar BQN.jar dbqn 37 + -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ 38 + -jar BQN.jar dbqn 36 39 '' + '' 37 40 runHook postBuild 38 41 '';
+10 -8
pkgs/development/interpreters/dzaima-apl/default.nix
··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 pname = "dapl" + lib.optionalString buildNativeImage "-native"; 11 - version = "0.2.0+unstable=2021-06-30"; 11 + version = "0.2.0+date=2021-10-16"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "dzaima"; 15 15 repo = "APL"; 16 - rev = "28b3667beb23c6472266bb2b6eb701708fa421c6"; 17 - hash = "sha256-2kM9XDMclxJNOZngwLvoDQG23UZQQ6ePK/j215UumCg="; 16 + rev = "5eb0a4205e27afa6122096a25008474eec562dc0"; 17 + hash = "sha256-UdumMytqT909JRpNqzhYPuKPw644m/vRUsEbIVF2a7U="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ 21 - makeWrapper 22 21 jdk 22 + makeWrapper 23 23 ]; 24 24 25 25 dontConfigure = true; 26 26 27 + postPatch = '' 28 + patchShebangs --build ./build 29 + ''; 30 + 27 31 buildPhase = '' 28 32 runHook preBuild 29 33 30 - patchShebangs --build ./build 31 - substituteInPlace ./build \ 32 - --replace "javac" "javac -encoding utf8" 33 34 ./build 34 35 '' + lib.optionalString buildNativeImage '' 35 36 native-image --report-unsupported-elements-at-runtime \ 36 - -H:CLibraryPath=${lib.getLib jdk}/lib -jar APL.jar dapl 37 + -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ 38 + -jar APL.jar dapl 37 39 '' + '' 38 40 runHook postBuild 39 41 '';