From patchwork Mon Apr 20 09:16:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 21368 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 95CF727BBE4; Mon, 20 Apr 2020 10:18:09 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 ESMTP id 3508F27BBE1 for ; Mon, 20 Apr 2020 10:18:09 +0100 (BST) Received: from localhost ([::1]:60200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQSZ6-0004bH-Ov for patchwork@mira.cbaines.net; Mon, 20 Apr 2020 05:18:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37728 helo=eggs1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQSZ1-0004a1-0Y for guix-patches@gnu.org; Mon, 20 Apr 2020 05:18:03 -0400 Received: from Debian-exim by eggs1p.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQSZ0-0004Wy-8M for guix-patches@gnu.org; Mon, 20 Apr 2020 05:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35054) by eggs1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQSYz-0004Wk-R2 for guix-patches@gnu.org; Mon, 20 Apr 2020 05:18:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQSYz-0001LZ-LE for guix-patches@gnu.org; Mon, 20 Apr 2020 05:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40479] [PATCH]: Add fdroidcl. References: <5e8c1249.1c69fb81.5b84a.0583@mx.google.com> In-Reply-To: <5e8c1249.1c69fb81.5b84a.0583@mx.google.com> Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Apr 2020 09:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40479@debbugs.gnu.org Cc: Sergey Trofimov Received: via spool by 40479-submit@debbugs.gnu.org id=B40479.15873742625151 (code B ref 40479); Mon, 20 Apr 2020 09:18:01 +0000 Received: (at 40479) by debbugs.gnu.org; 20 Apr 2020 09:17:42 +0000 Received: from localhost ([127.0.0.1]:46600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQSYc-0001Kw-Pt for submit@debbugs.gnu.org; Mon, 20 Apr 2020 05:17:42 -0400 Received: from flashner.co.il ([178.62.234.194]:47006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQSYb-0001Kk-3O for 40479@debbugs.gnu.org; Mon, 20 Apr 2020 05:17:38 -0400 Received: from localhost (unknown [147.161.8.139]) by flashner.co.il (Postfix) with ESMTPSA id EE70D4023A; Mon, 20 Apr 2020 09:17:30 +0000 (UTC) Date: Mon, 20 Apr 2020 12:16:53 +0300 From: Efraim Flashner Message-ID: <20200420091653.GE7353@E5400> MIME-Version: 1.0 Content-Disposition: inline X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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 I made a couple of changes to the patch. It now downloads the source using git-fetch and I updated the inputs a bit. For the tests, I'm afraid you're going to need to package the missing package. diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 17f5f41fcb..a32d6c570c 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020 Sergey Trofimov ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system android-ndk) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module ((guix licenses) #:prefix license:) @@ -41,6 +43,7 @@ #:use-module (gnu packages docker) #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages pcre) @@ -946,6 +949,39 @@ publishing, or to assist in creating, testing and submitting metadata to the main repository.") (license license:agpl3+))) +(define-public fdroidcl + (package + (name "fdroidcl") + (version "0.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mvdan/fdroidcl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rxcdyy2j34z0ql9d62w7ivsch9xihjnpb1z9kgy9q46vl8zhhy0")))) + (build-system go-build-system) + (arguments + `(#:import-path "mvdan.cc/fdroidcl" + #:tests? #f ; TODO. + #:install-source? #f)) + (inputs + `(("go-github-com-kr-pretty" + ,go-github-com-kr-pretty))) + (native-inputs + `(;; used in tests + ;; ("go-github-com-rogpeppe-go-internal-testscript" + ;; ,go-github-com-rogpeppe-go-internal-testscript) + )) + (synopsis "F-Droid desktop client") + (description + "While the Android client integrates with the system with regular update +checks and notifications, this is a simple command line client that talks to +connected devices via ADB.") + (home-page "https://github.com/mvdan/fdroidcl") + (license license:bsd-3))) + (define-public enjarify (package (name "enjarify")