Commit 6037b4df authored by Gary Guo's avatar Gary Guo
Browse files

tpm2-pkcs11: 1.8.0 -> 1.9.0

parent 85f1ba3e

pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/configure.ac b/configure.ac

index e861e42..018c19c 100644

--- a/configure.ac

+++ b/configure.ac

@@ -26,7 +26,7 @@

 #;**********************************************************************;

 

 AC_INIT([tpm2-pkcs11],

-  [m4_esyscmd_s([git describe --tags --always --dirty])],

+  [git-@VERSION@],

   [https://github.com/tpm2-software/tpm2-pkcs11/issues],

   [],

   [https://github.com/tpm2-software/tpm2-pkcs11])

pkgs/misc/tpm2-pkcs11/default.nix

+4 −7
Original line number Diff line number Diff line
@@ -6,25 +6,22 @@ 


stdenv.mkDerivation rec {

  pname = "tpm2-pkcs11";

  version = "1.8.0";

  version = "1.9.0";



  src = fetchFromGitHub {

    owner = "tpm2-software";

    repo = pname;

    rev = version;

    sha256 = "sha256-f5wi0nIM071yaQCwPkY1agKc7OEQa/IxHJc4V2i0Q9I=";

    sha256 = "sha256-SoHtgZRIYNJg4/w1MIocZAM26mkrM+UOQ+RKCh6nwCk=";

  };



  patches = lib.singleton (

    substituteAll {

      src = ./0001-configure-ac-version.patch;

      VERSION = version;

    });

  patches = [ ./version.patch ];



  # The preConfigure phase doesn't seem to be working here

  # ./bootstrap MUST be executed as the first step, before all

  # of the autoreconfHook stuff

  postPatch = ''

    echo ${version} > VERSION

    ./bootstrap

  '';

pkgs/misc/tpm2-pkcs11/version.patch

0 → 100644
+10 −0
Original line number Diff line number Diff line 
--- a/bootstrap

+++ b/bootstrap

@@ -4,7 +4,6 @@

 

 # Generate a VERSION file that is included in the dist tarball to avoid needed git

 # when calling autoreconf in a release tarball.

-git describe --tags --always --dirty > VERSION

 

 # generate list of source files for use in Makefile.am

 # if you add new source files, you must run ./bootstrap again