souffle: 1.2.0 -> 1.5.1, co-maintain

Souffle has seen some significant upgrades in the past few years and now
has trimmed and replaced several of its more expensive dependencies,
such as boost, openjdk, etc.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2019-03-12 00:44:08 -05:00
parent ca3b67355c
commit 4f74e3abcf
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D

View File

@ -1,40 +1,53 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, boost, bison, flex, openjdk, doxygen , perl, ncurses, zlib, sqlite, libffi
, perl, graphviz, ncurses, zlib, sqlite , autoreconfHook, mcpp, bison, flex, doxygen, graphviz
, autoreconfHook }: , makeWrapper
}:
let
toolsPath = stdenv.lib.makeBinPath [ mcpp ];
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.0";
name = "souffle-${version}"; name = "souffle-${version}";
version = "1.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "souffle-lang"; owner = "souffle-lang";
repo = "souffle"; repo = "souffle";
rev = version; rev = version;
sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd"; sha256 = "06sa250z3v8hs91p6cqdzlwwaq96j6zmfrrld1fzd1b620aa5iys";
}; };
nativeBuildInputs = [ autoreconfHook bison flex ]; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];
buildInputs = [ ncurses zlib sqlite libffi ];
buildInputs = [ # these propagated inputs are needed for the compiled Souffle mode to work,
boost openjdk ncurses zlib sqlite doxygen perl graphviz # since generated compiler code uses them. TODO: maybe write a g++ wrapper
]; # that adds these so we can keep the propagated inputs clean?
propagatedBuildInputs = [ ncurses zlib sqlite libffi ];
# see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for
# Wno-error fixes
patchPhase = '' patchPhase = ''
substituteInPlace ./src/Makefile.am \
--replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other'
substituteInPlace configure.ac \ substituteInPlace configure.ac \
--replace "m4_esyscmd([git describe --tags --abbrev=0 --always | tr -d '\n'])" "${version}" --replace "m4_esyscmd([git describe --tags --always | tr -d '\n'])" "${version}"
''; '';
# Without this, we get an obscure error about not being able to find a library version postInstall = ''
# without saying what library it's looking for. Turns out it's searching global paths wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}"
# for boost and failing there, so we tell it what's what here. '';
configureFlags = [ "--with-boost-libdir=${boost}/lib" ];
outputs = [ "out" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A translator of declarative Datalog programs into the C++ language"; description = "A translator of declarative Datalog programs into the C++ language";
homepage = "http://souffle-lang.github.io/"; homepage = "http://souffle-lang.github.io/";
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin wchresta ]; maintainers = with maintainers; [ thoughtpolice copumpkin wchresta ];
license = licenses.upl; license = licenses.upl;
}; };
} }