Re: [PATCH] gnu: guile-next: Set correct native search paths.

[Andy Wingo]

On Sat 13 Feb 2016 06:13, "Thompson, David"  writes:

> diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
> index e6e7228..11d9da1 100644
> --- a/gnu/packages/guile.scm
> +++ b/gnu/packages/guile.scm
> @@ -210,7 +210,15 @@ without requiring the source code to be rewritten.")
>;; times (almost 3 hours on a 4-core Intel i5).
>(snippet '(for-each delete-file
>(find-files "prebuilt" "\\.go$")
> -(synopsis "Snapshot of what will become version 2.2 of GNU Guile")))
> +(synopsis "Snapshot of what will become version 2.2 of GNU Guile")
> +(native-search-paths
> + (list (search-path-specification
> +(variable "GUILE_LOAD_PATH")
> +(files '("share/guile/site/2.2")))
> +   (search-path-specification
> +(variable "GUILE_LOAD_COMPILED_PATH")
> +(files '("lib/guile/2.0/ccache"
> + "share/guile/site/2.2")))
>  
>  (define-public guile-for-guile-emacs
>(package (inherit guile-next)

This doesn't look right to me; why is GUILE_LOAD_COMPILED_PATH pointing
into share?  Probably need to update the pointer into lib to use 2.2,
also.

Andy

Re: PulseAudio

[Alex Sassmannshausen]

Hiya,

Ricardo Wurmus writes:

> Alex Sassmannshausen  writes:
>
>> Hello,
>>
>> Ricardo Wurmus writes:
>>
>>> Ludovic Courtès  writes:
>>>
 Leo Famulari  skribis:

> All kidding aside, I'm happy to push this with PulseAudio support, *if*
> a GuixSD user can confirm that it works. I don't have sound on my GuixSD
> installation.

 I use it all the time and it works, except for IceCat & co. as Chris
 notes, which try to use ALSA directly.
>>>
>>> Does this mean you do not hear sound coming from IceCat and its plugins
>>> with the example desktop system configuration?
>>
>> This is my experience too: works lovely for things like VLC, but not so
>> much for IceCat.
>
> How strange!  Do you have a configuration file “~/.asoundrc” or
> “/etc/asound.conf” that reroutes ALSA to PulseAudio?
>
> I’m not using PulseAudio on GuixSD and I have sound in media players and
> browser alike.

Sorry — I think I misunderstood what is going on: seems I don't have
PulseAudio enabled on my system at the moment — please ignore the noise.

Still curious why I don't have sound in my browser… more investigation
on my side needed it seems.

Cheers,

Alex

Re: GuixSD artwork

[Andreas Enge]

On Sun, Feb 14, 2016 at 04:59:17PM -0800, Christopher Allan Webber wrote:
> Why would we drop the checkerboard pattern again?  I like it a lot!

That of course is a question of taste; I am not so fond of it.
But my message was not to discuss matters of taste (which according
to German and French sayings is impossible). I seem to recall that
the pattern was simply an artefact of the program used to create
the png from the svg, and that it had been discussed and corrected.

> Yes, a nice GuixSD background by default might be nice.

And I also seem to recall that it was there before; or was that only
in ratpoison and not in xfce?

Andreas

Re: Network-Manager test fail

[Efraim Flashner]

On Sun, 14 Feb 2016 20:53:52 -0500
Leo Famulari  wrote:

> On Sun, Feb 14, 2016 at 08:41:29PM -0300, Daniel Pimentel wrote:
>  [...]  
> 
> Can you provide the parts of test-suite.log that describe the failures?
> 

if you build with the '-K' flag it'll keep the directory around so you can
get the log.

Also, another option is to try to update it to a newer version and see if
that takes care of the test failure.

-- 
Efraim Flashner  אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted


pgprSk2yf1xfS.pgp
Description: OpenPGP digital signature

[PATCH] gnu: add kicad

[Danny Milosavljevic]

Hi,

this patch adds kicad, an electronics design automation tool, to 
"engineering.scm".

What do I do with the optional stuff like scripting etc? Is there something 
like Gentoo USE flags?

Also, for this to work, wxwidgets.scm needs a 4 character patch. Do I add this 
here as well?
 
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index ba11f52..5c3440c 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -27,6 +27,7 @@
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
@@ -48,8 +49,10 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages wxwidgets)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages texlive)
+  #:use-module (gnu packages tls)
   #:use-module (srfi srfi-1))
 
 (define-public librecad
@@ -106,6 +109,53 @@
 plans and designs.")
 (license license:gpl2)))
 
+(define-public kicad
+ (package
+   (name "kicad")
+   (version "4.0.2")
+   (source (origin
+  (method url-fetch)
+  (uri (string-append
+   "https://launchpad.net/kicad/4.0/kicad-";
+   version
+   "/+download/kicad-"
+   version
+   ".tar.xz"))
+  (sha256
+   (base32
+"1fcf91fmxj6ha3mm6gzdb0px50j58m80p8wrncm8ca9shj36kbif"
+   (build-system cmake-build-system)
+   (arguments
+'(#:tests? #f ; TODO re-enable
+  #:configure-flags
+ (list "-DKICAD_SKIP_BOOST=ON" ; use system boost; otherwise, it tries to 
download one and fails.
+ ; TODO -DCMAKE_BUILD_TYPE=Release
+ ; TODO -DOPENSSL_ROOT_DIR=...
+ ; TODO -DCMAKE_PREFIX_PATH=...
+ ; TODO -DCMAKE_INSTALL_PREFIX=...
+ ; TODO -DDEFAULT_INSTALL_PATH=...
+ ; TODO -DKICAD_SCRIPTING=ON
+ ; TODO -DKICAD_SCRIPTING_MODULES=ON
+ ; TODO -DKICAD_SCRIPTING_WXPYTHON=ON
+ )))
+   ; TODO optional doxygen for source docs
+   (native-inputs
+ `())
+   (inputs
+ `(("wxwidgets" ,wxwidgets)
+   ("mesa" ,mesa)
+   ("glew" ,glew)
+   ("cairo" ,cairo)
+   ("libressl" ,libressl)
+   ("boost" ,boost)))
+   (home-page "http://kicad-pcb.org/";)
+   (synopsis "Electronics Design Automation Suite")
+   (description "Electronics Design Automation Suite")
+   (license license:gpl3+)))
+
+; TODO extra options for Python (which) and for version.
+; TODO kicad-doc, kicad-library, kicad-footprints
+
 (define-public geda-gaf
   (package
 (name "geda-gaf")

Re: [PATCH] gnu: Add genometools.

[Justus Winter]

Quoting Ben Woodcroft (2016-02-15 02:13:07)
> Thanks for the patch, but it appears you've included many other 
> changes.

Yeah :/

> Can you resend without them please?

I will, as soon as I have revised the package not to use some
libraries it bundles.

Justus

Re: [PATCH] gnu: add kicad

[Ben Woodcroft]

Hi,

Thanks for the patch. New contributors are most welcome.

On 15/02/16 17:40, Danny Milosavljevic wrote:

this patch adds kicad, an electronics design automation tool, to 
"engineering.scm".

What do I do with the optional stuff like scripting etc? Is there something 
like Gentoo USE flags?


That depends on the situation. Sometimes 'extra' scripts form part of 
the regular distribution and included as normal, sometimes they are 
included as separate outputs if they are large in size (or as separate 
packages), and sometimes they are simply not included. It really depends 
on what you'd like to see packaged (and maintained).



Also, for this to work, wxwidgets.scm needs a 4 character patch. Do I add this 
here as well?


Yes please. It isn't quite clear to me at this stage, but I would 
imagine a separate patch would be required.


[...]

Thanks.
ben

Add guile-config

[Alex Sassmannshausen]

Hello,

Attached you should find a working patch for guile-config, a library for
Guile that should make maintaining command-line options and
configuration files for your scripts/programs easier.

I'm preparing a 0.1 Release announcement for this project too.

I ran it through `guix lint` and it seemed to be fine, but let me know
if you have any comments!

Best wishes,
Alex

>From 3666fb9444092710d11a939eba487b5152f51ffe Mon Sep 17 00:00:00 2001
From: Alex Sassmannshausen 
Date: Sun, 14 Feb 2016 19:23:24 +0100
Subject: [PATCH] gnu: Add guile-config.

* gnu/packages/guile.scm (guile-config): New variable.
---
 gnu/packages/guile.scm | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index e6e7228..ab38af5 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -731,6 +731,33 @@ interface for reading articles in any format.")
 (home-page "http://haunt.dthompson.us";)
 (license gpl3+)))
 
+(define-public guile-config
+  (package
+(name "guile-config")
+(version "0.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"http://alex.pompo.co/software/"; name "-" version
+".tar.gz"))
+  (sha256
+   (base32
+"1yk4xmwp4rl9ral02igppfh9dh4l97k2kmgpkqhy3znjir004v8z"
+(build-system gnu-build-system)
+(inputs
+ `(("guile" ,guile-2.0)))
+(synopsis "Guile application configuration parsing library")
+(description
+ "Guile Config is a library providing a declarative approach to
+application configuration specification.  The library provides clean
+configuration declaration forms, and processors that take care of:
+configuration file creation; configuration file parsing; command-line
+parameter parsing using getopt-long; basic GNU command-line parameter
+generation (--help, --usage, --version); automatic output generation for the
+above command-line parameters.")
+(home-page "https://github.com/a-sassmannshausen/guile-config";)
+(license agpl3+)))
+
 (define-public guile-redis
   (package
 (name "guile-redis")
-- 
2.6.3

Re: [PATCH] gnu: Add slurm.

[Pjotr Prins]

On Sun, Feb 14, 2016 at 02:08:30PM -0500, Leo Famulari wrote:
> I think the old version of git must play a role, or every patch with a
> copyright attribution line would fail to apply.

New version cleaned up (using python-wrapper) and patch created
with latest git and en_US.utf8 Guix style...

Ah yes, lint is happy too. I am proud of this one. Hope you are.

Pj.

-- 
>From 72513ea3f730323dc8977d97c9d4ddd691f6d48a Mon Sep 17 00:00:00 2001
From: Pjotr Prins 
Date: Mon, 15 Feb 2016 10:14:44 +
Subject: [PATCH] gnu: Add slurm.

* gnu/packages/parallel.scm (slurm): New variable.
* gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch: New file.
* gnu/packages/parallel.scm (parallel): Introduce license name space.
---
 gnu-system.am  |  1 +
 gnu/packages/parallel.scm  | 60 --
 .../slurm-configure-remove-nonfree-contribs.patch  | 43 
 3 files changed, 99 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch

diff --git a/gnu-system.am b/gnu-system.am
index 91945db..7727bad 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -700,6 +700,7 @@ dist_patch_DATA =		\
   gnu/packages/patches/slim-session.patch			\
   gnu/packages/patches/slim-config.patch			\
   gnu/packages/patches/slim-sigusr1.patch			\
+  gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch \
   gnu/packages/patches/soprano-find-clucene.patch		\
   gnu/packages/patches/sudo-CVE-2015-5602.patch			\
   gnu/packages/patches/superlu-dist-scotchmetis.patch		\
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 8f63bda..d6910de 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013,2014 Eric Bavier 
 ;;; Copyright © 2015 Mark H Weaver 
 ;;; Copyright © 2015 Efraim Flashner 
+;;; Copyright © 2016 Pjotr Prins 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,12 +20,18 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu packages parallel)
-  #:use-module (guix packages)
-  #:use-module (guix licenses)
-  #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
   #:use-module (gnu packages)
-  #:use-module (gnu packages perl))
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tcl)
+  #:use-module (gnu packages tls))
 
 (define-public parallel
   (package
@@ -46,4 +53,47 @@
  "GNU Parallel is a tool for executing shell jobs in parallel using one
 or more computers.  Jobs can consist of single commands or of scripts
 and they are executed on lists of files, hosts, users or other items.")
-(license gpl3+)))
+(license license:gpl3+)))
+
+(define-public slurm
+  (package
+   (name "slurm")
+   (version "15.08.7.1")
+   (source (origin
+(method url-fetch)
+(uri (string-append
+  "https://github.com/SchedMD/slurm/archive/slurm-";
+  (string-join (string-split version #\.) "-") ".tar.gz"))
+(file-name (string-append name "-" version ".tar.gz"))
+(sha256
+ (base32
+  "1rmi35l4img00dr4vic8cv8s7b6n1yx1mkq2s7kjf5hvqdh6s2ki"))
+(patches (list
+ (search-patch "slurm-configure-remove-nonfree-contribs.patch")))
+(modules '((guix build utils)))
+(snippet
+ '(begin
+(delete-file-recursively "contribs")
+#t
+   (inputs `(("openssl" ,openssl)
+ ("munge" ,munge)
+ ("perl" ,perl)
+ ("expect" ,expect)
+ ("python" ,python-wrapper)
+ ("linux-pam" , linux-pam)))
+   (native-inputs
+`(("autoconf" ,autoconf)))
+   (build-system gnu-build-system)
+   (arguments
+`(#:configure-flags '("--enable-pam")
+  #:phases
+  (modify-phases %standard-phases
+   (add-before
+'configure 'autogen
+(lambda _ (zero? (system* "autoconf"))) ; configure.ac was patched
+   (home-page "http://slurm.schedmd.com/";)
+   (synopsis "Workload manager for cluster computing")
+   (description
+"Fault-tolerant and highly scalable cluster management and job
+scheduling system for large and small clusters.")
+   (license license:gpl2+)))
diff --git a/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch b/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch
new file mode 100644
index 000..b63d5bb
--- /dev/null
+++ b/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch
@@ -0,0 +1,43 @@
+From 53eda9102b969a4be2882cea4befee03591a7436 Mon Sep 17 00:00:00 2001
+From: P

Re: emacs packaging (emacs-popup)

[Federico Beffa]

Nils Gillmann  writes:

> I'm packaging emacs-popup.
>
> Currently the output builds with
> niasterisk@khazad-dum ~/projects/guix_project/guix$ ls -al
> /gnu/store/knpjk9vflja0i6yhnz4ai57k29jpgm4p-emacs-popup-0.5.3/share/emacs/site-lisp/guix.d/popup-0.5.3/
> total 180
> dr-xr-xr-x 4 root guixbuild  4096 Jan  1  1970 ./
> dr-xr-xr-x 3 root guixbuild  4096 Jan  1  1970 ../
> -r--r--r-- 2 root guixbuild90 Jan  1  1970 Cask
> dr-xr-xr-x 3 root guixbuild  4096 Jan  1  1970 etc/
> -r--r--r-- 2 root guixbuild14 Jan  1  1970 .gitignore
> -r--r--r-- 2 root guixbuild   626 Jan  1  1970 Makefile
> -r--r--r-- 2 root guixbuild   334 Jan  1  1970 popup-autoloads.el
> -r--r--r-- 2 root guixbuild 54848 Jan  1  1970 popup.el
> -r--r--r-- 2 root guixbuild 75474 Jan  1  1970 popup.elc
> -r--r--r-- 2 root guixbuild 10187 Jan  1  1970 README.md
> dr-xr-xr-x 2 root guixbuild  4096 Jan  1  1970 tests/
> -r--r--r-- 2 root guixbuild   569 Jan  1  1970 .travis.yml
>
> Can this be improved, ie remove some of the files to clean it up,
> or is it all good?

I would suggest to move the README.md (and in general documentation
related files) to $datadir/doc/package-name-version/. Info files to
$datadir/info/package-name-version/. Take a look at 'emacs-slime'.

Remove unused files like .gitignore, ...

Regards,
Fede

Re: [PATCH] gnu: guile-next: Set correct native search paths.

[Thompson, David]

On Mon, Feb 15, 2016 at 3:47 AM, Andy Wingo  wrote:
> On Sat 13 Feb 2016 06:13, "Thompson, David"  writes:
>
>> diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
>> index e6e7228..11d9da1 100644
>> --- a/gnu/packages/guile.scm
>> +++ b/gnu/packages/guile.scm
>> @@ -210,7 +210,15 @@ without requiring the source code to be rewritten.")
>>;; times (almost 3 hours on a 4-core Intel i5).
>>(snippet '(for-each delete-file
>>(find-files "prebuilt" "\\.go$")
>> -(synopsis "Snapshot of what will become version 2.2 of GNU Guile")))
>> +(synopsis "Snapshot of what will become version 2.2 of GNU Guile")
>> +(native-search-paths
>> + (list (search-path-specification
>> +(variable "GUILE_LOAD_PATH")
>> +(files '("share/guile/site/2.2")))
>> +   (search-path-specification
>> +(variable "GUILE_LOAD_COMPILED_PATH")
>> +(files '("lib/guile/2.0/ccache"
>> + "share/guile/site/2.2")))
>>
>>  (define-public guile-for-guile-emacs
>>(package (inherit guile-next)
>
> This doesn't look right to me; why is GUILE_LOAD_COMPILED_PATH pointing
> into share?

Because this is what our Guile package already did.  I just changed
"2.0" to "2.2".

> Probably need to update the pointer into lib to use 2.2, also.

Yeah, that was a typo I've since fixed locally.

- Dave

Re: [PATCH] gnu: Add genometools.

[Ricardo Wurmus]

Justus Winter  writes:

> Quoting Ben Woodcroft (2016-02-15 02:13:07)
>> Thanks for the patch, but it appears you've included many other 
>> changes.
>
> Yeah :/
>
>> Can you resend without them please?
>
> I will, as soon as I have revised the package not to use some
> libraries it bundles.

Feel free to post a preliminary version here if you get stuck.  I’ve
stripped bundled libraries in a couple of bioinfo packages before and we
could work through this together.

~~ Ricardo

Re: [PATCH] Add audit.

[Ricardo Wurmus]

Ludovic Courtès  writes:

> Ricardo Wurmus  skribis:
>
>> the tests for this package cannot easily be fixed by
>>
>>#:phases
>>(modify-phases %standard-phases
>>  (add-after 'unpack 'fix-tests
>>(lambda _
>>  (substitute* "auparse/test/auparse_test.ref"
>>(("\\(root\\)") "(unknown(0))"))
>>  #t)))
>>
>> because for *some* of them “(root)” is returned (while for *most* of
>> them its “(unknown(0))”).  Ideas on how to fix the tests are very
>> welcome!
>
> How does it get that info?
>
> One thing to know is that /etc/passwd in the build environment contains
> only two entries, and no entry for root/0; quoth build.cc:
>
> --8<---cut here---start->8---
> writeFile(chrootRootDir + "/etc/passwd",
> (format(
> "nixbld:x:%1%:%2%:Nix build user:/:/noshell\n"
> "nobody:x:65534:65534:Nobody:/:/noshell\n")
> % (buildUser.enabled() ? buildUser.getUID() : getuid())
> % (buildUser.enabled() ? buildUser.getGID() : getgid())).str());
> --8<---cut here---end--->8---
>
> Thus, getpwuid(0) and getpwnam("root") both fail.

Ah, this explains it.  With a variant of the above build phase I was
able to make the tests pass.  I added a comment to explain why that’s
needed.

>> From c4948bc06b30e4e55810b82cc458cd6a429b6f80 Mon Sep 17 00:00:00 2001
>> From: Ricardo Wurmus 
>> Date: Wed, 13 Jan 2016 16:00:06 +0100
>> Subject: [PATCH] gnu: Add audit.
>>
>> * gnu/packages/admin.scm (audit): New variable.
>
> [...]
>
>> +(synopsis "Userspace component to the Linux auditing system")
>
> I’d write “User-space”.
>
>> +(description
>> + "auditd is the userspace component to the Linux auditing system.  It's
>
> Maybe something like: “… to the Linux auditing system, which allows
> logging of system calls made by user-land processes.”

Okay.  I applied these changes and pushed.
Thanks for the review and the suggestions!

~~ Ricardo

[PATCH] wxwidgets: enable extended regexps

[Danny Milosavljevic]

Hi,

the following patch enables "extended" regexps as required by kicad.
It could conceivably inadvertedly change behaviour of other wxwidgets apps. 
What do you think? Is this the right way?

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index b49fb2f..65adfc1 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -61,7 +61,7 @@
  `(("pkg-config" ,pkg-config)))
 (arguments
  '(#:configure-flags
-   '("--with-regex=sys" "--with-libmspack" "--with-sdl")
+   '("--with-regex" "--with-libmspack" "--with-sdl")
#:make-flags
(list (string-append "LDFLAGS=-Wl,-rpath="
 (assoc-ref %outputs "out") "/lib"))

Re: emacs packaging (emacs-popup)

[Alex Kost]

Federico Beffa (2016-02-15 15:12 +0300) wrote:

> Nils Gillmann  writes:
>
>> I'm packaging emacs-popup.
>>
>> Currently the output builds with
>> niasterisk@khazad-dum ~/projects/guix_project/guix$ ls -al
>> /gnu/store/knpjk9vflja0i6yhnz4ai57k29jpgm4p-emacs-popup-0.5.3/share/emacs/site-lisp/guix.d/popup-0.5.3/
>> total 180
>> dr-xr-xr-x 4 root guixbuild  4096 Jan  1  1970 ./
>> dr-xr-xr-x 3 root guixbuild  4096 Jan  1  1970 ../
>> -r--r--r-- 2 root guixbuild90 Jan  1  1970 Cask
>> dr-xr-xr-x 3 root guixbuild  4096 Jan  1  1970 etc/
>> -r--r--r-- 2 root guixbuild14 Jan  1  1970 .gitignore
>> -r--r--r-- 2 root guixbuild   626 Jan  1  1970 Makefile
>> -r--r--r-- 2 root guixbuild   334 Jan  1  1970 popup-autoloads.el
>> -r--r--r-- 2 root guixbuild 54848 Jan  1  1970 popup.el
>> -r--r--r-- 2 root guixbuild 75474 Jan  1  1970 popup.elc
>> -r--r--r-- 2 root guixbuild 10187 Jan  1  1970 README.md
>> dr-xr-xr-x 2 root guixbuild  4096 Jan  1  1970 tests/
>> -r--r--r-- 2 root guixbuild   569 Jan  1  1970 .travis.yml
>>
>> Can this be improved, ie remove some of the files to clean it up,
>> or is it all good?
>
> I would suggest to move the README.md (and in general documentation
> related files) to $datadir/doc/package-name-version/. Info files to
> $datadir/info/package-name-version/. Take a look at 'emacs-slime'.
>
> Remove unused files like .gitignore, ...

I don't agree.  This is not done for any other emacs package.  I think
".gitignore" and other files should not be removed in a package recipe.
This is a job for emacs-build-system, and I thought it was agreed¹.  So
I think this "emacs-popup" package can be left as it is now, and once
our emacs-build-system will be improved (to remove useless file, to move
README into share/doc, etc.), it will be fixed automatically.

¹ http://lists.gnu.org/archive/html/guix-devel/2015-07/msg00416.html

-- 
Alex

Re: Add guile-config

[Christopher Allan Webber]

Alex Sassmannshausen writes:

> Hello,
>
> Attached you should find a working patch for guile-config, a library for
> Guile that should make maintaining command-line options and
> configuration files for your scripts/programs easier.
>
> I'm preparing a 0.1 Release announcement for this project too.
>
> I ran it through `guix lint` and it seemed to be fine, but let me know
> if you have any comments!
>
> Best wishes,
> Alex

Horray!  After your FOSDEM talk I'm excited about it :)

Re: Guix vs GuixSD

[myglc2]

Chris Marusich  writes:
[...]
> I think you're asking "What is the difference between Guix and
> GuixSD", and you don't feel that the manual is clear enough about
> this. Is that right?

No, the problem is at a higher level than the manual.

The current packaging of Guix within GuixSD obfuscates what is going on
and makes understanding the Guix-verse difficult.

I drew the diagrams: To illustrate and stimulate a discussion of this.

Do you have any thoughts about the diagrams?

Re: emacs packaging (emacs-popup)

[Nils Gillmann]

Alex Kost  writes:

> Federico Beffa (2016-02-15 15:12 +0300) wrote:
>
>> Nils Gillmann  writes:
>>
>>> I'm packaging emacs-popup.
>>>
>>> Currently the output builds with
>>> niasterisk@khazad-dum ~/projects/guix_project/guix$ ls -al
>>> /gnu/store/knpjk9vflja0i6yhnz4ai57k29jpgm4p-emacs-popup-0.5.3/share/emacs/site-lisp/guix.d/popup-0.5.3/
>>> total 180
>>> dr-xr-xr-x 4 root guixbuild  4096 Jan  1  1970 ./
>>> dr-xr-xr-x 3 root guixbuild  4096 Jan  1  1970 ../
>>> -r--r--r-- 2 root guixbuild90 Jan  1  1970 Cask
>>> dr-xr-xr-x 3 root guixbuild  4096 Jan  1  1970 etc/
>>> -r--r--r-- 2 root guixbuild14 Jan  1  1970 .gitignore
>>> -r--r--r-- 2 root guixbuild   626 Jan  1  1970 Makefile
>>> -r--r--r-- 2 root guixbuild   334 Jan  1  1970 popup-autoloads.el
>>> -r--r--r-- 2 root guixbuild 54848 Jan  1  1970 popup.el
>>> -r--r--r-- 2 root guixbuild 75474 Jan  1  1970 popup.elc
>>> -r--r--r-- 2 root guixbuild 10187 Jan  1  1970 README.md
>>> dr-xr-xr-x 2 root guixbuild  4096 Jan  1  1970 tests/
>>> -r--r--r-- 2 root guixbuild   569 Jan  1  1970 .travis.yml
>>>
>>> Can this be improved, ie remove some of the files to clean it up,
>>> or is it all good?
>>
>> I would suggest to move the README.md (and in general documentation
>> related files) to $datadir/doc/package-name-version/. Info files to
>> $datadir/info/package-name-version/. Take a look at 'emacs-slime'.
>>
>> Remove unused files like .gitignore, ...
>
> I don't agree.  This is not done for any other emacs package.  I think
> ".gitignore" and other files should not be removed in a package recipe.
> This is a job for emacs-build-system, and I thought it was agreed¹.  So
> I think this "emacs-popup" package can be left as it is now, and once
> our emacs-build-system will be improved (to remove useless file, to move
> README into share/doc, etc.), it will be fixed automatically.
>
> ¹ http://lists.gnu.org/archive/html/guix-devel/2015-07/msg00416.html

Oh!
Thanks for the input and further reading. Then I'll look into
last changes and get a patch ready.

thanks,
-- 
ng

[PATCH] gnu: emacs-popup (new variable)

[Nils Gillmann]

This patch adds emacs-popup.

>From 66abaf9cfcb566e2027acf145b06963c6e52a99c Mon Sep 17 00:00:00 2001
From: Nils Gillmann 
Date: Mon, 15 Feb 2016 19:06:16 +0100
Subject: [PATCH] gnu: add emacs-popup

* gnu/packages/emacs.scm (emacs-popup): New variable.
---
 gnu/packages/emacs.scm | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 48417e6..78a6af0 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2014, 2015, 2016 Alex Kost 
 ;;; Copyright © 2015 Federico Beffa 
 ;;; Copyright © 2015 Ricardo Wurmus 
+;;; Copyright © 2016 Nils Gillmann 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1452,3 +1453,29 @@ supports editing Lisp source files, @{slime-mode} adds support for
 interacting with a running Common Lisp process for compilation,
 debugging, documentation lookup, and so on.")
 (license license:gpl2+)))
+
+(define-public emacs-popup
+  (package
+(name "emacs-popup")
+(version "0.5.3")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://github.com/auto-complete/popup-el/archive/v";
+ version
+ ".tar.gz"))
+   (file-name (string-append name "-" version ".tar.gz"))
+   (sha256
+(base32
+ "1yrgfj8y69xmcb6kwgplhq68ndm9410qwh7sd2knnd1gchpphdc0"
+(build-system emacs-build-system)
+(native-inputs
+ `(("emacs" ,emacs-no-x)))
+(home-page "https://github.com/auto-complete/popup-el";)
+(synopsis "Visual Popup User Interface for Emacs")
+(description
+ "Popup.el is a visual popup user interface library for Emacs.
+  This provides a basic API and common UI widgets such as popup
+tooltips and popup menus.")
+(license license:gpl3+)))
-- 
2.6.3


thanks,
-- 
ng

[PATCH] gnu: Add gnome-backgrounds.

[rennes]

Hi,

i attached gnome-backgrounds patch for review.

Considerations:
 a) I can't find the licenses CC-BY2 and CC-BY-SA2 in licenses.scm.
 b) Just found the home-page 
"https://git.gnome.org/browse/gnome-backgrounds";, for the project.



ThanksFrom 80a921672022ddf1198c3d71c497d98f0800fe73 Mon Sep 17 00:00:00 2001
From: Rene Saavedra 
Date: Mon, 15 Feb 2016 12:18:28 -0600
Subject: [PATCH] gnu: Add gnome-backgrounds.

* gnu/packages/gnome.scm (gnome-backgrounds): New variable.

---
 gnu/packages/gnome.scm | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fd0ce67..76892cc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4681,3 +4681,30 @@ a specific user-requested directory branch (local or remote).  Once the scan
 is complete it provides a graphical representation of each selected folder.")
 (home-page "https://wiki.gnome.org/Apps/Baobab";)
 (license license:gpl2+)))
+
+(define-public gnome-backgrounds
+  (package
+(name "gnome-backgrounds")
+(version "3.18.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "mirror://gnome/sources/" name "/"
+   (version-major+minor version) "/"
+   name "-" version ".tar.xz"))
+   (sha256
+   (base32
+"1fd7y8dh3iy88ayb8irgsihvssli6bzjzb5a6vfhi8qjbw70ymma"
+(build-system glib-or-gtk-build-system)
+(native-inputs
+ `(("intltool" ,intltool)))
+(home-page "https://git.gnome.org/browse/gnome-backgrounds";)
+(synopsis "Background images for the GNOME desktop")
+(description
+ "GNOME backgrounds package contains a collection of graphics files
+which can be used as backgrounds in the GNOME Desktop environment.
+Additionally, the package creates the proper framework and directory structure
+so that you can add your own files to the collection.")
+(license (list license:gpl2+
+   ;; XXX: licensing also included: CC-BY2, CC-BY-SA2.
+   license:cc-by-sa3.0
-- 
2.6.3

Re: [PATCH] Add and use sqlite-legacy-for-python

[Christopher Allan Webber]

Christopher Allan Webber writes:

> Mark Weaver suggested that I try with the latest sqlite release (3.10.2)
> and see if upgrading would fix the problem.  It did not.
>
> python-alembic is the only Python package I have left to do for handling
> all of MediaGoblin's Python dependencies.  I would really appreciate it
> if we could find a solution for this.
>
> (I suppose bugs should also be filed upstream.  I can do that tomorrow,
> I hope.)
>
>  - Chris

Building with a newer version still fails.

I filed a bug on the sqlalchemy tracker:

  
https://bitbucket.org/zzzeek/sqlalchemy/issues/3649/tests-fail-with-python-built-with-newer

Re: Add guile-config

[Christopher Allan Webber]

Alex Sassmannshausen writes:

> Hello,
>
> Attached you should find a working patch for guile-config, a library for
> Guile that should make maintaining command-line options and
> configuration files for your scripts/programs easier.
>
> I'm preparing a 0.1 Release announcement for this project too.
>
> I ran it through `guix lint` and it seemed to be fine, but let me know
> if you have any comments!
>
> Best wishes,
> Alex

I tried building and testing it:

Starting download of 
/gnu/store/gq2zz95zmmsjkpn7lbwfbna8m4hr56r7-guile-config-0.1.tar.gz
>From http://alex.pompo.co/software/guile-config-0.1.tar.gz...
 guile-config-0.1.tar.gz  332KiB100KiB/s 00:03 [] 100.0%
output path 
`/gnu/store/gq2zz95zmmsjkpn7lbwfbna8m4hr56r7-guile-config-0.1.tar.gz' should 
have sha256 hash `1yk4xmwp4rl9ral02igppfh9dh4l97k2kmgpkqhy3znjir004v8z', 
instead has `0fcj2d91z7nhm9k79zkc826l8i06khqvp3d641wik9s3hv6qjya2'

So I guess unless I'm being MITM'ed or some other error (I verified
that's the hash I'm seeing with "guix hash" after a wget), it looks like
that hash is wrong?

 - Chris

Re: [PATCH] Add and use sqlite-legacy-for-python

[Christopher Allan Webber]

Christopher Allan Webber writes:

> Building with a newer version still fails.
>
> I filed a bug on the sqlalchemy tracker:
>
>   
> https://bitbucket.org/zzzeek/sqlalchemy/issues/3649/tests-fail-with-python-built-with-newer

Good news, see the above ticket!  There's a fix upstream.  I'm working
backporting as a patch for Guix.

Only python-sqlalchemy will need to be updated, which meanss this won't
require a ton of rebuilds.

Re: [PATCH] gnu: Add gnome-backgrounds.

[Alex Kost]

ren...@openmailbox.org (2016-02-15 21:35 +0300) wrote:

> Hi,
>
> i attached gnome-backgrounds patch for review.
>
> Considerations:
>  a) I can't find the licenses CC-BY2 and CC-BY-SA2 in licenses.scm.

Then you are welcome to add them :-)  See commit 12abc6e¹ for example.

>  b) Just found the home-page
> "https://git.gnome.org/browse/gnome-backgrounds";, for the project.

I think it's OK.  There is probably no special home for backgrounds.

[...]
> +(define-public gnome-backgrounds
> +  (package
> +(name "gnome-backgrounds")
> +(version "3.18.0")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (string-append "mirror://gnome/sources/" name "/"
> +   (version-major+minor version) "/"
> +   name "-" version ".tar.xz"))
> +   (sha256
> +   (base32
   (base32
  ↑↑
should be shifted a bit

> +"1fd7y8dh3iy88ayb8irgsihvssli6bzjzb5a6vfhi8qjbw70ymma"
> +(build-system glib-or-gtk-build-system)
> +(native-inputs
> + `(("intltool" ,intltool)))
> +(home-page "https://git.gnome.org/browse/gnome-backgrounds";)
> +(synopsis "Background images for the GNOME desktop")
> +(description
> + "GNOME backgrounds package contains a collection of graphics files
> +which can be used as backgrounds in the GNOME Desktop environment.
> +Additionally, the package creates the proper framework and directory 
> structure
> +so that you can add your own files to the collection.")
> +(license (list license:gpl2+
> +   ;; XXX: licensing also included: CC-BY2, CC-BY-SA2.
> +   license:cc-by-sa3.0

Overall the patch looks good to me, so if you are willing to add these
missing licenses, I think we can commit 'gnome-backgrounds' afterwards.

¹ 
http://git.savannah.gnu.org/cgit/guix.git/commit/?id=12abc6e39548a55c2b6ba4113f9f1bde8d5d08e1

-- 
Alex

Re: Add guile-config

[Efraim Flashner]

On Mon, 15 Feb 2016 12:43:35 +0100
Alex Sassmannshausen  wrote:

> Hello,
> 
> Attached you should find a working patch for guile-config, a library for
> Guile that should make maintaining command-line options and
> configuration files for your scripts/programs easier.
> 
> I'm preparing a 0.1 Release announcement for this project too.
> 
> I ran it through `guix lint` and it seemed to be fine, but let me know
> if you have any comments!
> 
> Best wishes,
> Alex
> 

don't forget the (c) line!

-- 
Efraim Flashner  אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted


pgpUNyjuM6d4J.pgp
Description: OpenPGP digital signature

Re: [PATCH] gnu: emacs-popup (new variable)

[Alex Kost]

Nils Gillmann (2016-02-15 21:13 +0300) wrote:

> This patch adds emacs-popup.

Hi, only nitpicks from my side, so I'm going to commit this patch (no
need to resend an updated version) in several days, if there will be no
other comments.

> From 66abaf9cfcb566e2027acf145b06963c6e52a99c Mon Sep 17 00:00:00 2001
> From: Nils Gillmann 
> Date: Mon, 15 Feb 2016 19:06:16 +0100
> Subject: [PATCH] gnu: add emacs-popup
Add emacs-popup.
typos:  ↑  ↑

> * gnu/packages/emacs.scm (emacs-popup): New variable.
> ---
>  gnu/packages/emacs.scm | 27 +++
>  1 file changed, 27 insertions(+)
>
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 48417e6..78a6af0 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -5,6 +5,7 @@
>  ;;; Copyright © 2014, 2015, 2016 Alex Kost 
>  ;;; Copyright © 2015 Federico Beffa 
>  ;;; Copyright © 2015 Ricardo Wurmus 
> +;;; Copyright © 2016 Nils Gillmann 
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -1452,3 +1453,29 @@ supports editing Lisp source files, @{slime-mode} adds 
> support for
>  interacting with a running Common Lisp process for compilation,
>  debugging, documentation lookup, and so on.")
>  (license license:gpl2+)))
> +
> +(define-public emacs-popup
> +  (package
> +(name "emacs-popup")
> +(version "0.5.3")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (string-append
> + "https://github.com/auto-complete/popup-el/archive/v";
> + version
> + ".tar.gz"))
> +   (file-name (string-append name "-" version ".tar.gz"))
> +   (sha256
> +(base32
> + "1yrgfj8y69xmcb6kwgplhq68ndm9410qwh7sd2knnd1gchpphdc0"
> +(build-system emacs-build-system)
> +(native-inputs
> + `(("emacs" ,emacs-no-x)))
> +(home-page "https://github.com/auto-complete/popup-el";)
> +(synopsis "Visual Popup User Interface for Emacs")
> +(description
> + "Popup.el is a visual popup user interface library for Emacs.
> +  This provides a basic API and common UI widgets such as popup
   ↑↑
Redundant spaces.

> +tooltips and popup menus.")
> +(license license:gpl3+)))

-- 
Alex

Re: [PATCH] Add and use sqlite-legacy-for-python

[Pjotr Prins]

On Mon, Feb 15, 2016 at 12:13:36PM -0800, Christopher Allan Webber wrote:
> Christopher Allan Webber writes:
> 
> > Building with a newer version still fails.
> >
> > I filed a bug on the sqlalchemy tracker:
> >
> >   
> > https://bitbucket.org/zzzeek/sqlalchemy/issues/3649/tests-fail-with-python-built-with-newer
> 
> Good news, see the above ticket!  There's a fix upstream.  I'm working
> backporting as a patch for Guix.
> 
> Only python-sqlalchemy will need to be updated, which meanss this won't
> require a ton of rebuilds.

That is good news indeed :)
-- 

[PATCH] gnu: Add pioneers

[thylakoid]

Hello all,

I am submitting this patch that packages the game 'pioneers' into the 
games.scm file.


Let me know if I made any mistakes or can improve anything. I'm hoping 
to package several more appplications soon.


The patch is an attachment.

- Rodger Foxdiff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 7eb0e7a..b32a6f4 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2015, 2016 Alex Kost 
 ;;; Copyright © 2015 Paul van der Walt 
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer 
+;;; Copyright © 2016 Rodger Fox 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -44,6 +45,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
+  #:use-module (gnu packages avahi)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages game-development)
@@ -89,6 +91,33 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system trivial))
 
+
+(define-public pioneers
+  (package
+(name "pioneers")
+(version "15.3")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+		 "http://downloads.sourceforge.net/pio/pioneers-";
+		 version
+ ".tar.gz"))
+  (sha256
+(base32
+  "128s718nnraiznbg2rajjqb7cfkdg24hy6spdd9narb4f4dsbbv9"
+(build-system gnu-build-system)
+(inputs `(("gtk+" ,gtk+)
+  ("librsvg" ,librsvg)
+  ("avahi" ,avahi)))
+(native-inputs `(("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)))
+(synopsis "A clone of The Settlers of Catan board game")
+(description
+  "Pioneers is an emulation of the board game The Settlers of Catan. It can be played on a local 
+network, on the internet, and with AI players.")
+(home-page "http://pio.sourceforge.net/";)
+(license license:gpl2+)))
+
 (define-public gnubg
   (package
 (name "gnubg")

gnu: python-sqlalchemy: Update to 1.0.12.

[Christopher Allan Webber]

This also fixes the python / sqlalchemy / sqlite test failure problem.

>From 880e39c230bf9ac956baa0853acf7158481b3ee6 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Mon, 15 Feb 2016 13:40:13 -0800
Subject: [PATCH] gnu: python-sqlalchemy: Update to 1.0.12.

* gnu/packages/python.scm (python-sqlalchemy): Update to 1.0.12.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2090d3a..805c4a2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3541,7 +3541,7 @@ routines such as routines for numerical integration and optimization.")
 (define-public python-sqlalchemy
   (package
 (name "python-sqlalchemy")
-(version "0.9.7")
+(version "1.0.12")
 (source
  (origin
   (method url-fetch)
@@ -3549,7 +3549,7 @@ routines such as routines for numerical integration and optimization.")
   "SQLAlchemy/SQLAlchemy-" version ".tar.gz"))
   (sha256
(base32
-"059ayifj5l08v6vv56anhyibyllscn10dlzr2fcw68gz1hfjdzsz"
+"1l8qclhd0s90w3pvwhi5mjxdwr5j7gw7cjka2fx6f2vqmq7f4yb6"
 (build-system python-build-system)
 (native-inputs
  `(("python-cython" ,python-cython) ;for c extensions
-- 
2.6.3

Re: [PATCH] gnu: Add slurm.

[Andreas Enge]

On Mon, Feb 15, 2016 at 01:09:01PM +0100, Pjotr Prins wrote:
> New version cleaned up (using python-wrapper) and patch created
> with latest git and en_US.utf8 Guix style...

Well, it turned out it was still in iso-latin-1, and patching failed again...
Anyway, I applied the modifications and expanded the description a bit.

A number of configure flags were missing - without them, the inputs
would not be found in their non-standard location. I also added a
number of further inputs that seemed important to me.

I did not add all possible inputs. In particular, mysql and gtk+ (2 or 3?)
could be added, so it is possible that not all functionality is there.

The result is pushed to master.

Andreas

Re: gnu: python-sqlalchemy: Update to 1.0.12.

[Andreas Enge]

On Mon, Feb 15, 2016 at 01:41:22PM -0800, Christopher Allan Webber wrote:
> This also fixes the python / sqlalchemy / sqlite test failure problem.

Excellent, please push!

Andreas

Re: gnu: python-sqlalchemy: Update to 1.0.12.

[Mark H Weaver]

Christopher Allan Webber  writes:

> This also fixes the python / sqlalchemy / sqlite test failure problem.
>
> From 880e39c230bf9ac956baa0853acf7158481b3ee6 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Mon, 15 Feb 2016 13:40:13 -0800
> Subject: [PATCH] gnu: python-sqlalchemy: Update to 1.0.12.

Looks good, please push!

Thanks,
  Mark

Re: [PATCH] wxwidgets: enable extended regexps

[Leo Famulari]

On Mon, Feb 15, 2016 at 05:28:39PM +0100, Danny Milosavljevic wrote:
> Hi,
> 
> the following patch enables "extended" regexps as required by kicad.
> It could conceivably inadvertedly change behaviour of other wxwidgets apps. 
> What do you think? Is this the right way?

Can you test that some of these other apps still work with this change?

> 
> diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
> index b49fb2f..65adfc1 100644
> --- a/gnu/packages/wxwidgets.scm
> +++ b/gnu/packages/wxwidgets.scm
> @@ -61,7 +61,7 @@
>   `(("pkg-config" ,pkg-config)))
>  (arguments
>   '(#:configure-flags
> -   '("--with-regex=sys" "--with-libmspack" "--with-sdl")
> +   '("--with-regex" "--with-libmspack" "--with-sdl")
> #:make-flags
> (list (string-append "LDFLAGS=-Wl,-rpath="
>  (assoc-ref %outputs "out") "/lib"))
> 

Re: gnu: python-sqlalchemy: Update to 1.0.12.

[Christopher Allan Webber]

Mark H Weaver writes:

> Christopher Allan Webber  writes:
>
>> This also fixes the python / sqlalchemy / sqlite test failure problem.
>>
>> From 880e39c230bf9ac956baa0853acf7158481b3ee6 Mon Sep 17 00:00:00 2001
>> From: Christopher Allan Webber 
>> Date: Mon, 15 Feb 2016 13:40:13 -0800
>> Subject: [PATCH] gnu: python-sqlalchemy: Update to 1.0.12.
>
> Looks good, please push!
>
> Thanks,
>   Mark

Done!  Whoo!

Re: [PATCH] wxwidgets: enable extended regexps

[Andreas Enge]

On Mon, Feb 15, 2016 at 05:04:09PM -0500, Leo Famulari wrote:
> Can you test that some of these other apps still work with this change?

$ guix refresh -l wxwidgets
A single dependent package: wxmaxima-15.04.0

Andreas

[PATCH] gnu: redshift: Update to 1.11.

[Tobias Geerinckx-Rice]

* gnu/packages/xdisorg.scm (redshift): Update to 1.11.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 5ca203e..41a8279 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -680,7 +680,7 @@ the X.Org X Server version 1.7 and later (X11R7.5 or 
later).")
 (define-public redshift
   (package
 (name "redshift")
-(version "1.10")
+(version "1.11")
 (source
  (origin
(method url-fetch)
@@ -690,7 +690,7 @@ the X.Org X Server version 1.7 and later (X11R7.5 or 
later).")
"/redshift-" version ".tar.xz"))
(sha256
 (base32
- "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"
+ "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh"
 (build-system gnu-build-system)
 (native-inputs
  `(("pkg-config" ,pkg-config)
-- 
2.7.0

Re: [PATCH] gnu: redshift: Update to 1.11.

[Andreas Enge]

On Mon, Feb 15, 2016 at 11:33:55PM +0100, Tobias Geerinckx-Rice wrote:
> * gnu/packages/xdisorg.scm (redshift): Update to 1.11.

Applied, thanks!

Andreas

Re: [PATCH] wxwidgets: enable extended regexps

[Thompson, David]

On Mon, Feb 15, 2016 at 5:07 PM, Andreas Enge  wrote:
> On Mon, Feb 15, 2016 at 05:04:09PM -0500, Leo Famulari wrote:
>> Can you test that some of these other apps still work with this change?
>
> $ guix refresh -l wxwidgets
> A single dependent package: wxmaxima-15.04.0

Additionally, the wxwidgets-2 package, which inherits from wxwidgets,
is used by Audacity.

- Dave

[PATCH 1/18] gnu: Add python-mako.

[Christopher Allan Webber]

First in a series of towards-MediaGoblin patches.

>From ad76816977e98e0230ccde7475598e6e85de4d29 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Fri, 12 Feb 2016 13:23:46 -0800
Subject: [PATCH 01/18] gnu: Add python-mako.

* gnu/packages/python.scm (python-mako, python2-mako): New variables.
---
 gnu/packages/python.scm | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 805c4a2..5b7e4ac 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7532,3 +7532,34 @@ available in Django, but is a standalone package.")
 (inherit (package-with-python2
   (strip-python2-variant python-wtforms)))
 (inputs `(("python2-setuptools" ,python2-setuptools)
+
+(define-public python-mako
+  (package
+(name "python-mako")
+(version "1.0.3")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "Mako" version))
+   (sha256
+(base32
+ "136kcjbs0s98qkx8a418b05dfblqp0kiiqyx8vhx4rarwc7bqi3n"
+(build-system python-build-system)
+(inputs
+ `(("python-markupsafe" ,python-markupsafe)
+   ("python-mock" ,python-mock)
+   ("python-nose" ,python-nose)))
+(home-page "http://www.makotemplates.org/";)
+(synopsis
+ "Fast templating language")
+(description
+ "Mako is a Python string templating library.  Used frequently for
+generating HTML.")
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-mako))
+
+(define-public python2-mako
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-mako)))
+(inputs `(("python2-setuptools" ,python2-setuptools)
-- 
2.6.3

[PATCH 2/18] gnu: Add python-alembic.

[Christopher Allan Webber]

>From 058ebb088ce2998f120f461699c3550f1fc8034b Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 17:04:24 -0800
Subject: [PATCH 02/18] gnu: Add python-alembic.

* gnu/packages/python.scm (python-alembic, python2-alembic): New variables.
---
 gnu/packages/python.scm | 36 
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5b7e4ac..7b794d1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3573,6 +3573,42 @@ simple and Pythonic domain language.")
 (define-public python2-sqlalchemy
   (package-with-python2 python-sqlalchemy))
 
+(define-public python-alembic
+  (package
+(name "python-alembic")
+(version "0.8.4")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "alembic" version))
+   (sha256
+(base32
+ "0jk23a852l3ybv7gfz81xzslyrnqnpjds5x15zd234y9rh9gq1w5"
+(build-system python-build-system)
+(native-inputs
+ `(("python-mock" ,python-mock)
+   ("python-pytest-cov" ,python-pytest-cov)))
+(inputs
+ `(("python-sqlalchemy" ,python-sqlalchemy)
+   ("python-mako" ,python-mako)
+   ("python-editor" ,python-editor)))
+(home-page "http://bitbucket.org/zzzeek/alembic";)
+(synopsis
+ "Database migration tool for SQLAlchemy")
+(description
+ "Alembic is a lightweight database migration tool for usage with the
+SQLAlchemy Database Toolkit for Python.")
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-alembic))
+
+(define-public python2-alembic
+  (let ((alembic (package-with-python2
+  (strip-python2-variant python-alembic
+(package
+  (inherit alembic)
+  (inputs `(("python2-setuptools" ,python2-setuptools)
+,@(package-inputs alembic))
+
 (define-public python-distutils-extra
   (package
 (name "python-distutils-extra")
-- 
2.6.3

[PATCH 3/18] gnu: Add python2-apipkg.

[Christopher Allan Webber]

>From 68a12b91238427d68767ca3a5a4adda36298274c Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 18:04:18 -0800
Subject: [PATCH 03/18] gnu: Add python2-apipkg.

* gnu/packages/python.scm (python2-apipkg): New variable.
---
 gnu/packages/python.scm | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7b794d1..83efbfb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6855,7 +6855,15 @@ applications.")
 package and greatly reduce the number of imports for your users.  It is a small
 pure Python module that works on virtually all Python versions.")
 (home-page "https://bitbucket.org/hpk42/apipkg";)
-(license license:expat)))
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-apipkg))
+
+(define-public python2-apipkg
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-apipkg)))
+(inputs
+ `(("python2-setuptools" ,python2-setuptools)
 
 (define-public python-execnet
   (package
-- 
2.6.3

[PATCH 4/18] gnu: Add python2-execnet.

[Christopher Allan Webber]

>From e2600910d0348451cbaa686a3e5adb57282228cc Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 18:11:05 -0800
Subject: [PATCH 04/18] gnu: Add python2-execnet.

* gnu/packages/python.scm (python2-execnet): New variable.
---
 gnu/packages/python.scm | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 83efbfb..29efce5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6891,7 +6891,15 @@ minimal and fast API targetting the following uses:
 @item write scripts to administer multiple environments
 @end enumerate")
 (home-page "http://codespeak.net/execnet/";)
-(license license:expat)))
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-execnet))
+
+(define-public python2-execnet
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-execnet)))
+(inputs
+ `(("python2-setuptools" ,python2-setuptools)
 
 ;;; The software provided by this package was integrated into pytest 2.8.
 (define-public python-pytest-cache
-- 
2.6.3

[PATCH 5/18] gnu: Add python-pytest-xdist.

[Christopher Allan Webber]

>From 48c2f5da6570880ff9ccfca5c11b809cbb47965e Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 18:11:47 -0800
Subject: [PATCH 05/18] gnu: Add python-pytest-xdist.

* gnu/packages/python.scm (python-pytest-xdist, python2-pytest-xdist):
  New variables.
---
 gnu/packages/python.scm | 36 
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 29efce5..3ef552d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1665,6 +1665,42 @@ supports coverage of subprocesses.")
 (define-public python2-pytest-runner
   (package-with-python2 python-pytest-runner))
 
+(define-public python-pytest-xdist
+  (package
+(name "python-pytest-xdist")
+(version "1.14")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "pytest-xdist" version ".zip"))
+   (sha256
+(base32
+ "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja"
+(build-system python-build-system)
+(native-inputs
+ `(("unzip" ,unzip)))
+(inputs
+ `(("python-setuptools" ,python-setuptools)
+   ("python-setuptools-scm" ,python-setuptools-scm)
+   ("python-execnet" ,python-execnet)
+   ("python-pytest" ,python-pytest)
+   ("python-py" ,python-py)))
+(home-page
+ "https://github.com/pytest-dev/pytest-xdist";)
+(synopsis
+ "Plugin for py.test with distributed testing and loop-on-failing modes")
+(description
+ "The pytest-xdist plugin extends py.test with some unique test execution
+modes: parallelization, running tests in boxed subprocesses, the ability
+to run tests repeatedly when failed, and the ability to run tests on multiple
+Python interpreters or platforms.  It uses rsync to copy the existing
+program code to a remote location, executes there, and then syncs the
+result back.")
+(license license:expat)))
+
+(define-public python2-pytest-xdist
+  (package-with-python2 python-pytest-xdist))
+
 (define-public python-scripttest
   (package
 (name "python-scripttest")
-- 
2.6.3

[PATCH 6/18] gnu: Add python-beautifulsoup4

[Christopher Allan Webber]

>From 12fea50a946441277e38cc6e7ef266c08738193e Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 18:35:57 -0800
Subject: [PATCH 06/18] gnu: Add python-beautifulsoup4

* gnu/packages/python.scm (python-beautifulsoup4, python2-beautifulsoup4):
  New variables.
---
 gnu/packages/python.scm | 33 +
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3ef552d..d7498dd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4573,6 +4573,39 @@ libxml2 and libxslt.")
 (define-public python2-lxml
   (package-with-python2 python-lxml))
 
+;; beautifulsoup4 has a totally different namespace than 3.x,
+;; and pypi seems to put it under its own name, so I guess we should too
+(define-public python-beautifulsoup4
+  (package
+(name "python-beautifulsoup4")
+(version "4.4.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "beautifulsoup4" version))
+   (sha256
+(base32
+ "1d36lc4pfkvl74fmzdib2nqnvknm0jddgf2n9yd7im150qyh3m47"
+(build-system python-build-system)
+(inputs
+ `(("python-lxml" ,python-lxml)
+   ("python-html5lib" ,python-html5lib)))
+(home-page
+ "http://www.crummy.com/software/BeautifulSoup/bs4/";)
+(synopsis
+ "Python screen-scraping library")
+(description
+ "HTML/XML parser for quick-turnaround applications like screen-scraping.
+Can parse even extremely broken HTML.")
+(license bsd-3)
+(properties `((python2-variant . ,(delay python2-beautifulsoup4))
+
+(define-public python2-beautifulsoup4
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-beautifulsoup4)))
+(inputs `(("python2-setuptools" ,python2-setuptools)
+
 (define-public python2-pil
   (package
 (name "python2-pil")
-- 
2.6.3

[PATCH 7/18] gnu: Add python-waitress.

[Christopher Allan Webber]

>From 727723160ed0a9c960fdc0d84173f926ef0bb170 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 18:57:11 -0800
Subject: [PATCH 07/18] gnu: Add python-waitress.

* gnu/packages/python.scm (python-waitress, python2-waitress): New variables.
---
 gnu/packages/python.scm | 25 +
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d7498dd..9c86e43 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7684,3 +7684,28 @@ generating HTML.")
 (inherit (package-with-python2
   (strip-python2-variant python-mako)))
 (inputs `(("python2-setuptools" ,python2-setuptools)
+
+(define-public python-waitress
+  (package
+(name "python-waitress")
+(version "0.8.10")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "waitress" version))
+   (sha256
+(base32
+ "017n9ra6vvmq9d5sfhdzyzr1mg15x2hj2dhm4pdlw98c1ypw2h3w"
+(build-system python-build-system)
+(home-page "https://github.com/Pylons/waitress";)
+(synopsis "Waitress WSGI server")
+(description "Waitress is meant to be a production-quality pure-Python WSGI
+server with very acceptable performance.")
+(license zpl2.1)
+(properties `((python2-variant . ,(delay python2-waitress))
+
+(define-public python2-waitress
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-waitress)))
+(inputs `(("python2-setuptools" ,python2-setuptools)
-- 
2.6.3

[PATCH 8/18] gnu: Add python-wsgiproxy2.

[Christopher Allan Webber]

>From fdedc5819c7a4615128cd2d6558cd00fa2340eb4 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 20:22:47 -0800
Subject: [PATCH 08/18] gnu: Add python-wsgiproxy2.

* gnu/packages/python.scm (python-wsgiproxy2, python2-wsgiproxy2):
  New variables.
---
 gnu/packages/python.scm | 37 +
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9c86e43..e1d20f5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7709,3 +7709,40 @@ server with very acceptable performance.")
 (inherit (package-with-python2
   (strip-python2-variant python-waitress)))
 (inputs `(("python2-setuptools" ,python2-setuptools)
+
+(define-public python-wsgiproxy2
+  (package
+(name "python-wsgiproxy2")
+(version "0.4.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "WSGIProxy2" version ".zip"))
+   (sha256
+(base32
+ "13kf9bdxrc95y9vriaz0viry3ah11nz4rlrykcfvb8nlqpx3dcm4"
+(build-system python-build-system)
+(native-inputs
+ `(("unzip" ,unzip)
+   ("python-nose" ,python-nose)
+   ("python-coverage" ,python-coverage)))
+(inputs
+ `(("python-six" ,python-six)
+   ("python-webob" ,python-webob)))
+(home-page
+ "https://github.com/gawel/WSGIProxy2/";)
+(synopsis "WSGI Proxy with various http client backends")
+(description "WSGI turns HTTP requests into WSGI function calls.
+WSGIProxy turns WSGI function calls into HTTP requests.
+It also includes code to sign requests and pass private data,
+and to spawn subprocesses to handle requests.")
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-wsgiproxy2))
+
+(define-public python2-wsgiproxy2
+  (let ((wsgiproxy2 (package-with-python2
+ (strip-python2-variant python-wsgiproxy2
+(package
+  (inherit wsgiproxy2)
+  (inputs `(("python2-setuptools" ,python2-setuptools)
+,@(package-inputs wsgiproxy2))
-- 
2.6.3

[PATCH 9/18] gnu: Add python-pastedeploy.

[Christopher Allan Webber]

>From 8aeb48d26f2391de674723d63d0722f3112245d0 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 21:13:14 -0800
Subject: [PATCH 09/18] gnu: Add python-pastedeploy

* gnu/packages/python.scm (python-pastedeploy, python2-pastedeploy):
  New variables.
---
 gnu/packages/python.scm | 29 +
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e1d20f5..5557bfb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7746,3 +7746,32 @@ and to spawn subprocesses to handle requests.")
   (inherit wsgiproxy2)
   (inputs `(("python2-setuptools" ,python2-setuptools)
 ,@(package-inputs wsgiproxy2))
+
+(define-public python-pastedeploy
+  (package
+(name "python-pastedeploy")
+(version "1.5.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "PasteDeploy" version))
+   (sha256
+(base32
+ "1jz3m4hq8v6hyhfjz9425nd3nvn52cvbfipdcd72krjmla4qz1fm"
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
+(propagated-inputs
+ `(("python2-setuptools" ,python-setuptools))) ; uses pkg_resources
+(home-page "http://pythonpaste.org/deploy/";)
+(synopsis
+ "Load, configure, and compose WSGI applications and servers")
+(description
+ "This tool provides code to load WSGI applications and servers from URIs;
+these URIs can refer to Python Eggs for INI-style configuration files.  Paste
+Script provides commands to serve applications based on this configuration
+file.")
+(license license:expat)))
+
+(define-public python2-pastedeploy
+  (package-with-python2 python-pastedeploy))
-- 
2.6.3

[PATCH 10/18] gnu: Add python-pyquery.

[Christopher Allan Webber]

>From a8896e49511d1b39558e48bb149c8fce91ba128c Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 21:40:22 -0800
Subject: [PATCH 10/18] gnu: Add python-pyquery

* gnu/packages/python.scm (python-pyquery, python2-pyquery): New variables.
---
 gnu/packages/python.scm | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5557bfb..1238849 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7775,3 +7775,34 @@ file.")
 
 (define-public python2-pastedeploy
   (package-with-python2 python-pastedeploy))
+
+(define-public python-pyquery
+  (package
+(name "python-pyquery")
+(version "1.2.11")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "pyquery" version))
+   (sha256
+(base32
+ "1ikz1387nsp0pp7mzzr6ip9n5gr67acpap24yn33987v7fkjp0sa"
+(build-system python-build-system)
+(inputs
+ `(("python-lxml" ,python-lxml)
+   ("python-cssselect" ,python-cssselect)))
+(home-page "https://github.com/gawel/pyquery";)
+(synopsis "Make jQuery-like queries on xml documents")
+(description "pyquery allows you to make jQuery queries on xml documents.
+The API is as much as possible the similar to jQuery.
+pyquery uses lxml for fast xml and html manipulation.")
+(license bsd-3)
+(properties `((python2-variant . ,(delay python2-pyquery))
+
+(define-public python2-pyquery
+  (let ((pyquery (package-with-python2
+  (strip-python2-variant python-pyquery
+(package
+  (inherit pyquery)
+  (inputs `(("python2-setuptools" ,python2-setuptools)
+,@(package-inputs pyquery))
-- 
2.6.3

[PATCH 11/18] gnu: Add python-webtest.

[Christopher Allan Webber]

>From 562f8e028563ac3eebe6c90b1c9e4bb3bc379177 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sat, 13 Feb 2016 22:13:14 -0800
Subject: [PATCH 11/18] gnu: Add python-webtest.

* gnu/packages/python.scm (python-webtest, python2-webtest):
  New variables.
---
 gnu/packages/python.scm | 50 +
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1238849..f5015df 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7806,3 +7806,53 @@ pyquery uses lxml for fast xml and html manipulation.")
   (inherit pyquery)
   (inputs `(("python2-setuptools" ,python2-setuptools)
 ,@(package-inputs pyquery))
+
+(define-public python-webtest
+  (package
+(name "python-webtest")
+(version "2.0.20")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "WebTest" version))
+   (sha256
+(base32
+ "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv"
+(build-system python-build-system)
+(arguments
+ `(;; Unfortunately we have to disable tests!
+   ;; This release of WebTest is pinned to python-nose < 1.3,
+   ;; but older versions of python-nose are plagged with the following
+   ;; bug(s), which rears its ugly head during test execution:
+   ;;   https://github.com/nose-devs/nose/issues/759
+   ;;   https://github.com/nose-devs/nose/pull/811
+   #:tests? #f))
+;; Commented out code is no good, but in this case, once tests
+;; are ready to be enabled again, we should put the following
+;; in place:
+;;  (native-inputs
+;;   `(("python-nose" ,python-nose) ; technially < 1.3,
+;;  ; but see above comment
+;; ("python-coverage" ,python-coverage)
+;; ("python-mock" ,python-mock)
+;; ("python-pastedeploy" ,python-pastedeploy)
+;; ("python-wsgiproxy2" ,python-wsgiproxy2)
+;; ("python-pyquery" ,python-pyquery)))
+(inputs
+ `(("python-waitress" ,python-waitress)
+   ("python-webob" ,python-webob)
+   ("python-six" ,python-six)
+   ("python-beautifulsoup4" ,python-beautifulsoup4)))
+(home-page "http://webtest.pythonpaste.org/";)
+(synopsis "Helper to test WSGI applications")
+(description "Helper to test WSGI applications")
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-webtest))
+
+(define-public python2-webtest
+  (let ((webtest (package-with-python2
+  (strip-python2-variant python-webtest
+(package
+  (inherit webtest)
+  (inputs `(("python2-setuptools" ,python2-setuptools)
+,@(package-inputs webtest))
-- 
2.6.3

[PATCH 12/18] gnu: Add python-anyjson.

[Christopher Allan Webber]

>From c8ef5a9b9507aff696a559967dde1dee11d229f8 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sun, 14 Feb 2016 12:16:49 -0800
Subject: [PATCH 12/18] gnu: Add python-anyjson.

* gnu/packages/python.scm (python-anyjson, python2-anyjson): New variables.
---
 gnu/packages/python.scm | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f5015df..82a467b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7856,3 +7856,42 @@ pyquery uses lxml for fast xml and html manipulation.")
   (inherit webtest)
   (inputs `(("python2-setuptools" ,python2-setuptools)
 ,@(package-inputs webtest))
+
+(define-public python-anyjson
+  (package
+(name "python-anyjson")
+(version "0.3.3")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "anyjson" version))
+   (sha256
+(base32
+ "1fjph4alvcscsl5d4b6qpv1yh31jy05jxi1l0xff7lws7j32v09p"
+(build-system python-build-system)
+(arguments
+ `(;; We could possibly get tests working, but on Python 3 it's not so easy.
+   ;; Very strangely, 2to3 is run *during setup.py install* (or bdist, or
+   ;; whatever) so this transformation needs to be done before the tests
+   ;; can be run.  Maybe we could add a build step to transform beforehand
+   ;; but it could be annoying/difficult.
+   ;; We can enable tests for the Python 2 version, though, and do below.
+   #:tests? #f))
+(home-page "http://bitbucket.org/runeh/anyjson/";)
+(synopsis
+ "Wraps best available JSON implementation in a common interface")
+(description
+ "Anyjson loads whichever is the fastest JSON module installed
+and provides a uniform API regardless of which JSON implementation is used.")
+(license bsd-3)
+(properties `((python2-variant . ,(delay python2-anyjson))
+
+(define-public python2-anyjson
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-anyjson)))
+(arguments `(;; Unlike the python 3 variant, we do run tests.  See above!
+ #:tests? #t
+ #:python ,python-2))
+(inputs `(("python2-setuptools" ,python2-setuptools)
+  ("python2-nose" ,python2-nose)
-- 
2.6.3

[PATCH 13/18] gnu: Add python-amqp.

[Christopher Allan Webber]

>From dedac86054cf1526731411b8b505084dd375de17 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sun, 14 Feb 2016 12:44:03 -0800
Subject: [PATCH 13/18] gnu: Add python-amqp.

* gnu/packages/python.scm (python-amqp, python2-amqp): New variables.
---
 gnu/packages/python.scm | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 82a467b..f9ad796 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7895,3 +7895,41 @@ and provides a uniform API regardless of which JSON implementation is used.")
  #:python ,python-2))
 (inputs `(("python2-setuptools" ,python2-setuptools)
   ("python2-nose" ,python2-nose)
+
+(define-public python-amqp
+  (package
+(name "python-amqp")
+(version "1.4.9")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "amqp" version))
+   (sha256
+(base32
+ "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)
+   ("python-mock" ,python-mock)))
+(home-page "http://github.com/celery/py-amqp";)
+(synopsis
+ "Low-level AMQP client for Python (fork of amqplib)")
+(description
+ "This is a fork of amqplib which was originally written by Barry Pederson.
+It is maintained by the Celery project, and used by kombu as a pure python
+alternative when librabbitmq is not available.")
+(license lgpl2.1+)
+(properties `((python2-variant . ,(delay python2-amqp))
+
+(define-public python2-amqp
+  (let ((amqp (package-with-python2
+   (strip-python2-variant python-amqp
+(package
+  (inherit amqp)
+  (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
+   ;; unmaintained.  Weirdly, does not do this on the python 3
+   ;; version?
+   #:tests? #f
+   ,@(package-arguments amqp)))
+  (native-inputs `(("python2-setuptools" ,python2-setuptools)
+   ,@(package-native-inputs amqp))
-- 
2.6.3

[PATCH 14/18] gnu: Add python-kombu.

[Christopher Allan Webber]

>From 096adf2f2172d77e7a3d08175be2a9ef72f7d38a Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sun, 14 Feb 2016 15:38:10 -0800
Subject: [PATCH 14/18] gnu: Add python-kombu.

* gnu/packages/python.scm (python-kombu, python2-kombu): New variables.
---
 gnu/packages/python.scm | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f9ad796..2bc45ae 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7933,3 +7933,41 @@ alternative when librabbitmq is not available.")
,@(package-arguments amqp)))
   (native-inputs `(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs amqp))
+
+(define-public python-kombu
+  (package
+(name "python-kombu")
+(version "3.0.33")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "kombu" version))
+   (sha256
+(base32
+ "16brjx2lgwbj2a37d0pjbfb84nvld6irghmqrs3qfncajp51hgc5"
+(build-system python-build-system)
+(native-inputs
+ `(("python-mock" ,python-mock)
+   ("python-nose" ,python-nose)))
+(inputs
+ `(("python-anyjson" ,python-anyjson)
+   ("python-amqp" ,python-amqp)))
+(home-page "http://kombu.readthedocs.org";)
+(synopsis "Message passing library for Python")
+(description "The aim of Kombu is to make messaging in Python as easy as
+possible by providing an idiomatic high-level interface for the AMQ protocol,
+and also provide proven and tested solutions to common messaging problems.
+AMQP is the Advanced Message Queuing Protocol, an open standard protocol for
+message orientation, queuing, routing, reliability and security, for which the
+RabbitMQ messaging server is the most popular implementation.")
+(license bsd-3)
+(properties `((python2-variant . ,(delay python2-kombu))
+
+(define-public python2-kombu
+  (let ((kombu (package-with-python2
+(strip-python2-variant python-kombu
+(package
+  (inherit kombu)
+  (inputs `(("python2-setuptools" ,python2-setuptools)
+("python2-unittest2" ,python2-unittest2)
+,@(package-inputs kombu))
-- 
2.6.3

[PATCH 15/18] gnu: Add python-billiard.

[Christopher Allan Webber]

>From 510854b320de72804575b18c77d1b30670408e6e Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sun, 14 Feb 2016 15:49:47 -0800
Subject: [PATCH 15/18] gnu: Add python-billiard.

* gnu/packages/python.scm (python-billiard, python2-billiard):
  New variables.
---
 gnu/packages/python.scm | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2bc45ae..ad1698b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7971,3 +7971,38 @@ RabbitMQ messaging server is the most popular implementation.")
   (inputs `(("python2-setuptools" ,python2-setuptools)
 ("python2-unittest2" ,python2-unittest2)
 ,@(package-inputs kombu))
+
+(define-public python-billiard
+  (package
+(name "python-billiard")
+(version "3.3.0.22")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "billiard" version))
+   (sha256
+(base32
+ "0zp7h6a58alrb3mwdw61jds07395j4j0mj6iqsb8czrihw9ih5nj"
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
+(home-page "http://github.com/celery/billiard";)
+(synopsis
+ "Python multiprocessing fork with improvements and bugfixes")
+(description
+ "billiard is a fork of the Python 2.7 multiprocessing package.  The
+multiprocessing package itself is a renamed and updated version of R Oudkerk's
+pyprocessing package.  This standalone variant is intended to be compatible with
+Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
+(license bsd-3)
+(properties `((python2-variant . ,(delay python2-billiard))
+
+(define-public python2-billiard
+  (let ((billiard (package-with-python2
+   (strip-python2-variant python-billiard
+(package
+  (inherit billiard)
+  (native-inputs `(("python2-setuptools" ,python2-setuptools)
+   ("python2-unittest2" ,python2-unittest2)
+   ("python2-mock" ,python2-mock)
+   ,@(package-native-inputs billiard))
-- 
2.6.3

[PATCH 16/18] gnu: Add python-celery.

[Christopher Allan Webber]

>From 469a32636b82fe925aa71f418b8af146161875ef Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sun, 14 Feb 2016 15:57:24 -0800
Subject: [PATCH 16/18] gnu: Add python-celery.

* gnu/packages/python.scm (python-celery, python2-celery): New variables.
---
 gnu/packages/python.scm | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ad1698b..efe0229 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8006,3 +8006,42 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
("python2-unittest2" ,python2-unittest2)
("python2-mock" ,python2-mock)
,@(package-native-inputs billiard))
+
+(define-public python-celery
+  (package
+(name "python-celery")
+(version "3.1.20")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "celery" version))
+   (sha256
+(base32
+ "1md6ywg1s0946qyp8ndnsd677wm0yax933h2sb4m3a4j7lf1jbyh"
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
+(inputs
+ `(("python-pytz" ,python-pytz)
+   ("python-billiard" ,python-billiard)
+   ("python-kombu" ,python-kombu)))
+(home-page "http://celeryproject.org";)
+(synopsis "Distributed Task Queue")
+(description "Celery is an asynchronous task queue/job queue based on
+distributed message passing.  It is focused on real-time operation, but
+supports scheduling as well.  The execution units, called tasks, are executed
+concurrently on a single or more worker servers using multiprocessing,
+Eventlet, or gevent.  Tasks can execute asynchronously (in the background) or
+synchronously (wait until ready).")
+(license bsd-3)
+(properties `((python2-variant . ,(delay python2-celery))
+
+(define-public python2-celery
+  (let ((celery (package-with-python2
+ (strip-python2-variant python-celery
+(package
+  (inherit celery)
+  (native-inputs `(("python2-setuptools" ,python2-setuptools)
+   ("python2-unittest2" ,python2-unittest2)
+   ("python2-mock" ,python2-mock)
+   ,@(package-native-inputs celery))
-- 
2.6.3

[PATCH 17/18] gnu: Add python-translitcodec.

[Christopher Allan Webber]

>From 4194f0b325d64718529275906ffe8294e8fb6111 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Sun, 14 Feb 2016 16:23:11 -0800
Subject: [PATCH 17/18] gnu: Add python-translitcodec.

* gnu/packages/python.scm (python-translitcodec, python2-translitcodec):
  New variables.
---
 gnu/packages/python.scm | 32 
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index efe0229..2cb87bc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8045,3 +8045,35 @@ synchronously (wait until ready).")
("python2-unittest2" ,python2-unittest2)
("python2-mock" ,python2-mock)
,@(package-native-inputs celery))
+
+(define-public python-translitcodec
+  (package
+(name "python-translitcodec")
+(version "0.4.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "translitcodec" version))
+   (sha256
+(base32
+ "10x6pvblkzky1zhjs8nmx64nb9jdzxad4bxhq4iwv0j4z2aqjnki"
+(build-system python-build-system)
+(arguments
+ `(#:tests? #f))  ; no tests provided
+(home-page
+ "https://github.com/claudep/translitcodec";)
+(synopsis
+ "Unicode to 8-bit charset transliteration codec")
+(description
+ "This package contains codecs for transliterating ISO 10646 texts into
+best-effort representations using smaller coded character sets (ASCII,
+ISO 8859, etc.).  The translation tables used by the codecs are from
+the 'transtab' collection by Markus Kuhn.")
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-translitcodec))
+
+(define-public python2-translitcodec
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-translitcodec)))
+(inputs `(("python2-setuptools" ,python2-setuptools)
-- 
2.6.3

[PATCH 18/18] gnu: Add python-editor.

[Christopher Allan Webber]

>From e43f2dca602a0e1bc90e8dce1947fcf3d401360f Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Mon, 15 Feb 2016 10:29:08 -0800
Subject: [PATCH 18/18] gnu: Add python-editor.

* gnu/packages/python.scm (python-editor, python2-editor): New variables.
---
 gnu/packages/python.scm | 30 ++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2cb87bc..0d45e7f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8077,3 +8077,33 @@ the 'transtab' collection by Markus Kuhn.")
 (inherit (package-with-python2
   (strip-python2-variant python-translitcodec)))
 (inputs `(("python2-setuptools" ,python2-setuptools)
+
+(define-public python-editor
+  (package
+  (name "python-editor")
+  (version "0.5")
+  (source
+(origin
+  (method url-fetch)
+  (uri (pypi-uri "python-editor" version))
+  (sha256
+(base32
+  "1ypnpgvzpkbwsg4rdvy4sy51j28b5xq9v8pnkwxncn07vqz06p7n"
+  (build-system python-build-system)
+  (inputs
+`(("python-setuptools" ,python-setuptools)))
+  (home-page
+"https://github.com/fmoo/python-editor";)
+  (synopsis
+"Programmatically open an editor, capture the result")
+  (description
+"python-editor is a library that provides the editor module for
+programmatically interfacing with your system's $EDITOR.")
+  (license asl2.0)
+  (properties `((python2-variant . ,(delay python2-editor))
+
+(define-public python2-editor
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-editor)))
+(inputs `(("python2-setuptools" ,python2-setuptools)
-- 
2.6.3

Re: [PATCH] gnu: emacs-popup (new variable)

[Nils Gillmann]

Alex Kost  writes:

> Nils Gillmann (2016-02-15 21:13 +0300) wrote:
>
>> This patch adds emacs-popup.
>
> Hi, only nitpicks from my side, so I'm going to commit this patch (no
> need to resend an updated version) in several days, if there will be no
> other comments.
>
>> From 66abaf9cfcb566e2027acf145b06963c6e52a99c Mon Sep 17 00:00:00 2001
>> From: Nils Gillmann 
>> Date: Mon, 15 Feb 2016 19:06:16 +0100
>> Subject: [PATCH] gnu: add emacs-popup
> Add emacs-popup.
> typos:  ↑  ↑
>
>> * gnu/packages/emacs.scm (emacs-popup): New variable.
>> ---
>>  gnu/packages/emacs.scm | 27 +++
>>  1 file changed, 27 insertions(+)
>>
>>
>> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
>> index 48417e6..78a6af0 100644
>> --- a/gnu/packages/emacs.scm
>> +++ b/gnu/packages/emacs.scm
>> @@ -5,6 +5,7 @@
>>  ;;; Copyright © 2014, 2015, 2016 Alex Kost 
>>  ;;; Copyright © 2015 Federico Beffa 
>>  ;;; Copyright © 2015 Ricardo Wurmus 
>> +;;; Copyright © 2016 Nils Gillmann 
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -1452,3 +1453,29 @@ supports editing Lisp source files, @{slime-mode} 
>> adds support for
>>  interacting with a running Common Lisp process for compilation,
>>  debugging, documentation lookup, and so on.")
>>  (license license:gpl2+)))
>> +
>> +(define-public emacs-popup
>> +  (package
>> +(name "emacs-popup")
>> +(version "0.5.3")
>> +(source
>> + (origin
>> +   (method url-fetch)
>> +   (uri (string-append
>> + "https://github.com/auto-complete/popup-el/archive/v";
>> + version
>> + ".tar.gz"))
>> +   (file-name (string-append name "-" version ".tar.gz"))
>> +   (sha256
>> +(base32
>> + "1yrgfj8y69xmcb6kwgplhq68ndm9410qwh7sd2knnd1gchpphdc0"
>> +(build-system emacs-build-system)
>> +(native-inputs
>> + `(("emacs" ,emacs-no-x)))
>> +(home-page "https://github.com/auto-complete/popup-el";)
>> +(synopsis "Visual Popup User Interface for Emacs")
>> +(description
>> + "Popup.el is a visual popup user interface library for Emacs.
>> +  This provides a basic API and common UI widgets such as popup
>↑↑
> Redundant spaces.

Sentences should be separated by two whitespaces. So this does
not apply when the end of one sentence and the beginning of
another is separated by a linebreak? Should I read the guile
coding style document to get more input on this?

>
>> +tooltips and popup menus.")
>> +(license license:gpl3+)))

-- 
ng

Re: [PATCH] gnu: Add pioneers

[Leo Famulari]

On Mon, Feb 15, 2016 at 01:14:16PM -0800, thylak...@openmailbox.org wrote:
> Hello all,
> 
> I am submitting this patch that packages the game 'pioneers' into the
> games.scm file.

Thanks for the patch! Maybe I can get some of my friends to play this,
or perhaps some people on #guix ;)

> 
> Let me know if I made any mistakes or can improve anything. I'm hoping to
> package several more appplications soon.

We use `git format-patch` to generate patches, since that includes the
commit message and authorship information (I had to manually name you as
the author of this commit). You can look at `git log` for examples of
the commit message format.

> 
> The patch is an attachment.

Okay! Alternatively, you can use `git send-email`, which formats the
patch and sends the mail on your behalf. It provides a nice workflow but
it's not required. I understand it might require you to set up an SMTP
client, etc.

My overall recommendations for future patches are:
1) Use `git format-patch` or `git send-email`.
2) Be sure to run `guix lint`.
3) Spend a couple minutes looking at the license headers on the source
files. Sometimes there are even multiple licenses in one project.

I applied the patch with a few minor changes regarding whitespace /
formatting, and the license, described below. Some of the style changes
were not required, but since I was making other edits...

> 
> - Rodger Fox

> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 7eb0e7a..b32a6f4 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -14,6 +14,7 @@
>  ;;; Copyright ?? 2015, 2016 Alex Kost 
>  ;;; Copyright ?? 2015 Paul van der Walt 
>  ;;; Copyright ?? 2015 Taylan Ulrich Bay??rl??/Kammer 
> 
> +;;; Copyright ?? 2016 Rodger Fox 
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -44,6 +45,7 @@
>#:use-module (gnu packages base)
>#:use-module (gnu packages admin)
>#:use-module (gnu packages audio)
> +  #:use-module (gnu packages avahi)
>#:use-module (gnu packages boost)
>#:use-module (gnu packages fribidi)
>#:use-module (gnu packages game-development)
> @@ -89,6 +91,33 @@
>#:use-module (guix build-system cmake)
>#:use-module (guix build-system trivial))
>  

I appended the package to the end of the file. This is how we usually
add packages.

> +
> +(define-public pioneers
> +  (package
> +(name "pioneers")
> +(version "15.3")
> +(source (origin
> +  (method url-fetch)
> +  (uri (string-append
> +  "http://downloads.sourceforge.net/pio/pioneers-";
> +  version
> + ".tar.gz"))

Reorganized and de-tabbed the uri section (the linter complains about
tabs).

> +  (sha256
> +(base32
> +  "128s718nnraiznbg2rajjqb7cfkdg24hy6spdd9narb4f4dsbbv9"
> +(build-system gnu-build-system)
> +(inputs `(("gtk+" ,gtk+)
> +  ("librsvg" ,librsvg)
> +  ("avahi" ,avahi)))
> +(native-inputs `(("intltool" ,intltool)
> + ("pkg-config" ,pkg-config)))
> +(synopsis "A clone of The Settlers of Catan board game")

I changed this to "Board game inspired by The Settlers of Catan". It's
not a true clone if my dinner table isn't a mess ;)

> +(description
> +  "Pioneers is an emulation of the board game The Settlers of Catan. It 
> can be played on a local 
> +network, on the internet, and with AI players.")

Wrapped to 80 characters, since `guix lint` complained.

> +(home-page "http://pio.sourceforge.net/";)
> +(license license:gpl2+)))

Since the source files include the "any later version" clause, I changed
this to GPL3+. I usually grep for 'later version' when COPYING indicates
GPL2.

Thanks again for the patch! Applied as 7e2e115501a.

[PATCH] licenses: Add CC-BY-SA and CC-BY.

[rennes]

Hi,

i attached patch for licenses CC-BY2 and CC-BY-SA2.

ThanksFrom fb8d0849612c10fb290db9ccc74efc1f17591687 Mon Sep 17 00:00:00 2001
From: Rene Saavedra 
Date: Mon, 15 Feb 2016 19:23:34 -0600
Subject: [PATCH] licenses: Add CC-BY-SA and CC-BY.

* guix/licenses.scm (cc-by-sa2.0, cc-by2.0): New variables.

---
 guix/licenses.scm | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index 1abb0a1..924b7a8 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -33,7 +33,7 @@
 non-copyleft
 bsd-style ;deprecated!
 cc0
-cc-by-sa4.0 cc-by-sa3.0 cc-by3.0
+cc-by-sa4.0 cc-by-sa3.0 cc-by3.0 cc-by-sa2.0 cc-by2.0
 cddl1.0
 cecill-c
 artistic2.0 clarified-artistic
@@ -155,11 +155,21 @@ at URI, which may be a file:// URI pointing the package's tree."
"http://creativecommons.org/licenses/by-sa/3.0/";
"Creative Commons Attribution-ShareAlike 3.0 Unported"))
 
+(define cc-by-sa2.0
+  (license "CC-BY-SA 2.0"
+   "http://creativecommons.org/licenses/by-sa/2.0/";
+   "Creative Commons Attribution-ShareAlike 2.0 Generic"))
+
 (define cc-by3.0
   (license "CC-BY 3.0"
"http://creativecommons.org/licenses/by/3.0/";
"Creative Commons Attribution 3.0 Unported"))
 
+(define cc-by2.0
+  (license "CC-BY 2.0"
+   "http://creativecommons.org/licenses/by/2.0/";
+   "Creative Commons Attribution 2.0 Generic"))
+
 (define cddl1.0
   (license "CDDL 1.0"
"http://directory.fsf.org/wiki/License:CDDLv1.0";
-- 
2.6.3

Re: [PATCH 1/18] gnu: Add python-mako.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:23:45PM -0800, Christopher Allan Webber wrote:
> First in a series of towards-MediaGoblin patches.

Awesome!

I'm reviewing these on the assumption that you've tested they all build.

> From ad76816977e98e0230ccde7475598e6e85de4d29 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Fri, 12 Feb 2016 13:23:46 -0800
> Subject: [PATCH 01/18] gnu: Add python-mako.
> 
> * gnu/packages/python.scm (python-mako, python2-mako): New variables.
> ---
>  gnu/packages/python.scm | 31 +++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 805c4a2..5b7e4ac 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -7532,3 +7532,34 @@ available in Django, but is a standalone package.")
>  (inherit (package-with-python2
>(strip-python2-variant python-wtforms)))
>  (inputs `(("python2-setuptools" ,python2-setuptools)
> +
> +(define-public python-mako
> +  (package
> +(name "python-mako")
> +(version "1.0.3")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "Mako" version))
> +   (sha256
> +(base32
> + "136kcjbs0s98qkx8a418b05dfblqp0kiiqyx8vhx4rarwc7bqi3n"
> +(build-system python-build-system)
> +(inputs
> + `(("python-markupsafe" ,python-markupsafe)
> +   ("python-mock" ,python-mock)
> +   ("python-nose" ,python-nose)))

Are mock and nose required after build-time? If not, they should be
native-inputs.

As for markupsafe, the latest version of the manual has this to say
about propagated-inputs:

Another example where propagated-inputs is useful is for languages that
lack a facility to record the run-time search path akin to ELF’s
RUNPATH; this includes Guile, Python, Perl, GHC, and more. To ensure
that libraries written in those languages can find library code they
depend on at run time, run-time dependencies must be listed in
propagated-inputs rather than inputs. 

I won't mention these potential issues in my reviews of the rest of the
patches.

> +(home-page "http://www.makotemplates.org/";)
> +(synopsis
> + "Fast templating language")
> +(description
> + "Mako is a Python string templating library.  Used frequently for
> +generating HTML.")
> +(license license:expat)
> +(properties `((python2-variant . ,(delay python2-mako))
> +
> +(define-public python2-mako
> +  (package
> +(inherit (package-with-python2
> +  (strip-python2-variant python-mako)))
> +(inputs `(("python2-setuptools" ,python2-setuptools)

Setuptools is a native-input.

> -- 
> 2.6.3
> 

Re: [PATCH 2/18] gnu: Add python-alembic.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:26:41PM -0800, Christopher Allan Webber wrote:
> From 058ebb088ce2998f120f461699c3550f1fc8034b Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sat, 13 Feb 2016 17:04:24 -0800
> Subject: [PATCH 02/18] gnu: Add python-alembic.
> 
> * gnu/packages/python.scm (python-alembic, python2-alembic): New variables.
> ---
>  gnu/packages/python.scm | 36 
>  1 file changed, 36 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 5b7e4ac..7b794d1 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -3573,6 +3573,42 @@ simple and Pythonic domain language.")
>  (define-public python2-sqlalchemy
>(package-with-python2 python-sqlalchemy))
>  
> +(define-public python-alembic
> +  (package
> +(name "python-alembic")
> +(version "0.8.4")
> +(source
> + (origin
^
I would move this 1 character to the right, and shift the rest of origin
accordingly.

> +   (method url-fetch)
> +   (uri (pypi-uri "alembic" version))
> +   (sha256
> +(base32
> + "0jk23a852l3ybv7gfz81xzslyrnqnpjds5x15zd234y9rh9gq1w5"
> +(build-system python-build-system)
> +(native-inputs
> + `(("python-mock" ,python-mock)
> +   ("python-pytest-cov" ,python-pytest-cov)))
> +(inputs
> + `(("python-sqlalchemy" ,python-sqlalchemy)
> +   ("python-mako" ,python-mako)
> +   ("python-editor" ,python-editor)))
> +(home-page "http://bitbucket.org/zzzeek/alembic";)
> +(synopsis
> + "Database migration tool for SQLAlchemy")
> +(description
> + "Alembic is a lightweight database migration tool for usage with the
> +SQLAlchemy Database Toolkit for Python.")
> +(license license:expat)
> +(properties `((python2-variant . ,(delay python2-alembic))
> +
> +(define-public python2-alembic
> +  (let ((alembic (package-with-python2
> +  (strip-python2-variant python-alembic
> +(package
> +  (inherit alembic)
> +  (inputs `(("python2-setuptools" ,python2-setuptools)
> +,@(package-inputs alembic))
> +
>  (define-public python-distutils-extra
>(package
>  (name "python-distutils-extra")
> -- 
> 2.6.3
> 
> 

Re: [PATCH 3/18] gnu: Add python2-apipkg.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:27:01PM -0800, Christopher Allan Webber wrote:
> From 68a12b91238427d68767ca3a5a4adda36298274c Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sat, 13 Feb 2016 18:04:18 -0800
> Subject: [PATCH 03/18] gnu: Add python2-apipkg.
> 
> * gnu/packages/python.scm (python2-apipkg): New variable.
> ---
>  gnu/packages/python.scm | 10 +-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 7b794d1..83efbfb 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -6855,7 +6855,15 @@ applications.")
>  package and greatly reduce the number of imports for your users.  It is a 
> small
>  pure Python module that works on virtually all Python versions.")
>  (home-page "https://bitbucket.org/hpk42/apipkg";)
> -(license license:expat)))
> +(license license:expat)
> +(properties `((python2-variant . ,(delay python2-apipkg))
> +
> +(define-public python2-apipkg
> +  (package
> +(inherit (package-with-python2
> +  (strip-python2-variant python-apipkg)))
> +(inputs
> + `(("python2-setuptools" ,python2-setuptools)
>  

Thanks for making this python2-variant (and any others I may have left
out). I left it out when I added python-apipkg since we didn't have this
solution yet.

>  (define-public python-execnet
>(package
> -- 
> 2.6.3
> 
> 

Re: [PATCH 6/18] gnu: Add python-beautifulsoup4

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:28:03PM -0800, Christopher Allan Webber wrote:
> From 12fea50a946441277e38cc6e7ef266c08738193e Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sat, 13 Feb 2016 18:35:57 -0800
> Subject: [PATCH 06/18] gnu: Add python-beautifulsoup4
> 
> * gnu/packages/python.scm (python-beautifulsoup4, python2-beautifulsoup4):
>   New variables.

I actually have a patch for this in one of my WIP branches, too :)

> ---
>  gnu/packages/python.scm | 33 +
>  1 file changed, 33 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 3ef552d..d7498dd 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -4573,6 +4573,39 @@ libxml2 and libxslt.")
>  (define-public python2-lxml
>(package-with-python2 python-lxml))
>  
> +;; beautifulsoup4 has a totally different namespace than 3.x,
> +;; and pypi seems to put it under its own name, so I guess we should too
> +(define-public python-beautifulsoup4
> +  (package
> +(name "python-beautifulsoup4")
> +(version "4.4.1")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "beautifulsoup4" version))
> +   (sha256
> +(base32
> + "1d36lc4pfkvl74fmzdib2nqnvknm0jddgf2n9yd7im150qyh3m47"
> +(build-system python-build-system)
> +(inputs
> + `(("python-lxml" ,python-lxml)
> +   ("python-html5lib" ,python-html5lib)))

I didn't find these necessary for the build process and test suite. Are
you sure they aren't supposed to be provided by the application that
uses beautifulsoup4?

> +(home-page
> + "http://www.crummy.com/software/BeautifulSoup/bs4/";)
> +(synopsis
> + "Python screen-scraping library")
> +(description
> + "HTML/XML parser for quick-turnaround applications like screen-scraping.
> +Can parse even extremely broken HTML.")

How about this:

"Beautiful Soup is a Python library designed for rapidly setting up
screen-scraping projects.  It offers Pythonic idioms for navigating,
searching, and modifying a parse tree, providing a toolkit for
dissecting a document and extracting what you need.  It automatically
converts incoming documents to Unicode and outgoing documents to UTF-8."

> +(license bsd-3)

It uses the Expat license, and has some code from html5lib, which is
also Expat.

> +(properties `((python2-variant . ,(delay python2-beautifulsoup4))
> +
> +(define-public python2-beautifulsoup4
> +  (package
> +(inherit (package-with-python2
> +  (strip-python2-variant python-beautifulsoup4)))
> +(inputs `(("python2-setuptools" ,python2-setuptools)
> +
>  (define-public python2-pil
>(package
>  (name "python2-pil")
> -- 
> 2.6.3
> 
> 

Re: [PATCH 9/18] gnu: Add python-pastedeploy.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:31:00PM -0800, Christopher Allan Webber wrote:
> From 8aeb48d26f2391de674723d63d0722f3112245d0 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sat, 13 Feb 2016 21:13:14 -0800
> Subject: [PATCH 09/18] gnu: Add python-pastedeploy
> 
> * gnu/packages/python.scm (python-pastedeploy, python2-pastedeploy):
>   New variables.
> ---
>  gnu/packages/python.scm | 29 +
>  1 file changed, 29 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index e1d20f5..5557bfb 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -7746,3 +7746,32 @@ and to spawn subprocesses to handle requests.")
>(inherit wsgiproxy2)
>(inputs `(("python2-setuptools" ,python2-setuptools)
>  ,@(package-inputs wsgiproxy2))
> +
> +(define-public python-pastedeploy
> +  (package
> +(name "python-pastedeploy")
> +(version "1.5.2")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "PasteDeploy" version))
> +   (sha256
> +(base32
> + "1jz3m4hq8v6hyhfjz9425nd3nvn52cvbfipdcd72krjmla4qz1fm"
> +(build-system python-build-system)
> +(native-inputs
> + `(("python-nose" ,python-nose)))
> +(propagated-inputs
> + `(("python2-setuptools" ,python-setuptools))) ; uses pkg_resources

Is setuptools needed at run-time? If not, it should be a native-input.

> +(home-page "http://pythonpaste.org/deploy/";)
> +(synopsis
> + "Load, configure, and compose WSGI applications and servers")
> +(description
> + "This tool provides code to load WSGI applications and servers from 
> URIs;
> +these URIs can refer to Python Eggs for INI-style configuration files.  Paste
> +Script provides commands to serve applications based on this configuration
> +file.")
> +(license license:expat)))
> +
> +(define-public python2-pastedeploy
> +  (package-with-python2 python-pastedeploy))
> -- 
> 2.6.3
> 
> 

Re: [PATCH 9/18] gnu: Add python-pastedeploy.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:31:00PM -0800, Christopher Allan Webber wrote:
> From 8aeb48d26f2391de674723d63d0722f3112245d0 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sat, 13 Feb 2016 21:13:14 -0800
> Subject: [PATCH 09/18] gnu: Add python-pastedeploy
> 
> * gnu/packages/python.scm (python-pastedeploy, python2-pastedeploy):
>   New variables.
> ---
>  gnu/packages/python.scm | 29 +
>  1 file changed, 29 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index e1d20f5..5557bfb 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -7746,3 +7746,32 @@ and to spawn subprocesses to handle requests.")
>(inherit wsgiproxy2)
>(inputs `(("python2-setuptools" ,python2-setuptools)
>  ,@(package-inputs wsgiproxy2))
> +
> +(define-public python-pastedeploy
> +  (package
> +(name "python-pastedeploy")
> +(version "1.5.2")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "PasteDeploy" version))
> +   (sha256
> +(base32
> + "1jz3m4hq8v6hyhfjz9425nd3nvn52cvbfipdcd72krjmla4qz1fm"
> +(build-system python-build-system)
> +(native-inputs
> + `(("python-nose" ,python-nose)))
> +(propagated-inputs
> + `(("python2-setuptools" ,python-setuptools))) ; uses pkg_resources

I forgot to mention, shouldn't it be python-setuptools?

> +(home-page "http://pythonpaste.org/deploy/";)
> +(synopsis
> + "Load, configure, and compose WSGI applications and servers")
> +(description
> + "This tool provides code to load WSGI applications and servers from 
> URIs;
> +these URIs can refer to Python Eggs for INI-style configuration files.  Paste
> +Script provides commands to serve applications based on this configuration
> +file.")
> +(license license:expat)))
> +
> +(define-public python2-pastedeploy
> +  (package-with-python2 python-pastedeploy))
> -- 
> 2.6.3
> 
> 

Re: [PATCH 10/18] gnu: Add python-pyquery.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:31:22PM -0800, Christopher Allan Webber wrote:
> From a8896e49511d1b39558e48bb149c8fce91ba128c Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sat, 13 Feb 2016 21:40:22 -0800
> Subject: [PATCH 10/18] gnu: Add python-pyquery
> 
> * gnu/packages/python.scm (python-pyquery, python2-pyquery): New variables.
> ---
>  gnu/packages/python.scm | 31 +++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 5557bfb..1238849 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -7775,3 +7775,34 @@ file.")
>  
>  (define-public python2-pastedeploy
>(package-with-python2 python-pastedeploy))
> +
> +(define-public python-pyquery
> +  (package
> +(name "python-pyquery")
> +(version "1.2.11")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "pyquery" version))
> +   (sha256
> +(base32
> + "1ikz1387nsp0pp7mzzr6ip9n5gr67acpap24yn33987v7fkjp0sa"
> +(build-system python-build-system)
> +(inputs
> + `(("python-lxml" ,python-lxml)
> +   ("python-cssselect" ,python-cssselect)))
> +(home-page "https://github.com/gawel/pyquery";)
> +(synopsis "Make jQuery-like queries on xml documents")
> +(description "pyquery allows you to make jQuery queries on xml documents.
> +The API is as much as possible the similar to jQuery.
> +pyquery uses lxml for fast xml and html manipulation.")

Line wrapping.

> +(license bsd-3)
> +(properties `((python2-variant . ,(delay python2-pyquery))
> +
> +(define-public python2-pyquery
> +  (let ((pyquery (package-with-python2
> +  (strip-python2-variant python-pyquery
> +(package
> +  (inherit pyquery)
> +  (inputs `(("python2-setuptools" ,python2-setuptools)
> +,@(package-inputs pyquery))
> -- 
> 2.6.3
> 
> 

Re: [PATCH 11/18] gnu: Add python-webtest.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:31:40PM -0800, Christopher Allan Webber wrote:
> From 562f8e028563ac3eebe6c90b1c9e4bb3bc379177 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sat, 13 Feb 2016 22:13:14 -0800
> Subject: [PATCH 11/18] gnu: Add python-webtest.
> 
> * gnu/packages/python.scm (python-webtest, python2-webtest):
>   New variables.
> ---
>  gnu/packages/python.scm | 50 
> +
>  1 file changed, 50 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 1238849..f5015df 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -7806,3 +7806,53 @@ pyquery uses lxml for fast xml and html manipulation.")
>(inherit pyquery)
>(inputs `(("python2-setuptools" ,python2-setuptools)
>  ,@(package-inputs pyquery))
> +
> +(define-public python-webtest
> +  (package
> +(name "python-webtest")
> +(version "2.0.20")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "WebTest" version))
> +   (sha256
> +(base32
> + "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv"
> +(build-system python-build-system)
> +(arguments
> + `(;; Unfortunately we have to disable tests!
> +   ;; This release of WebTest is pinned to python-nose < 1.3,
> +   ;; but older versions of python-nose are plagged with the following

s/plagged/plagued

> +   ;; bug(s), which rears its ugly head during test execution:
> +   ;;   https://github.com/nose-devs/nose/issues/759
> +   ;;   https://github.com/nose-devs/nose/pull/811
> +   #:tests? #f))
> +;; Commented out code is no good, but in this case, once tests
> +;; are ready to be enabled again, we should put the following
> +;; in place:
> +;;  (native-inputs
> +;;   `(("python-nose" ,python-nose) ; technially < 1.3,
> +;;  ; but see above comment
> +;; ("python-coverage" ,python-coverage)
> +;; ("python-mock" ,python-mock)
> +;; ("python-pastedeploy" ,python-pastedeploy)
> +;; ("python-wsgiproxy2" ,python-wsgiproxy2)
> +;; ("python-pyquery" ,python-pyquery)))

Thanks for the detail!

> +(inputs
> + `(("python-waitress" ,python-waitress)
> +   ("python-webob" ,python-webob)
> +   ("python-six" ,python-six)
> +   ("python-beautifulsoup4" ,python-beautifulsoup4)))
> +(home-page "http://webtest.pythonpaste.org/";)
> +(synopsis "Helper to test WSGI applications")
> +(description "Helper to test WSGI applications")

The description should at least be a complete sentence, and ideally
offer more detail than the synopsis.

> +(license license:expat)
> +(properties `((python2-variant . ,(delay python2-webtest))
> +
> +(define-public python2-webtest
> +  (let ((webtest (package-with-python2
> +  (strip-python2-variant python-webtest
> +(package
> +  (inherit webtest)
> +  (inputs `(("python2-setuptools" ,python2-setuptools)
> +,@(package-inputs webtest))
> -- 
> 2.6.3
> 
> 

Re: [PATCH 13/18] gnu: Add python-amqp.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:32:16PM -0800, Christopher Allan Webber wrote:
> From dedac86054cf1526731411b8b505084dd375de17 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sun, 14 Feb 2016 12:44:03 -0800
> Subject: [PATCH 13/18] gnu: Add python-amqp.
> 
> * gnu/packages/python.scm (python-amqp, python2-amqp): New variables.
> ---
>  gnu/packages/python.scm | 38 ++
>  1 file changed, 38 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 82a467b..f9ad796 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -7895,3 +7895,41 @@ and provides a uniform API regardless of which JSON 
> implementation is used.")
>   #:python ,python-2))
>  (inputs `(("python2-setuptools" ,python2-setuptools)
>("python2-nose" ,python2-nose)
> +
> +(define-public python-amqp
> +  (package
> +(name "python-amqp")
> +(version "1.4.9")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "amqp" version))
> +   (sha256
> +(base32
> + "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"
> +(build-system python-build-system)
> +(native-inputs
> + `(("python-nose" ,python-nose)
> +   ("python-mock" ,python-mock)))
> +(home-page "http://github.com/celery/py-amqp";)
> +(synopsis
> + "Low-level AMQP client for Python (fork of amqplib)")
> +(description
> + "This is a fork of amqplib which was originally written by Barry 
> Pederson.
> +It is maintained by the Celery project, and used by kombu as a pure python
> +alternative when librabbitmq is not available.")
> +(license lgpl2.1+)
> +(properties `((python2-variant . ,(delay python2-amqp))
> +
> +(define-public python2-amqp
> +  (let ((amqp (package-with-python2
> +   (strip-python2-variant python-amqp
> +(package
> +  (inherit amqp)
> +  (arguments `(;; Tries to run coverage tests with nose-cover3, which 
> seems
> +   ;; unmaintained.  Weirdly, does not do this on the python 
> 3
> +   ;; version?
> +   #:tests? #f

Do we need the python-2 version? Maybe it's not worth the effort if the
AMQP authors are depending on an unmaintained. Maybe they don't even
intend to support python-2 anymore.

> +   ,@(package-arguments amqp)))
> +  (native-inputs `(("python2-setuptools" ,python2-setuptools)
> +   ,@(package-native-inputs amqp))
> -- 
> 2.6.3
> 
> 

Re: [PATCH 15/18] gnu: Add python-billiard.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:32:49PM -0800, Christopher Allan Webber wrote:
> From 510854b320de72804575b18c77d1b30670408e6e Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sun, 14 Feb 2016 15:49:47 -0800
> Subject: [PATCH 15/18] gnu: Add python-billiard.
> 
> * gnu/packages/python.scm (python-billiard, python2-billiard):
>   New variables.
> ---
>  gnu/packages/python.scm | 35 +++
>  1 file changed, 35 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 2bc45ae..ad1698b 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -7971,3 +7971,38 @@ RabbitMQ messaging server is the most popular 
> implementation.")
>(inputs `(("python2-setuptools" ,python2-setuptools)
>  ("python2-unittest2" ,python2-unittest2)
>  ,@(package-inputs kombu))
> +
> +(define-public python-billiard
> +  (package
> +(name "python-billiard")
> +(version "3.3.0.22")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "billiard" version))
> +   (sha256
> +(base32
> + "0zp7h6a58alrb3mwdw61jds07395j4j0mj6iqsb8czrihw9ih5nj"
> +(build-system python-build-system)
> +(native-inputs
> + `(("python-nose" ,python-nose)))
> +(home-page "http://github.com/celery/billiard";)
> +(synopsis
> + "Python multiprocessing fork with improvements and bugfixes")
> +(description
> + "billiard is a fork of the Python 2.7 multiprocessing package.  The

Please capitalize billiard at the beginning of the sentence.

> +multiprocessing package itself is a renamed and updated version of R 
> Oudkerk's
> +pyprocessing package.  This standalone variant is intended to be compatible 
> with
> +Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
> +(license bsd-3)
> +(properties `((python2-variant . ,(delay python2-billiard))
> +
> +(define-public python2-billiard
> +  (let ((billiard (package-with-python2
> +   (strip-python2-variant python-billiard
> +(package
> +  (inherit billiard)
> +  (native-inputs `(("python2-setuptools" ,python2-setuptools)
> +   ("python2-unittest2" ,python2-unittest2)
> +   ("python2-mock" ,python2-mock)
> +   ,@(package-native-inputs billiard))
> -- 
> 2.6.3
> 
> 

Re: [PATCH] gnu: Add pioneers

[Jookia]

On Mon, Feb 15, 2016 at 08:21:04PM -0500, Leo Famulari wrote:
> > +(home-page "http://pio.sourceforge.net/";)
> > +(license license:gpl2+)))
>
> Since the source files include the "any later version" clause, I changed
> this to GPL3+. I usually grep for 'later version' when COPYING indicates
> GPL2.

I don't like this and I think this is a bad idea. The project isn't licensed
under the GPLv3+, it's licensed under the GPLv2+. When people search for
packages and read licenses they're not going to be misinformed. I feel this is a
disservice to the users of Guix, and misleading at best or dishonest at worst.

You mentioned in IRC that this is supposed to be for the package that Guix
builds and distributes. Indeed, the Guix documentation says the license field is
for "The license of the package", not the license of the software in the
package. Yet the home-page field is "The URL to the home-page of the package",
and the synopsis field is "A one-line description of the package." 'package'
here means the upstream, not the Guix package. Logic says that the license is
for the software, and yet it's being misrepresented.

I'd much rather like a package manager that reliably tells me the license for
upstream software, but I have a feeling this is a sore political spot. I don't
even get why you'd distribute the package under a newer GPL- this makes packages
that were previously compatible incompatible!

I don't care for the politics, but I think at the very least the 'license' field
needs to be explicitly documented as not the license for the upstream software.

Jookia.

Re: [PATCH 17/18] gnu: Add python-translitcodec.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:33:27PM -0800, Christopher Allan Webber wrote:
> From 4194f0b325d64718529275906ffe8294e8fb6111 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Sun, 14 Feb 2016 16:23:11 -0800
> Subject: [PATCH 17/18] gnu: Add python-translitcodec.
> 
> * gnu/packages/python.scm (python-translitcodec, python2-translitcodec):
>   New variables.
> ---
>  gnu/packages/python.scm | 32 
>  1 file changed, 32 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index efe0229..2cb87bc 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -8045,3 +8045,35 @@ synchronously (wait until ready).")
> ("python2-unittest2" ,python2-unittest2)
> ("python2-mock" ,python2-mock)
> ,@(package-native-inputs celery))
> +
> +(define-public python-translitcodec
> +  (package
> +(name "python-translitcodec")
> +(version "0.4.0")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "translitcodec" version))
> +   (sha256
> +(base32
> + "10x6pvblkzky1zhjs8nmx64nb9jdzxad4bxhq4iwv0j4z2aqjnki"
> +(build-system python-build-system)
> +(arguments
> + `(#:tests? #f))  ; no tests provided
> +(home-page
> + "https://github.com/claudep/translitcodec";)
> +(synopsis
> + "Unicode to 8-bit charset transliteration codec")
> +(description
> + "This package contains codecs for transliterating ISO 10646 texts into
> +best-effort representations using smaller coded character sets (ASCII,
> +ISO 8859, etc.).  The translation tables used by the codecs are from
> +the 'transtab' collection by Markus Kuhn.")

Do we need to attribute Mr. Kuhn here? AFAIK we don't normally do this.

> +(license license:expat)
> +(properties `((python2-variant . ,(delay python2-translitcodec))
> +
> +(define-public python2-translitcodec
> +  (package
> +(inherit (package-with-python2
> +  (strip-python2-variant python-translitcodec)))
> +(inputs `(("python2-setuptools" ,python2-setuptools)
> -- 
> 2.6.3
> 
> 

Re: [PATCH] gnu: Add pioneers

[Leo Famulari]

On Tue, Feb 16, 2016 at 01:03:34PM +1100, Jookia wrote:
> On Mon, Feb 15, 2016 at 08:21:04PM -0500, Leo Famulari wrote:
> > > +(home-page "http://pio.sourceforge.net/";)
> > > +(license license:gpl2+)))
> >
> > Since the source files include the "any later version" clause, I changed
> > this to GPL3+. I usually grep for 'later version' when COPYING indicates
> > GPL2.
> 
> I don't like this and I think this is a bad idea. The project isn't licensed
> under the GPLv3+, it's licensed under the GPLv2+. When people search for
> packages and read licenses they're not going to be misinformed. I feel this 
> is a
> disservice to the users of Guix, and misleading at best or dishonest at worst.
> 
> You mentioned in IRC that this is supposed to be for the package that Guix
> builds and distributes. Indeed, the Guix documentation says the license field 
> is
> for "The license of the package", not the license of the software in the
> package. Yet the home-page field is "The URL to the home-page of the package",
> and the synopsis field is "A one-line description of the package." 'package'
> here means the upstream, not the Guix package. Logic says that the license is
> for the software, and yet it's being misrepresented.
> 
> I'd much rather like a package manager that reliably tells me the license for
> upstream software, but I have a feeling this is a sore political spot. I don't
> even get why you'd distribute the package under a newer GPL- this makes 
> packages
> that were previously compatible incompatible!
> 
> I don't care for the politics, but I think at the very least the 'license' 
> field
> needs to be explicitly documented as not the license for the upstream 
> software.
> 
> Jookia.

You're right, I was wrong. I'm correcting this mistake and looking
through my history to see if I've made it elsewhere.

Re: [PATCH] gnu: Add pioneers

[Mark H Weaver]

Jookia <166...@gmail.com> writes:

> On Mon, Feb 15, 2016 at 08:21:04PM -0500, Leo Famulari wrote:
>> > +(home-page "http://pio.sourceforge.net/";)
>> > +(license license:gpl2+)))
>>
>> Since the source files include the "any later version" clause, I changed
>> this to GPL3+. I usually grep for 'later version' when COPYING indicates
>> GPL2.
>
> I don't like this and I think this is a bad idea. The project isn't licensed
> under the GPLv3+, it's licensed under the GPLv2+. When people search for
> packages and read licenses they're not going to be misinformed. I feel this 
> is a
> disservice to the users of Guix, and misleading at best or dishonest at worst.

You're right, Jookia.  Leo was mistaken about our policy.

If upstream allows distribution under "GPLv2 or any later version", then
our license field should be gpl2+.

 Thanks,
   Mark

Re: Guix vs GuixSD

[Chris Marusich]

(Apologies for top-posting; my mobile email client doesn't seem to let me
post in any other way...)

Regarding your diagrams, I guess the one that shows GuixSD using Guix makes
a little more sense to me than the one that shows GuixSD as a total
replacement for Guix. However, I'm not sure exactly how GuixSD uses Guix
when managing the system, so I will defer to the opinion of others on the
mailing list who know more about theses things than me.

It isn't clear to me what you want to know. Perhaps if you can ask a more
concrete question, it will be easier for the others to answer?

To reiterate what I said before: my current understanding is that Guix is a
functional package manager (with a lot of fantastic features) that you can
run anywhere. That's all, really. And GuixSD is a full GNU operating system
which currently uses Linux-Libre as its kernel, Guix as its package
manager, and Shepherd (formerly DMD) as its init system. Similar to a
GNU/Linux distribution, the GuixSD system comes with some extra "glue"
which makes all those separate components work together out of the box. But
the way that those components are glued together in GuixSD allows you to
enjoy certain benefits that you don't get with other systems (software
freedom, system configuration in guile, easy rollback of system upgrades,
etc). I don't yet know much about how GuixSD's "glue" is implemented, but I
think that's the gist of it.

On Mon, Feb 15, 2016, 09:37 myglc2  wrote:

> Chris Marusich  writes:
> [...]
> > I think you're asking "What is the difference between Guix and
> > GuixSD", and you don't feel that the manual is clear enough about
> > this. Is that right?
>
> No, the problem is at a higher level than the manual.
>
> The current packaging of Guix within GuixSD obfuscates what is going on
> and makes understanding the Guix-verse difficult.
>
> I drew the diagrams: To illustrate and stimulate a discussion of this.
>
> Do you have any thoughts about the diagrams?
>
>
>
>

Adding idle3-tools while unable to run ‘guix lint’

[Tobias Geerinckx-Rice]

Hullo Guix,

YAPackage. I'd love to run ‘guix lint’, but then:

  ~blah$ ./pre-inst-env guix lint idle3-tools
  gnu/packages/disk.scm:193:15: idle3-tools-0.9.1: \
URI http://idle3-tools.sourceforge.net unreachable: \
Connection timed out

I don't know if this is the cause or just a symptom. Full error output
is pasted below. Loading the URI in my browser, of course, works fine.

Kind regards,

T G-R

--

gnu/packages/disk.scm:193:15: idle3-tools-0.9.1: URI 
http://idle3-tools.sourceforge.net unreachable: Connection timed out
;;; Failed to autoload make-session in (gnutls):
;;; ERROR: missing interface for module (gnutls)
Backtrace:
In ice-9/boot-9.scm:
  63: 19 [call-with-prompt prompt0 ...]
In ice-9/eval.scm:
 432: 18 [eval # #]
In ice-9/boot-9.scm:
2401: 17 [save-module-excursion #]
4050: 16 [#]
1724: 15 [%start-stack load-stack ...]
1729: 14 [#]
In unknown file:
   ?: 13 [primitive-load "/home/nckx/Hacking/guix/scripts/guix"]
In guix/ui.scm:
1177: 12 [run-guix-command lint "idle3-tools"]
In srfi/srfi-1.scm:
 619: 11 [for-each # 
#]
 619: 10 [for-each # #]
In guix/scripts/lint.scm:
 608: 9 [check-vulnerabilities #]
 602: 8 [# #]
In unknown file:
   ?: 7 [force #>]
In guix/scripts/lint.scm:
 592: 6 [#]
In ice-9/boot-9.scm:
 157: 5 [catch getaddrinfo-error ...]
In guix/cve.scm:
  63: 4 [call-with-cve-port #]
In guix/http-client.scm:
 292: 3 [# system-error 
...]
 234: 2 [loop #]
In guix/build/download.scm:
 367: 1 [open-connection-for-uri # # #f]
 252: 0 [tls-wrap # "nvd.nist.gov"]

guix/build/download.scm:252:17: In procedure tls-wrap:
guix/build/download.scm:252:17: In procedure module-lookup: Unbound variable: 
make-session

[PATCH] gnu: Add idle3-tools.

[Tobias Geerinckx-Rice]

* gnu/packages/disk.scm (idle3-tools): New variable.
* gnu/packages/disk.scm: Introduce license name space.
---
 gnu/packages/disk.scm | 40 ++--
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index b9240a3..92475a1 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -20,7 +20,7 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu packages disk)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
@@ -68,7 +68,7 @@
 (description
  "GNU Parted is a package for creating and manipulating disk partition
 tables.  It includes a library and command-line utility.")
-(license gpl3+)))
+(license license:gpl3+)))
 
 (define-public fdisk
   (package
@@ -94,7 +94,7 @@ tables.  It includes a library and command-line utility.")
  "GNU fdisk provides a GNU version of the common disk partitioning tool
 fdisk.  fdisk is used for the creation and manipulation of disk partition
 tables, and it understands a variety of different formats.")
-(license gpl3+)))
+(license license:gpl3+)))
 
 (define-public ddrescue
   (package
@@ -117,7 +117,7 @@ tables, and it understands a variety of different formats.")
 from one file to another, working to rescue data in case of read errors.  The
 program also includes a tool for manipulating its log files, which are used
 to recover data more efficiently by only reading the necessary blocks.")
-(license gpl3+)))
+(license license:gpl3+)))
 
 (define-public dosfstools
   (package
@@ -144,7 +144,7 @@ to recover data more efficiently by only reading the 
necessary blocks.")
 (description
  "The dosfstools package includes the mkfs.fat and fsck.fat utilities,
 which respectively make and check MS-DOS FAT filesystems.")
-(license gpl3+)))
+(license license:gpl3+)))
 
 (define-public sdparm
   (package
@@ -170,4 +170,32 @@ uses a SCSI command set.  Such devices include CD/DVD 
drives (irrespective of
 transport), SCSI and ATAPI tape drives, and SCSI enclosures.  This utility can
 also send commands associated with starting and stopping the media, loading
 and unloading removable media and some other housekeeping functions.")
-(license bsd-3)))
+(license license:bsd-3)))
+
+(define-public idle3-tools
+  (package
+(name "idle3-tools")
+(version "0.9.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "mirror://sourceforge/idle3-tools/idle3-tools-"
+   version ".tgz"))
+   (sha256
+(base32
+ "00ia7xq9yldxyl9gz0mr4xa568nav14p0fnv82f2rbbkg060cy4p"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ;no test suite
+   #:phases (modify-phases %standard-phases
+ (delete 'configure))
+   #:make-flags '("CC=gcc")))
+(home-page "http://idle3-tools.sourceforge.net";)
+(synopsis "Change or disable Western Digital hard drives' Idle3 timer")
+(description
+ "Idle3-tools provides a utility to get, set, or disable the Idle3 timer
+present in many Western Digital hard drives.  This timer is part of the
+\"IntelliPark\" feature that stops the disk when not in use.  Unfortunately,
+the default timer setting is not well suited to Linux or other *nix systems,
+and can dramatically shorten the lifespan of the drive if left unchecked.")
+(license license:gpl3+)))
-- 
2.7.0

Re: GuixSD is missing /dev/disk/by-uuid

[Chris Marusich]

Chris Marusich  writes:

> I ran those commands, and it fixed the problem: /dev/disk/by-uuid now
> exists and contains the links I expected to see.
>
> However, it introduced a new problem. Now, my network interface eth0
> does not show up like it did before. For example, when I run ifconfig,
> "lo" shows up but "eth0" is missing. Nothing that relies on the network
> works.
>

I think I'll start a new email threads to investigate this second issue,
which is decidedly separate from the /dev/disk/by-uuid problem. Thank
you, Ludo, for your help in resolving the original issue!

Chris

Re: [PATCH] gnu: Add slurm.

[Pjotr Prins]

On Mon, Feb 15, 2016 at 10:51:00PM +0100, Andreas Enge wrote:
> On Mon, Feb 15, 2016 at 01:09:01PM +0100, Pjotr Prins wrote:
> > New version cleaned up (using python-wrapper) and patch created
> > with latest git and en_US.utf8 Guix style...
> 
> Well, it turned out it was still in iso-latin-1, and patching failed again...
> Anyway, I applied the modifications and expanded the description a bit.

Weird. I should check that the files were utf8 before they went into
git. Maybe git is not the problem at all!

> A number of configure flags were missing - without them, the inputs
> would not be found in their non-standard location. 

Hmmm. It compiled, the tools ran...

> I also added a number of further inputs that seemed important to me.

Awesome!

Use of mysql or postgresql for detailed job information is optional.
By default it is text. I think it is fine this way, maybe we'll make
mysql a working option when we roll it out on our setup.

Pj.

Re: Adding idle3-tools while unable to run ‘guix lint’

[Pjotr Prins]

guile gnutls is missing which means it should be installed and
visible from

  export GUILE_LOAD_PATH="/home/wrk/.guix-profile/share/guile/site/2.0"

I am thinking, to make things easier, why don't we have a guix-dev
package which includes guix, guile, emacs and all related packages and
emacs extensions typically used for development?

That way guix lint and emacs can work out of the box. All it needs is
setting the search paths.

Pj.

On Tue, Feb 16, 2016 at 04:56:31AM +0100, Tobias Geerinckx-Rice wrote:
> Hullo Guix,
> 
> YAPackage. I'd love to run ‘guix lint’, but then:
> 
>   ~blah$ ./pre-inst-env guix lint idle3-tools
>   gnu/packages/disk.scm:193:15: idle3-tools-0.9.1: \
> URI http://idle3-tools.sourceforge.net unreachable: \
> Connection timed out
> 
> I don't know if this is the cause or just a symptom. Full error output
> is pasted below. Loading the URI in my browser, of course, works fine.
> 
> Kind regards,
> 
> T G-R
> 
> --
> 
> gnu/packages/disk.scm:193:15: idle3-tools-0.9.1: URI 
> http://idle3-tools.sourceforge.net unreachable: Connection timed out
> ;;; Failed to autoload make-session in (gnutls):
> ;;; ERROR: missing interface for module (gnutls)
> Backtrace:
> In ice-9/boot-9.scm:
>   63: 19 [call-with-prompt prompt0 ...]
> In ice-9/eval.scm:
>  432: 18 [eval # #]
> In ice-9/boot-9.scm:
> 2401: 17 [save-module-excursion # ice-9/boot-9.scm:4045:3 ()>]
> 4050: 16 [#]
> 1724: 15 [%start-stack load-stack ...]
> 1729: 14 [#]
> In unknown file:
>?: 13 [primitive-load "/home/nckx/Hacking/guix/scripts/guix"]
> In guix/ui.scm:
> 1177: 12 [run-guix-command lint "idle3-tools"]
> In srfi/srfi-1.scm:
>  619: 11 [for-each # (spec)> #]
>  619: 10 [for-each # (checker)> #]
> In guix/scripts/lint.scm:
>  608: 9 [check-vulnerabilities #]
>  602: 8 [# #]
> In unknown file:
>?: 7 [force # ()>>]
> In guix/scripts/lint.scm:
>  592: 6 [#]
> In ice-9/boot-9.scm:
>  157: 5 [catch getaddrinfo-error ...]
> In guix/cve.scm:
>   63: 4 [call-with-cve-port #]
> In guix/http-client.scm:
>  292: 3 [# system-error 
> ...]
>  234: 2 [loop #]
> In guix/build/download.scm:
>  367: 1 [open-connection-for-uri # # #f]
>  252: 0 [tls-wrap # "nvd.nist.gov"]
> 
> guix/build/download.scm:252:17: In procedure tls-wrap:
> guix/build/download.scm:252:17: In procedure module-lookup: Unbound variable: 
> make-session
> 
> 

-- 

Re: emacs packaging (emacs-popup)

[Federico Beffa]

On Mon, Feb 15, 2016 at 5:46 PM, Alex Kost  wrote:
> Federico Beffa (2016-02-15 15:12 +0300) wrote:
>
>> Nils Gillmann  writes:
>>
>>> I'm packaging emacs-popup.
>>>
>>> Currently the output builds with
>>> niasterisk@khazad-dum ~/projects/guix_project/guix$ ls -al
>>> /gnu/store/knpjk9vflja0i6yhnz4ai57k29jpgm4p-emacs-popup-0.5.3/share/emacs/site-lisp/guix.d/popup-0.5.3/
>>> total 180
>>> dr-xr-xr-x 4 root guixbuild  4096 Jan  1  1970 ./
>>> dr-xr-xr-x 3 root guixbuild  4096 Jan  1  1970 ../
>>> -r--r--r-- 2 root guixbuild90 Jan  1  1970 Cask
>>> dr-xr-xr-x 3 root guixbuild  4096 Jan  1  1970 etc/
>>> -r--r--r-- 2 root guixbuild14 Jan  1  1970 .gitignore
>>> -r--r--r-- 2 root guixbuild   626 Jan  1  1970 Makefile
>>> -r--r--r-- 2 root guixbuild   334 Jan  1  1970 popup-autoloads.el
>>> -r--r--r-- 2 root guixbuild 54848 Jan  1  1970 popup.el
>>> -r--r--r-- 2 root guixbuild 75474 Jan  1  1970 popup.elc
>>> -r--r--r-- 2 root guixbuild 10187 Jan  1  1970 README.md
>>> dr-xr-xr-x 2 root guixbuild  4096 Jan  1  1970 tests/
>>> -r--r--r-- 2 root guixbuild   569 Jan  1  1970 .travis.yml
>>>
>>> Can this be improved, ie remove some of the files to clean it up,
>>> or is it all good?
>>
>> I would suggest to move the README.md (and in general documentation
>> related files) to $datadir/doc/package-name-version/. Info files to
>> $datadir/info/package-name-version/. Take a look at 'emacs-slime'.
>>
>> Remove unused files like .gitignore, ...
>
> I don't agree.  This is not done for any other emacs package.  I think
> ".gitignore" and other files should not be removed in a package recipe.
> This is a job for emacs-build-system, and I thought it was agreed¹.  So
> I think this "emacs-popup" package can be left as it is now, and once
> our emacs-build-system will be improved (to remove useless file, to move
> README into share/doc, etc.), it will be fixed automatically.
>
> ¹ http://lists.gnu.org/archive/html/guix-devel/2015-07/msg00416.html

Doing so will break some packages. One example is 'emacs-slime' which
includes .lisp and .asd files, other ones are 'emacs-auctex' and
'emacs-ob-ipython', ...

While we could add a phase to remove some pretty common and useless
files such as .gitignore, in general things are not standardized and
more complex. Unless upstream fixes this situation it will be
impossible to make a perfect 'emacs-build-system'.

Checking the code to remind myself of the details, the only thing
about non .el files that it does, is to move info files to the
appropriate directory.

Regards,
Fede