lol

koka: 2.3.6 -> 2.3.8

Include fix for mimalloc on darwin; see
https://github.com/koka-lang/koka/issues/243

+19 -3
+9 -3
pkgs/development/compilers/koka/default.nix
··· 4 4 , parsec, process, regex-compat, text, time }: 5 5 6 6 let 7 - version = "2.3.6"; 7 + version = "2.3.8"; 8 8 src = fetchFromGitHub { 9 9 owner = "koka-lang"; 10 10 repo = "koka"; 11 11 rev = "v${version}"; 12 - sha256 = "sha256-AibS/HudJKFQZlTxGD5LfwjBawIy1xwO2Hm8qzAUP2M="; 12 + sha256 = "sha256-4a9UwtiWq9eFpNHpcrlhYUwzXcr1EXFMjBmDFYP933U="; 13 13 fetchSubmodules = true; 14 14 }; 15 15 kklib = stdenv.mkDerivation { 16 16 pname = "kklib"; 17 17 inherit version; 18 18 src = "${src}/kklib"; 19 + patches = [ ./kklib-mimalloc-macos-fix.diff ]; 19 20 nativeBuildInputs = [ cmake ]; 21 + outputs = [ "out" "dev" ]; 22 + postInstall = '' 23 + mkdir -p ''${!outputDev}/share/koka/v${version} 24 + cp -a ../../kklib ''${!outputDev}/share/koka/v${version} 25 + ''; 20 26 }; 21 27 inherit (pkgsHostTarget.targetPackages.stdenv) cc; 22 28 runtimeDeps = [ ··· 40 46 postInstall = '' 41 47 mkdir -p $out/share/koka/v${version} 42 48 cp -a lib $out/share/koka/v${version} 43 - cp -a kklib $out/share/koka/v${version} 49 + ln -s ${kklib.dev}/share/koka/v${version}/kklib $out/share/koka/v${version} 44 50 wrapProgram "$out/bin/koka" \ 45 51 --set CC "${lib.getBin cc}/bin/${cc.targetPrefix}cc" \ 46 52 --prefix PATH : "${lib.makeSearchPath "bin" runtimeDeps}"
+10
pkgs/development/compilers/koka/kklib-mimalloc-macos-fix.diff
··· 1 + --- kklib/mimalloc/src/random.c 1969-12-31 18:00:01.000000000 -0600 2 + +++ kklib/mimalloc/src/random.c.new 2022-01-16 19:43:54.000000000 -0600 3 + @@ -195,6 +195,7 @@ 4 + #elif defined(__APPLE__) 5 + #include <AvailabilityMacros.h> 6 + #if defined(MAC_OS_X_VERSION_10_10) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10 7 + +#include <CommonCrypto/CommonCryptoError.h> 8 + #include <CommonCrypto/CommonRandom.h> 9 + #endif 10 + static bool os_random_buf(void* buf, size_t buf_len) {