python3Packages.jsonnet: 0.20.0 -> 0.21.0 (#405111)
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index 3a52458..872e6c6 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -10,6 +10,7 @@ set(LIBJSONNETPP_SOURCE
|
||||
|
||||
add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE})
|
||||
add_dependencies(libjsonnet++ jsonnet)
|
||||
+target_link_libraries(libjsonnet++ libjsonnet)
|
||||
# target_link_libraries(libjsonnet libjsonnet)
|
||||
|
||||
# CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jsonnet";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
rev = "v${version}";
|
||||
owner = "google";
|
||||
repo = "jsonnet";
|
||||
sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y=";
|
||||
sha256 = "sha256-QHp0DOu/pqcgN7di219cHzfFb7fWtdGGE6J1ZXgbOGQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,11 +37,6 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
|
||||
];
|
||||
|
||||
# https://github.com/google/jsonnet/issues/778
|
||||
patches = [
|
||||
./fix-cpp-unresolved-symbols.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Upstream writes documentation in html, not in markdown/rst, so no
|
||||
|
||||
Reference in New Issue
Block a user