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

Previous Next

Package: guix-patches;

Reported by: Ashish SHUKLA <ashish.is <at> lostca.se>

Date: Tue, 24 Sep 2024 21:59:01 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73461 in the body.
You can then email your comments to 73461 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#73461; Package guix-patches. (Tue, 24 Sep 2024 21:59:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Ashish SHUKLA <ashish.is <at> lostca.se>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Tue, 24 Sep 2024 21:59:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

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
Information forwarded to guix-patches <at> gnu.org:
bug#73461; Package guix-patches. (Wed, 25 Sep 2024 09:18:02 GMT) Full text and rfc822 format available.

Message #8 received at 73461 <at> debbugs.gnu.org (full text, mbox):

From: ashish.is <at> lostca.se
To: 73461 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v2] gnu: knot: Update to 3.4.0
Date: Wed, 25 Sep 2024 11:08:57 +0200

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

* 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
---
Changes in this revision:

 - sort the dist_patch_DATA list in gnu/local.mk.

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..af210c1a16 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1624,6 +1624,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/kiwix-desktop-newer-libkiwix.patch	\
   %D%/packages/patches/kmod-module-directory.patch		\
   %D%/packages/patches/kmscon-runtime-keymap-switch.patch	\
+  %D%/packages/patches/knot-remove-runtime-deps.patch		\
   %D%/packages/patches/kobodeluxe-paths.patch			\
   %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch	\
   %D%/packages/patches/kobodeluxe-const-charp-conversion.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.1
Information forwarded to guix-patches <at> gnu.org:
bug#73461; Package guix-patches. (Sun, 20 Oct 2024 09:17:01 GMT) Full text and rfc822 format available.

Message #11 received at 73461 <at> debbugs.gnu.org (full text, mbox):

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: 73461 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v3] gnu: knot: Update to 3.4.1.
Date: Sun, 20 Oct 2024 11:15:26 +0200

* 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
---
 gnu/local.mk                                  |  1 +
 gnu/packages/dns.scm                          |  6 ++++--
 .../patches/knot-remove-runtime-deps.patch    | 19 +++++++++++++++++++
 3 files changed, 24 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 89a795bfbd..3cec17b52b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1633,6 +1633,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/kiwix-desktop-newer-libkiwix.patch	\
   %D%/packages/patches/kmod-module-directory.patch		\
   %D%/packages/patches/kmscon-runtime-keymap-switch.patch	\
+  %D%/packages/patches/knot-remove-runtime-deps.patch		\
   %D%/packages/patches/kobodeluxe-paths.patch			\
   %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch	\
   %D%/packages/patches/kobodeluxe-const-charp-conversion.patch	\
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 1e9d1bc904..7f902965d8 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -845,7 +845,7 @@ (define-public yadifa
 (define-public knot
   (package
     (name "knot")
-    (version "3.3.8")
+    (version "3.4.1")
     (source
      (origin
        (method git-fetch)
@@ -854,7 +854,9 @@ (define-public knot
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0iaardlmvcp6f0vccs81f202bb53y7fkcw5n12ahgqymqzhafpmq"))
+        (base32 "0iqzqfjk60lxzbjgkjsf1l8vqnv6rgz1z0p1zyhdqnp037123d4j"))
+       (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..8c5cf21d46
--- /dev/null
+++ b/gnu/packages/patches/knot-remove-runtime-deps.patch
@@ -0,0 +1,19 @@
+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: 551a2b293ee34855f9395b9032e5a8837a64e08e
-- 
2.47.0
Changed bug title to '[PATCH v3] gnu: knot: Update to 3.4.1.' from '[PATCH] gnu: knot: Update to 3.4.0' Request was from "Ashish SHUKLA" <ashish.is <at> lostca.se> to control <at> debbugs.gnu.org. (Sun, 20 Oct 2024 09:18:01 GMT) Full text and rfc822 format available.
Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Fri, 25 Oct 2024 10:33:03 GMT) Full text and rfc822 format available.
Notification sent to Ashish SHUKLA <ashish.is <at> lostca.se>:
bug acknowledged by developer. (Fri, 25 Oct 2024 10:33:03 GMT) Full text and rfc822 format available.

Message #18 received at 73461-done <at> debbugs.gnu.org (full text, mbox):

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!
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 22 Nov 2024 12:24:12 GMT) Full text and rfc822 format available.
This bug report was last modified 266 days ago.

Previous Next

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