diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-05-05 22:38:19 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-05-05 22:39:39 +0200 |
| commit | 19d2c0601bfdf9aec5636c79b0ed49672c0325b3 (patch) | |
| tree | ac5bcc6bedb158e5e100c8e2192a5a43350d29d6 /pkgs/development/tools/wabt | |
| parent | 15e583c1b10fb28d6e328743dd1158aa5c1ad624 (diff) | |
wabt: 1.0.13 -> 1.0.14
https://github.com/WebAssembly/wabt/releases/tag/1.0.14
Diffstat (limited to 'pkgs/development/tools/wabt')
| -rw-r--r-- | pkgs/development/tools/wabt/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/wabt/version.patch | 28 |
2 files changed, 3 insertions, 38 deletions
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 281d68d27de6c..376593eefb8ba 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,25 +2,18 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "07x8m5sf4c7zjq1flypycw1d15ylqdp38l81vn961ds089ngvpgg"; + sha256 = "0zis0190zs37x1wq044qd2vyvzcrkm8kp0734byz1lpdlgl5257b"; fetchSubmodules = true; }; - patches = [ - (substituteAll { - src = ./version.patch; - inherit version; - }) - ]; - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ]; buildInputs = [ python3 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/wabt/version.patch b/pkgs/development/tools/wabt/version.patch deleted file mode 100644 index a49cd0bc1552a..0000000000000 --- a/pkgs/development/tools/wabt/version.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 363a5660..ad3300ed 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,22 +68,7 @@ endif () - include(CheckTypeSize) - check_type_size(ssize_t SSIZE_T) - check_type_size(size_t SIZEOF_SIZE_T) -- --FIND_PACKAGE(Git QUIET REQUIRED) --EXECUTE_PROCESS(COMMAND -- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags -- RESULT_VARIABLE -- GIT_HASH_RESULT -- OUTPUT_VARIABLE -- GIT_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- --IF(${GIT_HASH_RESULT} EQUAL 0) -- SET(WABT_VERSION_INFO "${GIT_HASH}") --ELSE() -- MESSAGE(WARNING "Error running git describe to determine version") -- SET(WABT_VERSION_INFO "(unable to determine version)") --ENDIF() -+SET(WABT_VERSION_INFO "@version@") - - configure_file( - ${WABT_SOURCE_DIR}/src/config.h.in |