solc: 0.5.12 -> 0.5.15

Also removes patchset for shared library use, since usage of this
feature was rare and maintenance costly.
See https://github.com/NixOS/nixpkgs/pull/39852#issuecomment-568474864
for a discussion.

2 files changed, 4 insertions, 82 deletions

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 285f2cd2ebe2..23e6c64f3ffc 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -7,26 +7,23 @@ assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0";
 assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
 
 let
-  jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
+  jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
-    sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
+    sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg";
   };
-  buildSharedLibs = stdenv.hostPlatform.isLinux;
 in
 stdenv.mkDerivation rec {
 
   pname = "solc";
-  version = "0.5.12";
+  version = "0.5.15";
 
   # upstream suggests avoid using archive generated by github
   src = fetchzip {
     url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
-    sha256 = "0b9m9jhdz5lgrhrkngj1xnggxp1f6z8pzh29acsz3298l77kfk3z";
+    sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y";
   };
 
-  patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ];
-
   postPatch = ''
     substituteInPlace cmake/jsoncpp.cmake \
       --replace "${jsoncppURL}" ${jsoncpp}
@@ -34,8 +31,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBoost_USE_STATIC_LIBS=OFF"
-  ] ++ stdenv.lib.optionals buildSharedLibs [
-    "-DBUILD_SHARED_LIBS=ON"
   ] ++ stdenv.lib.optionals (!z3Support) [
     "-DUSE_Z3=OFF"
   ] ++ stdenv.lib.optionals (!cvc4Support) [
@@ -74,8 +69,6 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  outputs = [ "out" "dev" ];
-
   meta = with stdenv.lib; {
     description = "Compiler for Ethereum smart contract language Solidity";
     homepage = https://github.com/ethereum/solidity;
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
deleted file mode 100644
index 382d49599c7f..000000000000
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0c05208f..8893648e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,6 +48,22 @@ add_subdirectory(libevmasm)
- add_subdirectory(libsolidity)
- add_subdirectory(libsolc)
- 
-+install(DIRECTORY libdevcore/
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore
-+        FILES_MATCHING PATTERN "*.h")
-+install(DIRECTORY libevmasm/
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libevmasm
-+        FILES_MATCHING PATTERN "*.h")
-+install(DIRECTORY libsolidity/
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity
-+        FILES_MATCHING PATTERN "*.h")
-+install(DIRECTORY libyul/
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyul
-+        FILES_MATCHING PATTERN "*.h")
-+install(DIRECTORY liblangutil/
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil
-+        FILES_MATCHING PATTERN "*.h")
-+
- if (NOT EMSCRIPTEN)
- 	add_subdirectory(solc)
- 	add_subdirectory(liblll)
-diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt
-index fa7e3f48..1f9f52b4 100644
---- a/libdevcore/CMakeLists.txt
-+++ b/libdevcore/CMakeLists.txt
-@@ -6,3 +6,4 @@ target_link_libraries(devcore PRIVATE jsoncpp ${Boost_FILESYSTEM_LIBRARIES} ${Bo
- target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}")
- target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
- add_dependencies(devcore solidity_BuildInfo.h)
-+install(TARGETS devcore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
-index 86192c1b..e7f15e93 100644
---- a/libevmasm/CMakeLists.txt
-+++ b/libevmasm/CMakeLists.txt
-@@ -3,3 +3,4 @@ file(GLOB headers "*.h")
- 
- add_library(evmasm ${sources} ${headers})
- target_link_libraries(evmasm PUBLIC devcore)
-+install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
-index 0bdec4b4..e876177e 100644
---- a/libsolidity/CMakeLists.txt
-+++ b/libsolidity/CMakeLists.txt
-@@ -29,6 +29,7 @@ endif()
- 
- add_library(solidity ${sources} ${z3_SRCS} ${cvc4_SRCS})
- target_link_libraries(solidity PUBLIC yul evmasm langutil devcore Boost::boost Boost::filesystem Boost::system)
-+install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- if (${Z3_FOUND})
-   target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
---- a/libyul/CMakeLists.txt
-+++ b/libyul/CMakeLists.txt
-@@ -43,3 +43,4 @@ endif()
- 	optimiser/VarDeclPropagator.cpp
- )
- target_link_libraries(yul PUBLIC evmasm devcore langutil)
-+install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
---- a/liblangutil/CMakeLists.txt
-+++ b/liblangutil/CMakeLists.txt
-@@ -11,3 +11,4 @@ endif()
- 
- add_library(langutil ${sources})
- target_link_libraries(langutil PUBLIC devcore)
-+install(TARGETS langutil LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})