From 7475c76ebcbba30fad9c4450529d94eb5d33b8ec Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 15 Jul 2024 16:59:46 -0400
Subject: [PATCH] ima-evm-utils: 1.5 -> 1.6

---
 .../linux/ima-evm-utils/default.nix           | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix
index 5960e49e7825..e17a6db1936b 100644
--- a/pkgs/os-specific/linux/ima-evm-utils/default.nix
+++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix
@@ -1,23 +1,26 @@
-{ lib
-, stdenv
-, fetchgit
-, autoreconfHook
-, pkg-config
-, openssl
-, keyutils
-, asciidoc
-, libxslt
-, docbook_xsl
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  openssl,
+  tpm2-tss,
+  keyutils,
+  asciidoc,
+  libxslt,
+  docbook_xsl,
 }:
 
 stdenv.mkDerivation rec {
   pname = "ima-evm-utils";
-  version = "1.5";
+  version = "1.6";
 
-  src = fetchgit {
-    url = "git://git.code.sf.net/p/linux-ima/ima-evm-utils";
-    rev = "v${version}";
-    sha256 = "sha256-WPBG7v29JHZ+ZGeLgA2gtLzZmaG0Xdvpq+BZ6NriY+A=";
+  src = fetchFromGitHub {
+    owner = "linux-integrity";
+    repo = "ima-evm-utils";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-rS2KChYKHnaR17VKYXyb28AsWnLZ8CRoHhLOUejO8Z8=";
   };
 
   strictDeps = true;
@@ -30,8 +33,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    openssl
     keyutils
+    openssl
+    tpm2-tss
   ];
 
   env.MANPAGE_DOCBOOK_XSL = "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl";
@@ -39,8 +43,11 @@ stdenv.mkDerivation rec {
   meta = {
     description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)";
     mainProgram = "evmctl";
-    homepage = "https://sourceforge.net/projects/linux-ima/";
-    license = lib.licenses.gpl2Only;
+    homepage = "https://github.com/linux-integrity/ima-evm-utils";
+    license = with lib.licenses; [
+      lgpl2Plus # libimaevm
+      gpl2Plus # evmctl
+    ];
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ nickcao ];
   };