cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #155184 from pmahoney/koka-2.3.8

Browse source 
koka: 2.3.6 -> 2.3.8
This commit is contained in:
sternenseemann 2022-05-16 00:59:20 +02:00 committed by GitHub
commit f607b644c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/koka/default.nix
View file

@ -4,19 +4,25 @@
, parsec, process, regex-compat, text, time }: , parsec, process, regex-compat, text, time }:
let let
version = "2.3.6"; version = "2.3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koka-lang"; owner = "koka-lang";
repo = "koka"; repo = "koka";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AibS/HudJKFQZlTxGD5LfwjBawIy1xwO2Hm8qzAUP2M="; sha256 = "sha256-4a9UwtiWq9eFpNHpcrlhYUwzXcr1EXFMjBmDFYP933U=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
kklib = stdenv.mkDerivation { kklib = stdenv.mkDerivation {
pname = "kklib"; pname = "kklib";
inherit version; inherit version;
src = "${src}/kklib"; src = "${src}/kklib";
patches = [ ./kklib-mimalloc-macos-fix.diff ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
outputs = [ "out" "dev" ];
postInstall = ''
mkdir -p ''${!outputDev}/share/koka/v${version}
cp -a ../../kklib ''${!outputDev}/share/koka/v${version}
'';
}; };
inherit (pkgsHostTarget.targetPackages.stdenv) cc; inherit (pkgsHostTarget.targetPackages.stdenv) cc;
runtimeDeps = [ runtimeDeps = [
@ -40,7 +46,7 @@ mkDerivation rec {
postInstall = '' postInstall = ''
mkdir -p $out/share/koka/v${version} mkdir -p $out/share/koka/v${version}
cp -a lib $out/share/koka/v${version} cp -a lib $out/share/koka/v${version}
cp -a kklib $out/share/koka/v${version} ln -s ${kklib.dev}/share/koka/v${version}/kklib $out/share/koka/v${version}
wrapProgram "$out/bin/koka" \ wrapProgram "$out/bin/koka" \
--set CC "${lib.getBin cc}/bin/${cc.targetPrefix}cc" \ --set CC "${lib.getBin cc}/bin/${cc.targetPrefix}cc" \
--prefix PATH : "${lib.makeSearchPath "bin" runtimeDeps}" --prefix PATH : "${lib.makeSearchPath "bin" runtimeDeps}"

10
pkgs/development/compilers/koka/kklib-mimalloc-macos-fix.diff Normal file
View file

@ -0,0 +1,10 @@
--- kklib/mimalloc/src/random.c 1969-12-31 18:00:01.000000000 -0600
+++ kklib/mimalloc/src/random.c.new 2022-01-16 19:43:54.000000000 -0600
@@ -195,6 +195,7 @@
#elif defined(__APPLE__)
#include <AvailabilityMacros.h>
#if defined(MAC_OS_X_VERSION_10_10) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
+#include <CommonCrypto/CommonCryptoError.h>
#include <CommonCrypto/CommonRandom.h>
#endif
static bool os_random_buf(void* buf, size_t buf_len) {