Skip to content

tpm2-tss: 3.0.3 -> 3.2.0#163863

Closed
delroth wants to merge 1 commit intoNixOS:stagingfrom
delroth:tpm2-tss-3.2.0
Closed

tpm2-tss: 3.0.3 -> 3.2.0#163863
delroth wants to merge 1 commit intoNixOS:stagingfrom
delroth:tpm2-tss-3.2.0

Conversation

@delroth
Copy link
Contributor

@delroth delroth commented Mar 12, 2022

Description of changes

Bump tpm2-tss to its latest upstream release. Tested with nix-build -A . systemd with this change rebased on master.

Removing myself from maintainers, I don't want to deal with derivations that have to have their changes go through staging.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Mar 12, 2022
@ajs124 ajs124 requested a review from a team April 3, 2022 11:55
@ajs124
Copy link
Member

ajs124 commented Apr 6, 2022

@delroth seems like you forgot to update the src 😶

@ajs124
Copy link
Member

ajs124 commented Apr 8, 2022

commit 2991c4b57cb7af31ef5aea46e02b2c75acd65cfe
Author: Pierre Bourdon <[email protected]>
Date:   Sat Mar 12 17:12:33 2022 +0100

    tpm2-tss: 3.0.3 -> 3.2.0

diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index 5ab4ff3b413..caf00dcca77 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -2,6 +2,7 @@
 , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl
 , openssl, json_c, curl, libgcrypt
 , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which
+, shadow
 }:
 let
   # Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss,
@@ -14,17 +15,18 @@ in
 
 stdenv.mkDerivation rec {
   pname = "tpm2-tss";
-  version = "3.0.3";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = pname;
     rev = version;
-    sha256 = "106yhsjwjadxsl9dqxywg287mdwsksman02hdalhav18vcnvnlpj";
+    sha256 = "1jijxnvjcsgz5yw4i9fj7ycdnnz90r3l0zicpwinswrw47ac3yy5";
   };
 
   nativeBuildInputs = [
     autoreconfHook autoconf-archive pkg-config doxygen perl
+    shadow
   ];
 
   # cmocka is checked / used(?) in the configure script
@@ -85,6 +87,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tpm2-software/tpm2-tss";
     license = licenses.bsd2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ delroth ];
+    maintainers = with maintainers; [ ];
   };
 }

something like this would be my suggestion

@delroth
Copy link
Contributor Author

delroth commented Apr 8, 2022

Oops, indeed, thanks for the review. Please feel free to resend this PR (with yourself as author, at that point you did all the work :) ), I won't have the time in the next few days to take care of it.

@delroth delroth closed this Apr 8, 2022
@ajs124 ajs124 mentioned this pull request Apr 8, 2022
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants