From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gGIKJ0rV82Y9wAAAe85BDQ:P1 (envelope-from ) for ; Wed, 25 Sep 2024 09:18:02 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gGIKJ0rV82Y9wAAAe85BDQ (envelope-from ) for ; Wed, 25 Sep 2024 11:18:02 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RyrVBYE7; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=kqYF5lD4; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727255882; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9LW3LVZMRkbuh/9ew2sbZCJhNmsfJSoCiBmzuKTXXwU=; b=OnDgQMBoj0UB9fTiV8K+YcipBJRDD8bPGEnhnHpnCsj42c90bFNdHtSFJjTpJGHtzz2zY5 opKhYdvnpr6T5z8bXDTWyN8QiVaQiwbDScFSoWcGFj7SO2HCJeWeWFEs+Q7JNpw6BouuW6 uSY/yKVt0AObkwCNEGJlSP3WaR6sMNZvFvpuT1HSt7E4Ru3jjdZ1ftOd5GffsX2WpAzhyE Oan/ZdD4fMpM+gq6ZdIAx+2HIGUALJIY07g1iGEj6kWDrEskDaOBASFShJIiLUs2W2RZnr poFcuwjHnI3ZcqrMQRK7JlKbA6ovZWFBLX7x8cnl/o/Cd3ieutJGT9kAjDhyKA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727255882; a=rsa-sha256; cv=none; b=p/8ZtiFI8qyXbnvesDz0QVtaXzhGD05/6Iac9SpbaDMPc/cZYKOU3BwSI9uIYRnYW/igO0 A3p8icFusjeQFo4Mr57GTf5TwpCZ3KHPdCdYHirX8WYVkUiz1UR4un/kVF16+uWVmhoS2i YUkwtP14vgTsY/46v6REwLCJskh/CCtFLhwD8GxU3xkLqC+L3tXt1dy8GVaI06UuBeZ5xP YF3+dHH4oo9TsM8S7b1aJiK0DZEXyjGuDmQZ5AWnPMzb0RGaQOvVU6yzqqKJLeI1ja9DAt YpCrGYMz0qIj8sbj3xnAtHz32UHLwj0tAFCSa1OBi9bYYjW+RaDSEIiWn4nWrA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RyrVBYE7; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=kqYF5lD4; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2E0EB1E1ED for ; Wed, 25 Sep 2024 11:18:01 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stO9T-0003hQ-0F; Wed, 25 Sep 2024 05:17:39 -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 1stO9R-0003hD-8V for guix-patches@gnu.org; Wed, 25 Sep 2024 05:17: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 1stO9Q-00069N-UZ for guix-patches@gnu.org; Wed, 25 Sep 2024 05:17: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:Date:From:To:In-Reply-To:References:Subject; bh=9LW3LVZMRkbuh/9ew2sbZCJhNmsfJSoCiBmzuKTXXwU=; b=RyrVBYE7u4ZFiImol8LEqN37eI1fApiwZ05HsnjEjHVIuKuDUAc1SFTW63YPLwdyJnRZEuiV+q9fuWscmSKRjZr484T5ZjwpH0fMozxYwyTYeOKcYT1jJq1nT2JyGFTg/d6EnnLj23NE/PDOxJwKKmseyXkGbNeKjMrlvTZi3xYAXnp26xb1+e1wUtts+rU7CkjCZ8OxmvmgSHEQHcUuE7/5ERbrxT2amTMZ5jbxSq1wUValwQ4SOddggIPS+m5um7r13v6MB5VDNxd1QbvQ2Sbd0IIvC2HgSJ/DNfKvsio11kO/4LVN/CrsZIYcSGn+QDRtTRJAAgDKpqlzcS+NYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stO9q-0000vh-DF for guix-patches@gnu.org; Wed, 25 Sep 2024 05:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73461] [PATCH v2] gnu: knot: Update to 3.4.0 References: <9a4ae20930ffdc6081909c61f63bd8336abf7092.1727213601.git.ashish.is@lostca.se> In-Reply-To: <9a4ae20930ffdc6081909c61f63bd8336abf7092.1727213601.git.ashish.is@lostca.se> Resent-From: ashish.is@lostca.se Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Sep 2024 09:18:02 +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.17272558693521 (code B ref 73461); Wed, 25 Sep 2024 09:18:02 +0000 Received: (at 73461) by debbugs.gnu.org; 25 Sep 2024 09:17:49 +0000 Received: from localhost ([127.0.0.1]:49665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stO9c-0000uj-OC for submit@debbugs.gnu.org; Wed, 25 Sep 2024 05:17:49 -0400 Received: from anamika.lostca.se ([65.21.75.227]:58738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stO9Z-0000uD-2g for 73461@debbugs.gnu.org; Wed, 25 Sep 2024 05:17:46 -0400 Received: from chateau-guix.home.inet6.fi (5.red-81-35-35.dynamicip.rima-tde.net [81.35.35.5]) (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 1402C2D87A; Wed, 25 Sep 2024 09:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1727255405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LW3LVZMRkbuh/9ew2sbZCJhNmsfJSoCiBmzuKTXXwU=; b=kqYF5lD4HX/hg2Vq7RoHgVjFni525zx4ds3QEQQvtNBainoeIhNKbcibKLVjlc9IuWIPlV LatESU+IqzdZysdMsH/89mD36wH0ae5UtRlf0PiA8XM5rMzyu1T+4mDohmb2fjvvCG0ebr vPAtYz8txjTXQ709oB7HOU/gZLU/bMY= Date: Wed, 25 Sep 2024 11:08:57 +0200 Message-ID: X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.is@lostca.se X-ACL-Warn: , "ashish.is--- via Guix-patches" From: "ashish.is--- via Guix-patches" via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -7.02 X-Migadu-Queue-Id: 2E0EB1E1ED X-Spam-Score: -7.02 X-TUID: oewcNRiLwzG/ From: 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 --- 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 ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2024 John Kehayias +;;; Copyright © 2024 Ashish SHUKLA ;;; ;;; 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