Merge branch 'master' into core-updates
gnu: python: Change URL to https.
* gnu/packages/python.scm (python-2, python)[source]: Change URL to
https. This makes sure GnuTLS is available in the derivation that
downloads the source, which is required since http URLs get redirected
to https anyway. Reported by Manolis Ragkousis <manolis837@gmail.com>.
Merge branch 'master' into core-updates
gnu: Add ElementTree and pybugz.
* gnu/packages/python.scm (python2-element-tree, python2-pybugz): New
variables.
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
gnu: python-pysqlite: Point to the latest release tarball.
* gnu/packages/python.scm (python2-pysqlite): Change 'version' to
"2.6.3a". Change 'uri' to point to pypi.python.org.
Reported by Mark H Weaver <mhw@netris.org> and others.
Update 'home-page' and 'synopsis'.
Merge branch 'master' into core-updates
gnu: python: Update to 3.3.3.
* gnu/packages/python.scm (python): Update to 3.3.3.
gnu: python-2: Update to 2.7.6.
* gnu/packages/python.scm (python-2): Update to 2.7.6.
gnu: Move libelf and patchelf to (gnu packages elf).
* gnu/packages/patchelf.scm (patchelf): Move to...
* gnu/packages/elf.scm (patchelf): ... here.
* gnu/packages/patchelf.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly.
* gnu/packages/gcc.scm (libelf): Move to...
* gnu/packages/elf.scm (libelf): ... here.
* gnu/packages/cdrom.scm, gnu/packages/icu4c.scm,
gnu/packages/samba.scm, gnu/packages/scheme.scm, gnu/packages/ssh.scm:
Adjust references to (gnu packages patchelf).
Merge branch 'master' into core-updates
gnu: Add python2-empy.
* gnu/packages/python.scm (python2-empy): New variable.
gnu: Add SCons.
* gnu/packages/python.scm (scons): New variable.
gnu: Add dogtail.
* gnu/packages/python.scm (python2-dogtail): New variable.
Merge branch 'master' into core-updates
gnu: Add python2-pyicu.
* gnu/packages/python.scm (python2-pyicu): New variable.
gnu: Add python-simplejson, python2-simplejson.
* gnu/packages/python.scm (python-simplejson, python2-simplejson):
New variables.
gnu: python2-pysqlite: Fix 'license'.
* gnu/packages/python.scm (python2-pysqlite): Refer to (@ (guix
licenses) zlib), not to the same-named package.
gnu: Add python2-mechanize.
* gnu/packages/python.scm (python2-mechanize): New variable.