diff options
| author | Gary Guo <gary@garyguo.net> | 2023-11-10 01:30:46 +0000 |
|---|---|---|
| committer | Gary Guo <gary@garyguo.net> | 2023-11-10 02:06:10 +0000 |
| commit | 6037b4dfcf67d28147edf5f7554131ef24313f2c (patch) | |
| tree | 5632a19b7a3d7c4eac03f64ac08939e6bbe50494 /pkgs/misc | |
| parent | 85f1ba3e51676fa8cc604a3d863d729026a6b8eb (diff) | |
| download | nixpkgs-6037b4dfcf67d28147edf5f7554131ef24313f2c.tar nixpkgs-6037b4dfcf67d28147edf5f7554131ef24313f2c.tar.gz nixpkgs-6037b4dfcf67d28147edf5f7554131ef24313f2c.tar.bz2 nixpkgs-6037b4dfcf67d28147edf5f7554131ef24313f2c.tar.lz nixpkgs-6037b4dfcf67d28147edf5f7554131ef24313f2c.tar.xz nixpkgs-6037b4dfcf67d28147edf5f7554131ef24313f2c.tar.zst nixpkgs-6037b4dfcf67d28147edf5f7554131ef24313f2c.zip | |
tpm2-pkcs11: 1.8.0 -> 1.9.0
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch | 13 | ||||
| -rw-r--r-- | pkgs/misc/tpm2-pkcs11/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/misc/tpm2-pkcs11/version.patch | 10 |
3 files changed, 14 insertions, 20 deletions
diff --git a/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch b/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch deleted file mode 100644 index fa2575cb938..00000000000 --- a/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -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]) diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index dd0cf011b15..faf2bdd5570 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -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 ''; diff --git a/pkgs/misc/tpm2-pkcs11/version.patch b/pkgs/misc/tpm2-pkcs11/version.patch new file mode 100644 index 00000000000..297a7bd5373 --- /dev/null +++ b/pkgs/misc/tpm2-pkcs11/version.patch @@ -0,0 +1,10 @@ +--- 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 |