JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39828 from wchresta/souffle-1.2

Browse Source 
souffle: 1.0.0 -> 1.2.0
This commit is contained in:
Daniel Peebles 2018-05-01 16:03:40 -04:00 committed by GitHub
commit 9a63471b3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -3984,6 +3984,11 @@
github = "vyp";
name = "vyp";
};
wchresta = {
email = "wchresta.nix@chrummibei.ch";
github = "wchresta";
name = "wchresta";
};
wedens = {
email = "kirill.wedens@gmail.com";
name = "wedens";

18
pkgs/development/compilers/souffle/default.nix
View File

@ -1,25 +1,27 @@
{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz }:
{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz, libtool, lsb-release, ncurses, zlib, sqlite }:
stdenv.mkDerivation rec {
version = "1.0.0";
version = "1.2.0";
name = "souffle-${version}";
src = fetchFromGitHub {
owner = "souffle-lang";
repo = "souffle";
rev = version;
sha256 = "13j14227dgxcm25z9iizcav563wg2ak9338pb03aqqz8yqxbmz4n";
sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd";
};
buildInputs = [
autoconf automake boost bison flex openjdk
# Used for 1.2.0
libtool lsb-release ncurses zlib sqlite
# Used for docs
doxygen perl graphviz
];
patchPhase = ''
substituteInPlace configure.ac \
--replace "m4_esyscmd([git describe --tags --abbrev=0 | tr -d '\n'])" "${version}"
--replace "m4_esyscmd([git describe --tags --abbrev=0 --always | tr -d '\n'])" "${version}"
'';
# Without this, we get an obscure error about not being able to find a library version
@ -29,17 +31,11 @@ stdenv.mkDerivation rec {
preConfigure = "./bootstrap";
# in 1.0.0: parser.hh:40:0: error: unterminated #ifndef
enableParallelBuilding = false;
# See https://github.com/souffle-lang/souffle/issues/176
hardeningDisable = [ "fortify" ];
meta = with stdenv.lib; {
description = "A translator of declarative Datalog programs into the C++ language";
homepage = "http://souffle-lang.github.io/";
platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin ];
maintainers = with maintainers; [ copumpkin wchresta ];
license = licenses.upl;
};
}