From patchwork Fri Jan 5 10:59:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 58370 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 D648A27BBEA; Fri, 5 Jan 2024 11:01:39 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 3B41A27BBE2 for ; Fri, 5 Jan 2024 11:01:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLhwn-00054J-F9; Fri, 05 Jan 2024 06:01:05 -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 1rLhwh-0004w5-4Q for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:59 -0500 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 1rLhwg-00055a-Rc for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLhwl-0004Dt-2i for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68258] [PATCH 4/7] system: hurd: Use the Shepherd 0.10.x. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68258@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68258-submit@debbugs.gnu.org id=B68258.170445241110140 (code B ref 68258); Fri, 05 Jan 2024 11:01:03 +0000 Received: (at 68258) by debbugs.gnu.org; 5 Jan 2024 11:00:11 +0000 Received: from localhost ([127.0.0.1]:56473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvv-0002bz-35 for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvp-0002G3-Fr for 68258@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:06 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLhvf-0004gd-Ul; Fri, 05 Jan 2024 05:59:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=qPFrfqaJWjugSXLagfFjc+033j9R5eqtwLMJ+4h+NqI=; b=MybMUcDAI5zoAFAiqDPB YXlpVHP3u3rqgfsIOJ1nMqOSXYyVZ3t5i2sE0HPOq9RBGq4Y19l8Stsx/2mOrIhMpsrroCAG59cnn syg8tnfMzvRLJUu+rlaMHXZglPZvEt1vti90WfUkyS5+f23UnrXPtWlBRZzS9F3nIStB5/wdWnpo/ 8tQBcAHgWPMTIQB6aV7Zq+G3lLsY4gNduYTI1nSt1su1i4WHhqHe3XRQhMVgQBCz6TJXGpB8NWgPd uR+ARxCspABE9nBgOtW/WR9NhKsQ+fsPQCRaXZgV/J6eUetwnmJHclBeeMLrzw0tjr0TWpY2Oa48Z yY1hwly7EG7caw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 5 Jan 2024 11:59:31 +0100 Message-ID: <2f608c034d3daad42311eb88a62b80e06bcc018f.1704451578.git.ludo@gnu.org> 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/system.scm (hurd-default-essential-services): Remove reference to ‘shepherd-0.8’. * gnu/system/hurd.scm (%base-packages/hurd): Replace ‘shepherd-0.8’ with ‘shepherd-0.10’. Change-Id: I9f1800693cda456286450d3d0bb6f7e3da85d55e --- gnu/system.scm | 4 +--- gnu/system/hurd.scm | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 279b9df5c0..be15615879 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -804,9 +804,7 @@ (define (hurd-default-essential-services os) %boot-service %hurd-startup-service %activation-service - (service shepherd-root-service-type - (shepherd-configuration - (shepherd shepherd-0.8))) ;no Fibers + (service shepherd-root-service-type) (service user-processes-service-type) (account-service (append (operating-system-accounts os) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 3b138bef65..cbe0081382 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020-2022 Ludovic Courtès +;;; Copyright © 2020-2023 Ludovic Courtès ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -70,7 +70,7 @@ (define %base-packages/hurd ;; Note: the Shepherd comes before the Hurd, not just because its duty is to ;; shepherd the herd, but also because we want its 'halt' and 'reboot' ;; commands to take precedence. - (list shepherd-0.8 hurd netdde bash coreutils file findutils grep sed + (list shepherd-0.10 hurd netdde bash coreutils file findutils grep sed diffutils patch gawk tar gzip bzip2 xz lzip guile-3.0-latest guile-colorized guile-readline net-base nss-certs inetutils less procps shadow sudo which