diff options
author | Nathan van Doorn <nvd1234@gmail.com> | 2022-03-23 06:30:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-23 06:30:06 +0100 |
commit | 61f798890ec12e5fe0adb8959070cab7c34f3fd4 (patch) | |
tree | 0c2fbb251cce5735f0fcdb50d6f7b85263728b37 /pkgs | |
parent | 3bf28598c18a52ef0e184e70f0e6def2b8f1a67a (diff) |
souffle: 2.0.2 -> 2.2 (#164103)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/souffle/default.nix | 35 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 30 deletions
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index dada4dfe9e81d..df8ad5d360e26 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, perl, ncurses, zlib, sqlite, libffi -, autoreconfHook, mcpp, bison, flex, doxygen, graphviz +{ lib, stdenv, fetchFromGitHub +, bash-completion, perl, ncurses, zlib, sqlite, libffi +, mcpp, cmake, bison, flex, doxygen, graphviz , makeWrapper }: @@ -10,42 +10,23 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.0.2"; + version = "2.2"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5"; + sha256 = "sha256-whvC+DL9XbQLc4wf2kFxUKXSyJnGkYq0/0uLCLbliJU="; }; - patches = [ - # Pull pending unstream inclusion fix for ncurses-6.3: - # https://github.com/souffle-lang/souffle/pull/2134 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch"; - sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; - buildInputs = [ ncurses zlib sqlite libffi ]; - + nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ]; + buildInputs = [ bash-completion ncurses zlib sqlite libffi ]; # these propagated inputs are needed for the compiled Souffle mode to work, # 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 - postPatch = '' - substituteInPlace ./src/Makefile.am \ - --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other' - - substituteInPlace configure.ac \ - --replace "m4_esyscmd([git describe --tags --always | tr -d '\n'])" "${version}" - ''; + cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ]; postInstall = '' wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e68a7e4a04b6..be22edcb2d9c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13518,9 +13518,7 @@ with pkgs; boost = boost172; }; - souffle = callPackage ../development/compilers/souffle { - autoreconfHook = buildPackages.autoreconfHook269; - }; + souffle = callPackage ../development/compilers/souffle { }; spasm-ng = callPackage ../development/compilers/spasm-ng { }; |