Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bc34c15a56d6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a2028529f302
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 15, 2019

  1. tpm2-tools: 3.1.3 -> 3.1.4

    @delroth
    delroth committed Mar 15, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    delroth Pierre Bourdon
    GPG key ID: 6FB80DCD84DA0F1C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    abe667c View commit details

  2. Merge pull request #57676 from delroth/tpm2-tools-3.1.4 

    tpm2-tools: 3.1.3 -> 3.1.4
    @ryantm
    ryantm authored Mar 15, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a202852 View commit details
Showing with 2 additions and 10 deletions.
  1. +2 −10 pkgs/tools/security/tpm2-tools/default.nix
12 changes: 2 additions & 10 deletions pkgs/tools/security/tpm2-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,21 +3,13 @@

stdenv.mkDerivation rec {
pname = "tpm2-tools";
version = "3.1.3";
version = "3.1.4";

src = fetchurl {
url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "05is1adwcg7y2p121yldd8m1gigdnzf9izbjazvsr6yg95pmg5fc";
sha256 = "0cv09wnf7sw17z1n898w0zmk58y8b1why58m63hqx5d7x4054l9g";
};

patches = [
(fetchpatch {
name = "tests-tss-2.2.0-compat.patch";
url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tools/pull/1322.patch";
sha256 = "0yy5qbgbd13d7cl8pzsji95a6qnwiik5s2cyqj35jd8blymikqxh";
})
];

nativeBuildInputs = [ pandoc pkgconfig ];
buildInputs = [
curl openssl tpm2-tss