alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

libtpms: 0.7.4 -> 0.8.0 (#114491)

Browse source 
* 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: Arthur 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: Arthur Gautier <baloo@superbaloo.net>

Co-authored-by: R. RyanTM <ryantm-bot@ryantm.com>
This commit is contained in:
Arthur Gautier 2021-03-03 18:59:28 +00:00 committed by GitHub
parent 3371fe2c9b
commit 1cd06e59e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/security/libtpms/default.nix
View file

@ -3,18 +3,17 @@
, fetchFromGitHub , fetchFromGitHub
, pkg-config, autoreconfHook , pkg-config, autoreconfHook
, openssl, perl , openssl, perl
, tpm2Support ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libtpms"; pname = "libtpms";
version = "0.7.4"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stefanberger"; owner = "stefanberger";
repo = "libtpms"; repo = "libtpms";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-nZSBD3WshlZHVMBFmDBBdFkhBjNgtASfg6+lYOOAhZ8="; sha256 = "sha256-/zvMXdAOb4J3YaqdVJvTUI1/JFC0OKwgiYwYgYB62Y4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -24,14 +23,13 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ openssl ]; buildInputs = [ openssl ];
outputs = [ "out" "lib" "man" "dev" ]; outputs = [ "out" "man" "dev" ];
enableParallelBuilding = true; enableParallelBuilding = true;
configureFlags = [ configureFlags = [
"--with-openssl" "--with-openssl"
] ++ lib.optionals tpm2Support [ "--with-tpm2"
"--with-tpm2" # TPM2 support is flagged experimental by upstream
]; ];
meta = with lib; { meta = with lib; {

1
pkgs/top-level/aliases.nix
View file

@ -681,6 +681,7 @@ mapAliases ({
surf-webkit2 = surf; # added 2017-04-02 surf-webkit2 = surf; # added 2017-04-02
sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; 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 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 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-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 systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12

5
pkgs/top-level/all-packages.nix
View file

@ -8254,11 +8254,6 @@ in
swec = callPackage ../tools/networking/swec { }; swec = callPackage ../tools/networking/swec { };
swtpm = callPackage ../tools/security/swtpm { }; swtpm = callPackage ../tools/security/swtpm { };
swtpm-tpm2 = swtpm.override {
libtpms = libtpms.override {
tpm2Support = true;
};
};
svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { svn2git = callPackage ../applications/version-management/git-and-tools/svn2git {
git = gitSVN; git = gitSVN;