From patchwork Sun Apr 7 20:57:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: paul X-Patchwork-Id: 62833 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 C91A027BBEA; Sun, 7 Apr 2024 21:59:13 +0100 (BST) 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 AF88527BBE2 for ; Sun, 7 Apr 2024 21:59:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtZbO-0003jC-CX; Sun, 07 Apr 2024 16:58:58 -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 1rtZbM-0003g8-Ee for guix-patches@gnu.org; Sun, 07 Apr 2024 16:58:56 -0400 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 1rtZbM-0000PF-6K for guix-patches@gnu.org; Sun, 07 Apr 2024 16:58:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtZbS-0005VO-HM; Sun, 07 Apr 2024 16:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70265] [PATCH 1/3] gnu: Add docker-credential-secretservice. References: In-Reply-To: Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sun, 07 Apr 2024 20:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70265 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 70265@debbugs.gnu.org Cc: Giacomo Leidi , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Vivien Kraus Received: via spool by 70265-submit@debbugs.gnu.org id=B70265.171252350920987 (code B ref 70265); Sun, 07 Apr 2024 20:59:02 +0000 Received: (at 70265) by debbugs.gnu.org; 7 Apr 2024 20:58:29 +0000 Received: from localhost ([127.0.0.1]:44875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtZat-0005S3-04 for submit@debbugs.gnu.org; Sun, 07 Apr 2024 16:58:28 -0400 Received: from confino.investici.org ([2a11:7980:1::2:0]:52577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtZaq-0005Ri-8A for 70265@debbugs.gnu.org; Sun, 07 Apr 2024 16:58:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1712523496; bh=bfhUaWCIY4fftVWcv+nM/6SxGv/p4xKcbtVWaI3LRn4=; h=From:To:Cc:Subject:Date:From; b=E+Shgg+XYW7guHXdlUh7Ywd55m9f5myWjYpSVjQpyE4waGBr4ulUJhXcP0Rvu7rM+ OuYJMO8Fv4xukIFwFdRpGVKGchowk0ugzsilTKL8CSaD3Sg4UkEa1f6Ed7NE5uoF5N vPMqX+CYw3B2SguWquh+a9brIyRjmzBTRdGl/Aa4= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4VCPh84HkDz11NH; Sun, 7 Apr 2024 20:58:16 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4VCPh81vLZz11NC; Sun, 7 Apr 2024 20:58:16 +0000 (UTC) Date: Sun, 7 Apr 2024 22:57:17 +0200 Message-ID: <95e5c6e85e09ead19a43fc37612d62bc91a64048.1712523439.git.goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.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: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: paul 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/docker.scm (docker-credential-helpers): New variable. * gnu/packages/gnome.scm (docker-credential-secretservice): New variable. Change-Id: I6c46d429fa2842969b0fcde58ded72e5b04ee321 --- gnu/packages/docker.scm | 70 ++++++++++++++++++++++++++++++++++++++++- gnu/packages/gnome.scm | 6 +++- 2 files changed, 74 insertions(+), 2 deletions(-) base-commit: 69951a61a1d8f1f2135ea2dc836738be282b97bc diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0fe1f2c1c7..31501e50b9 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Jesse Dowell ;;; Copyright © 2021, 2022 Oleg Pykhalov ;;; Copyright © 2022 Pierre Langlois +;;; Copyright © 2024 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,7 +52,8 @@ (define-module (gnu packages docker) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages version-control) - #:use-module (gnu packages virtualization)) + #:use-module (gnu packages virtualization) + #:export (docker-credential-helpers)) ;; Note - when changing Docker versions it is important to update the versions ;; of several associated packages (docker-libnetwork and go-sctp). @@ -670,6 +672,72 @@ (define-public docker-cli (home-page "https://www.docker.com/") (license license:asl2.0))) +;; Actual users of this procedure are +;; docker-credentials-secretservice and docker-credential-pass, they live in +;; different modules to avoid circular imports. +(define* (docker-credential-helpers plugin-name #:key (inputs '())) + (package + (name (string-append "docker-credential-" plugin-name)) + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/docker/docker-credential-helpers") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kric2yrgypdqncqfrmrh7l7904km5zisygi3fg6zlfkyh6rsm23")))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:go go-1.19 + #:unpack-path "github.com/docker/docker-credential-helpers" + #:import-path + (string-append "github.com/docker/docker-credential-helpers/" + plugin-name "/cmd") + #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda* (#:key unpack-path import-path build-flags #:allow-other-keys) + (apply invoke "go" "build" + "-v" + "-x" + (string-append "-ldflags=-s -w " + "-X github.com/docker/docker-credential-helpers" + "/credentials.Version=" #$version " " + "-X github.com/docker/docker-credential-helpers" + "/credentials.Package=" unpack-path " " + "-X github.com/docker/docker-credential-helpers" + "/credentials.Name=" #$name) + "-o" (string-append "bin/" #$name) + `(,@build-flags ,import-path)))) + (replace 'install + (lambda _ + (let* ((bin + (string-append #$output "/bin")) + (lib + (string-append #$output "/libexec/docker/cli-plugins")) + (entrypoint + (string-append lib "/" #$name))) + (mkdir-p bin) + (mkdir-p lib) + (copy-file (string-append "bin/" #$name) entrypoint) + (symlink entrypoint + (string-append bin "/" #$name)))))))) + (native-inputs + (list pkg-config)) + (inputs inputs) + (home-page "https://github.com/docker/docker-credential-helpers") + (synopsis "Store Docker login credentials in platform keystores") + (description + (string-append "docker-credential-helpers is a suite of programs to use native stores to keep +Docker credentials safe. + +This package provides the @code{" name "} plugin.")) + (license license:expat))) + (define-public cqfd (package (name "cqfd") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 06256066bc..58b53aba22 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2019 Danny Milosavljevic ;;; Copyright © 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2019 Florian Pelz -;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2019, 2024 Giacomo Leidi ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Jonathan Frederickson ;;; Copyright © 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer @@ -5229,6 +5229,10 @@ (define-public libsecret and other secrets. It communicates with the \"Secret Service\" using DBus.") (license license:lgpl2.1+))) +(define-public docker-credential-secretservice + (docker-credential-helpers "secretservice" + #:inputs (list libsecret))) + (define-public five-or-more (package (name "five-or-more")