git.iko.soy/typeable/nixpkgs
on master help sign in
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

commitbcfe04dce53c39ed56c4ccca47d6ba4994322a1b authorAnderson Torres <torres.anderson.85@protonmail.com> dateSat 16 Oct 2021, 23:09 (5 years ago) parent6836bff84e726b
2 files changed+20−15
compare with master
unifiedsplit
pkgs/development/interpreters/bqn/dzaima-bqn/default.nix+10−7 pkgs/development/interpreters/dzaima-apl/default.nix+10−8
pkgs/development/interpreters/bqn/dzaima-bqn/default.nix+10−7
@@ -8,31 +8,34 @@
88
99stdenv.mkDerivation rec {
1010 pname = "dbqn" + lib.optionalString buildNativeImage "-native";
11− version = "0.pre+unstable=2021-10-05";
11+ version = "0.pre+date=2021-10-08";
1212
1313 src = fetchFromGitHub {
1414 owner = "dzaima";
1515 repo = "BQN";
16− rev = "c31ceef52bbf380e747723f5ffd09c5f006b21c5";
17− sha256 = "1nzqgwpjawcky85mfrz5izs9lfb3aqlm96dc8syrxhgg20xrziwx";
16+ rev = "0001109a1c5a420421b368c79d34b1e93bfe606e";
17+ hash = "sha256-riHHclTLkrVbtzmcz9ungAIc7kaoFHS77+SNatsfNhc=";
1818 };
1919
2020 nativeBuildInputs = [
21− makeWrapper
2221 jdk
22+ makeWrapper
2323 ];
2424
2525 dontConfigure = true;
2626
27+ postPatch = ''
28+ patchShebangs --build ./build8
29+ '';
30+
2731 buildPhase = ''
2832 runHook preBuild
2933
30− patchShebangs --build ./build8
3134 ./build8
3235 '' + lib.optionalString buildNativeImage ''
3336 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
3639 '' + ''
3740 runHook postBuild
3841 '';
pkgs/development/interpreters/dzaima-apl/default.nix+10−8
@@ -8,32 +8,34 @@
88
99stdenv.mkDerivation rec {
1010 pname = "dapl" + lib.optionalString buildNativeImage "-native";
11− version = "0.2.0+unstable=2021-06-30";
11+ version = "0.2.0+date=2021-10-16";
1212
1313 src = fetchFromGitHub {
1414 owner = "dzaima";
1515 repo = "APL";
16− rev = "28b3667beb23c6472266bb2b6eb701708fa421c6";
17− hash = "sha256-2kM9XDMclxJNOZngwLvoDQG23UZQQ6ePK/j215UumCg=";
16+ rev = "5eb0a4205e27afa6122096a25008474eec562dc0";
17+ hash = "sha256-UdumMytqT909JRpNqzhYPuKPw644m/vRUsEbIVF2a7U=";
1818 };
1919
2020 nativeBuildInputs = [
21− makeWrapper
2221 jdk
22+ makeWrapper
2323 ];
2424
2525 dontConfigure = true;
2626
27+ postPatch = ''
28+ patchShebangs --build ./build
29+ '';
30+
2731 buildPhase = ''
2832 runHook preBuild
2933
30− patchShebangs --build ./build
31− substituteInPlace ./build \
32− --replace "javac" "javac -encoding utf8"
3334 ./build
3435 '' + lib.optionalString buildNativeImage ''
3536 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
3739 '' + ''
3840 runHook postBuild
3941 '';