From patchwork Wed Feb 1 09:36:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46561 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 77F8527BBEE; Wed, 1 Feb 2023 09:37: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 9424C27BBED for ; Wed, 1 Feb 2023 09:37:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pN9Y7-0004aa-Tg; Wed, 01 Feb 2023 04:37:03 -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 1pN9Y7-0004Zx-2Q for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:03 -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 1pN9Y6-0007BV-PA for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pN9Y6-0006Ed-L5 for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH v2 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: Wed, 01 Feb 2023 09:37:02 +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.167524418223895 (code B ref 61078); Wed, 01 Feb 2023 09:37:02 +0000 Received: (at 61078) by debbugs.gnu.org; 1 Feb 2023 09:36:22 +0000 Received: from localhost ([127.0.0.1]:56482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XR-0006D7-Bo for submit@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:21 -0500 Received: from mail-wm1-f42.google.com ([209.85.128.42]:39573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XO-0006Ci-FJ for 61078@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:20 -0500 Received: by mail-wm1-f42.google.com with SMTP id hn2-20020a05600ca38200b003dc5cb96d46so867789wmb.4 for <61078@debbugs.gnu.org>; Wed, 01 Feb 2023 01:36:18 -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=mxbzr6ENj18++HjOzek5UazKZTv6YOsfIZJ01LbGepw=; b=f5UnDlHDqgKCQn2N1ia9zj4ztH2eUJ1PesNReoW5kiwm8Uy4Tiox3w9chPyJ+e2uQM OMuLOeR/zGNpkUflwYNETmUvpor4lTb8iW5t3owfOnvwbA2Jj7hez0yXcqY1x7bUEvCO T2bARf4QmD5YPiFmnOpNKtdx/UEpbc8gzi+cvObTXPts68fZDaMqSc1+++05HGiraPga eO6+wAVMx3y6BWZQodayQoSjQNrGKiuQiGHaxF2XIQ4R2pXArRXe28Y2kxVP766mqQBi SdK0rY8U/3OAV1oag/pbf2DjEfhtIkHxoAO22VhtK4hQS+x2yYm+NHumflV4gKmgFhL0 OCyQ== 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=mxbzr6ENj18++HjOzek5UazKZTv6YOsfIZJ01LbGepw=; b=ChccwnbZiOSYpjc0S/TLwpHrnvSnnmP0hKdXj4NjYkzI91H2CcZX/1whVrSOi5pcGA ExKbnfCCsAaSLkGaWagHHPyPzynctJHXDdWmer3rVepHcT4OafopNz9LbnwFN6IR0NAP xJmClklJV45nvL+zDBimKufg8THBSDWofauJZPV5k2LarpHyteC66+bDA2WnQQEljGUv B7kF2jC0Qcisin4uHiX3fcTzeoKyIfAu2byfiAaMRY/6imwewv7XPyHq6gBGmJjzq8vF i2QAN70YXJq5rCh9FYdfuLH0cNMzXpp9oCnBYpWujko4VyG32+/PlrUhwBy/pzjHAW4E KPsw== X-Gm-Message-State: AO0yUKXZapdQaE7wvkbXtreyNf6PjS6unO8IycqiDKtZUfu11uN2R36A knqsNqXOAgBCKVIMLXttzMGPlboUTVc= X-Google-Smtp-Source: AK7set/ZM8JcuwU5sW8GLEw9rtg8+avPvTGyFXXnILn00q/E5UEFR00VaOoR7sHMA1wI936oMsYLsg== X-Received: by 2002:a05:600c:204e:b0:3dc:4234:fe89 with SMTP id p14-20020a05600c204e00b003dc4234fe89mr1214993wmg.2.1675244172904; Wed, 01 Feb 2023 01:36:12 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id p11-20020a1c544b000000b003dc4fd6e624sm1163107wmi.19.2023.02.01.01.36.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 01:36:12 -0800 (PST) From: Simon Tournier Date: Wed, 1 Feb 2023 10:36:03 +0100 Message-Id: <20230201093603.1432036-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230201093603.1432036-1-zimon.toutoune@gmail.com> References: <20230201093603.1432036-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 937f26e172..b1f0615702 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5199,7 +5199,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")