summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-08-13 19:31:23 +0800
committerPeter Hoeg <peter@hoeg.com>2017-08-13 19:31:33 +0800
commitb9b00495d53ad85f04279865c95d09e2a57bb94a (patch)
tree217406c3b1f0209439ccb9e5e363da7245b83e5e /pkgs
parent2ae41630598b4b00fb5dce1d4f6abb0ca7fb39a5 (diff)
downloadnixpkgs-b9b00495d53ad85f04279865c95d09e2a57bb94a.tar
nixpkgs-b9b00495d53ad85f04279865c95d09e2a57bb94a.tar.gz
nixpkgs-b9b00495d53ad85f04279865c95d09e2a57bb94a.tar.bz2
nixpkgs-b9b00495d53ad85f04279865c95d09e2a57bb94a.tar.lz
nixpkgs-b9b00495d53ad85f04279865c95d09e2a57bb94a.tar.xz
nixpkgs-b9b00495d53ad85f04279865c95d09e2a57bb94a.tar.zst
nixpkgs-b9b00495d53ad85f04279865c95d09e2a57bb94a.zip
tboot: 1.8.2 -> 1.9.6
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/security/tboot/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix
index 506b1d398d5..8530aab4e70 100644
--- a/pkgs/tools/security/tboot/default.nix
+++ b/pkgs/tools/security/tboot/default.nix
@@ -1,16 +1,19 @@
 { stdenv, fetchurl, trousers, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tboot-1.8.2";
+  name = "tboot-${version}";
+  version = "1.9.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/tboot/${name}.tar.gz";
-    sha256 = "1l9ccm7ik9fs7kzg1bjc5cjh0pcf4v0k1c84dmyr51r084i7p31m";
+    sha256 = "0f9afz260xhycpd0x5zz6jn8ha14i8j98rck0fhb55l1rbbfwm8v";
   };
 
+  patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ];
+
   buildInputs = [ trousers openssl zlib ];
 
-  patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ];
+  enableParallelBuilding = true;
 
   hardeningDisable = [ "pic" "stackprotector" ];
 
@@ -27,8 +30,7 @@ stdenv.mkDerivation rec {
     description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM";
     homepage    = http://sourceforge.net/projects/tboot/;
     license     = licenses.bsd3;
-    maintainers = [ maintainers.ak ];
+    maintainers = with maintainers; [ ak ];
     platforms   = platforms.linux;
   };
 }
-