From patchwork Thu Apr 25 15:54:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 63363 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 46F4227BBE2; Thu, 25 Apr 2024 16:58:58 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 8866D27BBEA for ; Thu, 25 Apr 2024 16:58:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s01UE-0000rz-BT; Thu, 25 Apr 2024 11:58:14 -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 1s01UC-0000qw-1A for guix-patches@gnu.org; Thu, 25 Apr 2024 11:58:12 -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 1s01UB-00035O-OP for guix-patches@gnu.org; Thu, 25 Apr 2024 11:58:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s01UT-00077k-BD for guix-patches@gnu.org; Thu, 25 Apr 2024 11:58:29 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70569] [PATCH 1/3] gnu: nss-3.98: Streamline source origin via inheritance. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Apr 2024 15:58:28 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70569 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70569@debbugs.gnu.org Cc: john.kehayias@protonmail.com, Maxim Cournoyer Received: via spool by 70569-submit@debbugs.gnu.org id=B70569.171406063726622 (code B ref 70569); Thu, 25 Apr 2024 15:58:28 +0000 Received: (at 70569) by debbugs.gnu.org; 25 Apr 2024 15:57:17 +0000 Received: from localhost ([127.0.0.1]:33123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s01TF-0006uX-2U for submit@debbugs.gnu.org; Thu, 25 Apr 2024 11:57:16 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:49590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s01SD-0006i8-Vr for 70569@debbugs.gnu.org; Thu, 25 Apr 2024 11:56:16 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-78d62c1e82bso85764985a.3 for <70569@debbugs.gnu.org>; Thu, 25 Apr 2024 08:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714060546; x=1714665346; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7ta2m/htvrUXYalG3Oepb/ow1SMJl1vkqu0wbtI7SNA=; b=aMbcBUG7jNm3GnNqPMKm9BWOxo/SJ5CxV0nahB6iZ1PZx6PGmAFEXsdKX8+kYSSfet VYbhr9tfKBBr0FG8ksSnl0HutGeAy6k6kRm7aAXLqNbJNYDbGGsjNhsdywJL2ro7LRC8 +QKTq6FpUGKB22y2XeAHVEdBHDC+JVR29/Jd9VIVmAm4IRgRgVtKPYoC2T2s4ZQa8j/U ohzNDh9SoElXSqXC50MDLZ8p4mHld+wONQRB479S9mSBqPXQzxZ8Vqr8ifbFqlIcvfjm 6TgS7dJIi1emnPC7Kzd9rhaclX0lJ9BiaZAVnieQO23dETwp8btFP9c3fd2Xv4KoUwP1 HcKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714060546; x=1714665346; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7ta2m/htvrUXYalG3Oepb/ow1SMJl1vkqu0wbtI7SNA=; b=MhLmB7j5ZRhIcYLf9dbQ41dIEMzc14dvNLm9n7JoPtuArauUiKWEyXn3Rc+wh+sxAN bFxJVJKbZO+Wb1Iz9pWTjcvDWSQRD+x1nIYFL9yDJ8dH81HGKBVatopwloQMcLULWt7V g9Y0ed8CPGDoWB+UuweE67hRKu0XKHw72Aowk04CDx/V1Nh6KkMi7UDu1AmKPOg5oNrB pO03kmXiF+d2phxZD+jxbDLmIjz1DIUnmEL3iQ5tdjM+4tUl7lQz80su8kbumGG8U/Aa 7aEzIF41l1SSPA4/xQVJO8H4iFyW/EiNQ1FZamST+wYMzeFW/YrlcW2t1A8GcVWmPwKO rHQw== X-Gm-Message-State: AOJu0Yx3A9Kfeo4Y8xIxtezv4pVcGWpokyk2Y2PGhMbshZad0PpwR7nE GBSupwrt5vn4Qs5bMSvJbKFY12/JuDzAth8SxNRPA5iYHb3/TAmOufh16w== X-Google-Smtp-Source: AGHT+IEwpRVO0y30wd1JCiSMnZgy+j0BjS+Cn0DnSxk03/aGnyMJWOYuD57fRlDK3DslJJirgRZE+Q== X-Received: by 2002:a05:620a:8391:b0:790:9711:f06b with SMTP id pb17-20020a05620a839100b007909711f06bmr4367006qkn.34.1714060546339; Thu, 25 Apr 2024 08:55:46 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-191.b2b2c.ca. [205.233.124.191]) by smtp.gmail.com with ESMTPSA id xx24-20020a05620a5d9800b0078f1583f724sm6464519qkn.59.2024.04.25.08.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 08:55:45 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 25 Apr 2024 11:54:28 -0400 Message-ID: <3418fbe66a1573937f44c1902bba6e9950426886.1714060468.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.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: , 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/nss.scm (nss-3.98): Simplify source via inheritance. Change-Id: I6c1df497a7ff538162afa128eca676997d76e28f --- gnu/packages/nss.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 00770f11a9..a2843be17a 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Jonathan Brielmaier -;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. @@ -253,7 +253,7 @@ (define-public nss-3.98 (inherit nss) (version "3.98") (source (origin - (method url-fetch) + (inherit (package-source nss)) (uri (let ((version-with-underscores (string-join (string-split version #\.) "_"))) (string-append @@ -262,17 +262,7 @@ (define-public nss-3.98 "nss-" version ".tar.gz"))) (sha256 (base32 - "1kh98amfklrq6915n4mlbrcqghc3srm7rkzs9dkh21jwscrwqjgm")) - ;; Create nss.pc and nss-config. - (patches (search-patches "nss-3.56-pkgconfig.patch" - "nss-getcwd-nonnull.patch" - "nss-increase-test-timeout.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete the bundled copy of these libraries. - (delete-file-recursively "nss/lib/zlib") - (delete-file-recursively "nss/lib/sqlite"))))) + "1kh98amfklrq6915n4mlbrcqghc3srm7rkzs9dkh21jwscrwqjgm")))) (arguments (substitute-keyword-arguments (package-arguments nss) ((#:phases phases)