From patchwork Tue Jun 30 15:43:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 22971 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 3C53D27BBE3; Tue, 30 Jun 2020 16:44:33 +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.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 171C327BBE1 for ; Tue, 30 Jun 2020 16:44:32 +0100 (BST) Received: from localhost ([::1]:53222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqIQx-0002xj-Ep for patchwork@mira.cbaines.net; Tue, 30 Jun 2020 11:44:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqIQU-0002i3-L1 for guix-patches@gnu.org; Tue, 30 Jun 2020 11:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39956) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqIQU-0004Fw-Bf for guix-patches@gnu.org; Tue, 30 Jun 2020 11:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jqIQU-00071g-9P for guix-patches@gnu.org; Tue, 30 Jun 2020 11:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41818] [PATCH] gnu: Add syncthing-gtk. Resent-From: paul Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Jun 2020 15:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41818 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke , 41818@debbugs.gnu.org Received: via spool by 41818-submit@debbugs.gnu.org id=B41818.159353180726956 (code B ref 41818); Tue, 30 Jun 2020 15:44:02 +0000 Received: (at 41818) by debbugs.gnu.org; 30 Jun 2020 15:43:27 +0000 Received: from localhost ([127.0.0.1]:51502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqIPl-00070Y-CA for submit@debbugs.gnu.org; Tue, 30 Jun 2020 11:43:27 -0400 Received: from confino.investici.org ([212.103.72.250]:40525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqIPj-00070P-7B for 41818@debbugs.gnu.org; Tue, 30 Jun 2020 11:43:16 -0400 Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 949EA2104B; Tue, 30 Jun 2020 15:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1593531793; bh=510sY+7Qm7tlUlRTwnAYXXtEBK9C9U2wVpvQDoPL4os=; h=Subject:To:References:From:Date:In-Reply-To:From; b=V3xVT9/4V2+MtSKHTiCFBSDEUUPF6/CtvH1r2gyXwlC3Kp18LSLzw5pTh2f9hF35J /lHaLLnFwdj3n6J+Q1cl8koPXbTt73whv1sm3IQ7qf/Jtts/6HAC0Favd1zlDCmNyI l9JBnfPQYNi5r9c4Xqj7+InrGh40HENc46fSF94s= Received: from [212.103.72.250] (mx1.investici.org [212.103.72.250]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 759212101D; Tue, 30 Jun 2020 15:43:13 +0000 (UTC) References: <20200611213707.22562-1-goodoldpaul@autistici.org> <87h7v2c0uw.fsf@gnu.org> From: paul Message-ID: <79263f3e-be1c-b7a8-aa46-bdf82c0cafeb@autistici.org> Date: Tue, 30 Jun 2020 17:43:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.9.0 MIME-Version: 1.0 In-Reply-To: <87h7v2c0uw.fsf@gnu.org> Content-Language: en-US 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 Hi Marius, On 6/22/20 10:16 PM, Marius Bakke wrote: > Giacomo Leidi writes: > >> * gnu/packages/syncthing.scm (syncthing-gtk): New variable. > [...] > >> + (build-system python-build-system) >> + (arguments >> + `(#:python ,python-2)) >> + (propagated-inputs >> + `(("python2-bcrypt" ,python2-bcrypt) >> + ("python2-dateutil" ,python2-dateutil) >> + ("python2-pycairo" ,python2-pycairo) >> + ("python2-pygobject" ,python2-pygobject) >> + ("python-nautilus" ,python-nautilus) >> + ("libappindicator" ,libappindicator) >> + ("libnotify" ,libnotify) >> + ("psmisc" ,psmisc) >> + ("syncthing" ,syncthing))) > I don't think these needs to be propagated, as the 'syncthing-gtk' > executable will be automatically wrapped with a PYTHONPATH that contains > the Python inputs. I didn't know that, I really should study deeper the build systems. > I'm not sure about libappindicator, libnotify and psmisc though. > Ideally we'd insert absolute references where appropriate to avoid > propagation. In the worst case we can wrap it with those in PATH. > > Can you look into it and send an updated patch? As you suggested I managed to move all propagated-inputs to the inputs field, I'm not sure I did it right but from my tests the package seem to be working. I'm attaching an updated version of the patch, I apologize for the delay. Giacomo From 76342546eb16a760137adacdfb2aefbf55592342 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Thu, 11 Jun 2020 23:34:43 +0200 Subject: [PATCH] gnu: Add syncthing-gtk. * gnu/packages/syncthing.scm (syncthing-gtk): New variable. --- gnu/packages/syncthing.scm | 76 +++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index dfc222057e..382d28e920 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,13 +22,23 @@ (define-module (gnu packages syncthing) #:use-module (guix build-system go) + #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix licenses) #:use-module (gnu packages) - #:use-module (gnu packages golang)) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages golang) + #:use-module (gnu packages gtk) + #:use-module (gnu packages linux) + #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages time)) (define-public syncthing (package @@ -177,6 +188,69 @@ Protocol.") (home-page "https://github.com/syncthing/syncthing") (license mpl2.0))) +(define-public syncthing-gtk + (package + (name "syncthing-gtk") + (version "0.9.4.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/syncthing/syncthing-gtk.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nc0wd7qvyri7841c3dd9in5d7367hys0isyw8znv5fj4c0a6v1f")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'hardcode-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (let ((psmisc (assoc-ref inputs "psmisc")) + (syncthing (assoc-ref inputs "syncthing"))) + ;; Hardcode dependencies paths to avoid propagation. + (substitute* "syncthing_gtk/tools.py" + (("killall") (string-append psmisc "/bin/killall"))) + (substitute* "syncthing_gtk/configuration.py" + (("/usr/bin/syncthing") (string-append syncthing + "/bin/syncthing")))) + #t)) + (add-after 'wrap 'wrap-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/syncthing-gtk") + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (inputs + `(("gtk+" ,gtk+) + ("libappindicator" ,libappindicator) + ("libnotify" ,libnotify) + ("python2-bcrypt" ,python2-bcrypt) + ("python2-dateutil" ,python2-dateutil) + ("python2-pycairo" ,python2-pycairo) + ("python2-pygobject" ,python2-pygobject) + ("python-nautilus" ,python-nautilus) + ("psmisc" ,psmisc) + ("syncthing" ,syncthing))) + (native-inputs + `(("python2-setuptools" ,python2-setuptools))) + (home-page "https://github.com/syncthing/syncthing-gtk") + (synopsis "GTK3 based GUI and notification area icon for Syncthing") + (description "@code{syncthing-gtk} is a GTK3 Python based GUI and +notification area icon for Syncthing. Supported Syncthing features: + +@itemize +@item Everything that WebUI can display +@item Adding, editing and deleting nodes +@item Adding, editing and deleting repositories +@item Restart, shutdown server +@item Editing daemon settings +@end itemize\n") + (license gpl2))) + (define-public go-github-com-jackpal-go-nat-pmp (package (name "go-github-com-jackpal-go-nat-pmp") -- 2.26.2