Merge pull request #61509 from thoughtpolice/nixpkgs/rm-souper

pkgs: remove souper-2017-03-23

pkgs/development/compilers/souper/cmake-fix.patch

@@ -1,14 +0,0 @@
---- souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt.orig     2017-01-20 13:55:14.783632588 -0600
-+++ souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt  2017-01-20 13:55:20.505728456 -0600
-@@ -33,7 +33,10 @@
-   OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
-   OUTPUT_STRIP_TRAILING_WHITESPACE
- )
--set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}")
-+
-+if (LLVM_SYSTEM_LIBS)
-+  set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}")
-+endif()
-
- execute_process(
-   COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags

pkgs/development/compilers/souper/default.nix

@@ -1,59 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper
-, llvmPackages_4, hiredis, z3, gtest
-}:
-
-let
-  klee = fetchFromGitHub {
-    owner = "rsas";
-    repo  = "klee";
-    rev   = "57cd3d43056b029d9da3c6b3c666c4153554c04f";
-    sha256 = "197wb7nbirlfpx2jr3afpjjhcj7slc4dxxi02j3kmazz9kcqaygz";
-  };
-in stdenv.mkDerivation rec {
-  name = "souper-unstable-${version}";
-  version = "2017-03-23";
-
-  src = fetchFromGitHub {
-    owner  = "google";
-    repo   = "souper";
-    rev    = "cf2911d2eb1e7c8ab465df5a722fa5cdac06e6fc";
-    sha256 = "1kg08a1af4di729pn1pip2lzqzlvjign6av95214f5rr3cq2q0cl";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    makeWrapper
-  ];
-
-  buildInputs = [
-    llvmPackages_4.llvm
-    llvmPackages_4.clang-unwrapped
-    hiredis
-    gtest
-  ];
-
-  patches = [ ./cmake-fix.patch ];
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-      mkdir -pv third_party
-      cp -R "${klee}" third_party/klee
-  '';
-
-  installPhase = ''
-      mkdir -pv $out/bin
-      cp -v ./souper       $out/bin/
-      cp -v ./clang-souper $out/bin/
-      wrapProgram "$out/bin/souper" \
-          --add-flags "-z3-path=\"${z3}/bin/z3\""
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A superoptimizer for LLVM IR";
-    homepage    = "https://github.com/google/souper";
-    license     = licenses.asl20;
-    maintainers = with maintainers; [ taktoa ];
-    platforms   = with platforms; linux;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -5872,8 +5872,6 @@ in
 
   soundkonverter = kdeApplications.callPackage ../applications/audio/soundkonverter {};
 
-  souper = callPackage ../development/compilers/souper { };
-
   sparsehash = callPackage ../development/libraries/sparsehash { };
 
   spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { };