From patchwork Thu Jan 26 16:43:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46423 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 EC47E27BBEB; Thu, 26 Jan 2023 16:45:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 9D0DD27BBE9 for ; Thu, 26 Jan 2023 16:45:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL5NS-0000fl-H3; Thu, 26 Jan 2023 11:45:30 -0500 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 1pL5N2-0000bd-KL for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL5N2-0007JC-CD for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pL5N2-0002ig-8G for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH 4/4] gnu: Rename 'samba/fixed' to 'samba/pinned'. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Jan 2023 16:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61078 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61078@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 61078-submit@debbugs.gnu.org id=B61078.16747514569978 (code B ref 61078); Thu, 26 Jan 2023 16:45:04 +0000 Received: (at 61078) by debbugs.gnu.org; 26 Jan 2023 16:44:16 +0000 Received: from localhost ([127.0.0.1]:36015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5MG-0002as-Di for submit@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:16 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:52818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5M5-0002ZM-Lg for 61078@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:06 -0500 Received: by mail-wm1-f49.google.com with SMTP id k16so1545444wms.2 for <61078@debbugs.gnu.org>; Thu, 26 Jan 2023 08:44:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=IR/ok95Emzkm6FZZ8CFKJ5dW4DmsL6aZ1GFsi95CVfg=; b=NIcpoq2jUvNAHcE4xmKGNPNNBt5uLNge4vJzO+5sWVc/D3Tow6EW9BAsz6EksYmgoL 9Tf/oi8K3is2ocPAL8GRCvtYkOwTZfz/9yAm5p0u9pyNIPIIfH04m0K9NMA8b3UM+p2+ 0URbEIbpZad5SIcCILzKLWGLmm0zhmJ5PcHyfE2B1n8y4yhOFU5ien6ls+466/mhkQYj uokWeK/mcuVCSj0iKRvuY3somKJmoLMzDcz1/9TW+WAISl5Oi/zFLSfigUIVbMlUSk0n pab1ZL5l0W+wWDfOAVW02e4ogqbe1hcr6oM3fWOhGWGgmKSAvDrNX94CYM3XMYszxIZQ W7bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=IR/ok95Emzkm6FZZ8CFKJ5dW4DmsL6aZ1GFsi95CVfg=; b=ivtYrqxpniACbMBWXqgA7SnvqaYbiL42FuD61vuacUpvdiZLAcualXyRY20UKbDQpM g8rF5F5ZwT2f0X0rc7pQQsNcXLLZF5nGqWpS8gsmy1QgP2+Bfn+chNAuPreeRUfO6FPl MWFSQzs9EjIzlzTUwvRSIdouVhtWbFkcAfjy3RjSPnqLxcC9b/tnWn/Gb0gHBABQ+vpX aiULHQKsewAWGVTnLbvzhVYdCcwB+a9mmhI8XNMPJ74eiUmPrYbov2g1p88EyeGyFEva iVVPo01FZmbTTsRf5GJSkmnUxfRK2QHWJt5my4rJqBJrIQ5jigFR5I4t9/aPgctZJUIJ pnjw== X-Gm-Message-State: AFqh2kpw1B90f097BbQL2nL5mzrVUV7RFQ8LuZwFhFPV2hGadUEgcnWp lZjRYXixU10TJbMHqvlMKtCglNElKdg= X-Google-Smtp-Source: AMrXdXtL9uHHYdhs+qePf3CDDYYR7gCfeNIDeYNkzio/IdggjCROzw9HKPj0UMCAVqa31vaQVacg0w== X-Received: by 2002:a05:600c:1c83:b0:3da:ff24:4b93 with SMTP id k3-20020a05600c1c8300b003daff244b93mr9381425wms.3.1674751440188; Thu, 26 Jan 2023 08:44:00 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t10-20020a05600c328a00b003d9a86a13bfsm1735900wmp.28.2023.01.26.08.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 08:43:59 -0800 (PST) From: Simon Tournier Date: Thu, 26 Jan 2023 17:43:47 +0100 Message-Id: <20230126164347.2462817-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230126164347.2462817-1-zimon.toutoune@gmail.com> References: <20230126164347.2462817-1-zimon.toutoune@gmail.com> 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/samba.scm: Rename variable 'samba/fixed' to 'samba/pinned' and 'samba/fixed-patched' to 'samba/fixed'. * gnu/packages/gnome.scm (libsoup-minimal)[inputs]: Replace 'samba/fixed' with 'samba/pinned'. --- gnu/packages/gnome.scm | 2 +- gnu/packages/samba.scm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 10945ff457..9d79055289 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5190,7 +5190,7 @@ (define-public libsoup-minimal sqlite zlib)) (inputs - (list mit-krb5 samba/fixed)) ; For ntlm_auth support + (list mit-krb5 samba/pinned)) ; For ntlm_auth support (home-page "https://wiki.gnome.org/Projects/libsoup") (synopsis "GLib-based HTTP Library") (description diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 00442d9645..da103ed839 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -275,14 +275,14 @@ (define-public samba Desktops into Active Directory environments using the winbind daemon.") (license license:gpl3+))) -;;; FIXME: Invert inheritance relationship; the "fixed" package shouldn't be +;;; FIXME: Invert inheritance relationship; the "pinned" package shouldn't be ;;; susceptible to changes in the free one. -(define-public samba/fixed +(define-public samba/pinned ;; Version that rarely changes, depended on by libsoup. (hidden-package (package (inherit samba) - (replacement samba/fixed-patched) + (replacement samba/fixed) (version "4.15.3") (source (origin @@ -306,9 +306,9 @@ (define-public samba/fixed libxslt libxml2))))) -(define-public samba/fixed-patched +(define-public samba/fixed (package - (inherit samba/fixed) + (inherit samba/pinned) ;; This is 4.15.13, but we need to trim the store file name to have ;; the same length as the one we are grafting above. (version "4.15.A")