[bug#63635] [PATCH 0/2] gnu: sbsigntools: Update to 0.9.5,

[bug#63635] [PATCH 0/2] gnu: sbsigntools: Update to 0.9.5,

[Felix Lechner via Guix-patches via]

This patch series brings sbsigntools up the the latest coding standards.

Felix Lechner (2):
  gnu: sbsigntools: Convert to gexp, new-style inputs.
  gnu: sbsigntools: Update to 0.9.5.

 gnu/packages/efi.scm | 58 +++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 30 deletions(-)


base-commit: c5bc698e8922d78ed85989985cc2ceb034de2f23
-- 
2.40.1

[bug#63635] [PATCH 1/2] gnu: sbsigntools: Convert to gexp, new-style inputs.

[Felix Lechner via Guix-patches via]

* gnu/packages/efi.scm (sbsigntools): Convert to gexp, new-style inputs.
---
 gnu/packages/efi.scm | 54 +++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm
index 75eb24bf86..b3da555549 100644
--- a/gnu/packages/efi.scm
+++ b/gnu/packages/efi.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages efi)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -113,31 +114,28 @@ (define-public sbsigntools
         (base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-more-shebangs
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "lib/ccan.git/tools/create-ccan-tree"
-              (("#!/bin/bash")
-               (string-append "#!"
-                              (assoc-ref inputs "bash")
-                              "/bin/bash")))
-             #t))
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (substitute* '("configure.ac"
-                            "tests/Makefile.am")
-              (("/usr/include/efi")
-               (string-append (assoc-ref inputs "gnu-efi")
-                              "/include/efi"))
-              (("/usr/lib/gnuefi")
-               (string-append (assoc-ref inputs "gnu-efi")
-                              "/lib")))
-             #t))
-         (add-after 'unpack 'setenv
-           (lambda _
-             (setenv "CC" "gcc")
-             #t)))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-more-shebangs
+            (lambda _
+              (substitute* "lib/ccan.git/tools/create-ccan-tree"
+                (("#!/bin/bash")
+                 (string-append "#!" #$bash "/bin/bash")))
+              #t))
+          (add-after 'unpack 'patch
+            (lambda _
+              (substitute* '("configure.ac"
+                             "tests/Makefile.am")
+                (("/usr/include/efi")
+                 (string-append #$gnu-efi "/include/efi"))
+                (("/usr/lib/gnuefi")
+                 (string-append #$gnu-efi "/lib")))
+              #t))
+          (add-after 'unpack 'setenv
+            (lambda _
+              (setenv "CC" "gcc")
+              #t)))))
     (native-inputs
      (list autoconf
            automake
@@ -146,9 +144,9 @@ (define-public sbsigntools
            pkg-config
            util-linux)) ; getopt
     (inputs
-     `(("gnu-efi" ,gnu-efi)
-       ("libuuid" ,util-linux "lib")
-       ("openssl" ,openssl)))
+     (list gnu-efi
+           (list util-linux "lib")
+           openssl))
     (synopsis "EFI signing tools")
     (description "This package provides tools for signing EFI binaries.")
     (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/")
-- 
2.40.1

[bug#63635] [PATCH 2/2] gnu: sbsigntools: Update to 0.9.5.

[Felix Lechner via Guix-patches via]

Will cause the rebuilding of a single package, namely efitools@1.9.2.

The linter complains with this message:

  sbsigntools@0.9.5: label 'util-linux' does not match package name
  'util-linux:lib'

* gnu/packages/efi.scm (sbsigntools): Update to 0.9.5.
---
 gnu/packages/efi.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm
index b3da555549..c897b8c57e 100644
--- a/gnu/packages/efi.scm
+++ b/gnu/packages/efi.scm
@@ -100,7 +100,7 @@ (define-public efi-analyzer
 (define-public sbsigntools
   (package
     (name "sbsigntools")
-    (version "0.9.4")
+    (version "0.9.5")
     (source
      (origin
        (method git-fetch)
@@ -111,7 +111,7 @@ (define-public sbsigntools
          (recursive? #t)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m"))))
+        (base32 "060n6w0dx1mrilhdv482ncckanqz6pdv53piimiki0bm15d2fcp4"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.40.1

[bug#63635] Merged duplicate

[Felix Lechner via Guix-patches via]

Hi,

There is a merged duplicate to this bug that may be hidden in Mumi.
The two bugs are Bug#63793 and Bug#63635. The linkage may be easier to
see in Debbugs.

Kind regards
Felix