Merge pull request #53523 from jacereda/futhark-darwin

Fix futhark build on Darwin
This commit is contained in:
Bas van Dijk 2019-01-07 12:13:13 +01:00 committed by GitHub
commit 8ad610b040
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 59 deletions

View file

@ -1,55 +0,0 @@
# Generated using `cabal2nix --hpack .`, then replace src
{ mkDerivation, alex, array, base, bifunctors, binary, blaze-html
, bytestring, containers, data-binary-ieee754, directory
, directory-tree, dlist, extra, file-embed, filepath, gitrev, happy
, haskeline, hpack, HUnit, json, language-c-quote, mainland-pretty
, markdown, mtl, neat-interpolation, parallel, parsec, process
, process-extras, QuickCheck, random, raw-strings-qq, regex-tdfa
, srcloc, stdenv, template-haskell, temporary, test-framework
, test-framework-hunit, test-framework-quickcheck2, text
, th-lift-instances, transformers, vector, vector-binary-instances
, zlib, fetchFromGitHub
}:
mkDerivation {
pname = "futhark";
version = "0.6.2";
src = fetchFromGitHub {
owner = "diku-dk";
repo = "futhark";
rev = "v0.6.2";
sha256 = "0yj7n01swpvqblybdnks3mjf0mzf1gdg2b2cpxdpxnrjw5j0pnq2";
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
array base bifunctors binary blaze-html bytestring containers
data-binary-ieee754 directory directory-tree dlist extra file-embed
filepath gitrev language-c-quote mainland-pretty markdown mtl
neat-interpolation parallel parsec process raw-strings-qq
regex-tdfa srcloc template-haskell text th-lift-instances
transformers vector vector-binary-instances zlib
];
libraryToolDepends = [ alex happy hpack ];
executableHaskellDepends = [
array base bifunctors binary blaze-html bytestring containers
data-binary-ieee754 directory directory-tree dlist extra file-embed
filepath gitrev haskeline json language-c-quote mainland-pretty
markdown mtl neat-interpolation parallel parsec process
process-extras random raw-strings-qq regex-tdfa srcloc
template-haskell temporary text th-lift-instances transformers
vector vector-binary-instances zlib
];
testHaskellDepends = [
array base bifunctors binary blaze-html bytestring containers
data-binary-ieee754 directory directory-tree dlist extra file-embed
filepath gitrev HUnit language-c-quote mainland-pretty markdown mtl
neat-interpolation parallel parsec process QuickCheck
raw-strings-qq regex-tdfa srcloc template-haskell test-framework
test-framework-hunit test-framework-quickcheck2 text
th-lift-instances transformers vector vector-binary-instances zlib
];
preConfigure = "hpack";
homepage = "https://futhark-lang.org";
description = "An optimising compiler for a functional, array-oriented language";
license = stdenv.lib.licenses.isc;
}

View file

@ -532,7 +532,7 @@ self: super: builtins.intersectAttrs super {
# The test-suite requires a running PostgreSQL server.
Frames-beam = dontCheck super.Frames-beam;
futhark = with pkgs;
futhark = if pkgs.stdenv.isDarwin then super.futhark else with pkgs;
let path = stdenv.lib.makeBinPath [ gcc ];
in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: {
postInstall = ''

View file

@ -12,7 +12,4 @@ self: super: {
# https://github.com/channable/vaultenv/issues/1
vaultenv = self.callPackage ../tools/haskell/vaultenv { };
# https://github.com/diku-dk/futhark/issues/614
futhark = self.callPackage ../compilers/futhark { };
}