Unverified Commit 1cd06e59 authored by Arthur Gautier's avatar Arthur Gautier Committed by GitHub
Browse files

libtpms: 0.7.4 -> 0.8.0 (#114491) 



* libtpms: 0.7.4 -> 0.8.0

* libtpms: tpm2 support is out of experimental

Since db80bd9ea16894a1902c3ab787aea9d58e7d1e85 commit, tpm2 support is
not experimental anymore

Signed-off-by: default avatarArthur Gautier <baloo@superbaloo.net>

* libtpms: remove extraneous output

Nothing was put in the $out output, remove the $lib and put everything
that was in it in the $out.

Signed-off-by: default avatarArthur Gautier <baloo@superbaloo.net>

Co-authored-by: default avatarR. RyanTM <ryantm-bot@ryantm.com>
parent 3371fe2c

pkgs/tools/security/libtpms/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -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; {

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −5
Original line number Diff line number Diff line
@@ -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;