From 4071794bc32564c742c728ca6d088b2e8b9fec96 Mon Sep 17 00:00:00 2001 From: Palmer Date: Thu, 8 May 2025 12:33:46 -0400 Subject: [PATCH] python3Packages.jsonnet: 0.20.0 -> 0.21.0 (#405111) --- .../js/jsonnet/fix-cpp-unresolved-symbols.patch | 12 ------------ pkgs/by-name/js/jsonnet/package.nix | 9 ++------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch diff --git a/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch b/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch deleted file mode 100644 index dc4cdcf2ea1b..000000000000 --- a/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch +++ /dev/null @@ -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 diff --git a/pkgs/by-name/js/jsonnet/package.nix b/pkgs/by-name/js/jsonnet/package.nix index 5d844ade98af..4d7136f01eb1 100644 --- a/pkgs/by-name/js/jsonnet/package.nix +++ b/pkgs/by-name/js/jsonnet/package.nix @@ -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