* [bug#73461] [PATCH] gnu: knot: Update to 3.4.0
@ 2024-09-24 21:33 Ashish SHUKLA via Guix-patches via
2024-09-25 9:08 ` [bug#73461] [PATCH v2] " ashish.is--- via Guix-patches via
0 siblings, 1 reply; 2+ messages in thread
From: Ashish SHUKLA via Guix-patches via @ 2024-09-24 21:33 UTC (permalink / raw)
To: 73461; +Cc: Ashish SHUKLA
* 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#73461] [PATCH v2] gnu: knot: Update to 3.4.0
2024-09-24 21:33 [bug#73461] [PATCH] gnu: knot: Update to 3.4.0 Ashish SHUKLA via Guix-patches via
@ 2024-09-25 9:08 ` ashish.is--- via Guix-patches via
0 siblings, 0 replies; 2+ messages in thread
From: ashish.is--- via Guix-patches via @ 2024-09-25 9:08 UTC (permalink / raw)
To: 73461; +Cc: Ashish SHUKLA
From: Ashish SHUKLA <ashish.is@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@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.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-25 9:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-24 21:33 [bug#73461] [PATCH] gnu: knot: Update to 3.4.0 Ashish SHUKLA via Guix-patches via
2024-09-25 9:08 ` [bug#73461] [PATCH v2] " ashish.is--- via Guix-patches via
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.