about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorLeon Schuermann <leon@is.currently.online>2020-06-16 12:46:53 +0200
committerDaniel Schaefer <git@danielschaefer.me>2020-06-17 16:46:18 +0200
commit8e94e61aec5c2065788a10850d1f9d9caa3f969b (patch)
tree5edabc6bb09b708bad8d749f01d6a10b8307c1f4 /pkgs/development
parent7e505053babfb207aa5f073bb81bd09c2191beb6 (diff)
downloadnixlib-8e94e61aec5c2065788a10850d1f9d9caa3f969b.tar
nixlib-8e94e61aec5c2065788a10850d1f9d9caa3f969b.tar.gz
nixlib-8e94e61aec5c2065788a10850d1f9d9caa3f969b.tar.bz2
nixlib-8e94e61aec5c2065788a10850d1f9d9caa3f969b.tar.lz
nixlib-8e94e61aec5c2065788a10850d1f9d9caa3f969b.tar.xz
nixlib-8e94e61aec5c2065788a10850d1f9d9caa3f969b.tar.zst
nixlib-8e94e61aec5c2065788a10850d1f9d9caa3f969b.zip
tpm2-tss: 2.3.2 -> 2.4.1
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/tpm2-tss/default.nix16
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index b264c3bc6c6e..5a62c8e45ecd 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -1,32 +1,24 @@
 { stdenv, lib, fetchurl, fetchpatch
-, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps
+, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps, json_c, curl
 , uthash, which
 }:
 
 stdenv.mkDerivation rec {
   pname = "tpm2-tss";
-  version = "2.3.2";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "19jg09sxy3aj4dc1yv32jjv0m62cnmhjlw02jbh4d4pk2439m4l2";
+    sha256 = "03g6l64nzkpadjyabmbhnhs8648iqb95fviinnpslggzp75azmsq";
   };
 
-  patches = [
-    # Fix test failure. see https://github.com/tpm2-software/tpm2-tss/pull/1585
-    (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tss/pull/1585.patch";
-      sha256 = "0ak3l588ahzv3yx1gfa4sa6p74lsffxzkr23ppznm34wvlcci86n";
-    })
-  ];
-
   nativeBuildInputs = [
     doxygen perl pkgconfig
     # For unit tests and integration tests.
     ibm-sw-tpm2 iproute procps which
   ];
   buildInputs = [
-    openssl
+    openssl json_c curl
     # For unit tests and integration tests.
     cmocka uthash
   ];