From patchwork Fri Aug 20 12:45:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 32198 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 035D327BC85; Fri, 20 Aug 2021 13:46:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8241927BC78 for ; Fri, 20 Aug 2021 13:46:21 +0100 (BST) Received: from localhost ([::1]:53952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3ue-000640-BU for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:46:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3uM-00063J-Q7 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3uM-0005v4-JF for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3uM-0002VS-9S for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50133] [PATCH 1/6] gnu: libraft: Update to 0.11.2. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50133 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50133@debbugs.gnu.org Cc: Andrew Whatson Received: via spool by 50133-submit@debbugs.gnu.org id=B50133.16294635419543 (code B ref 50133); Fri, 20 Aug 2021 12:46:02 +0000 Received: (at 50133) by debbugs.gnu.org; 20 Aug 2021 12:45:41 +0000 Received: from localhost ([127.0.0.1]:33153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3u0-0002Tr-Tx for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:41 -0400 Received: from mail-pg1-f181.google.com ([209.85.215.181]:42775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3ty-0002Tb-UK for 50133@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:39 -0400 Received: by mail-pg1-f181.google.com with SMTP id o2so9047467pgr.9 for <50133@debbugs.gnu.org>; Fri, 20 Aug 2021 05:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oH/49iui3besqi8Piap2Um/CIDRKcBJrGxAyv3+qTXQ=; b=gI50xmZ19N34qrflhF7pYbOqRCk5dOQarP+F1VSZfNdVCrqNqHXaKqCikq800e27h4 rSmpEymfijzmACnO+V6AkwtuJWtUvxC2ijdrINnCFsgii7q7GCW4R+yfx4IJPk8/agEk K2bar2lo7l6H3x3WFaoEn9RvLV2FV6n6zZIbQWCacs9QdT7xsw3r0N2swOwZrNUvC7aw DEdhi8qLndyaAWBxzu0IxwWzwPJ9mDVfBxXiwqxlASd8w7UWUB9vE1bgMbCjaMiWRBM4 sMG2ysIycSzJetdWOaaYYEfNTYQTyGpLmJkytpsGhaoI0FVH/dsvfI0yRVEYek3cfjJe TUnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oH/49iui3besqi8Piap2Um/CIDRKcBJrGxAyv3+qTXQ=; b=NQssfercgMzG9rHZ6ux4vSxHQAhCpbp1MCIFAGtKKGq2KIW5gg2clsfBwvaR9gmsDU cfqS5C3VgBhQOxUw1ACj+YpH/009JX9eKaChgM9fi/lqyrC0wMq2rWcv0D6KCmIsl+sk Ecyv8nBqs2Pb82baA+pvdSgwjdAfXlVYr9lUFgW3VXmLU8hVqk2TjWTRX1JQIJe4PX5g JBAV8qd4B4kM/mOuLR9IwKg09gaulUXGb667ZEXkAt8hK0Z7n7ccd6upF+5fCYKNRgOa nKiOypfsSKgaswRaRjoAvmLTF/Q00PZEPfTzHx6HwhSIA2sEWwKIifBqh6ohtYtbw6FA DkwQ== X-Gm-Message-State: AOAM532sTsiH97cG6SpFYXxxhEV2cfuZ2471gOdsmvZ5IG7VOJSJy5Gv Cr/m9smsX4vIr2t6NAl+3EecNQ6cffI= X-Google-Smtp-Source: ABdhPJx6pFftT0aNCjFk7AMbgdGrOY6hyVVyOMDMuNyCVukQPYUFHhS5QAKdyx0EMP5NKwurGhFmaQ== X-Received: by 2002:a62:584:0:b029:32e:3b57:a1c6 with SMTP id 126-20020a6205840000b029032e3b57a1c6mr19372757pff.13.1629463532816; Fri, 20 Aug 2021 05:45:32 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id o10sm5113868pfk.212.2021.08.20.05.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:45:32 -0700 (PDT) From: Andrew Whatson Date: Fri, 20 Aug 2021 22:45:19 +1000 Message-Id: <20210820124524.117090-1-whatson@gmail.com> X-Mailer: git-send-email 2.32.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cluster.scm (libraft): Update to 0.11.2. [inputs]: Add lz4. --- gnu/packages/cluster.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm index e643cc58f9..5464c6dd4d 100644 --- a/gnu/packages/cluster.scm +++ b/gnu/packages/cluster.scm @@ -28,6 +28,7 @@ #:use-module (guix packages) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages flex) #:use-module (gnu packages gettext) #:use-module (gnu packages libevent) @@ -188,7 +189,7 @@ independently or together to provide resilient infrastructures.") (define-public libraft (package (name "libraft") - (version "0.10.1") + (version "0.11.2") (home-page "https://github.com/canonical/raft") (source (origin (method git-fetch) @@ -197,7 +198,7 @@ independently or together to provide resilient infrastructures.") (file-name (git-file-name name version)) (sha256 (base32 - "18idj53vnl5fx1ja1zlp8kiwmdxgwjxsi88rdql0pbh0484b92a3")))) + "050dwy34jh8dihfwfm0r1by2i3sy9crapipp9idw32idm79y4izb")))) (arguments '(#:configure-flags '("--enable-uv") #:phases (modify-phases %standard-phases @@ -207,7 +208,8 @@ independently or together to provide resilient infrastructures.") ((".*test_uv_append.c.*") "")) #t))))) (inputs - `(("libuv" ,libuv))) + `(("libuv" ,libuv) + ("lz4" ,lz4))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) From patchwork Fri Aug 20 12:45:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 32199 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 58D4B27BC78; Fri, 20 Aug 2021 13:46:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BFAA327BC82 for ; Fri, 20 Aug 2021 13:46:21 +0100 (BST) Received: from localhost ([::1]:53950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3ue-00063u-QJ for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:46:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3uM-00063N-VD for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3uM-0005vf-OA for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3uM-0002Vb-N9 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50133] [PATCH 2/6] gnu: libdqlite: Update to 1.9.0. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50133 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50133@debbugs.gnu.org Cc: Andrew Whatson Received: via spool by 50133-submit@debbugs.gnu.org id=B50133.16294635439558 (code B ref 50133); Fri, 20 Aug 2021 12:46:02 +0000 Received: (at 50133) by debbugs.gnu.org; 20 Aug 2021 12:45:43 +0000 Received: from localhost ([127.0.0.1]:33156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3u3-0002U6-4a for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:43 -0400 Received: from mail-pl1-f177.google.com ([209.85.214.177]:41720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3u1-0002Tf-EY for 50133@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:42 -0400 Received: by mail-pl1-f177.google.com with SMTP id e15so5892073plh.8 for <50133@debbugs.gnu.org>; Fri, 20 Aug 2021 05:45:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xqOm8ntClha88b73sphFJEWDHbWytN+voSFa3rcJgu8=; b=kaEpUcGkTTyMIif4EsFJkkJx7ouknPG4HrX6Y9t7Uwq3bol9GCoBdBw8h07te3D57T YiB3oyIZm0BjnqU6JAJmgOnzR6p5lLuuUntbfbUo92QvB8TxVaeVPHbqxAKzlw7k/nlJ Lh+FBjOFkKvGHb3cnf3TiLxS9EIc19LSEHzaARR998bOYcj8Lp4UNq3+4M1Dgyt/jtbD gBlMRJ5XopIIeTl6TWIGTVX/gJ+GPDrR5zwkF1HK3cFYh1BcuIdr6efQGFXJWg9hrPZV wkYj7oPfO1grj6k03h9FHfB2KYGwYMtZpy6OtpKmTf0mxj25igZLxzGhhnbuorFG6BRO NPLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xqOm8ntClha88b73sphFJEWDHbWytN+voSFa3rcJgu8=; b=Sr86CFjv8joESPbvh9VKRvRvU3hat+ljnLUh09xQh8y8XNYIP7u5JQkRyFI+eFbkN4 6dvi1l6hpdrVL1v13h4Q6pbYSHbgtJILbiz9gsPwMd6JwCYUN5E804twxhF5DPmQZhjJ AfLi7dees5ra9cVEoGp+ojXgzu3J3LVlhgjT/ZRXA6Rze9pVFliTV8mVMRHpoNh/6wdW vNTdM1DTr/QSjcyj4zXBwwiS0X8Qbd/LLgKNxSxWJOJn96DFFDdw19sItjy8EH1CzG12 jLAU6obAXZgpOL12mS0eXyEUuir+WNPtVM8ou8F2bITtxFejj8kTN1aA3szC3ql+X/BK i/Xg== X-Gm-Message-State: AOAM532OqNy47qgTK5zXv/3LMkXOouPAc88r95FVGxhUFz/ax9UKDFC7 GPPqNWns7lK2506Zkt6MxRDEwDHTuiM= X-Google-Smtp-Source: ABdhPJxFqYab5ZhODOoJrnYMpEWUKkk3E5RrwPzkPJLik/1qlMw4Yh2aCOrGZowqnxN0ZW6E1Pcj8w== X-Received: by 2002:a17:90a:2b89:: with SMTP id u9mr4502514pjd.116.1629463535525; Fri, 20 Aug 2021 05:45:35 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id o10sm5113868pfk.212.2021.08.20.05.45.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:45:35 -0700 (PDT) From: Andrew Whatson Date: Fri, 20 Aug 2021 22:45:20 +1000 Message-Id: <20210820124524.117090-2-whatson@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210820124524.117090-1-whatson@gmail.com> References: <20210820124524.117090-1-whatson@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cluster.scm (libdqlite): Update to 1.9.0. --- gnu/packages/cluster.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm index 5464c6dd4d..2de5f6fe36 100644 --- a/gnu/packages/cluster.scm +++ b/gnu/packages/cluster.scm @@ -228,7 +228,7 @@ snapshots).") (define-public libdqlite (package (name "libdqlite") - (version "1.7.0") + (version "1.9.0") (home-page "https://github.com/canonical/dqlite") (source (origin (method git-fetch) @@ -237,7 +237,7 @@ snapshots).") (file-name (git-file-name name version)) (sha256 (base32 - "15cg8yl3n7lcg0qyg0byciz8v6y200ghmzzkwpdzggy3m6c168wl")))) + "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn")))) (arguments '(#:phases (modify-phases %standard-phases From patchwork Fri Aug 20 12:45:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 32201 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 6F9DF27BC82; Fri, 20 Aug 2021 13:46:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 408F127BC6B for ; Fri, 20 Aug 2021 13:46:34 +0100 (BST) Received: from localhost ([::1]:54584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3ur-0006Ux-BD for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:46:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3uN-00063Z-EX for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3uN-0005vq-6l for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3uN-0002Vj-3p for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50133] [PATCH 3/6] gnu: lxc: Update to 4.0.10. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50133 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50133@debbugs.gnu.org Cc: Andrew Whatson Received: via spool by 50133-submit@debbugs.gnu.org id=B50133.16294635479583 (code B ref 50133); Fri, 20 Aug 2021 12:46:03 +0000 Received: (at 50133) by debbugs.gnu.org; 20 Aug 2021 12:45:47 +0000 Received: from localhost ([127.0.0.1]:33160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3u7-0002UU-B1 for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:47 -0400 Received: from mail-pf1-f170.google.com ([209.85.210.170]:42618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3u4-0002Tj-91 for 50133@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:44 -0400 Received: by mail-pf1-f170.google.com with SMTP id 18so8507030pfh.9 for <50133@debbugs.gnu.org>; Fri, 20 Aug 2021 05:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n0ChX1sac1pRgGcpGEjQ9z+/rACCGWAEDPKC84UC/gQ=; b=IOYaAf2d/mm7IpHSafrZG6QEv98UlC+QlGZuqXLMppFjKlG8nbRb+1X3uG81m1Y4ur ELvuIMdqMuh7EKkHWWiD5iGKoVBgbF0RoGRKf89WCQoTCV4uQZf1AT9EQUklqcCAIevp BAtC2yDAkAz7dGdeXvsJUjlOIz5DGrQYERQPOraFUbv2rRLPFR7L6iQlLEm7t8xErJzy 9jNZ6RMdbR0f4SCLTCzfnvH4LJib8qKe2z6KfK2cVIsgvfTUvskyR44yv5ubsJ2AXTwJ zv1zsU7OAcDhvXFl1AAjtQcRaBFZl3W5A7vHkO/fu+TK8S35nUzAcHRMLL7tRwqRMdmJ 7p1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n0ChX1sac1pRgGcpGEjQ9z+/rACCGWAEDPKC84UC/gQ=; b=Yr1llN/lQoC7ApQ4DKwbNC7tKmT/nOHIAWm4yOuy1rhNAG8hjX7RtwDFOOpEPd7O7q JQWHmfiiLDTxkF+qHzFQ4zCI8jImXmIe5/VhYZnONrx4bT6OARxFx1V3Im0rm/IRaDbp bNH8It+i68QFfdBh+44ggjhAqKwOmSohs6fYinZmGPrw60U17Uj2DezfeOUU9m9j7Oim N99rr58Nwadw+7nf+KuC7h5npug453gR0TCX0fMCmpe1aABHG0rbYrrcDpTB4PHf1g0/ kRc3HQFBn678nKwFuKS8aVGqw/GG0MfZZQCeM5a56aZBWPMk/pxNkURbr2gef4Uyv/Pi mGXw== X-Gm-Message-State: AOAM533Bws6OlVL4lCpcy5z89kIOxr9ik08FjpblCAFCb+7wYAQS/M1T ioRaGSKTCsCBAL0Z5jcrWwxOhQCueqA= X-Google-Smtp-Source: ABdhPJyVCHzE9yJUvfs+zchF8P2RkRr7YCUWkogkPSrjnoxDNMsbByDvGcOsTQML4hRMWxboq/9BeA== X-Received: by 2002:a65:62d1:: with SMTP id m17mr18643512pgv.370.1629463538292; Fri, 20 Aug 2021 05:45:38 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id o10sm5113868pfk.212.2021.08.20.05.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:45:38 -0700 (PDT) From: Andrew Whatson Date: Fri, 20 Aug 2021 22:45:21 +1000 Message-Id: <20210820124524.117090-3-whatson@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210820124524.117090-1-whatson@gmail.com> References: <20210820124524.117090-1-whatson@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (lxc): Update to 4.0.10. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1bbcb46b99..0919ef7785 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -997,7 +997,7 @@ all common programming languages. Vala bindings are also provided.") (define-public lxc (package (name "lxc") - (version "4.0.6") + (version "4.0.10") (source (origin (method url-fetch) (uri (string-append @@ -1005,7 +1005,7 @@ all common programming languages. Vala bindings are also provided.") version ".tar.gz")) (sha256 (base32 - "0qz4l7mlhq7hx53q606qgvkyzyr01glsw290v8ppzvxn1fydlrci")))) + "1sgsic9dzj3wv2k5bx2vhcgappivhp1glkqfc2yrgr6jas052351")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From patchwork Fri Aug 20 12:45:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 32202 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 C489A27BC6B; Fri, 20 Aug 2021 13:46:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6C77C27BC78 for ; Fri, 20 Aug 2021 13:46:34 +0100 (BST) Received: from localhost ([::1]:54604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3ur-0006Vt-HC for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:46:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3uN-00063d-Pu for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3uN-0005wY-Ht for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3uN-0002Vw-H2 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50133] [PATCH 4/6] gnu: lxcfs: Update to 4.0.9. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50133 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50133@debbugs.gnu.org Cc: Andrew Whatson Received: via spool by 50133-submit@debbugs.gnu.org id=B50133.16294635509597 (code B ref 50133); Fri, 20 Aug 2021 12:46:03 +0000 Received: (at 50133) by debbugs.gnu.org; 20 Aug 2021 12:45:50 +0000 Received: from localhost ([127.0.0.1]:33163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3uA-0002Uj-HH for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:50 -0400 Received: from mail-pg1-f175.google.com ([209.85.215.175]:38403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3u6-0002Ty-Q6 for 50133@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:47 -0400 Received: by mail-pg1-f175.google.com with SMTP id w8so9047829pgf.5 for <50133@debbugs.gnu.org>; Fri, 20 Aug 2021 05:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CKFyffJ35LXRUwLwpzBZ1+hIM/ZuVGh9ZuBggT3+oT8=; b=T6+grJmRcAoAVc5mDPtg6OPxglZGWnis8Okyn48zYK7dqr4VxUHrqSTxxmH6quxzNE X10emD0ukeyo3xi7SiDZIItmFqgHYQp17psH2I4WxSJnWHyiOFyfBGZnSfY9cheh/6Es 0hC17aCI4mVE3Ov7RlLYcJ7mPs0Jf9UaGzy6S1I+xix0vLaia+p0m7JnNLad/YK+El2n MhmHhCVmD9wcsksAOrKdirZimqKKdvxpwk+c6Ey2VFNZ6ZY4V9IESzm3YZubtH3WIk1+ hVgfthvJw9ITEYoPlLuBRcxQAcAdEYM5AwtPXbqm3EhX2iY7KcHkgVG+JpWfvKwDQJEo CzUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CKFyffJ35LXRUwLwpzBZ1+hIM/ZuVGh9ZuBggT3+oT8=; b=BxOr+oNvBWRN+vsjk1s1tulUB4n1RMXjg2WE8032rYeG2DqcyrnSuZdaosPnGsMFIO haw0j+FGYLiPlY6XAF9hZWT0eEe6IKEN9S/mscb/YTPL1o7DQiArUrQUzXxZYLAA5jEZ 4QVTX6nToST+OLPWLd4wpyAXVjmQoH1NFbDMSfpSX8obmk7ceoxf9wpr6JTEq9IgpytG ysBPKUybG1BO+36VC0+P00BpsXn09dSJjaC+jh0AfT3bFROUgdFrnSFcJeHp30HGwM0q ijclIbtqSJzAbmR/P/PWKcNFyQb2Rty8k0Si20LEtbvDdOvG1CkpDXgblvjCfFTB8AlB RDUQ== X-Gm-Message-State: AOAM532L2/H1AGzwgtpCTQUuMbcz3me8WMuTn0tklWJCnPcKC2+/Q8nH 05Qnrpl+AftdeW2uB3wEYDxsv/qt2zo= X-Google-Smtp-Source: ABdhPJx3ttSoCXWSjNELU8Q0Rap05O+7y2PSXwpVAL8VQuar06oWp2IHdTkH0PfAcj6jqeFT5RGXJw== X-Received: by 2002:a62:520e:0:b0:3e2:1c21:f1ba with SMTP id g14-20020a62520e000000b003e21c21f1bamr19502517pfb.78.1629463540962; Fri, 20 Aug 2021 05:45:40 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id o10sm5113868pfk.212.2021.08.20.05.45.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:45:40 -0700 (PDT) From: Andrew Whatson Date: Fri, 20 Aug 2021 22:45:22 +1000 Message-Id: <20210820124524.117090-4-whatson@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210820124524.117090-1-whatson@gmail.com> References: <20210820124524.117090-1-whatson@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (lxcfs): Update to 4.0.9. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 0919ef7785..07ad1cb101 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1044,7 +1044,7 @@ manage system or application containers.") (define-public lxcfs (package (name "lxcfs") - (version "4.0.8") + (version "4.0.9") (home-page "https://github.com/lxc/lxcfs") (source (origin (method git-fetch) @@ -1053,7 +1053,7 @@ manage system or application containers.") (file-name (git-file-name name version)) (sha256 (base32 - "1f74wy88si2ia035pcvciq5821kc8jcb75w1f8vhbp0cd29rqdpi")))) + "0zx58lair8hwi4bxm5h7i8n1j5fcdgw5cr6f4wk9qhks0sr5dip5")))) (arguments '(#:configure-flags '("--localstatedir=/var"))) (native-inputs From patchwork Fri Aug 20 12:45:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 32200 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 0336D27BC78; Fri, 20 Aug 2021 13:46:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6E0C227BC6B for ; Fri, 20 Aug 2021 13:46:25 +0100 (BST) Received: from localhost ([::1]:54020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3uh-000673-Iy for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:46:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3uO-00063m-BE for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3uN-0005wy-VL for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3uN-0002W3-Ti for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50133] [PATCH 5/6] gnu: Add lxd. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50133 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50133@debbugs.gnu.org Cc: Andrew Whatson Received: via spool by 50133-submit@debbugs.gnu.org id=B50133.16294635549613 (code B ref 50133); Fri, 20 Aug 2021 12:46:03 +0000 Received: (at 50133) by debbugs.gnu.org; 20 Aug 2021 12:45:54 +0000 Received: from localhost ([127.0.0.1]:33166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3uD-0002Uy-NZ for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:54 -0400 Received: from mail-pl1-f170.google.com ([209.85.214.170]:35689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3u9-0002UF-EO for 50133@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:50 -0400 Received: by mail-pl1-f170.google.com with SMTP id b9so1513617plx.2 for <50133@debbugs.gnu.org>; Fri, 20 Aug 2021 05:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SSXJKEO3Tl7gZhQke8VjMVFbt3a5LU8kqnVXMuDd5Xs=; b=k8xhji/GhK8tL8vwcmY/Ltm3UHbbjeLfZGOFwFXbpTPUTAkeiMJtsVTlE5TNg7JJP5 oaH5I4ZcWb1a1k1xxSHpjzoQQ9ruuFRgrCL15VzukKzbdxk3hU98DZPcm/BBAsF7Mlii xvbyNQ5fVdM70AYyJMcsoErpJuXa782TmTvIclV9bP/0p/x0TOh6BcTCJ8SRUkKagw+S dX3LRMAZwhQarKq8k56kv9FVtFRGmr/yah4ebNXOxgHOZb9xqBpDvtcG8GkW6ONJfTDS ZmqJFI1Qi84X5NM0tRXUq3hB4NFDJBdBZjSNLR0v12e486f7SZZBhCmhgZ2EjuIs3uoG UH6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SSXJKEO3Tl7gZhQke8VjMVFbt3a5LU8kqnVXMuDd5Xs=; b=cWg61n4iVccqUTMSWkJyeQ7dUbj8KsqSvHHeU5ZJyJQIus+ffEWvR1Ld/qDLPQ+TOV iorgF2SHZEhYKX6pgOlYW6KzWDDhHLMXzWTblALuqBqklzlMGrDCMbTgUD/d+ce5ScWv qCjEX/I5Rq1P+aZ7egyyMSkTU2TJLQzquQmSFOzhKySwiviZx55G7oy08t3UQRoMNdCj zd8RBYw9AAKqcsUkte0LQ/WxZTl8G1ydxgkNDlM1t4wNVx1EnHa1TcItXDIt3pOMwk+K sXCsE8kJzyHN33hxAS58UArVn4pocbRF9TBAlrauiTrnUEJPeO109oEhdawOYnAt8a0i 4UIA== X-Gm-Message-State: AOAM53241LYYvrCeRUt7dmnjTBAc6OObPdTz6VS2PGHM65yO0I1oCLMp 3bBmAg0jHc7KxINKI8oB+c0CuCNwVmU= X-Google-Smtp-Source: ABdhPJzRXWrRNf2CLfBupidMkXYXcNhu3PZB2E7iXCvrUV3XorFpzqfptGP6hsHjh9qDu25Shc01LA== X-Received: by 2002:a17:90a:b284:: with SMTP id c4mr4519300pjr.213.1629463543496; Fri, 20 Aug 2021 05:45:43 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id o10sm5113868pfk.212.2021.08.20.05.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:45:43 -0700 (PDT) From: Andrew Whatson Date: Fri, 20 Aug 2021 22:45:23 +1000 Message-Id: <20210820124524.117090-5-whatson@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210820124524.117090-1-whatson@gmail.com> References: <20210820124524.117090-1-whatson@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (lxd): New variable. --- gnu/packages/virtualization.scm | 113 ++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 07ad1cb101..da130d1e9d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021 Pierre Langlois ;;; Copyright © 2021 Dion Mendel +;;; Copyright © 2021 Andrew Whatson ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,6 +50,7 @@ #:use-module (gnu packages bison) #:use-module (gnu packages build-tools) #:use-module (gnu packages check) + #:use-module (gnu packages cluster) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) @@ -102,6 +104,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages readline) + #:use-module (gnu packages rsync) #:use-module (gnu packages selinux) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) @@ -1070,6 +1073,116 @@ of making Linux containers feel more like a virtual machine. It started as a side project of LXC but can be used by any run-time.") (license license:lgpl2.1+))) +(define-public lxd + (package + (name "lxd") + (version "4.17") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/lxc/lxd/releases/download/" + "lxd-" version "/lxd-" version ".tar.gz")) + (sha256 + (base32 + "1kzmgyg5kw3zw9qa6jabld6rmb53b6yy69h7y9znsdlf74jllljl")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/lxc/lxd" + #:tests? #f ;; tests fail due to missing /var, cgroups, etc. + #:modules ((guix build go-build-system) + (guix build union) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-dist + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + ;; remove the link back to the top level + (delete-file (string-append "_dist/src/" import-path)) + ;; move all the deps into the src directory + (copy-recursively "_dist/src" "../../..")) + #t)) + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (invoke "make" "build" "CC=gcc" "TAG_SQLITE3=libsqlite3") + #t))) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "make" "check" "CC=gcc" "TAG_SQLITE3=libsqlite3"))) + #t)) + (replace 'install + (lambda* (#:key inputs outputs import-path #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin-dir + (string-append out "/bin/")) + (doc-dir + (string-append out "/share/doc/lxd-" ,version)) + (completions-dir + (string-append out "/share/bash-completion/completions"))) + (with-directory-excursion (string-append "src/" import-path) + ;; wrap lxd with runtime dependencies + (wrap-program (string-append bin-dir "lxd") + `("PATH" ":" prefix + ,(fold (lambda (input paths) + (let* ((in (assoc-ref inputs input)) + (bin (string-append in "/bin")) + (sbin (string-append in "/sbin"))) + (append (filter file-exists? + (list bin sbin)) paths))) + '() + '("bash" "acl" "rsync" "tar" "xz" "btrfs-progs" + "gzip" "dnsmasq" "squashfs-tools" "iproute2" + "criu" "iptables")))) + ;; remove unwanted binaries + (for-each (lambda (prog) + (delete-file (string-append bin-dir prog))) + '("deps" "macaroon-identity" "generate")) + ;; install documentation + (for-each (lambda (file) + (install-file file doc-dir)) + (find-files "doc")) + ;; install bash completion + (rename-file "scripts/bash/lxd-client" "scripts/bash/lxd") + (install-file "scripts/bash/lxd" completions-dir))) + #t))))) + (native-inputs + `(;; test dependencies: + ;; ("go-github-com-rogpeppe-godeps" ,go-github-com-rogpeppe-godeps) + ;; ("go-github-com-tsenart-deadcode" ,go-github-com-tsenart-deadcode) + ;; ("go-golang-org-x-lint" ,go-golang-org-x-lint) + ("pkg-config" ,pkg-config))) + (inputs + `(("acl" ,acl) + ("eudev" ,eudev) + ("libdqlite" ,libdqlite) + ("libraft" ,libraft) + ("libcap" ,libcap) + ("lxc" ,lxc) + ;; runtime dependencies: + ("bash" ,bash-minimal) + ("rsync" ,rsync) + ("tar" ,tar) + ("xz" ,xz) + ("btrfs-progs" ,btrfs-progs) + ("gzip" ,gzip) + ("dnsmasq" ,dnsmasq) + ("squashfs-tools" ,squashfs-tools) + ("iproute2" ,iproute) + ("criu" ,criu) + ("iptables" ,iptables))) + (synopsis "Daemon based on liblxc offering a REST API to manage containers") + (home-page "https://linuxcontainers.org/lxd/") + (description "LXD is a next generation system container manager. It +offers a user experience similar to virtual machines but using Linux +containers instead. It's image based with pre-made images available for a +wide number of Linux distributions and is built around a very powerful, yet +pretty simple, REST API.") + (license license:asl2.0))) + (define-public libvirt (package (name "libvirt") From patchwork Fri Aug 20 12:45:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 32203 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 3EC0227BC78; Fri, 20 Aug 2021 13:46:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C780427BC6B for ; Fri, 20 Aug 2021 13:46:42 +0100 (BST) Received: from localhost ([::1]:55062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3uz-0006oO-Sv for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:46:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3uO-00063v-KA for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3uO-0005xt-BI for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3uO-0002WB-AB for guix-patches@gnu.org; Fri, 20 Aug 2021 08:46:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50133] [PATCH 6/6] services: Add lxd-service-type. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:46:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50133 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50133@debbugs.gnu.org Cc: Andrew Whatson Received: via spool by 50133-submit@debbugs.gnu.org id=B50133.16294635559621 (code B ref 50133); Fri, 20 Aug 2021 12:46:04 +0000 Received: (at 50133) by debbugs.gnu.org; 20 Aug 2021 12:45:55 +0000 Received: from localhost ([127.0.0.1]:33168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3uF-0002V6-6U for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:55 -0400 Received: from mail-pl1-f182.google.com ([209.85.214.182]:36771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3uC-0002UT-E3 for 50133@debbugs.gnu.org; Fri, 20 Aug 2021 08:45:53 -0400 Received: by mail-pl1-f182.google.com with SMTP id f3so5918001plg.3 for <50133@debbugs.gnu.org>; Fri, 20 Aug 2021 05:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zaay0zqaW9tDBHezB7RohNKntuupO15p/hxyAsP5H+Y=; b=KcLtEJmCgv86T3YPGmBJLcjc3oGhiM1TDER2MxbI/bYV7LSh4dEl85qO6DfA08vLzB kbJtyrmIT4f3d0Apk07CgvOtY1oAueGHKpXyU/VB3lug9UnjBfIafZ8SPaki2f5nXdVI oml/N+uqPVd8bS9dYQsntcXj3z1L+oxU9xUJNxOrITLv0CkzGX4YIWfLfNIcQSojowax NEVZ5L7q7Wx4rOWG3WS1mNPi/uchZwTpa1HY/YmwRaAzhxl6IL7UurLhB2RXB2SxhAkY kTp9a9JrkQw0AtvZrNweT2ZxcVDULgR0xvCgwLAQKF1+ZFDjKQDTXj0OWY1apxY8XzJy iHPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zaay0zqaW9tDBHezB7RohNKntuupO15p/hxyAsP5H+Y=; b=V06eS40JPP6I8EwNsaxa9yNtpFUqRYgnoKyUS2uW+Q+2GceMFX2zClRHrZPu3eZzNZ MoKjHQsPBfc+GYB+ey9Spx05QGDJyCIGcQnJusi/sR3vCZW3cO2dAdWrCYke83o2vAOJ IouJCf2o5WkT1i56xW6vqAe55wDbG0/YUjH5+qJ5Hv0cOwzEIy+BuF+6OrfwpLsvw3rf QDi8CsCsA4kB5uSQ025NWoXuH7KXdo+3rOQGjW58e/Tikz5yAzbO5lV+MwQKP6DpEssT awT02rNV33aq4EKEjVo7xwGXYudx6b5G87Tfzcb6yU6pSjKNqkETo0TWg2rQTTDq6d+g QZyQ== X-Gm-Message-State: AOAM532gFsVZKn3vdqb3ESji5q7epxgwFezgwQ75pwjXZ1nOPGJPacsc dzmLB9W2YoBVW38Kb6l5w/x4Ct+lCME= X-Google-Smtp-Source: ABdhPJyJ1v4vYO7s49xUPyl/J6XmRCKI+h7i27ZTNb43v0dBPOhe8gNb+6UNVYf1Jb2VW33gZ4IPxw== X-Received: by 2002:a17:90a:8b95:: with SMTP id z21mr4344297pjn.131.1629463546622; Fri, 20 Aug 2021 05:45:46 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id o10sm5113868pfk.212.2021.08.20.05.45.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:45:46 -0700 (PDT) From: Andrew Whatson Date: Fri, 20 Aug 2021 22:45:24 +1000 Message-Id: <20210820124524.117090-6-whatson@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210820124524.117090-1-whatson@gmail.com> References: <20210820124524.117090-1-whatson@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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/virtualization.scm (lxd-configuration): New type. (%lxd-accounts, lxd-service-type): New variables. (%lxd-activation, lxd-shepherd-service): New procedures. * gnu/system/file-systems.scm (%elogind-file-systems): Add "/sys/fs/cgroup/systemd" file-system. --- gnu/services/virtualization.scm | 66 +++++++++++++++++++++++++++++++++ gnu/system/file-systems.scm | 11 ++++++ 2 files changed, 77 insertions(+) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index c8adcd06d0..34ddc94423 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -75,6 +75,9 @@ virtlog-configuration virtlog-service-type + lxd-configuration + lxd-service-type + %qemu-platforms lookup-qemu-platforms qemu-platform? @@ -548,6 +551,69 @@ potential infinite waits blocking libvirt.")) `((libvirt-configuration ,libvirt-configuration-fields)) 'libvirt-configuration)) + +;;; +;;; LXD linux container daemon. +;;; + +(define-configuration lxd-configuration + (lxd + (package lxd) + "LXD package.") + (debug? + (boolean #f) + "Enable or disable debug messages.") + (verbose? + (boolean #f) + "Enable or disable information messages.")) + +(define %lxd-accounts + (list (user-group (name "lxd") (system? #t)))) + +(define (%lxd-activation config) + #~(begin + (use-modules (guix build utils)) + (mkdir-p "/var/log/lxd"))) + +(define (lxd-shepherd-service config) + (let* ((lxd (lxd-configuration-lxd config)) + (debug? (lxd-configuration-debug? config)) + (verbose? (lxd-configuration-verbose? config))) + (list + (shepherd-service + (documentation "LXD daemon.") + (provision '(lxd)) + (requirement '(dbus-system + elogind + file-system-/sys/fs/cgroup/blkio + file-system-/sys/fs/cgroup/cpu + file-system-/sys/fs/cgroup/cpuset + file-system-/sys/fs/cgroup/devices + file-system-/sys/fs/cgroup/memory + file-system-/sys/fs/cgroup/pids + file-system-/sys/fs/cgroup/systemd + networking + udev)) + (start #~(make-forkexec-constructor + (list (string-append #$lxd "/bin/lxd") + "--group=lxd" + "--logfile=/var/log/lxd/lxd.log" + #$@(if debug? '("--debug") '()) + #$@(if verbose? '("--verbose") '())))) + (stop #~(make-kill-destructor)))))) + +(define lxd-service-type + (service-type + (name 'lxd) + (extensions + (list (service-extension activation-service-type + %lxd-activation) + (service-extension shepherd-root-service-type + lxd-shepherd-service) + (service-extension account-service-type + (const %lxd-accounts)))) + (default-value (lxd-configuration)))) + ;;; ;;; Transparent QEMU emulation via binfmt_misc. diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index b9eda80958..7c3777298b 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -499,6 +499,17 @@ TARGET in the other system." (check? #f) (options "none,name=elogind") (create-mount-point? #t) + (dependencies (list (car %control-groups)))) + ;; The systemd cgroup needs to exist to run systemd inside linux + ;; containers (eg. via LXD). This is *not* required for elogind, but + ;; keeping it with the other systemd hacks seemed sensible, for now. + (file-system + (device "cgroup") + (mount-point "/sys/fs/cgroup/systemd") + (type "cgroup") + (check? #f) + (options "none,name=systemd") + (create-mount-point? #t) (dependencies (list (car %control-groups))))) %control-groups))