From patchwork Sun Oct 20 09:15:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 69141 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A381B27BBEA; Sun, 20 Oct 2024 10:16:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AB52127BBE2 for ; Sun, 20 Oct 2024 10:16:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2S3M-000810-Rh; Sun, 20 Oct 2024 05:16:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t2S3B-00080M-6J for guix-patches@gnu.org; Sun, 20 Oct 2024 05:16:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t2S3A-0003jE-T9 for guix-patches@gnu.org; Sun, 20 Oct 2024 05:16:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=4h7w5lTXEMSnQDeemmkuajmglrlGCtKC+rk7FFO//qQ=; b=a0Pa3ZU4hbAHhMP/hF//5dWZkHudjYqDyxW19pN5o1yvhiFTupZ8SsdQBuHUZaLvsQeucj7xCyzaDBm7hKculRDfmT4eBUPJAr6hDGfb23FOdTGB+AMXWuhuZPLWedCqSI2lyhmNCLzi7aH+QJxDOdtqOU28GtlbvKRAQDhGEBGXWfh63JKTzugN/ji216kC1RNrt51G7Y+dgBMwGTbymnJqWAui57Uu9Cs0pnvqZJjzf6U+1TBo4gQW8dpj2tG2tNwBrAZiWMgdteLFNyAkCqPuN6mrzH92tMLRd5myxHeW1ANiSNVPjjvOorIksXD8Ajfdav5k/SyMFaOtGaAeWg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t2S3Z-0004Mq-O3 for guix-patches@gnu.org; Sun, 20 Oct 2024 05:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73461] [PATCH v3] gnu: knot: Update to 3.4.1. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Oct 2024 09:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73461@debbugs.gnu.org Cc: Ashish SHUKLA Received: via spool by 73461-submit@debbugs.gnu.org id=B73461.172941580816760 (code B ref 73461); Sun, 20 Oct 2024 09:17:01 +0000 Received: (at 73461) by debbugs.gnu.org; 20 Oct 2024 09:16:48 +0000 Received: from localhost ([127.0.0.1]:45814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t2S3L-0004MF-R5 for submit@debbugs.gnu.org; Sun, 20 Oct 2024 05:16:48 -0400 Received: from anamika.lostca.se ([65.21.75.227]:36642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t2S3I-0004Lx-UI for 73461@debbugs.gnu.org; Sun, 20 Oct 2024 05:16:46 -0400 Received: from localhost.localdomain (unknown [IPv6:2a02:9140:3880:9e00:18a0:9f1a:a8e0:d72c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id C251E33BFE; Sun, 20 Oct 2024 09:16:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1729415771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4h7w5lTXEMSnQDeemmkuajmglrlGCtKC+rk7FFO//qQ=; b=D4Ksjg1xTabFtm9YnY6LDKQYWwSMShCJ2l5iDYFu8a0ozJhi9gjXFhGE3me4cgqKFgGXcR vgRe+ajIwhlJhBOAy5PGPDtk8Z7tQuyKmfeNojKYBzyx1t6+K9VVSN8OGkm9dr9k7y9qxP SIJzue/fyKDtiVaIBspkx5CfPzc7xXM= Date: Sun, 20 Oct 2024 11:15:26 +0200 Message-ID: <7785e56d220a5ae16e6b20496484846ffdb54367.1729415726.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.47.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: 551a2b293ee34855f9395b9032e5a8837a64e08e 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]) + + +