unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Ashish SHUKLA via Guix-patches via <guix-patches@gnu.org>
To: 73461@debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is@lostca.se>
Subject: [bug#73461] [PATCH] gnu: knot: Update to 3.4.0
Date: Tue, 24 Sep 2024 21:33:22 +0000	[thread overview]
Message-ID: <9a4ae20930ffdc6081909c61f63bd8336abf7092.1727213601.git.ashish.is@lostca.se> (raw)

* 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@makinata.eu>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@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





             reply	other threads:[~2024-09-24 21:59 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-24 21:33 Ashish SHUKLA via Guix-patches via [this message]
2024-09-25  9:08 ` [bug#73461] [PATCH v2] gnu: knot: Update to 3.4.0 ashish.is--- via Guix-patches via
2024-10-20  9:15   ` [bug#73461] [PATCH v3] gnu: knot: Update to 3.4.1 Ashish SHUKLA via Guix-patches via
2024-10-25 10:31     ` bug#73461: " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9a4ae20930ffdc6081909c61f63bd8336abf7092.1727213601.git.ashish.is@lostca.se \
    --to=guix-patches@gnu.org \
    --cc=73461@debbugs.gnu.org \
    --cc=ashish.is@lostca.se \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).