From 8a998edc8254967a58c1c9015717198e5ea1cd4c Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:20:42 +0200 Subject: [PATCH] igvm-tooling: 1.5.0 -> 1.5.0-unstable-2024-06-06 This update allows us to drop some of the patches, which have been upstreamed since. The remaining patch is still in the air upstream. Once it's included, I'll ask them to cut a release, but for now, let's drop the patches we can already. Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> --- igvm.log | 0 pkgs/by-name/ig/igvm-tooling/package.nix | 22 +++------------------- 2 files changed, 3 insertions(+), 19 deletions(-) create mode 100644 igvm.log diff --git a/igvm.log b/igvm.log new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/pkgs/by-name/ig/igvm-tooling/package.nix b/pkgs/by-name/ig/igvm-tooling/package.nix index de9bdd996bf1f..a1e9a498ba352 100644 --- a/pkgs/by-name/ig/igvm-tooling/package.nix +++ b/pkgs/by-name/ig/igvm-tooling/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "igvm-tooling"; - version = "1.5.0"; + version = "1.5.0-unstable-2024-06-06"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "igvm-tooling"; - rev = "igvm-${version}"; - hash = "sha256-13TtiJv2w9WXSW6oPMfo+rRah+Q1wHV14aBaFGfz9CE="; + rev = "53656ddde294bbafcae6349b5acfc5da9f7dbb92"; + hash = "sha256-X9Gi+kTmc/ZcsgbHldEj9zPnOmd5puDD7/+J1s1CVws="; }; patches = [ @@ -27,22 +27,6 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-tcVxcuLxknyEdo2YjeHOqSG9xQna8US+YyvlcfX+Htw="; stripLen = 1; }) - # write updated acpi files to tempdir (instead of nix store path) at runtime - # remove once https://github.com/microsoft/igvm-tooling/pull/54 is merged - (fetchpatch { - name = "0002-acpi-update-dsl-files-in-tempdir.patch"; - url = "https://github.com/microsoft/igvm-tooling/commit/20f8d123ec6531d8540074b7df2ee12de60e73b8.patch"; - sha256 = "sha256-hNfkclxaYViy66TPHqLV3mqD7wqBuBN9MnMLaDOeRNM="; - stripLen = 1; - }) - # allow for determinist id block signing - # remove once https://github.com/microsoft/igvm-tooling/pull/55 is merged - (fetchpatch { - name = "0003-add-deterministic-id-block-signature-mode.patch"; - url = "https://github.com/microsoft/igvm-tooling/commit/03ad7825ade76ac25e308bb85f92e89b732e0bf1.patch"; - sha256 = "sha256-Y7DFr0KgGtY8KOt6fLWd32sTaig/zHFe7n83+Yb9ls8="; - stripLen = 1; - }) ]; postPatch = ''