GNU bug report logs - #73461
[PATCH v3] gnu: knot: Update to 3.4.1.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: bug#73461: closed (Re: bug#73461: [PATCH v3] gnu: knot: Update to
 3.4.1.)
Date: Fri, 25 Oct 2024 10:33:03 +0000

[Message part 1 (text/plain, inline)]

Your bug report

#73461: [PATCH v3] gnu: knot: Update to 3.4.1.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 73461 <at> debbugs.gnu.org.

-- 
73461: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73461
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Ludovic Courtès <ludo <at> gnu.org>
To: Ashish SHUKLA <ashish.is <at> lostca.se>
Cc: 73461-done <at> debbugs.gnu.org
Subject: Re: bug#73461: [PATCH v3] gnu: knot: Update to 3.4.1.
Date: Fri, 25 Oct 2024 12:31:51 +0200

Ashish SHUKLA <ashish.is <at> lostca.se> skribis:

> * gnu/packages/dns.scm (knot): Update to 3.4.1.
> [source](patches) Add a patch.
> * gnu/packages/patches/knot-remove-runtime-deps.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it here.
>
> Change-Id: I2fcb61a161631954137eaf058bc7c6095fceef47

Applied, thanks!

[Message part 3 (message/rfc822, inline)]

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: guix-patches <at> gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH] gnu: knot: Update to 3.4.0
Date: Tue, 24 Sep 2024 21:33:22 +0000

* gnu/packages/dns.scm (knot): Update to 3.4.0.
[source](patches) Add a patch.
* gnu/packages/patches/knot-remove-runtime-deps.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.

Change-Id: Ib1cea508a982a6172f9edb25bc96add6cee5eae4
---
Hi,

This patch updates Knot to 3.4.0, and also includes a patch imported from nixpkgs[0] which removes references, which would otherwise result in "cycle detected in the references" error.

References:
[0] https://github.com/NixOS/nixpkgs/pull/338995

Thanks!

 gnu/local.mk                                    |  1 +
 gnu/packages/dns.scm                            |  7 +++++--
 .../patches/knot-remove-runtime-deps.patch      | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/knot-remove-runtime-deps.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 795ff822a4..8e85eb2024 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1610,6 +1610,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/lightdm-vnc-color-depth.patch		\
   %D%/packages/patches/lightdm-vncserver-check.patch		\
   %D%/packages/patches/localed-xorg-keyboard.patch		\
+  %D%/packages/patches/knot-remove-runtime-deps.patch		\
   %D%/packages/patches/kcontacts-incorrect-country-name.patch	\
   %D%/packages/patches/kde-cli-tools-delay-mime-db.patch	\
   %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index b2eda558df..8190848704 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2023 Bruno Victal <mirai <at> makinata.eu>
 ;;; Copyright © 2023 Hilton Chain <hako <at> ultrarare.space>
 ;;; Copyright © 2024 John Kehayias <john.kehayias <at> protonmail.com>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is <at> lostca.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -844,7 +845,7 @@ (define-public yadifa
 (define-public knot
   (package
     (name "knot")
-    (version "3.3.8")
+    (version "3.4.0")
     (source
      (origin
        (method git-fetch)
@@ -853,7 +854,9 @@ (define-public knot
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0iaardlmvcp6f0vccs81f202bb53y7fkcw5n12ahgqymqzhafpmq"))
+        (base32 "1xngrfyiv5yg8ra8aw7cbdm2mqxkry9y049byh5ka6fj4nd3wnf4"))
+       (patches
+        (search-patches "knot-remove-runtime-deps.patch"))
        (modules '((guix build utils)))
        (snippet
         '(begin
diff --git a/gnu/packages/patches/knot-remove-runtime-deps.patch b/gnu/packages/patches/knot-remove-runtime-deps.patch
new file mode 100644
index 0000000000..b83b7997ae
--- /dev/null
+++ b/gnu/packages/patches/knot-remove-runtime-deps.patch
@@ -0,0 +1,17 @@
+Following patch is imported from nixpkgs:
+
+source: https://github.com/NixOS/nixpkgs/pull/338995
+
+Remove unnecessary runtime dependencies.
+
+`knotc status configure` shows summary from the configure script,
+but that contains also references like include paths.
+Filter these at least in a crude way (whole lines).
+--- a/configure.ac
++++ b/configure.ac
+@@ -788,5 +788,5 @@ result_msg_base="
+-result_msg_esc=$(echo -n "    Configure:$filtered_config_params\n$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n')
++result_msg_esc=$(echo -n "    Configure:$filtered_config_params\n$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n')
+ 
+ AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary])
+ 

base-commit: 3ac69c1a757430d6dfdd37eb948ba1d6967967cc
-- 
2.46.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.