From 071773dc5d995edfc494a4bc46c5526833f12908 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 11 Oct 2022 22:23:04 +0200 Subject: [PATCH 1/3] ibm-sw-tpm2: 1661 -> 1682 --- pkgs/tools/security/ibm-sw-tpm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index c5b738678aa2c..92136ba92d575 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; - version = "1661"; + version = "1682"; src = fetchurl { url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; - sha256 = "sha256-VRRZKK0rJPNL5qDqz5+0kuEODqkZuEKMch+pcOhdYUc="; + hash = "sha256-PLZC+HGheyPVCwRuX5X0ScIodBX8HnrrS9u4kg28s48="; }; patches = [ From c4849d44d40910624f28303b3bb5aa5240500595 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 11 Oct 2022 22:22:18 +0200 Subject: [PATCH 2/3] Revert "ibm-sw-tpm2: Fix build on RISC-V" This reverts commit 8524b11d557f17e66cd629b1f77527facd7abdf4. --- pkgs/tools/security/ibm-sw-tpm2/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index 92136ba92d575..012d492aacad6 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, openssl }: +{ stdenv, fetchurl, lib, openssl }: stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; @@ -9,15 +9,6 @@ stdenv.mkDerivation rec { hash = "sha256-PLZC+HGheyPVCwRuX5X0ScIodBX8HnrrS9u4kg28s48="; }; - patches = [ - (fetchpatch { - url = "https://github.com/kgoldman/ibmswtpm2/commit/e6684009aff9c1bad38875e3319c2e02ef791424.patch"; - sha256 = "1flzlri807c88agmpb0w8xvh5f16mmqv86xw4ic4z272iynzd40j"; - }) - ]; - - patchFlags = [ "-p2" ]; - buildInputs = [ openssl ]; sourceRoot = "src"; From 3b9c30a8d624b1ecc6d16115a2b8110f96f17e7e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 11 Oct 2022 22:22:42 +0200 Subject: [PATCH 3/3] Revert "ibm-sw-tpm2: Pin OpenSSL 1.1.1" This reverts commit af91144ef52a2ccb929b7af29cd16a4cf689c5ea. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10cd802c22947..9d991b7578a25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7761,9 +7761,7 @@ with pkgs; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; - ibm-sw-tpm2 = callPackage ../tools/security/ibm-sw-tpm2 { - openssl = openssl_1_1; - }; + ibm-sw-tpm2 = callPackage ../tools/security/ibm-sw-tpm2 { }; ibniz = callPackage ../tools/graphics/ibniz { };