From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id wCaIGKKUHGQwJgAASxT56A (envelope-from ) for ; Thu, 23 Mar 2023 19:04:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cG21F6KUHGRVHgAAG6o9tA (envelope-from ) for ; Thu, 23 Mar 2023 19:04:18 +0100 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 EF42F47321 for ; Thu, 23 Mar 2023 19:04:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pfPIC-0001OA-BR; Thu, 23 Mar 2023 14:04:04 -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 1pfPIA-0001Ns-Dy for guix-patches@gnu.org; Thu, 23 Mar 2023 14:04:02 -0400 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 1pfPI9-0005vp-UU for guix-patches@gnu.org; Thu, 23 Mar 2023 14:04:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pfPI9-0000Qv-Py for guix-patches@gnu.org; Thu, 23 Mar 2023 14:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62298] [PATCH v2 7/8] services: mpd: Use user-account (resp. user-group) for user (resp. group) fields. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Mar 2023 18:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal , 62298@debbugs.gnu.org Cc: ludo@gnu.org, maxim.cournoyer@gmail.com Received: via spool by 62298-submit@debbugs.gnu.org id=B62298.16795946361651 (code B ref 62298); Thu, 23 Mar 2023 18:04:01 +0000 Received: (at 62298) by debbugs.gnu.org; 23 Mar 2023 18:03:56 +0000 Received: from localhost ([127.0.0.1]:39288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfPI4-0000QZ-0x for submit@debbugs.gnu.org; Thu, 23 Mar 2023 14:03:56 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:35718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfPI2-0000QK-A3 for 62298@debbugs.gnu.org; Thu, 23 Mar 2023 14:03:54 -0400 Received: by mail-ed1-f68.google.com with SMTP id y4so90497120edo.2 for <62298@debbugs.gnu.org>; Thu, 23 Mar 2023 11:03:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679594628; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=iYXm/cQ8O2VLXMkyOxmOXTwMuGgw64e5L6fE+urmcwE=; b=Qy4+e1hZSUnmWGadWjPkp50n3MkALYLUL+RsuakT6IwUSJxyvmEzupQjWX+5IOK4jd 0oq9jaoqVm1MJjy2gSa4XKMXLtDNK7ozL41sudz6XaI5dlMVHl783eMP3gOBvz4VuiP3 Apl3WmmZI0pMmr9YmgSQNQ5vwkrzx8Trw5xeXxIZx3IE8A1M0N5ARTrKmXJQ9o0z7dkv Kt1S8VohNDxusxM43uR868mZGja2/OY4lF54a8hn2vDQ0K4Mj0EACsbiSOt+IAPVz6AE OiXaY9XyfZm4+E5zSSarpwWbQh6hFYxV1FQyRpCPuVvXfe1yCAycfdOvmNqi/99deSZo nsgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679594628; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iYXm/cQ8O2VLXMkyOxmOXTwMuGgw64e5L6fE+urmcwE=; b=68eaNX313gz25U4foXyoE2FOcNn4F83LeUFKgz24q+SdZtfYqp+aO/7oIrXWUlwJzy JO7sZ++XhD18yd9ru+PcZ7NaEmJGxTEBcxLEziZqKpgnf2GXhBb2OoscE5rjzIu+K2Dp gWbFc0TsDiqQ7hb9IVPxwaWNKZ+JozLybCNAzyMK3bBvUjfJCkbWvPAQBfnJpp6zBcDc Cmnt/lmxf2ltx4vEA2cYWLhdXOplOA8Z8wrcFlvY7svIV+cS4hmi4y0lQ4ogF7HkFPkw Ban3N5SEHFjPm8NOr0RM2WPHLDn/1Nx5bnU+G3q4GNOlLUvcrDMmUmUHezQ/YecHdfWx T1IA== X-Gm-Message-State: AAQBX9er7Yf01bR4AYWnY+e9+KYVZPHADYJRXcS9gby/nIgHRL9kDums zjs6U8CXA6vZDnax1yJHfqg= X-Google-Smtp-Source: AKy350YvsPhvmjykv0GNEYhjVA5llG/f0XS1nv8MKOZca5M3egrOXUv9Qd8AmN6kDSTpLwiilneATA== X-Received: by 2002:aa7:da82:0:b0:502:100c:53a with SMTP id q2-20020aa7da82000000b00502100c053amr248530eds.41.1679594627970; Thu, 23 Mar 2023 11:03:47 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n11-20020a17090673cb00b0093dbb008281sm99751ejl.130.2023.03.23.11.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Mar 2023 11:03:47 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Thu, 23 Mar 2023 19:03:45 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679594658; a=rsa-sha256; cv=none; b=FleP/3ea+3tV9XnD2LIM79RAE+ORNplBNTH+hd+XanBKtrzO971r8U0tRwj3J9BeMIZ6Eq Q05LgLvIanpBVSYbofxjSU9ohJNhzw46ZNchSF3jbdonj9zLqCe5ZVLaF64JLCt5yHNQCa +TBMHnXK5S0X411IwO0hJiPRtiXdDrV4DiKdZ/RFysCiLa6iEUfaNIRnvoIATnEm+j3VIJ FWWBul9qkbPBn7gd6aaNI/uP/8KWG+CExsi2I1dYvRVeiKRUy7qseSaVDoPkQeq/ud5ssI WjMW6wcIgy1M9c9VSxhJTHtj6+Aa04s81M9dHmKla02Qh9RE7U/arWhS1BBzXw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Qy4+e1hZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679594658; h=from:from:sender:sender: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=iYXm/cQ8O2VLXMkyOxmOXTwMuGgw64e5L6fE+urmcwE=; b=c0b5/0qCqVD7iqcGHeM1piOZbNUxlKFFOF4rs60OWcBdS5iAy07e10up9lxkkvWXoMCE5E I7Gpt2l54MAjWGTipVqntA4/apuF9veNxsgDtasooau0P/BTLd8hbpmvkOF7F14N4Jfiiu IuvzMqqVH/7fYhF8rhp8ZwltRibhAF6D+FTL2pUb7Ly2o6C8yrYnFazdsagiG3OZAdpwZT /Jjert8puGetoH3UoxnbzdKC6ckyS4EkaGAXVMINyNYC9wd1HTnXK26WaEve01Lca/IBFY eNpMn8g9/88A1fPwn2SZpNOxRNbdHt85PKAIksDo1vyNotb+z+3L2BSlQBHKqg== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Qy4+e1hZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 0.85 X-Spam-Score: 0.85 X-Migadu-Queue-Id: EF42F47321 X-TUID: gu+Vov+rkAu9 Am Donnerstag, dem 23.03.2023 um 15:02 +0000 schrieb Bruno Victal: > If a string value is encountered, it is ignored and a predefined > variable is used instead. This is essentially a rollback to how it > used to be before '5c5f0fc1135ff15f9c4adfc5f27eadd9a592b5d1'. As far as I can see, this is not actually what happens. Don't forget to update your commit messages :) > Fixes #61570 . You only need one newline after this one imho. > --- a/gnu/services/audio.scm > +++ b/gnu/services/audio.scm > @@ -140,6 +140,14 @@ (define (uglify-field-name field-name) > =C2=A0(define list-of-symbol? > =C2=A0=C2=A0 (list-of symbol?)) > =C2=A0 > +;; helpers for deprecated field types, to be removed later > +(define %lazy-group (make-symbol "%lazy-group")) > + > +(define (inject-group-into-user user group) > +=C2=A0 (user-account > +=C2=A0=C2=A0 (inherit user) > +=C2=A0=C2=A0 (group (user-group-name group)))) > + > =C2=A0=0C > =C2=A0;;; > =C2=A0;;; MPD > @@ -559,17 +620,11 @@ (define (mpd-shepherd-service config) > =C2=A0 > =C2=A0(define (mpd-accounts config) > =C2=A0=C2=A0 (match-record config (user group) > -=C2=A0=C2=A0=C2=A0 (list (user-group > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (name group= ) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (system? #t= )) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (user-account > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (name user) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (group grou= p) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (system? #t= ) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (comment "M= usic Player Daemon (MPD) user") > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; MPD can = use $HOME (or $XDG_CONFIG_HOME) to place its > data > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (home-direc= tory "/var/lib/mpd") > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (shell (fil= e-append shadow "/sbin/nologin")))))) > +=C2=A0=C2=A0=C2=A0 ;; TODO: deprecation code, to be removed > +=C2=A0=C2=A0=C2=A0 (let ((user (if (eq? (user-account-group user) %lazy-= group) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (inject-group-into-user user gro= up) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 user))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (list user group)))) A little over-engineered, but works for me :) Cheers