diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2018-05-01 16:03:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 16:03:40 -0400 |
| commit | 9a63471b3a1a5e06606bdd039b1433940ccb0308 (patch) | |
| tree | 71ac3ff60105e0d9cd3a25f463da8741d6027353 | |
| parent | 4bcf3d9b8221f73d032b74ebd29e8dba95369180 (diff) | |
| parent | 0cb39237312fead3cfddb1dcfa1e761df08883b2 (diff) | |
| download | nixlib-9a63471b3a1a5e06606bdd039b1433940ccb0308.tar nixlib-9a63471b3a1a5e06606bdd039b1433940ccb0308.tar.gz nixlib-9a63471b3a1a5e06606bdd039b1433940ccb0308.tar.bz2 nixlib-9a63471b3a1a5e06606bdd039b1433940ccb0308.tar.lz nixlib-9a63471b3a1a5e06606bdd039b1433940ccb0308.tar.xz nixlib-9a63471b3a1a5e06606bdd039b1433940ccb0308.tar.zst nixlib-9a63471b3a1a5e06606bdd039b1433940ccb0308.zip | |
Merge pull request #39828 from wchresta/souffle-1.2
souffle: 1.0.0 -> 1.2.0
| -rw-r--r-- | maintainers/maintainer-list.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/souffle/default.nix | 18 |
2 files changed, 12 insertions, 11 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 14fd53b2f492..4b584e6a1151 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index c56ea8cc6495..5289540e944c 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -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; }; } |