diff options
| -rw-r--r-- | pkgs/tools/security/libtpms/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index 71966a934d624..67228be6741bc 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -3,18 +3,17 @@ , fetchFromGitHub , pkg-config, autoreconfHook , openssl, perl -, tpm2Support ? false }: stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-nZSBD3WshlZHVMBFmDBBdFkhBjNgtASfg6+lYOOAhZ8="; + sha256 = "sha256-/zvMXdAOb4J3YaqdVJvTUI1/JFC0OKwgiYwYgYB62Y4="; }; nativeBuildInputs = [ @@ -24,14 +23,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl ]; - outputs = [ "out" "lib" "man" "dev" ]; + outputs = [ "out" "man" "dev" ]; enableParallelBuilding = true; configureFlags = [ "--with-openssl" - ] ++ lib.optionals tpm2Support [ - "--with-tpm2" # TPM2 support is flagged experimental by upstream + "--with-tpm2" ]; meta = with lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7963127787c2a..84adc261adc70 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -681,6 +681,7 @@ mapAliases ({ surf-webkit2 = surf; # added 2017-04-02 sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 + swtpm-tpm2 = swtpm; # added 2021-02-26 system_config_printer = system-config-printer; # added 2016-01-03 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1177645cea76f..35b6e6bfa22df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8254,11 +8254,6 @@ in swec = callPackage ../tools/networking/swec { }; swtpm = callPackage ../tools/security/swtpm { }; - swtpm-tpm2 = swtpm.override { - libtpms = libtpms.override { - tpm2Support = true; - }; - }; svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { git = gitSVN; |