Merge pull request #195584 from helsinki-systems/upd/ibm-sw-tpm2

ibm-sw-tpm2: 1661 -> 1682
This commit is contained in:
ajs124
2022-10-12 11:36:46 +02:00
committed by GitHub
2 changed files with 4 additions and 15 deletions
+3 -12
View File
@@ -1,23 +1,14 @@
{ stdenv, fetchurl, fetchpatch, lib, openssl }:
{ stdenv, fetchurl, lib, openssl }:
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 = [
(fetchpatch {
url = "https://github.com/kgoldman/ibmswtpm2/commit/e6684009aff9c1bad38875e3319c2e02ef791424.patch";
sha256 = "1flzlri807c88agmpb0w8xvh5f16mmqv86xw4ic4z272iynzd40j";
})
];
patchFlags = [ "-p2" ];
buildInputs = [ openssl ];
sourceRoot = "src";
+1 -3
View File
@@ -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 { };