Re: [PATCH 00/16] Add onionshare

2016-09-11 Thread Efraim Flashner 
On Sun, Sep 11, 2016 at 09:58:41PM +0300, Efraim Flashner wrote:
> When I started this seemed like an easy way to share files. I'm not
> entirely happy with the number of packages that I ended up putting in
> python.scm, grapql-* seems like it could be broken off, django ones could
> go in Hartmut's django.scm. Python-nautilus doesn't seem to belong
> anywhere. I'd like to move all the sqlalchemy packages to databases.scm,
> but I don't think there's anything we can do about python.scm hitting
> 10k+ lines.
> 
> python-nautilus can be upgraded to 0.5.x, but it involves packaging more
> python packages, so I figured that could wait until later.
> 
> I've also included my "master file" that I pulled the patches from, it
> makes building all the patches a bit easier to only have to drop in one
> file than to apply 16 patches.
> 
> 
> Efraim Flashner (16):
>   gnu: Add python-pika.
>   gnu: Add python-peewee.
>   gnu: Add python-promise.
>   gnu: Add python-pytest-mock.
>   gnu: Add python-graphql-core.
>   gnu: Add python-graphql-relay.
>   gnu: Add python-sqlalchemy-utils.
>   gnu: Add python-pytest-django.
>   gnu: Add python-django-filter.
>   gnu: Add python-graphene.
>   gnu: Add python-consul.
>   gnu: Add python-cov-core.
>   gnu: Add python-nose2.
>   gnu: Add python-bcrypt.
>   gnu: Add python-nautilus.
>   gnu: Add onionshare.
> 
>  gnu/local.mk   |   1 +
>  gnu/packages/databases.scm |  30 ++
>  gnu/packages/password-utils.scm|  35 ++
>  .../patches/onionshare-fix-install-paths.patch |  39 ++
>  gnu/packages/python.scm| 452 
> -
>  gnu/packages/tor.scm   | 100 +
>  6 files changed, 656 insertions(+), 1 deletion(-)
>  create mode 100644 gnu/packages/patches/onionshare-fix-install-paths.patch
> 
> -- 
> 2.10.0
> 

And here's the onionshare.scm that I was using

-- 
Efraim Flashner      אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
;;; Copyright © 2016 Efraim Flashner 
;;;
;;; This file is an addendum to GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix.  If not, see .

(define-module (wip onionshare)
  #:use-module (gnu packages)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix download)
  #:use-module (guix packages)
  #:use-module (guix utils)
  #:use-module (guix build-system python)
  #:use-module (gnu packages databases)
  #:use-module (gnu packages python)
  #:use-module (gnu packages qt)
  #:use-module (gnu packages zip))

(define-public onionshare
  (package
(name "onionshare")
(version "0.9")
(source
  (origin
(method url-fetch)
(uri (string-append "https://github.com/micahflee/onionshare/archive/v;
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
 (base32
  "0pc3xbq379415s0i0y6rz02hay20zbvgra1jmg4mgrl9vbdr8zmw"))
(patches (search-patches "onionshare-fix-install-paths.patch"
(build-system python-build-system)
(arguments
 `(#:phases
   (modify-phases %standard-phases
 (add-after 'unpack 'fix-install-path
   (lambda* (#:key outputs #:allow-other-keys)
 (let* ((out(assoc-ref outputs "out"))
(onionshare (string-append out "/share/onionshare")))
   (substitute*
 "install/pyinstaller.spec"
 ;; inform onionshare where the 'resources' files are installed
 (("../resources") onionshare))
   (substitute*
 "onionshare/strings.py"
 ;; correct the locale directory
 (("helpers.get_resource_path\\('locale'\\)")
  (string-append "'" onionshare "/locale'")))
   (substitute*
 "onionshare/helpers.py"
 ;; correct the location of version.txt
 (("/usr") out)
 (("get_resource_path\\('version.txt'\\)")
  (string-append "'" onionshare "/version.txt'"))
 (("get_resource_path\\('wordlist.txt'\\)")
  (string-append "'" onionshare

[PATCH 00/16] Add onionshare

2016-09-11 Thread Efraim Flashner 
When I started this seemed like an easy way to share files. I'm not
entirely happy with the number of packages that I ended up putting in
python.scm, grapql-* seems like it could be broken off, django ones could
go in Hartmut's django.scm. Python-nautilus doesn't seem to belong
anywhere. I'd like to move all the sqlalchemy packages to databases.scm,
but I don't think there's anything we can do about python.scm hitting
10k+ lines.

python-nautilus can be upgraded to 0.5.x, but it involves packaging more
python packages, so I figured that could wait until later.

I've also included my "master file" that I pulled the patches from, it
makes building all the patches a bit easier to only have to drop in one
file than to apply 16 patches.


Efraim Flashner (16):
  gnu: Add python-pika.
  gnu: Add python-peewee.
  gnu: Add python-promise.
  gnu: Add python-pytest-mock.
  gnu: Add python-graphql-core.
  gnu: Add python-graphql-relay.
  gnu: Add python-sqlalchemy-utils.
  gnu: Add python-pytest-django.
  gnu: Add python-django-filter.
  gnu: Add python-graphene.
  gnu: Add python-consul.
  gnu: Add python-cov-core.
  gnu: Add python-nose2.
  gnu: Add python-bcrypt.
  gnu: Add python-nautilus.
  gnu: Add onionshare.

 gnu/local.mk   |   1 +
 gnu/packages/databases.scm |  30 ++
 gnu/packages/password-utils.scm|  35 ++
 .../patches/onionshare-fix-install-paths.patch |  39 ++
 gnu/packages/python.scm| 452 -
 gnu/packages/tor.scm   | 100 +
 6 files changed, 656 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/onionshare-fix-install-paths.patch

-- 
2.10.0