branch master updated (e940a27 -> 1de17a6)
mhw pushed a change to branch master
in repository guix.
from e940a27 doc: Add guide on how to specify dependencies for Python
packages.
new 1de17a6 gnu: ghostscript: Fix CVE-2013-5653 and
CVE-2016-{7976,7978,7979,8602}.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
gnu/local.mk |5 +
gnu/packages/ghostscript.scm | 18 +-
.../patches/ghostscript-CVE-2013-5653.patch| 85 +
.../patches/ghostscript-CVE-2016-7976.patch| 185
.../patches/ghostscript-CVE-2016-7978.patch| 25 +++
.../patches/ghostscript-CVE-2016-7979.patch| 48 +
.../patches/ghostscript-CVE-2016-8602.patch| 47 +
7 files changed, 411 insertions(+), 2 deletions(-)
create mode 100644 gnu/packages/patches/ghostscript-CVE-2013-5653.patch
create mode 100644 gnu/packages/patches/ghostscript-CVE-2016-7976.patch
create mode 100644 gnu/packages/patches/ghostscript-CVE-2016-7978.patch
create mode 100644 gnu/packages/patches/ghostscript-CVE-2016-7979.patch
create mode 100644 gnu/packages/patches/ghostscript-CVE-2016-8602.patch
01/01: gnu: ghostscript: Fix CVE-2013-5653 and CVE-2016-{7976, 7978, 7979, 8602}.
mhw pushed a commit to branch master
in repository guix.
commit 1de17a648fa631f0074d315bfff0716220ce4880
Author: Mark H Weaver
Date: Thu Oct 13 03:20:46 2016 -0400
gnu: ghostscript: Fix CVE-2013-5653 and CVE-2016-{7976,7978,7979,8602}.
* gnu/packages/patches/ghostscript-CVE-2013-5653.patch,
gnu/packages/patches/ghostscript-CVE-2016-7976.patch,
gnu/packages/patches/ghostscript-CVE-2016-7978.patch,
gnu/packages/patches/ghostscript-CVE-2016-7979.patch,
gnu/packages/patches/ghostscript-CVE-2016-8602.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/ghostscript.scm (ghostscript)[replacement]: New field.
(ghostscript/fixed): New variable.
(ghostscript/x): Inherit 'ghostscript/fixed'.
---
gnu/local.mk |5 +
gnu/packages/ghostscript.scm | 18 +-
.../patches/ghostscript-CVE-2013-5653.patch| 85 +
.../patches/ghostscript-CVE-2016-7976.patch| 185
.../patches/ghostscript-CVE-2016-7978.patch| 25 +++
.../patches/ghostscript-CVE-2016-7979.patch| 48 +
.../patches/ghostscript-CVE-2016-8602.patch| 47 +
7 files changed, 411 insertions(+), 2 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 432c073..521ba2d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -538,7 +538,12 @@ dist_patch_DATA =
\
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gegl-CVE-2012-4433.patch\
%D%/packages/patches/geoclue-config.patch\
+ %D%/packages/patches/ghostscript-CVE-2013-5653.patch \
%D%/packages/patches/ghostscript-CVE-2015-3228.patch \
+ %D%/packages/patches/ghostscript-CVE-2016-7976.patch \
+ %D%/packages/patches/ghostscript-CVE-2016-7978.patch \
+ %D%/packages/patches/ghostscript-CVE-2016-7979.patch \
+ %D%/packages/patches/ghostscript-CVE-2016-8602.patch \
%D%/packages/patches/ghostscript-runpath.patch \
%D%/packages/patches/glib-networking-ssl-cert-file.patch \
%D%/packages/patches/glib-tests-timer.patch \
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index f013a73..6a86acb 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge
-;;; Copyright © 2014, 2015 Mark H Weaver
+;;; Copyright © 2014, 2015, 2016 Mark H Weaver
;;; Copyright © 2015 Ricardo Wurmus
;;; Copyright © 2013, 2015, 2016 Ludovic Courtès
;;;
@@ -127,6 +127,7 @@ printing, and psresize, for adjusting page sizes.")
(package
(name "ghostscript")
(version "9.14.0")
+ (replacement ghostscript/fixed)
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/ghostscript/gnu-ghostscript-"
@@ -192,8 +193,21 @@ output file formats and printers.")
(license license:agpl3+)
(home-page "http://www.gnu.org/software/ghostscript/";)))
+(define ghostscript/fixed
+ (package
+(inherit ghostscript)
+(source (origin
+ (inherit (package-source ghostscript))
+ (patches (search-patches "ghostscript-CVE-2013-5653.patch"
+ "ghostscript-CVE-2015-3228.patch"
+ "ghostscript-CVE-2016-7976.patch"
+ "ghostscript-CVE-2016-7978.patch"
+ "ghostscript-CVE-2016-7979.patch"
+ "ghostscript-CVE-2016-8602.patch"
+ "ghostscript-runpath.patch"))
+
(define-public ghostscript/x
- (package (inherit ghostscript)
+ (package (inherit ghostscript/fixed)
(name (string-append (package-name ghostscript) "-with-x"))
(inputs `(("libxext" ,libxext)
("libxt" ,libxt)
diff --git a/gnu/packages/patches/ghostscript-CVE-2013-5653.patch
b/gnu/packages/patches/ghostscript-CVE-2013-5653.patch
new file mode 100644
index 000..622266b
--- /dev/null
+++ b/gnu/packages/patches/ghostscript-CVE-2013-5653.patch
@@ -0,0 +1,85 @@
+The following patch was adapted for GNU Ghostscript
+by Mark H Weaver based on:
+
+http://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=ab109aaeb3ddba59518b036fb288402a65cf7ce8
+
+From ab109aaeb3ddba59518b036fb288402a65cf7ce8 Mon Sep 17 00:00:00 2001
+From: Chris Liddell
+Date: Sat, 5 Mar 2016 14:56:03 -0800
+Subject: [PATCH] Bug 694724: Have filenameforall and getenv honor SAFER
+
+---
+ Resource/Init/gs_init.ps | 2 ++
+ psi/zfile.c | 36
+ 2 files changed, 22 insertions(+), 16 deletions(-)
+
+diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps
+index fa33d88..99888ac 100644
+--
01/01: gnu: ghostscript-with-x: Avoid inheriting replacement field.
mhw pushed a commit to branch master in repository guix. commit ab8536e4a8c7697580d91ae4a25d56a253b30f6f Author: Mark H Weaver Date: Thu Oct 13 03:38:03 2016 -0400 gnu: ghostscript-with-x: Avoid inheriting replacement field. This is a followup to commit 1de17a648fa631f0074d315bfff0716220ce4880. * gnu/packages/ghostscript.scm (ghostscript/fixed)[replacement]: Override inherited value. --- gnu/packages/ghostscript.scm |1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 6a86acb..09b10f7 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -196,6 +196,7 @@ output file formats and printers.") (define ghostscript/fixed (package (inherit ghostscript) +(replacement #f) ; Prevent ghostscript/x from inheriting the replacement (source (origin (inherit (package-source ghostscript)) (patches (search-patches "ghostscript-CVE-2013-5653.patch"
branch master updated (1de17a6 -> ab8536e)
mhw pushed a change to branch master
in repository guix.
from 1de17a6 gnu: ghostscript: Fix CVE-2013-5653 and
CVE-2016-{7976,7978,7979,8602}.
new ab8536e gnu: ghostscript-with-x: Avoid inheriting replacement
field.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
gnu/packages/ghostscript.scm |1 +
1 file changed, 1 insertion(+)
branch master updated (ab8536e -> 59929e9)
mhw pushed a change to branch master
in repository guix.
from ab8536e gnu: ghostscript-with-x: Avoid inheriting replacement
field.
new 59929e9 gnu: imagemagick: Update to 6.9.6-2 [Fixes
CVE-2016-{7799,7906}].
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
gnu/packages/imagemagick.scm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: imagemagick: Update to 6.9.6-2 [Fixes CVE-2016-{7799, 7906}].
mhw pushed a commit to branch master
in repository guix.
commit 59929e98498f471e2d385d00cb6f0fae468fd320
Author: Mark H Weaver
Date: Thu Oct 13 04:27:11 2016 -0400
gnu: imagemagick: Update to 6.9.6-2 [Fixes CVE-2016-{7799,7906}].
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.6-2.
---
gnu/packages/imagemagick.scm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 75427a4..5a2ba95 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -41,14 +41,14 @@
(define-public imagemagick
(package
(name "imagemagick")
-(version "6.9.5-10")
+(version "6.9.6-2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz"))
(sha256
(base32
- "0cxjzqzca80vf6sfx4z9zq4wq2w0vy9ajp9kf88jb4na8mwsn198"
+ "139h9lycxw3lszn052m34xm0rqyanin4nb529vxjcrkkzqilh91r"
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
01/01: gnu: imagemagick: Disable tests.
mhw pushed a commit to branch master
in repository guix.
commit e98e9f4e8539e24efaebf22fc3db00b7e772618f
Author: Mark H Weaver
Date: Thu Oct 13 05:28:25 2016 -0400
gnu: imagemagick: Disable tests.
* gnu/packages/imagemagick.scm (imagemagick)[arguments]: Disable tests.
---
gnu/packages/imagemagick.scm |3 +++
1 file changed, 3 insertions(+)
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 5a2ba95..adce8d4 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -52,6 +52,9 @@
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
+ ;; FIXME: The test suite succeeded before version 6.9.6-2.
+ ;; Try enabling it again with newer releases.
+ #:tests? #f
#:phases (modify-phases %standard-phases
(add-before
'build 'pre-build
branch master updated (59929e9 -> e98e9f4)
mhw pushed a change to branch master
in repository guix.
from 59929e9 gnu: imagemagick: Update to 6.9.6-2 [Fixes
CVE-2016-{7799,7906}].
new e98e9f4 gnu: imagemagick: Disable tests.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
gnu/packages/imagemagick.scm |3 +++
1 file changed, 3 insertions(+)
branch core-updates updated (6671ce9 -> f2ec23d)
wingo pushed a change to branch core-updates in repository guix. from 6671ce9 gnu: ath9k-htc-firmware: Update binutils patch for binutils 2.27. new f2ec23d gnu: Add CUPS service. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi | 832 +++ gnu/local.mk |1 + gnu/services/cups.scm | 1166 + 3 files changed, 1999 insertions(+) create mode 100644 gnu/services/cups.scm
01/01: gnu: Add CUPS service.
wingo pushed a commit to branch core-updates
in repository guix.
commit f2ec23d18e50eef3e4f574a3e6498d8964e4e1a3
Author: Andy Wingo
Date: Wed Oct 5 19:23:48 2016 +0200
gnu: Add CUPS service.
* gnu/services/cups.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add gnu/services/cups.scm.
* doc/guix.texi (Printing Services): New section.
---
doc/guix.texi | 832 +++
gnu/local.mk |1 +
gnu/services/cups.scm | 1166 +
3 files changed, 1999 insertions(+)
diff --git a/doc/guix.texi b/doc/guix.texi
index 57821c5..5096f18 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -7643,6 +7643,7 @@ declaration.
* Log Rotation::The rottlog service.
* Networking Services:: Network setup, SSH daemon, etc.
* X Window::Graphical display.
+* Printing Services:: Local and remote printer support.
* Desktop Services::D-Bus and desktop services.
* Database Services:: SQL databases.
* Mail Services:: IMAP, POP3, SMTP, and all that.
@@ -8686,6 +8687,837 @@ makes the good ol' XlockMore usable.
@end deffn
+@node Printing Services
+@subsubsection Printing Services
+
+The @code{(gnu services cups)} module provides a Guix service definition
+for the CUPS printing service. To add printer support to a GuixSD
+system, add a @code{cups-service} to the operating system definition:
+
+@deffn {Scheme Variable} cups-service-type
+The service type for the CUPS print server. Its value should be a valid
+CUPS configuration (see below). For example:
+@example
+(service cups-service-type (cups-configuration))
+@end example
+@end deffn
+
+The CUPS configuration controls the basic things about your CUPS
+installation: what interfaces it listens on, what to do if a print job
+fails, how much logging to do, and so on. To actually add a printer,
+you have to visit the @url{http://localhost:631} URL, or use a tool such
+as GNOME's printer configuration services. By default, configuring a
+CUPS service will generate a self-signed certificate if needed, for
+secure connections to the print server.
+
+One way you might want to customize CUPS is to enable or disable the web
+interface. You can do that directly, like this:
+
+@example
+(service cups-service-type
+ (cups-configuration
+ (web-interface? #f)))
+@end example
+
+The available configuration parameters follow. Each parameter
+definition is preceded by its type; for example, @samp{string-list foo}
+indicates that the @code{foo} parameter should be specified as a list of
+strings. There is also a way to specify the configuration as a string,
+if you have an old @code{cupsd.conf} file that you want to port over
+from some other system; see the end for more details.
+
+@c The following documentation was initially generated by
+@c (generate-documentation) in (gnu services cups). Manually maintained
+@c documentation is better, so we shouldn't hesitate to edit below as
+@c needed. However if the change you want to make to this documentation
+@c can be done in an automated way, it's probably easier to change
+@c (generate-documentation) than to make it below and have to deal with
+@c the churn as CUPS updates.
+
+
+Available @code{cups-configuration} fields are:
+
+@deftypevr {@code{cups-configuration} parameter} package cups
+The CUPS package.
+@end deftypevr
+
+@deftypevr {@code{cups-configuration} parameter} package-list extensions
+Drivers and other extensions to the CUPS package.
+@end deftypevr
+
+@deftypevr {@code{cups-configuration} parameter} files-configuration
files-configuration
+Configuration of where to write logs, what directories to use for print
+spools, and related privileged configuration parameters.
+
+Available @code{files-configuration} fields are:
+
+@deftypevr {@code{files-configuration} parameter} log-location access-log
+Defines the access log filename. Specifying a blank filename disables
+access log generation. The value @code{stderr} causes log entries to be
+sent to the standard error file when the scheduler is running in the
+foreground, or to the system log daemon when run in the background. The
+value @code{syslog} causes log entries to be sent to the system log
+daemon. The server name may be included in filenames using the string
+@code{%s}, as in @code{/var/log/cups/%s-access_log}.
+
+Defaults to @samp{"/var/log/cups/access_log"}.
+@end deftypevr
+
+@deftypevr {@code{files-configuration} parameter} file-name cache-dir
+Where CUPS should cache data.
+
+Defaults to @samp{"/var/cache/cups"}.
+@end deftypevr
+
+@deftypevr {@code{files-configuration} parameter} string config-file-perm
+Specifies the permissions for all configuration files that the scheduler
+writes.
+
+Note that the permissions for the printers.conf file are currently
+masked to only allow access from the scheduler user (typically root).
+This is done
branch master updated (e98e9f4 -> 1cc2138)
mhw pushed a change to branch master in repository guix. from e98e9f4 gnu: imagemagick: Disable tests. new 1cc2138 gnu: graphicsmagick: Update to 1.3.25-1-56c8cae [security fixes]. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/imagemagick.scm | 95 +++--- 1 file changed, 52 insertions(+), 43 deletions(-)
01/01: gnu: graphicsmagick: Update to 1.3.25-1-56c8cae [security fixes].
mhw pushed a commit to branch master
in repository guix.
commit 1cc213850a2009d55e137fee990f9743894c76c5
Author: Mark H Weaver
Date: Thu Oct 13 04:57:40 2016 -0400
gnu: graphicsmagick: Update to 1.3.25-1-56c8cae [security fixes].
Fixes CVE-2016-7800, CVE-2016-7996, CVE-2016-7997, and several other flaws.
* gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.25-1-56c8cae.
[source]: Change method from 'url-fetch' to 'hg-fetch'. Add 'file-name'.
---
gnu/packages/imagemagick.scm | 95 +++---
1 file changed, 52 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index adce8d4..4c3c636 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2015 Eric Bavier
;;; Copyright © 2015 Ricardo Wurmus
;;; Copyright © 2016 Leo Famulari
+;;; Copyright © 2016 Mark H Weaver
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +25,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix download)
+ #:use-module (guix hg-download)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
@@ -157,48 +159,55 @@ script.")
(license (package-license imagemagick
(define-public graphicsmagick
- (package
-(name "graphicsmagick")
-(version "1.3.25")
-(source (origin
- (method url-fetch)
- (uri (string-append "ftp://ftp.graphicsmagick.org/pub/";
- "GraphicsMagick/" (version-major+minor
version)
- "/GraphicsMagick-" version ".tar.xz"))
- (sha256
- (base32
- "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn"
-(build-system gnu-build-system)
-(arguments
- `(#:configure-flags
- (list "--with-frozenpaths"
- "--enable-shared=yes"
- "--with-x=yes"
- (string-append "--with-gs-font-dir="
-(assoc-ref %build-inputs "gs-fonts")
-"/share/fonts/type1/ghostscript"
-(inputs
- `(("graphviz" ,graphviz)
- ("ghostscript" ,ghostscript)
- ("gs-fonts" ,gs-fonts)
- ("lcms" ,lcms)
- ("libx11" ,libx11)
- ("libxml2" ,libxml2)
- ("libtiff" ,libtiff)
- ("libpng" ,libpng)
- ("libjpeg" ,libjpeg)
- ("freetype" ,freetype)
- ("bzip2" ,bzip2)
- ("xz" ,xz)
- ("zlib" ,zlib)))
-(native-inputs
- `(("pkg-config" ,pkg-config)))
-(outputs '("out" ; 13 MiB
- "doc")) ; ~7 MiB
-(home-page "http://www.graphicsmagick.org";)
-(synopsis "Create, edit, compose, or convert bitmap images")
-(description
- "GraphicsMagick provides a comprehensive collection of utilities,
+ (let ((changeset "56c8cae") ; 3e01b
+(revision "1"))
+(package
+ (name "graphicsmagick")
+ (version (string-append "1.3.25-" revision "." changeset))
+ (source (origin
+(method hg-fetch)
+(uri (hg-reference
+ (url "http://hg.code.sf.net/p/graphicsmagick/code";)
+ (changeset changeset)))
+(file-name (string-append name "-" version "-checkout"))
+;;(method url-fetch)
+;;(uri (string-append "ftp://ftp.graphicsmagick.org/pub/";
+;;"GraphicsMagick/" (version-major+minor
version)
+;;"/GraphicsMagick-" version ".tar.xz"))
+(sha256
+ (base32
+ "1s9apvkn0kxr6i4i5wlkfw1prja02rgk689n3cf822zc0dkycxdh"
+ (build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list "--with-frozenpaths"
+ "--enable-shared=yes"
+ "--with-x=yes"
+ (string-append "--with-gs-font-dir="
+ (assoc-ref %build-inputs "gs-fonts")
+ "/share/fonts/type1/ghostscript"
+ (inputs
+ `(("graphviz" ,graphviz)
+ ("ghostscript" ,ghostscript)
+ ("gs-fonts" ,gs-fonts)
+ ("lcms" ,lcms)
+ ("libx11" ,libx11)
+ ("libxml2" ,libxml2)
+ ("libtiff" ,libtiff)
+ ("libpng" ,libpng)
+ ("libjpeg" ,libjpeg)
+ ("freetype" ,freetype)
+ ("bzip2" ,bzip2)
+ ("xz" ,xz)
+ ("zlib" ,zlib)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (outputs '("out" ; 13 MiB
+ "doc")); ~7 MiB
+ (home-page "http://www.graphicsmagick.org";)
+ (synopsis "Create, edit, compose, or convert bitmap images")
+ (description
+ "GraphicsMagick provides a comprehensive collection of utilities,
programming interfaces, and GUIs, t
branch core-updates updated (f2ec23d -> 34708a2)
mhw pushed a change to branch core-updates
in repository guix.
from f2ec23d gnu: Add CUPS service.
adds eb419bc gnu: Add NFS related services.
adds 402bb3b build: Arrange so temporary .go files are deleted upon
SIGINT.
adds 69e7322 build: Make 'assert-no-store-file-names' effective.
adds becbbef gnu: Add hdf4
adds e940a27 doc: Add guide on how to specify dependencies for Python
packages.
adds 1de17a6 gnu: ghostscript: Fix CVE-2013-5653 and
CVE-2016-{7976,7978,7979,8602}.
adds ab8536e gnu: ghostscript-with-x: Avoid inheriting replacement
field.
adds 59929e9 gnu: imagemagick: Update to 6.9.6-2 [Fixes
CVE-2016-{7799,7906}].
adds e98e9f4 gnu: imagemagick: Disable tests.
adds 1cc2138 gnu: graphicsmagick: Update to 1.3.25-1-56c8cae [security
fixes].
new 061d7f3 Merge branch 'master' into core-updates
new 34708a2 gnu: ghostscript: Eliminate graft.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile.am|5 +-
build-aux/compile-all.scm |6 +
doc/guix.texi | 148 +++-
gnu/local.mk |7 +
gnu/packages/ghostscript.scm |9 +-
gnu/packages/imagemagick.scm | 102 ++-
gnu/packages/maths.scm | 59 +++
.../patches/ghostscript-CVE-2013-5653.patch| 85 +
.../patches/ghostscript-CVE-2016-7976.patch| 185
.../patches/ghostscript-CVE-2016-7978.patch| 25 +++
.../patches/ghostscript-CVE-2016-7979.patch| 48 +
.../patches/ghostscript-CVE-2016-8602.patch| 47 +
gnu/packages/patches/hdf4-reproducibility.patch| 35
gnu/packages/patches/hdf4-shared-fortran.patch | 25 +++
gnu/services/nfs.scm | 129 +-
15 files changed, 863 insertions(+), 52 deletions(-)
create mode 100644 gnu/packages/patches/ghostscript-CVE-2013-5653.patch
create mode 100644 gnu/packages/patches/ghostscript-CVE-2016-7976.patch
create mode 100644 gnu/packages/patches/ghostscript-CVE-2016-7978.patch
create mode 100644 gnu/packages/patches/ghostscript-CVE-2016-7979.patch
create mode 100644 gnu/packages/patches/ghostscript-CVE-2016-8602.patch
create mode 100644 gnu/packages/patches/hdf4-reproducibility.patch
create mode 100644 gnu/packages/patches/hdf4-shared-fortran.patch
02/02: gnu: ghostscript: Eliminate graft.
mhw pushed a commit to branch core-updates
in repository guix.
commit 34708a221aac12f96d0ba2403bb52658c6355536
Author: Mark H Weaver
Date: Thu Oct 13 05:54:22 2016 -0400
gnu: ghostscript: Eliminate graft.
* gnu/packages/ghostscript.scm (ghostscript)[replacement]: Remove field.
[source]: Add new patches from 'ghostscript/fixed'.
(ghostscript/fixed): Remove variable.
(ghostscript/x): Inherit from 'ghostscript'.
---
gnu/packages/ghostscript.scm | 24 +++-
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index fcf769f..87e4d0e 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -127,7 +127,6 @@ printing, and psresize, for adjusting page sizes.")
(package
(name "ghostscript")
(version "9.14.0")
- (replacement ghostscript/fixed)
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/ghostscript/gnu-ghostscript-"
@@ -135,7 +134,12 @@ printing, and psresize, for adjusting page sizes.")
(sha256
(base32
"0q4jj41p0qbr4mgcc9q78f5zs8cm1g57wgryhsm2yq4lfslm3ib1"))
-(patches (search-patches "ghostscript-CVE-2015-3228.patch"
+(patches (search-patches "ghostscript-CVE-2013-5653.patch"
+ "ghostscript-CVE-2015-3228.patch"
+ "ghostscript-CVE-2016-7976.patch"
+ "ghostscript-CVE-2016-7978.patch"
+ "ghostscript-CVE-2016-7979.patch"
+ "ghostscript-CVE-2016-8602.patch"
"ghostscript-runpath.patch"))
(modules '((guix build utils)))
(snippet
@@ -198,22 +202,8 @@ output file formats and printers.")
(license license:agpl3+)
(home-page "http://www.gnu.org/software/ghostscript/";)))
-(define ghostscript/fixed
- (package
-(inherit ghostscript)
-(replacement #f) ; Prevent ghostscript/x from inheriting the replacement
-(source (origin
- (inherit (package-source ghostscript))
- (patches (search-patches "ghostscript-CVE-2013-5653.patch"
- "ghostscript-CVE-2015-3228.patch"
- "ghostscript-CVE-2016-7976.patch"
- "ghostscript-CVE-2016-7978.patch"
- "ghostscript-CVE-2016-7979.patch"
- "ghostscript-CVE-2016-8602.patch"
- "ghostscript-runpath.patch"))
-
(define-public ghostscript/x
- (package (inherit ghostscript/fixed)
+ (package (inherit ghostscript)
(name (string-append (package-name ghostscript) "-with-x"))
(inputs `(("libxext" ,libxext)
("libxt" ,libxt)
01/02: Merge branch 'master' into core-updates
mhw pushed a commit to branch core-updates in repository guix. commit 061d7f3bd2cc67c964acb2cb1bde07ee61df5d1a Merge: f2ec23d 1cc2138 Author: Mark H Weaver Date: Thu Oct 13 05:53:07 2016 -0400 Merge branch 'master' into core-updates Makefile.am|5 +- build-aux/compile-all.scm |6 + doc/guix.texi | 148 +++- gnu/local.mk |7 + gnu/packages/ghostscript.scm | 19 +- gnu/packages/imagemagick.scm | 102 ++- gnu/packages/maths.scm | 59 +++ .../patches/ghostscript-CVE-2013-5653.patch| 85 + .../patches/ghostscript-CVE-2016-7976.patch| 185 .../patches/ghostscript-CVE-2016-7978.patch| 25 +++ .../patches/ghostscript-CVE-2016-7979.patch| 48 + .../patches/ghostscript-CVE-2016-8602.patch| 47 + gnu/packages/patches/hdf4-reproducibility.patch| 35 gnu/packages/patches/hdf4-shared-fortran.patch | 25 +++ gnu/services/nfs.scm | 129 +- 15 files changed, 873 insertions(+), 52 deletions(-)
branch master updated (1cc2138 -> b23ece1)
mhw pushed a change to branch master in repository guix. from 1cc2138 gnu: graphicsmagick: Update to 1.3.25-1-56c8cae [security fixes]. new b23ece1 gnu: linux-libre@4.1: Update to 4.1.34. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/linux.scm |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: linux-libre@4.1: Update to 4.1.34.
mhw pushed a commit to branch master in repository guix. commit b23ece1d2c5d693f8ce2b31cf010dc33453534a5 Author: Mark H Weaver Date: Thu Oct 13 06:27:55 2016 -0400 gnu: linux-libre@4.1: Update to 4.1.34. * gnu/packages/linux.scm (linux-libre-4.1): Update to 4.1.34. --- gnu/packages/linux.scm |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2e4d00c..293ff3f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -335,8 +335,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.1 - (make-linux-libre "4.1.33" -"1s45vymx7zp7qwj4rx63dpj9xwm8hv5fd9nm27wqvmgnmd3q548h" + (make-linux-libre "4.1.34" +"0dajsb363p9lgga22ml8gp9k9lxd8mvrzxk9y3h9c6hpzfcmqdqr" %intel-compatible-systems #:configuration-file kernel-config))
01/01: git: webkitgtk: Update to 2.14.1.
mhw pushed a commit to branch master in repository guix. commit c8ed7309f4f73a405b6d280032d48bf5ab44d360 Author: Mark H Weaver Date: Thu Oct 13 06:36:05 2016 -0400 git: webkitgtk: Update to 2.14.1. * gnu/packages/webkit.scm (webkitgtk): Update to 2.14.1. --- gnu/packages/webkit.scm |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 38d..46ae30a 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -53,14 +53,14 @@ (define-public webkitgtk (package (name "webkitgtk") -(version "2.14.0") +(version "2.14.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/"; name "-" version ".tar.xz")) (sha256 (base32 -"02paj0anbnqn1z3hn5c4csmq9nga995rzagiplj3sjk2dj1ss4q5" +"1dffnz20psgc604azhbzn9a6cdhafar9dw74w3bbwrfy531pcb9f" (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests
branch master updated (b23ece1 -> c8ed730)
mhw pushed a change to branch master in repository guix. from b23ece1 gnu: linux-libre@4.1: Update to 4.1.34. new c8ed730 git: webkitgtk: Update to 2.14.1. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/webkit.scm |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
branch core-updates updated (34708a2 -> e3d9da3)
lfam pushed a change to branch core-updates in repository guix. from 34708a2 gnu: ghostscript: Eliminate graft. new e3d9da3 gnu: gnupg: Remove superfluous patch. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk |1 - gnu/packages/gnupg.scm|1 - gnu/packages/patches/gnupg-fix-expired-test.patch | 78 - 3 files changed, 80 deletions(-) delete mode 100644 gnu/packages/patches/gnupg-fix-expired-test.patch
01/01: gnu: gnupg: Remove superfluous patch.
lfam pushed a commit to branch core-updates in repository guix. commit e3d9da3c0c35cb4eac0af0f280d5342282eae7df Author: Leo Famulari Date: Thu Oct 13 10:01:33 2016 -0400 gnu: gnupg: Remove superfluous patch. This patch was integrated into GnuPG 2.1.14. * gnu/packages/patches/gnupg-fix-expired-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/gnupg.scm (gnupg)[source]: Remove patch. --- gnu/local.mk |1 - gnu/packages/gnupg.scm|1 - gnu/packages/patches/gnupg-fix-expired-test.patch | 78 - 3 files changed, 80 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 125e540..59d424a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -556,7 +556,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ - %D%/packages/patches/gnupg-fix-expired-test.patch\ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch\ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 4972b37..dd75ea5 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -216,7 +216,6 @@ compatible to GNU Pth.") (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) - (patches (search-patches "gnupg-fix-expired-test.patch")) (sha256 (base32 "1pgz02gd84ab94w4xdg67p9z8kvkyr9d523bvcxxd2hviwh1m362" diff --git a/gnu/packages/patches/gnupg-fix-expired-test.patch b/gnu/packages/patches/gnupg-fix-expired-test.patch deleted file mode 100644 index ac2564f..000 --- a/gnu/packages/patches/gnupg-fix-expired-test.patch +++ /dev/null @@ -1,78 +0,0 @@ -Fix a test that has an expiration date of 2016-09-17: - -https://bugs.gnupg.org/gnupg/issue2393 - -Patch adapted from upstream source repository: - -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=e584d6468a2e72cd01e55f46104f9f96b56c0b66 - -The patch has been altered by commenting out a diff that does not apply -to the version of GnuPG that we are applying it to, 2.1.13. This is -what the patch author refers to below with "This commit includes changes -to the old test as well, for those who need to backport it." We keep the -old test and comment out the new test. - -From e584d6468a2e72cd01e55f46104f9f96b56c0b66 Mon Sep 17 00:00:00 2001 -From: Justus Winter -Date: Thu, 23 Jun 2016 17:24:23 +0200 -Subject: [PATCH] tests/openpgp: Fake the system time for the tofu test. - -The keys in the tofu test are set to expire on 2016-09-17. Fake the -system time for this test. - -This commit includes changes to the old test as well, for those who -need to backport it. - -* tests/openpgp/gpg-agent.conf.tmpl: Drop trailing newlines. -* tests/openpgp/tofu.scm: Fake system time. -* tests/openpgp/tofu.test: Likewise. - -GnuPG-bug-id: 2393 -Signed-off-by: Justus Winter - tests/openpgp/gpg-agent.conf.tmpl | 2 -- - tests/openpgp/tofu.scm| 4 +++- - tests/openpgp/tofu.test | 3 +++ - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/tests/openpgp/gpg-agent.conf.tmpl b/tests/openpgp/gpg-agent.conf.tmpl -index b3cb54f..70e1633 100644 a/tests/openpgp/gpg-agent.conf.tmpl -+++ b/tests/openpgp/gpg-agent.conf.tmpl -@@ -1,4 +1,2 @@ - allow-preset-passphrase - no-grab -- -- -#diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm -#index 24fa9df..38b6a0f 100755 -#--- a/tests/openpgp/tofu.scm -#+++ b/tests/openpgp/tofu.scm -#@@ -19,7 +19,9 @@ -# -# (load (with-path "defs.scm")) -# -#-(define GPG `(,(tool 'gpg) --no-permission-warning)) ;; w/o --always-trust -#+ ;; Redefine GPG without --always-trust and a fixed time. -#+(define GPG `(,(tool 'gpg) --no-permission-warning -#+ --faked-system-time=1466684990)) -# (define GNUPGHOME (getenv "GNUPGHOME")) -# (if (string=? "" GNUPGHOME) -# (error "GNUPGHOME not set")) -diff --git a/tests/openpgp/tofu.test b/tests/openpgp/tofu.test -index 18c1756..0d34af4 100755 a/tests/openpgp/tofu.test -+++ b/tests/openpgp/tofu.test -@@ -4,6 +4,9 @@ - - # set -x - -+# Redefine GPG with a fixed time. -+GPG="$GPG --faked-system-time=1466684990" -+ - KEYS="2183839A BC15C85A EE37CF96" - - # Make sure $srcdir is set. --- -2.10.0 -
branch core-updates updated (e3d9da3 -> 3abd66a)
civodul pushed a change to branch core-updates in repository guix. from e3d9da3 gnu: gnupg: Remove superfluous patch. new c86447f gnu: bash-minimal: Remove "include" output. new 3abd66a gnu: make-bootstrap: Remove duplicate definition of 'bash-static'. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/bash.scm |8 gnu/packages/make-bootstrap.scm |7 ++- 2 files changed, 6 insertions(+), 9 deletions(-)
01/02: gnu: bash-minimal: Remove "include" output.
civodul pushed a commit to branch core-updates
in repository guix.
commit c86447f486506d468e08ef42f5683883cafadfda
Author: Ludovic Courtès
Date: Thu Oct 13 13:01:37 2016 +0200
gnu: bash-minimal: Remove "include" output.
* gnu/packages/bash.scm (bash-minimal)[outputs]: New field.
(static-bash)[outputs]: Remove.
---
gnu/packages/bash.scm |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index c12c0ac..d328d71 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -182,6 +182,10 @@ without modification.")
(package (inherit bash)
(name "bash-minimal")
(inputs '()); no readline, no curses
+
+;; No "include" output because there's no support for loadable modules.
+(outputs (delete "include" (package-outputs bash)))
+
(arguments
(let ((args `(#:modules ((guix build gnu-build-system)
(guix build utils)
@@ -217,10 +221,6 @@ without modification.")
(package
(inherit bash)
(name "bash-static")
-
- ;; No "include" output because there's no support for loadable modules.
- (outputs (delete "include" (package-outputs bash)))
-
(arguments
(substitute-keyword-arguments
`(#:allowed-references ("out") ,@(package-arguments bash))
02/02: gnu: make-bootstrap: Remove duplicate definition of 'bash-static'.
civodul pushed a commit to branch core-updates
in repository guix.
commit 3abd66aa0cb8820124d249e497c95bd0cadb8ca2
Author: Ludovic Courtès
Date: Thu Oct 13 16:24:30 2016 +0200
gnu: make-bootstrap: Remove duplicate definition of 'bash-static'.
* gnu/packages/make-bootstrap.scm (%bash-static): Remove.
(%static-inputs): Use STATIC-BASH instead of %BASH-STATIC.
---
gnu/packages/make-bootstrap.scm |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index def9c23..2c14e74 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -114,9 +114,6 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(current-source-location)
#:native-inputs native-inputs))
-(define %bash-static
- (static-package bash-minimal))
-
(define %static-inputs
;; Packages that are to be used as %BOOTSTRAP-INPUTS.
(let ((coreutils (package (inherit coreutils)
@@ -184,7 +181,7 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(("-Wl,-export-dynamic") "")))
,phases)
(inputs (if (%current-target-system)
-`(("bash" ,%bash-static))
+`(("bash" ,static-bash))
'()
(finalize (compose static-package
package-with-relocatable-glibc)))
@@ -200,7 +197,7 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
("sed" ,sed)
("grep" ,grep)
("gawk" ,gawk)))
- ("bash" ,%bash-static
+ ("bash" ,static-bash
(define %static-binaries
(package
21/57: gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit bd0f78e3961e977c3fc7d85c4f00b0edf614f0b9
Author: Hartmut Goebel
Date: Thu Oct 13 13:35:55 2016 +0200
gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs.
This patch contains the changes where all [inputs] are changed to
[native-inputs].
* gnu/packages/python.scm (python-pytest, python-fixtures,
python-testrepository, python-virtualenv): All [inputs] are changed to
[native-inputs].
* gnu/packages/openstack.scm (...): dito.
---
gnu/packages/openstack.scm | 24
gnu/packages/python.scm|8
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 172de25..96ad32e 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -49,7 +49,7 @@
("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)
("python-stevedore" ,python-stevedore)))
-(inputs
+(native-inputs
`(("python-pbr" ,python-pbr)
;; Tests
("python-fixtures" ,python-fixtures)
@@ -84,7 +84,7 @@ all the files it generates a report.")
(propagated-inputs
`(("python-six" ,python-six)
("python-wrapt" ,python-wrapt)))
-(inputs
+(native-inputs
`(("python-babel" ,python-babel)
("python-pbr" ,python-pbr)
;; Tests.
@@ -120,7 +120,7 @@ manner.")
("python-pep8-1.5.7" ,python-pep8-1.5.7)
("python-pyflakes-0.8.1" ,python-pyflakes-0.8.1)
("python-six" ,python-six)))
-(inputs
+(native-inputs
`(;; Tests
("python-testscenarios" ,python-testscenarios)))
(home-page "http://github.com/openstack-dev/hacking";)
@@ -332,7 +332,7 @@ extensions.")
("python-paramiko" ,python-paramiko)
("python-pbr" ,python-pbr)
("python-six" ,python-six)))
-(inputs
+(native-inputs
`(("python-babel" ,python-babel)
("python-mock" ,python-mock)
("python-os-testr" ,python-os-testr)
@@ -367,7 +367,7 @@ common features used in Tempest.")
`(("python-netaddr" ,python-netaddr)
("python-six" ,python-six)
("python-stevedore" ,python-stevedore)))
-(inputs
+(native-inputs
`(("python-pbr" ,python-pbr)
;; Tests
("python-oslo.i18n" ,python-oslo.i18n)
@@ -396,7 +396,7 @@ common features used in Tempest.")
(base32
"0kvha0rs9295njyl2z6n6zm5dapi5mrl5zwjm0m6ldqrvccyf8c3"
(build-system python-build-system)
-(inputs
+(native-inputs
`(("python-babel" ,python-babel)
("python-pbr" ,python-pbr)
;; Tests.
@@ -427,7 +427,7 @@ pipeline and used by various modules such as logging.")
(propagated-inputs
`(("python-babel" ,python-babel)
("python-six" ,python-six)))
-(inputs
+(native-inputs
`(("python-pbr" ,python-pbr)
;; Tests
("python-mock" ,python-mock)
@@ -468,7 +468,7 @@ in an application or library.")
("python-oslo.utils" ,python-oslo.utils)
("python-oslo.serialization" ,python-oslo.serialization)
("python-six" ,python-six)))
- (inputs
+ (native-inputs
`(("python-babel" ,python-babel)
("python-iso8601" ,python-iso8601)
("python-mock" ,python-mock)
@@ -504,7 +504,7 @@ handlers and support for context specific logging (like
resource id’s etc).")
("python-simplejson" ,python-simplejson)
("python-six" ,python-six)
("python-pytz" ,python-pytz)))
-(inputs
+(native-inputs
`(("python-babel" ,python-babel)
("python-pbr" ,python-pbr)
;; Tests.
@@ -535,7 +535,7 @@ in transmittable and storable formats, such as JSON and
MessagePack.")
(build-system python-build-system)
(propagated-inputs
`(("python-requests" ,python-requests)))
-(inputs
+(native-inputs
`(("python-pbr" ,python-pbr)
("python-docutils" ,python-docutils)
("python-hacking" ,python-hacking)
@@ -570,7 +570,7 @@ from the OpenStack project.")
("python-mock" ,python-mock)
("python-mox3" ,python-mox3)
("python-six" ,python-six)))
-(inputs
+(native-inputs
`(("python-pbr" ,python-pbr)
("python-os-client-config" ,python-os-client-config)
("python-subunit" ,python-subunit)
@@ -613,7 +613,7 @@ and better support for mocking results.")
("python-netifaces" ,python-netifaces)
("python-pytz" ,python-pytz)
("python-six" ,python-six)))
-(inputs
+(native-inputs
`(("python-babel" ,python-babel)
("python-pbr" ,python-pbr)
;; Tests.
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 51d7537..d1eac83 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1562,7 +1562,7 @@ code introspection, and logging.")
(build-system python
30/57: gnu: python-h5py: Remove needless "python2-variant" property.
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit 01edecf1c56af878ba9a18dfa7377d9e433e2928 Author: Hartmut Goebel Date: Wed Sep 28 14:38:54 2016 +0200 gnu: python-h5py: Remove needless "python2-variant" property. * gnu/packages/python.scm (python-h5py) [python2-variant]: Remove property. (python2-h5py): Don't strip property "strip-python2-variant". --- gnu/packages/python.scm |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 37f7958..ca2093d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -730,11 +730,10 @@ HDF5 library from Python. The low-level interface is intended to be a complete wrapping of the HDF5 API, while the high-level component supports access to HDF5 files, datasets and groups using established Python and NumPy concepts.") -(license license:bsd-3) -(properties `((python2-variant . ,(delay python2-h5py)) +(license license:bsd-3))) (define-public python2-h5py - (package-with-python2 (strip-python2-variant python-h5py))) + (package-with-python2 python-h5py)) (define-public python-lockfile (package
02/57: guix: build all Python packages with --single-version-externally-managed.
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit 2c37e36ac6c06c49f73feb7cf03c82958704272a Author: Hartmut Goebel Date: Wed Sep 28 10:42:35 2016 +0200 guix: build all Python packages with --single-version-externally-managed. This requires setuptools to be installed together with python, which is the case for Python 3 anyway and which we do for our build of Python 2 (see last commit). * guix/build/python-build-system.scm (install): Add "--single-version-externally-managed" and "--root=/" to params to be passed to call-setuppy. Remove thus needless manipulation of PYTHONPATH. --- guix/build/python-build-system.scm | 21 ++--- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 9109fb4..d07b83f 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2016 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,21 +65,11 @@ #:allow-other-keys) "Install a given Python package." (let* ((out (assoc-ref outputs "out")) - (params (append (list (string-append "--prefix=" out)) - configure-flags)) - (python-version (get-python-version (assoc-ref inputs "python"))) - (old-path (getenv "PYTHONPATH")) - (add-path (string-append out "/lib/python" python-version - "/site-packages/"))) -;; create the module installation directory and add it to PYTHONPATH -;; to make setuptools happy -(mkdir-p add-path) -(setenv "PYTHONPATH" -(string-append (if old-path - (string-append old-path ":") - "") - add-path)) -(call-setuppy "install" params))) + (params (append (list (string-append "--prefix=" out) + "--single-version-externally-managed" + "--root=/") + configure-flags))) +(call-setuppy "install" params))) (define* (wrap #:key inputs outputs #:allow-other-keys) (define (list-of-files dir)
52/57: gnu: python-subunit, python-testrepository: Fix inputs
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 8228da1d3d34a6abedb1643560fb6eb508107d75
Author: Hartmut Goebel
Date: Mon Oct 10 12:15:04 2016 +0200
gnu: python-subunit, python-testrepository: Fix inputs
* gnu/packages/python.scm (python-subunit, python2-subunit):
[propagated-inputs]:: Add python-extras, remove python-testtools, move
python-testscenarios to [native-inputs]. (python-testrepository,
python2-testrepository): [native-inputs] move python-fixtures and
python-subunit to [propagated-inputs]
---
gnu/packages/python.scm | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 91a7feb..7c90c9b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1850,9 +1850,10 @@ use of resources by test cases.")
"1nkw9wfbvizmpajbj3in8ns07g7lwkiv8hip14jjlwk3cacls6jv"
(build-system python-build-system)
(propagated-inputs
- `(("python-testtools" ,python-testtools)
- ("python-mimeparse" ,python-mimeparse)
- ("python-testscenarios" ,python-testscenarios)))
+ `(("python-extras" ,python-extras)
+ ("python-mimeparse" ,python-mimeparse)))
+(native-inputs
+ `(("python-testscenarios" ,python-testscenarios)))
(home-page "http://launchpad.net/subunit";)
(synopsis "Python implementation of the subunit protocol")
(description
@@ -1968,11 +1969,11 @@ Python tests.")
"1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"
(build-system python-build-system)
(propagated-inputs
- `(("python-testtools" ,python-testtools)))
-(native-inputs
`(("python-fixtures" ,python-fixtures)
- ("python-pbr-minimal" ,python-pbr-minimal) ;; same as for building
fixture
("python-subunit" ,python-subunit)
+ ("python-testtools" ,python-testtools)))
+(native-inputs
+ `(("python-pbr-minimal" ,python-pbr-minimal) ;; same as for building
fixture
("python-mimeparse" ,python-mimeparse)))
(home-page "https://launchpad.net/testrepository";)
(synopsis "Database for Python test results")
15/57: gnu: Remove needless inputs python-pip and python2-pip.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 63c6e978a096ea1efec55cec813e85bd1e2c3b61
Author: Hartmut Goebel
Date: Wed Sep 28 14:36:46 2016 +0200
gnu: Remove needless inputs python-pip and python2-pip.
This is installed together with Python 3 anyway and for our build
of Python 2.
* gnu/packages/python.scm (python-fixtures): remove input "python-pip".
* gnu/packages/pdf.scm (python2-reportlab): remove native-input
"python2-pip". (python-reportlab): remove now needless property
"python2-variant".
---
gnu/packages/pdf.scm|8 ++--
gnu/packages/python.scm |3 +--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 61fe84e..614816f 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -634,14 +634,10 @@ using a stylus.")
(description "This is the ReportLab PDF Toolkit. It allows rapid creation
of rich PDF documents, and also creation of charts in a variety of bitmap and
vector formats.")
-(license license:bsd-3)
-(properties `((python2-variant . ,(delay python2-reportlab))
+(license license:bsd-3)))
(define-public python2-reportlab
- (package
-(inherit (package-with-python2
- (strip-python2-variant python-reportlab)))
-(native-inputs `(("python2-pip" ,python2-pip)
+ (package-with-python2 python-reportlab))
(define-public impressive
(package
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index cd1d5e4..2a96c06 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1965,8 +1965,7 @@ and sensible default behaviors into your setuptools run.")
`(("python-six" ,python-six)
("python-pbr-0.11" ,python-pbr-0.11)))
(inputs
- `(("python-pip" ,python-pip)
- ;; Tests
+ `(;; Tests
("python-testtools" ,python-testtools)))
(arguments
'(#:tests? #f)) ; no setup.py test command
38/57: gnu: python-pytest-flakes: Fix build.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit a0df989e8ba04f271e5a469f6ef6c5194d25e9fd
Author: Hartmut Goebel
Date: Fri Oct 7 21:48:36 2016 +0200
gnu: python-pytest-flakes: Fix build.
* python.scm (python-pytest-flakes): Set PYTHONPATH prior to running tests.
---
gnu/packages/python.scm |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f2e2a5b..c430026 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10119,7 +10119,10 @@ failures.")
(modify-phases %standard-phases
(delete 'check)
(add-after 'install 'check
- (lambda _ ; It's easier to run tests after install.
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ ;; It's easier to run tests after install.
+ ;; Make installed package available for running the tests
+ (add-installed-pythonpath outputs inputs)
(zero? (system* "py.test" "-vv")))
(native-inputs
`(("python-coverage" ,python-coverage)
53/57: gnu: python-pytest-xdist: Remove needless input python-apipkg.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 0d7071ca2b42079afdc346a39fcc60a95f1d5164
Author: Hartmut Goebel
Date: Mon Oct 10 12:00:11 2016 +0200
gnu: python-pytest-xdist: Remove needless input python-apipkg.
* gnu/packages/python.scm (python-pytest-xdist): Remove input
python-apipkg.
---
gnu/packages/python.scm |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7c90c9b..54fc1b8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1708,8 +1708,7 @@ same arguments.")
`(("unzip" ,unzip)
("python-setuptools-scm" ,python-setuptools-scm)))
(propagated-inputs
- `(("python-apipkg" ,python-apipkg)
- ("python-execnet" ,python-execnet)
+ `(("python-execnet" ,python-execnet)
("python-pytest" ,python-pytest)
("python-py" ,python-py)))
(home-page
06/57: guix: python-build-system: Delete .egg-info file created in phase check.
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit df91d66082701837278ac6a8a5c52d056d93dbff Author: Hartmut Goebel Date: Fri Oct 7 17:17:00 2016 +0200 guix: python-build-system: Delete .egg-info file created in phase check. * guix/build/python-build-system.scm (check): Delete .egg-info dirs which did not exist prior to calling setup.py but afterwards. --- guix/build/python-build-system.scm | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index c4e5a75..c97a0ee 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -67,7 +67,15 @@ (define* (check #:key tests? test-target use-setuptools? #:allow-other-keys) "Run the test suite of a given Python package." (if tests? -(call-setuppy test-target '() use-setuptools?) + ;; Running `setup.py test` creates an additional .egg-info directory in + ;; build/lib in some cases, e.g. if the source is in a sub-directory + ;; (given with `package_dir`). This will by copied to the output, too, + ;; so we need to remove. + (let ((before (find-files "build" "\\.egg-info$" #:directories? #t))) +(call-setuppy test-target '() use-setuptools?) +(let* ((after (find-files "build" "\\.egg-info$" #:directories? #t)) + (inter (lset-difference eqv? after before))) + (for-each delete-file-recursively inter))) #t)) (define (get-python-version python)
01/57: gnu: ensure pip and setuptools are installed even for Python 2.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit bb9042b0faeb18bdcd01db261b57597dd6cf8b24
Author: Hartmut Goebel
Date: Wed Sep 28 10:36:45 2016 +0200
gnu: ensure pip and setuptools are installed even for Python 2.
* gnu/packages/python.scm (python-2.7): Add "--with-ensurepip=install" to
configure-flags.
* doc/guix.texi (Python Modules): Document it.
---
doc/guix.texi |9 ++---
gnu/packages/python.scm |1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 74733f4..46c059a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12344,7 +12344,6 @@ for instance, the module python-dateutil is packaged
under the names
starts with @code{py} (e.g. @code{pytz}), we keep it and prefix it as
described above.
-
@subsubsection Specifying Dependencies
@cindex inputs, for Python packages
@@ -12361,6 +12360,11 @@ following check list to determine which dependency
goes where.
@itemize
@item
+We currently package Python 2 with @code{setuptools} and @code{pip}
+installed like Python 3.4 has per default. Thus you don't need to
+specify either of these as an input.
+
+@item
Python dependencies required at run time go into
@code{propagated-inputs}. They are typically defined with the
@code{install_requires} keyword in @file{setup.py}, or in the
@@ -12374,8 +12378,7 @@ testing---e.g., those in @code{tests_require}---go into
propagated because they are not needed at run time, and (2) in a
cross-compilation context, it's the ``native'' input that we'd want.
-Examples are @code{setuptools}, which is usually needed only at build
-time, or the @code{pytest}, @code{mock}, and @code{nose} test
+Examples are the @code{pytest}, @code{mock}, and @code{nose} test
frameworks. Of course if any of these packages is also required at
run-time, it needs to go to @code{propagated-inputs}.
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a9fd8eb..70147cd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -156,6 +156,7 @@
#:configure-flags
(list "--enable-shared";allow embedding
"--with-system-ffi" ;build ctypes
+ "--with-ensurepip=install" ;install pip and setuptools
(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib"))
19/57: gnu: python-pytest-cov: Use upstream options for testing.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 3d88956558e5fb96e7f634f2a8811f8373be99b9
Author: Hartmut Goebel
Date: Sun Oct 2 23:15:14 2016 +0200
gnu: python-pytest-cov: Use upstream options for testing.
* gnu/packages/python.scm (python-pytest-cov): Replace phase "check"
by one passing the options found in upstream's tox.ini-file
to "python setup.py check".
---
gnu/packages/python.scm | 10 ++
1 file changed, 10 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5ca9085..7997c5b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1588,6 +1588,16 @@ and many external plugins.")
(base32
"1yl4nbhzfgsxqlsyk4clafgp9x11zvgrkprm9i2p3fgkwx9jxcm8"
(build-system python-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+;; options taken from tox.ini
+;; TODO: make "--restructuredtext" tests pass. They currently fail
+;; with "Duplicate implicit target name"
+(zero? (system* "python" "./setup.py" "check"
+"--strict" "--metadata")))
(inputs
`(("python-coverage" ,python-coverage)
("python-pytest" ,python-pytest)))
04/57: guix: python-build-system: Add option "#:use-setuptools?" (default true).
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 04c5019355667b2c7605956a79d958bd07575067
Author: Hartmut Goebel
Date: Sun Oct 2 14:03:32 2016 +0200
guix: python-build-system: Add option "#:use-setuptools?" (default true).
* guix/build-system/python.scm (python-build): New keyword argument
"#:use-setuptools?", defaulting to #t.
* guix/build/python-build-system.scm (call-setup-py): New positional
parameter "use-setuptools?". If false, do not use the shim-wrapper
for addin setuptools. (build, check): accept keyword-
parameter, and pass to call-setuppy. (install): same; if
"use-setuptools?" is false, do not use options "--root" and
"--single-version-externally-managed" for setup.py.
* doc/guix.texi (Build Systems): Document it.
---
doc/guix.texi |5 +
guix/build-system/python.scm |2 ++
guix/build/python-build-system.scm | 28 +---
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 46c059a..33d62b8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3093,6 +3093,11 @@ the @code{#:python} parameter. This is a useful way to
force a package
to be built for a specific version of the Python interpreter, which
might be necessary if the package is only compatible with a single
interpreter version.
+
+By default guix calls @code{setup.py} under control of
+@code{setuptools}, much like @command{pip} does. Some packages are not
+compatible with setuptools (and pip), thus you can disable this by
+setting the @code{#:use-setuptools} parameter to @code{#f}.
@end defvr
@defvr {Scheme Variable} perl-build-system
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index adeceb4..d4d3d28 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -177,6 +177,7 @@ pre-defined variants."
#:key
(tests? #t)
(test-target "test")
+ (use-setuptools? #t)
(configure-flags ''())
(phases '(@ (guix build python-build-system)
%standard-phases))
@@ -204,6 +205,7 @@ provides a 'setup.py' file as its build system."
#:system ,system
#:test-target ,test-target
#:tests? ,tests?
+ #:use-setuptools? ,use-setuptools?
#:phases ,phases
#:outputs %outputs
#:search-paths ',(map search-path-specification->sexp
diff --git a/guix/build/python-build-system.scm
b/guix/build/python-build-system.scm
index f16abad..cded89f 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -47,22 +47,25 @@
"exec(compile(getattr(tokenize, 'open', open)(__file__).read()"
".replace('\\r\\n', '\\n'), __file__, 'exec'))"))
-(define (call-setuppy command params)
+(define (call-setuppy command params use-setuptools?)
(if (file-exists? "setup.py")
(begin
(format #t "running \"python setup.py\" with command ~s and
parameters ~s~%"
command params)
- (zero? (apply system* "python" "-c" setuptools-shim command params)))
+ (if use-setuptools?
+ (zero? (apply system* "python" "-c" setuptools-shim
+ command params))
+ (zero? (apply system* "python" "./setup.py" command params
(error "no setup.py found")))
-(define* (build #:rest empty)
+(define* (build #:key use-setuptools? #:allow-other-keys)
"Build a given Python package."
- (call-setuppy "build" '()))
+ (call-setuppy "build" '() use-setuptools?))
-(define* (check #:key tests? test-target #:allow-other-keys)
+(define* (check #:key tests? test-target use-setuptools? #:allow-other-keys)
"Run the test suite of a given Python package."
(if tests?
-(call-setuppy test-target '())
+(call-setuppy test-target '() use-setuptools?)
#t))
(define (get-python-version python)
@@ -71,15 +74,18 @@
(major+minor (take components 2)))
(string-join major+minor ".")))
-(define* (install #:key outputs inputs (configure-flags '())
+(define* (install #:key outputs inputs (configure-flags '()) use-setuptools?
#:allow-other-keys)
"Install a given Python package."
(let* ((out (assoc-ref outputs "out"))
- (params (append (list (string-append "--prefix=" out)
- "--single-version-externally-managed"
- "--root=/")
+ (params (append (list (string-append "--prefix=" out))
+ (if use-setuptools?
+ ;; distutils does not accept these flags
+ (list "--single-version-externally-managed"
+
32/57: gnu: python-fixture: Correct inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 76d9ad4eee3db06a67a0362326825b30d611a266
Author: Hartmut Goebel
Date: Thu Oct 13 14:43:57 2016 +0200
gnu: python-fixture: Correct inputs.
python-pbr is required only for building.
* gnu/packages/python.scm (python-fixtures) [propagated-inputs] move
python-pbr-0.11 to [native-inputs].
---
gnu/packages/python.scm |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e50c845..b2a117b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1977,10 +1977,9 @@ and sensible default behaviors into your setuptools
run.")
"0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y"
(build-system python-build-system)
(propagated-inputs
- `(("python-six" ,python-six)
- ("python-pbr-0.11" ,python-pbr-0.11)))
+ `(("python-six" ,python-six)))
(native-inputs
- `(;; Tests
+ `(("python-pbr-0.11" ,python-pbr-0.11)
("python-testtools" ,python-testtools)))
(arguments
'(#:tests? #f)) ; no setup.py test command
33/57: gnu: python-fixture: Enable tests.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 65ab5641ad8a960b390098d889d08922849b2073
Author: Hartmut Goebel
Date: Thu Oct 13 14:44:53 2016 +0200
gnu: python-fixture: Enable tests.
* gnu/packages/python.scm (python-fixtures) [arguments] remove
keyword `#:tests?`.
---
gnu/packages/python.scm |2 --
1 file changed, 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b2a117b..941dc52 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1981,8 +1981,6 @@ and sensible default behaviors into your setuptools run.")
(native-inputs
`(("python-pbr-0.11" ,python-pbr-0.11)
("python-testtools" ,python-testtools)))
-(arguments
- '(#:tests? #f)) ; no setup.py test command
(home-page "https://launchpad.net/python-fixtures";)
(synopsis "Python test fixture library")
(description
34/57: gnu: python-testrepositoryfixture: Correct inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit f99830096543ef19cf0aa817c6b8ace49a1141d3
Author: Hartmut Goebel
Date: Thu Oct 13 14:46:12 2016 +0200
gnu: python-testrepositoryfixture: Correct inputs.
python-fixtures is required only for building.
* gnu/packages/python.scm (python-testrepository) [propagated-inputs] move
python-fixtures to [native-inputs].
---
gnu/packages/python.scm |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 941dc52..0605f2e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2006,10 +2006,10 @@ Python tests.")
"1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"
(build-system python-build-system)
(propagated-inputs
- `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16)
- ("python-testtools" ,python-testtools)))
+ `(("python-testtools" ,python-testtools)))
(native-inputs
- `(("python-subunit" ,python-subunit)
+ `(("python-fixtures" ,python-fixtures)
+ ("python-subunit" ,python-subunit)
("python-mimeparse" ,python-mimeparse)))
(home-page "https://launchpad.net/testrepository";)
(synopsis "Database for Python test results")
05/57: guix: python-build-system: Add helpers for getting and setting PYTHONPATH.
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit 58b4921872f89b1a38f460828b23e9e4d8327298 Author: Hartmut Goebel Date: Sat Oct 8 12:04:20 2016 +0200 guix: python-build-system: Add helpers for getting and setting PYTHONPATH. * guix/build/python-build-system.scm (add-installed-pythonpath, site-packages): New exported procedures. --- guix/build/python-build-system.scm | 22 +- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index cded89f..c4e5a75 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -28,7 +28,9 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases -python-build)) +python-build +add-installed-pythonpath +site-packages)) ;; Commentary: ;; @@ -74,6 +76,24 @@ (major+minor (take components 2))) (string-join major+minor "."))) +(define (site-packages outputs inputs) + "Return the path of the current output's Python site-package." + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python"))) +(string-append out "/lib/python" + (get-python-version python) + "/site-packages/"))) + +(define (add-installed-pythonpath outputs inputs) + "Prepend the Python site-package of OUTPUT to PYTHONPATH. This is useful +when running checks after installing the package." + (let ((old-path (getenv "PYTHONPATH")) +(add-path (site-packages outputs inputs))) +(setenv "PYTHONPATH" +(string-append add-path + (if old-path (string-append ":" old-path) ""))) +#t)) + (define* (install #:key outputs inputs (configure-flags '()) use-setuptools? #:allow-other-keys) "Install a given Python package."
13/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a)
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 9910fc506d15f9f598840ea285e13e4925e1c6e9
Author: Hartmut Goebel
Date: Wed Sep 28 13:57:21 2016 +0200
gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a)
This patch contains the changes for all modules beside python.scm where
setuptools are used in an inherited package and removing this input also
removes the need for inheriting the package. This is the case if adding
setuptools in the inherited packge was the only change.
Change this to not inherit and remove the new needless call to
"strip-python2-variant (if applicable).
* gnu/packages/bioinformatics.scm: No longer "inherit" Python 2 packages
inheriting from a Python 3 package if the sole reason for inheriting was
adding python-setuptools respective python2-setuptools to inputs,
native-inputs or propagated-inputs. Remove now needless properties
"python2-variant" where applicable.
* gnu/packages/django.scm: Likewise.
* gnu/packages/gnupg.scm: Likewise.
* gnu/packages/mpd.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/openstack.scm: Likewise.
* gnu/packages/password-utils.scm: Likewise.
* gnu/packages/protobuf.scm: Likewise.
* gnu/packages/statistics.scm: Likewise.
---
gnu/packages/bioinformatics.scm | 35 ++-
gnu/packages/django.scm | 16 ++--
gnu/packages/gnupg.scm |7 +--
gnu/packages/mpd.scm|9 ++---
gnu/packages/music.scm | 17 -
gnu/packages/openstack.scm | 16 +++-
gnu/packages/password-utils.scm |6 +-
gnu/packages/protobuf.scm |7 ++-
gnu/packages/statistics.scm |9 ++---
9 files changed, 23 insertions(+), 99 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 976c24f..d1572e2 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -674,15 +674,10 @@ bioinformatics programs; a standard sequence class and
tools for performing
common operations on them; code to perform data classification; code for
dealing with alignments; code making it easy to split up parallelizable tasks
into separate processes; and more.")
-(license (license:non-copyleft "http://www.biopython.org/DIST/LICENSE";))
-(properties `((python2-variant . ,(delay python2-biopython))
+(license (license:non-copyleft "http://www.biopython.org/DIST/LICENSE";
(define-public python2-biopython
- (let ((base (package-with-python2 (strip-python2-variant python-biopython
-(package
- (inherit base)
- (native-inputs `(("python2-setuptools" ,python2-setuptools)
- ,@(package-native-inputs base))
+ (package-with-python2 python-biopython))
;; An outdated version of biopython is required for seqmagick, see
;; https://github.com/fhcrc/seqmagick/issues/59
@@ -1421,7 +1416,6 @@ also includes an interface for tabix.")
(sha256
(base32
"0y408fp6psqzwxpcpqn0wp7fr41dwz8d54wpj6j261fj5q8vs169"
-(properties `((python2-variant . ,(delay python2-twobitreader
(build-system python-build-system)
(native-inputs
`(("python-sphinx" ,python-sphinx)))
@@ -1433,11 +1427,7 @@ UCSC genome browser.")
(license license:artistic2.0)))
(define-public python2-twobitreader
- (let ((base (package-with-python2 (strip-python2-variant
python-twobitreader
-(package
- (inherit base)
- (native-inputs `(("python2-setuptools" ,python2-setuptools)
- ,@(package-native-inputs base))
+ (package-with-python2 python-twobitreader))
(define-public python-plastid
(package
@@ -1449,7 +1439,6 @@ UCSC genome browser.")
(sha256
(base32
"1sqkz5d3b9kf688mp7k771c87ins42j7j0whmkb49cb3fsg8s8lj"
-(properties `((python2-variant . ,(delay python2-plastid
(build-system python-build-system)
(arguments
;; Some test files are not included.
@@ -1474,12 +1463,7 @@ high-throughput sequencing data – with an emphasis on
simplicity.")
(license license:bsd-3)))
(define-public python2-plastid
- (let ((base (package-with-python2 (strip-python2-variant python-plastid
-(package
- (inherit base)
- ;; setuptools is required at runtime
- (propagated-inputs `(("python2-setuptools" ,python2-setuptools)
- ,@(package-propagated-inputs base))
+ (package-with-python2 python-plastid))
(define-public cd-hit
(package
@@ -1928,10 +1912,7 @@ accessing bigWig files.")
(license license:expat)))
(define-public python2-pybigwig
- (let ((pybigwig (package-with-python2 python-pybigwig)))
-(package (inherit pybigwig)
- (native-inputs
- `(("pyth
18/57: gnu: python-pytest: Propagate input "python-py".
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit f96fffc9511ea905e1d421acb66bdfadfbb3bd67
Author: Hartmut Goebel
Date: Sun Oct 2 23:13:17 2016 +0200
gnu: python-pytest: Propagate input "python-py".
* gnu/packages/python.scm (python-pytest): Move "python-py" from
inputs to propagated-inputs.
---
gnu/packages/python.scm |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 73a1cd1..5ca9085 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1560,9 +1560,10 @@ code introspection, and logging.")
(("def test_remove_dir_prefix\\(self\\):")
"@pytest.mark.xfail\ndef test_remove_dir_prefix(self):")
(build-system python-build-system)
+(propagated-inputs
+ `(("python-py" ,python-py)))
(inputs
- `(("python-py" ,python-py)
- ("python-nose" ,python-nose)
+ `(("python-nose" ,python-nose)
("python-mock" ,python-mock)))
(home-page "http://pytest.org";)
(synopsis "Python testing library")
08/57: lint: more packages to probably be a native input.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 81171cbb7729abcf462b4ed6a6de54efc90d375a
Author: Hartmut Goebel
Date: Thu Oct 6 16:52:31 2016 +0200
lint: more packages to probably be a native input.
* guix/scripts/lint.scm (check-inputs-should-be-native package): Add python
packages which are typically used for testing or for building the
documentation.
---
guix/scripts/lint.scm | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 042c679..cd630c1 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -245,7 +245,17 @@ by two spaces; possible infraction~p at ~{~a~^, ~}")
"glib:bin"
"intltool"
"itstool"
-"qttools")))
+"qttools"
+"python-coverage" "python2-coverage"
+"python-cython" "python2-cython"
+"python-docutils" "python2-docutils"
+"python-mock" "python2-mock"
+"python-nose" "python2-nose"
+"python-pbr" "python2-pbr"
+"python-pytest" "python2-pytest"
+"python-pytest-cov" "python2-pytest-cov"
+"python-setuptools-scm" "python2-setuptools-scm"
+"python-sphinx" "python2-sphinx")))
(warn-if-package-has-input package inputs input-names message)))
(define (check-inputs-should-not-be-an-input-at-all package)
24/57: gnu: python-sphinx-rtd-theme: Remove inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 42a11c4ee06130674d44a3fb3cf7a29a6687891d
Author: Hartmut Goebel
Date: Tue Oct 4 00:33:14 2016 +0200
gnu: python-sphinx-rtd-theme: Remove inputs.
This package is a plugin for python-sphinx, it does not require
python-sphinx
nor docutils, but is an add-on for python-sphinx and should not be installed
by it's own.
* gnu/packages/python/.scm (python-sphinx-rtd-theme)[inputs]: Remove.
---
gnu/packages/python.scm |3 ---
1 file changed, 3 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 11e5e9b..6b4f374 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2703,9 +2703,6 @@ sources.")
(base32
"19nw3rn7awplcdrz63kg1njqwkbymfg9lwn7l2grhdyhyr2gaa8g"
(build-system python-build-system)
-(inputs
- `(("python-docutils" ,python-docutils)
- ("python-sphinx" ,python-sphinx)))
(home-page "https://github.com/snide/sphinx_rtd_theme/";)
(synopsis "ReadTheDocs.org theme for Sphinx")
(description "A theme for Sphinx used by ReadTheDocs.org.")
23/57: inputs -> propagated-inputs: special
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 8d8e901affe04de034cab2706d45347cf7649191
Author: Hartmut Goebel
Date: Thu Oct 13 13:42:02 2016 +0200
inputs -> propagated-inputs: special
This patch contains the special cases in python.scm where all [inputs]
are changed to [propagated-inputs].
* (python2-jsonschema): python-jsonschema does not have propagated-inputs.
---
gnu/packages/python.scm |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f8f784d..11e5e9b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2343,9 +2343,8 @@ version numbers.")
(let ((jsonschema (package-with-python2
(strip-python2-variant python-jsonschema
(package (inherit jsonschema)
- (inputs
- `(("python2-functools32" ,python2-functools32)
- ,@(package-inputs jsonschema))
+ (propagated-inputs
+ `(("python2-functools32" ,python2-functools32))
(define-public python-unidecode
(package
51/57: gnu: python-scripttest: Correct inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 665dcbff192638b3b3d8296e66fb475d169f0528
Author: Hartmut Goebel
Date: Mon Oct 10 12:14:10 2016 +0200
gnu: python-scripttest: Correct inputs.
python-pytest is only required for testing, not at run-time.
* gnu/packages/python.scm (python-singledispatch, python2-singledispatch):
[propagated-inputs] Move python-pytest to [native-inputs].
---
gnu/packages/python.scm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6918a96..91a7feb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1742,7 +1742,7 @@ result back.")
(base32
"0f4w84k8ck82syys7yg9maz93mqzc8p5ymis941x034v44jzq74m"
(build-system python-build-system)
-(propagated-inputs
+(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page "http://pythonpaste.org/scripttest/";)
(synopsis "Python library to test command-line scripts")
28/57: gnu: python-ccm: Add missing input python-psutil.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 82826a0c4bb9be3900e756301da160793a3e1309
Author: Hartmut Goebel
Date: Thu Oct 13 14:54:38 2016 +0200
gnu: python-ccm: Add missing input python-psutil.
* gnu/packages/python.scm (python-ccm) [propagated-inouts]: Add
python-psutil.
---
gnu/packages/python.scm |3 +++
1 file changed, 3 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7aedc19..b46dc58 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -591,6 +591,9 @@ making them easy to handle and incorporate into other
protocols.")
(build-system python-build-system)
(propagated-inputs
`(("python-pyyaml" ,python-pyyaml)
+ ;; Not listed in setup.py, but used in ccmlib/node.py for full
+ ;; functionality
+ ("python-psutil" ,python-psutil)
("python-six" ,python-six)))
(home-page "https://github.com/pcmanus/ccm";)
(synopsis "Cassandra Cluster Manager")
40/57: gnu: python-zope-testing: Remove needless input.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 7115421220328b9cd0eeaaf46101f48bb52bafec
Author: Hartmut Goebel
Date: Fri Oct 7 21:47:02 2016 +0200
gnu: python-zope-testing: Remove needless input.
* gnu/packages.python.scm (python-zope-testing): Remove
python-zope-interface from native-imports.
---
gnu/packages/python.scm |1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1e8196b..7052ce7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6323,6 +6323,7 @@ forms, HTTP servers, regular expressions, and more.")
(build-system python-build-system)
(native-inputs
`(("python-six" ,python-six)
+ ;("python-zope-interface" ,python-zope-interface)
("python-zope-exceptions" ,python-zope-exceptions)
("python-zope-testing" ,python-zope-testing)
("unzip" ,unzip)))
35/57: gnu: python-pbr: Rework bootstrapping.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 5a3317f5b38332138ef9721fd08a0b78292635bb
Author: Hartmut Goebel
Date: Thu Oct 13 14:46:35 2016 +0200
gnu: python-pbr: Rework bootstrapping.
For breaking the cyclic build, formerly a separate (older) version was used
for bootstrapping. Now we use the same version just without tests and
without
test dependencies.
* gnu/packages/python.scm (python-pbr-0.11, python2-pbr-0.11):
replace by … (python-pbr-minimal, python2-pbr-minimal).
(python-pbr) inherit from python-pbr-minimal, adding the requirements for
testing and building the documentation.
(python-fixtures) [native-inputs] Use python-pbr-minimal here.
(python-testrepository): [native-inputs] Add it here, it was a missing
dependency.
---
gnu/packages/python.scm | 106 +++
1 file changed, 34 insertions(+), 72 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0605f2e..1bfba78 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1862,104 +1862,65 @@ protocol.")
(define-public python2-subunit
(package-with-python2 python-subunit))
-;; Recent versions of python-fixtures need a recent version of python-pbr,
-;; which needs a recent version of python-fixtures. To fix this circular
-;; dependency, we keep old versions of python-fixtures and python-pbr to
-;; bootstrap the whole thing:
-;; - python-fixtures-0.3.16 is used to build python-pbr-0.11
-;; - python-pbr-0.11 is used to build python-fixtures
-;; - python-fixtures is used to build python-pbr
-(define-public python-fixtures-0.3.16
- (package
-(name "python-fixtures")
-(version "0.3.16")
-(source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://pypi.python.org/packages/source/f/fixtures/fixtures-";
- version ".tar.gz"))
- (sha256
-(base32
- "0x9r2gwilcig5g54k60bxzg96zabizq1855lrprlb4zckalp9asc"
-(build-system python-build-system)
-(arguments
- '(#:tests? #f)) ; no setup.py test command
-(home-page "https://launchpad.net/python-fixtures";)
-(synopsis "Python test fixture library")
-(description
- "Fixtures provides a way to create reusable state, useful when writing
-Python tests.")
-(license (list license:bsd-3 license:asl2.0 ; at user's option
-
-(define-public python2-fixtures-0.3.16
- (package-with-python2 python-fixtures-0.3.16))
-
-(define-public python-pbr-0.11
- (package
-(name "python-pbr")
-(version "0.11.0")
+;; Recent versions of python-fixtures and python-testrepository need
+;; python-pbr for packaging, which itself needs these two packages for
+;; testing.
+;; To fix this circular dependency, we use a build of python-pbr, based on the
+;; same source, just without any test dependencies and with tests disabled.
+;; python-pbr-minmal is then used to package python-fixtures and
+;; python-testrepository.
+;; Strictly speaking we currently could remove the test-requirements from the
+;; normal python-pbr package (and save this package) since test are disabled
+;; there anyway. But this may change in future.
+(define python-pbr-minimal
+ (package
+(name "python-pbr-minimal")
+(version "1.8.1")
(source
(origin
(method url-fetch)
- (uri (string-append
- "https://pypi.python.org/packages/source/p/pbr/pbr-";
- version ".tar.gz"))
+ (uri (pypi-uri "pbr" version))
(sha256
(base32
- "0v9gb7gyqf7q9s99l0nnjj9ww9b0jvyqlwm4d56pcyinxydddw6p"
+ "0jcny36cf3s8ar5r4a575npz080hndnrfs4np1fqhv0ym4k7c4p2"
(build-system python-build-system)
(arguments
- `(#:tests? #f)) ;; Most tests seem to use the Internet.
-(propagated-inputs
- `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16)))
-(home-page "https://launchpad.net/pbr";)
-(synopsis "Change the default behavior of Python’s setuptools")
+ `(#:tests? #f))
+(home-page "http://docs.openstack.org/developer/pbr/";)
+(synopsis "Minimal build of python-pbr used for bootstrapping")
(description
- "Python Build Reasonableness (PBR) is a library that injects some useful
-and sensible default behaviors into your setuptools run.")
+ "Used only for bootstrapping python2-pbr, you should not need this.")
(license license:asl2.0)))
-(define-public python2-pbr-0.11
- (package-with-python2 python-pbr-0.11))
+(define python2-pbr-minimal
+ (package-with-python2 python-pbr-minimal))
(define-public python-pbr
(package
+(inherit python-pbr-minimal)
(name "python-pbr")
-(version "1.8.1")
-(source
- (origin
-(method url-fetch)
-(uri (string-append
- "https://pypi.python.org/packages/source/p/pbr/pbr-";
- version
- ".tar.gz"))
-(sha256
-
07/57: guix: Add lint-checker for packages which should be no inputs at all.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 4241426d66abdce97072e779d2e3822ab48a1412
Author: Hartmut Goebel
Date: Wed Sep 28 11:36:35 2016 +0200
guix: Add lint-checker for packages which should be no inputs at all.
Also refactor some common code into a new function.
Examples for these pacakges are python(2)-setuptools and python(2)-pip,
which
are installed together with python itself.
* guix/scripts/lint.scm (warn-if-package-has-input): New procedure.
(check-inputs-should-be-native package): Use it; rename and clean-up
variables. (check-inputs-should-not-be-an-input-at-all): New procedure.
(%checkers) Add it.
* doc/guix.texi (Python Modules): Document it.
* tests/lint.scm: ("inputs: python-setuptools should not be an input at all
(input)", "inputs: python-setuptools should not be an input at all
(native-input)" "inputs: python-setuptools should not be an input at all
(propagated-input)"): Add tests.
---
doc/guix.texi |3 ++-
guix/scripts/lint.scm | 63 +++--
tests/lint.scm| 34 ++
3 files changed, 81 insertions(+), 19 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 33d62b8..55ae89e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12367,7 +12367,8 @@ following check list to determine which dependency goes
where.
@item
We currently package Python 2 with @code{setuptools} and @code{pip}
installed like Python 3.4 has per default. Thus you don't need to
-specify either of these as an input.
+specify either of these as an input. @command{guix lint} will warn you
+if you do.
@item
Python dependencies required at run time go into
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index b3ec6d6..042c679 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès
;;; Copyright © 2015, 2016 Mathieu Lirzin
;;; Copyright © 2016 Danny Milosavljevic
+;;; Copyright © 2016 Hartmut Goebel
;;;
;;; This file is part of GNU Guix.
;;;
@@ -59,6 +60,7 @@
#:export (guix-lint
check-description-style
check-inputs-should-be-native
+check-inputs-should-not-be-an-input-at-all
check-patch-file-names
check-synopsis-style
check-derivation
@@ -213,34 +215,55 @@ by two spaces; possible infraction~p at ~{~a~^, ~}")
(format #f (_ "invalid description: ~s") description)
'description
+(define (warn-if-package-has-input linted inputs-to-check input-names message)
+ ;; Emit a warning MESSAGE if some of the inputs named in INPUT-NAMES are
+ ;; contained in INPUTS-TO-CHECK, which are assumed to be inputs of package
+ ;; LINTED.
+ (match inputs-to-check
+(((labels packages . outputs) ...)
+ (for-each (lambda (package output)
+ (when (package? package)
+ (let ((input (string-append
+ (package-name package)
+ (if (> (length output) 0)
+ (string-append ":" (car output))
+ ""
+ (when (member input input-names)
+ (emit-warning linted
+ (format #f (_ message) input)
+ 'inputs-to-check)
+ packages outputs
+
(define (check-inputs-should-be-native package)
;; Emit a warning if some inputs of PACKAGE are likely to belong to its
;; native inputs.
- (let ((linted package)
+ (let ((message "'~a' should probably be a native input")
(inputs (package-inputs package))
-(native-inputs
+(input-names
'("pkg-config"
"extra-cmake-modules"
"glib:bin"
"intltool"
"itstool"
"qttools")))
-(match inputs
- (((labels packages . outputs) ...)
- (for-each (lambda (package output)
- (when (package? package)
- (let ((input (string-append
- (package-name package)
- (if (> (length output) 0)
- (string-append ":" (car output))
- ""
- (when (member input native-inputs)
- (emit-warning linted
- (format #f (_ "'~a' should probably \
-be a native input")
- input)
- 'inputs)
- packages outputs)
+(warn-if-package-has-input package inputs input-names message)))
+
+(define (check-inputs-should-not-be-an-input-at-all pa
54/57: gnu: python-setuptools: remove pre-built binaries from source.
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit fd1660196a160dd62b009ac98b98526f700d37a4 Author: Hartmut Goebel Date: Wed Sep 28 11:40:26 2016 +0200 gnu: python-setuptools: remove pre-built binaries from source. These are used to build self-extracting installers for Windows. * gnu/packages/python.scm (python-setuptools, python2-setuptools) [source]: Add snippet to delete *.exe files. --- 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 54fc1b8..746c8c4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -798,7 +798,15 @@ have been used.") version ".tar.gz")) (sha256 (base32 -"0kc7rbav00ks6iaw14p38y81q12fx0lpkhgf5m97xc04f5r318ig" +"0kc7rbav00ks6iaw14p38y81q12fx0lpkhgf5m97xc04f5r318ig")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove included binaries which are used to build self-extracting + ;; installers for Windows. + ;; TODO: Find some way to build them ourself so we can include them. + (for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$")) + #t (build-system python-build-system) ;; FIXME: Tests require pytest, which itself relies on setuptools. ;; One could bootstrap with an internal untested setuptools.
09/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1a)
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit c3b9832a7fc2598c248d90d94183dcfc0133
Author: Hartmut Goebel
Date: Wed Sep 28 13:07:24 2016 +0200
gnu: Remove python-setuptools and python2-setuptools from inputs (part 1a)
This patch contains the changes in python.scm where removing setuptools from
the inputs could be achieved by removing complete lines.
* gnu/packages/python.scm: Remove all inputs, native-inputs and
propagated-inputs where python-setuptools and python2-setuptools are the
sole entries. Remove python-setuptools and python2-setuptools listed on a
line by its own from inputs, native-inputs and propagated-inputs.
---
gnu/packages/python.scm | 223 +--
1 file changed, 2 insertions(+), 221 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 70147cd..8954479 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -408,8 +408,6 @@ instead of @command{python3}.")))
(base32
"1w4r09fvn6kd80m5mx4ws1wz100brkaq6hzzpwrns8cgjzjpl6c6"
(build-system python-build-system)
-(native-inputs
- `(("python-setuptools" ,python-setuptools)))
(home-page "https://www.github.com/giampaolo/psutil";)
(synopsis "Library for retrieving information on running processes")
(description
@@ -478,8 +476,6 @@ to providing full-strength password hashing for multi-user
application.")
(base32
"0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az"
(build-system python-build-system)
-(native-inputs
- `(("python-setuptools" ,python-setuptools)))
(home-page "https://code.google.com/p/py-bcrypt";)
(synopsis
"Bcrypt password hashing and key derivation")
@@ -513,8 +509,6 @@ John the Ripper).")
(base32
"14k8z7ndc3zk5xivnm4d8lncchx475ll5izpf8vmfbq7rp9yp5rj"
(build-system python-build-system)
-(native-inputs
- `(("python-setuptools" ,python-setuptools)))
(propagated-inputs
`(("python-pycrypto" ,python-pycrypto)))
(inputs
@@ -543,8 +537,6 @@ Python interface around SSH networking concepts.")
(base32
"126rsryvw9vhbf3qmsfw9lf4l4xm2srmgs439lgma4cpag4s3ay3"
(build-system python-build-system)
-(native-inputs
- `(("python-setuptools" ,python-setuptools)))
(home-page "https://github.com/jcgregorio/httplib2";)
(synopsis "Comprehensive HTTP client library")
(description
@@ -570,8 +562,6 @@ other HTTP libraries.")
(base32
"1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4"
(build-system python-build-system)
-(native-inputs
- `(("python-setuptools" ,python-setuptools)))
(inputs
`(("openssl" ,openssl)))
(home-page
@@ -601,8 +591,6 @@ making them easy to handle and incorporate into other
protocols.")
(base32
"177dfxsmk3k4cih6fh6v8d91bh4nqx7ns6pc07w7m7i3cvdx3c8n"
(build-system python-build-system)
-(native-inputs
- `(("python-setuptools" ,python-setuptools)))
(inputs
`(("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)))
@@ -687,8 +675,6 @@ etc. ")
(arguments
`(#:python ,python-2
#:tests? #f)) ; no test target
-(inputs
- `(("python2-setuptools" ,python2-setuptools)))
(home-page "https://bitbucket.org/brandon/backports.ssl_match_hostname";)
(synopsis "Backport of ssl.match_hostname() function from Python 3.5")
(description
@@ -853,8 +839,6 @@ Python 3 support.")
(base32
"0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"
(build-system python-build-system)
-(native-inputs
- `(("python-setuptools" ,python-setuptools)))
(inputs
`(("python" ,python)
("gmp" ,gmp)))
@@ -930,8 +914,6 @@ password storage.")
(base32
"0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh"
(build-system python-build-system)
-(inputs
- `(("python-setuptools" ,python-setuptools)))
(home-page "http://pypi.python.org/pypi/six/";)
(synopsis "Python 2 and 3 compatibility utilities")
(description
@@ -987,8 +969,6 @@ datetime module, available in Python 2.3+.")
(base32
"0fqfglhy5khbvsipr3x7m6bcaqljh8xl5cw33vbfxy7qhmywm2n0"
(build-system python-build-system)
-(inputs
- `(("python-setuptools" ,python-setuptools)))
(home-page "http://labix.org/python-dateutil";)
(synopsis "Extensions to the standard datetime module")
(description
@@ -1129,8 +1109,6 @@ Database API 2.0T.")
(base32
"0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf"
(build-system python-build-system)
-(inputs
- `(("python2-setuptools" ,python2-setuptools)))
(arguments
`(#:python ,python-2 ; apparently incompatible with Python 3
#:tests? #f))
@@ -1442,8 +1420,6 @@ software.")
(base3
17/57: gnu: scons: Do not use setuptools for building.
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit f6b896734886f398a91f902ebea9511978900e26 Author: Hartmut Goebel Date: Sun Oct 2 14:13:56 2016 +0200 gnu: scons: Do not use setuptools for building. * gnu/packages/python.scm (scons): Set "#:use-setuptools" to #f. --- gnu/packages/python.scm |1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a7ca1dc..73a1cd1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1363,6 +1363,7 @@ syntax.") (arguments ;; With Python 3.x, fails to build with a syntax error. `(#:python ,python-2 + #:use-setuptools? #f; still relies on distutils #:tests? #f)) ; no 'python setup.py test' command (home-page "http://scons.org/";) (synopsis "Software construction tool written in Python")
31/57: gnu: python-hdf5: Correct inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit ecc7fbc934498e6a8658734dbbe1c80ba8e4d4d8
Author: Hartmut Goebel
Date: Thu Oct 6 15:38:20 2016 +0200
gnu: python-hdf5: Correct inputs.
According to setup.py python-six is requried at run-time, thus has to be a
propagated input.
* gnu/packages/python.scm (python-hdf5) [inputs]: Move `python-six` to
[propagated-inputs].
---
gnu/packages/python.scm |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ca2093d..e50c845 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -715,10 +715,10 @@ and verifies that it matches the intended target
hostname.")
(string-append "['" prefix "/lib" "']")))
#t))
(propagated-inputs
- `(("python-numpy" ,python-numpy)))
+ `(("python-six" ,python-six)
+ ("python-numpy" ,python-numpy)))
(inputs
- `(("hdf5" ,hdf5)
- ("python-six" ,python-six)))
+ `(("hdf5" ,hdf5)))
(native-inputs
`(("python-cython" ,python-cython)
("python-pkgconfig" ,python-pkgconfig)))
20/57: gnu: Fix inputs in python.scm, part 1: inputs -> propagated-inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit aae9e457e7ee66b621d5f6160f549266dabec8f6
Author: Hartmut Goebel
Date: Thu Oct 13 13:33:43 2016 +0200
gnu: Fix inputs in python.scm, part 1: inputs -> propagated-inputs.
This patch contains the changes where all [inputs] are changed to
[propagated-inputs]
* gnu/packages/python.scm: (python-passlib, python-paramiko, python-ccm,
python-babel, python-keyring python-pandas, python-tzlocal,
python-parse-type, python-nose2, python-pytest, python-pytest-cov,
python-pytest-mock, python-pytest-xdist, python-scripttest,
python-testtools, python-testscenarios, python-pbr-0.11, python-oauthlib,
python-jinja2, python-sphinx, python-tzlocal, python-bugz,
python2-pytest-mock, behave, pelican, sqlalchemy-utils,
python-pygridtools,
python-urwidtrees, python-tornado, python2-tornado, python-debian,
python-execnet, python-pytest-cache, pytest-localserver, python-clint,
python-rply, python-hy, python-rauth, python-rsa, python-celery,
python-vobject, s3cmd, python-prompt-toolkit, ptpython,
python-requests-oauthlib, python-stem, python-binaryornot,
python2-binaryornot, python-nltk, python-pymongo, python-schematics,
python-url, python2-url, python-freezegun, python-glances,
python-graphql-core, python-graphql-relay, python-graphene,
python-nautilus): All [inputs] become [propagated-inputs].
* gnu/packages/django.scm (pytest-django): dito.
* gnu/packages/password-utils.scm (python-bcrypt): dito.
* gnu/packages/propbuf.scm (python-protobuf): dito.
* gnu/packages/rdf.scm (python-rdflib): dito.
---
gnu/packages/django.scm |2 +-
gnu/packages/password-utils.scm |2 +-
gnu/packages/protobuf.scm |2 +-
gnu/packages/python.scm | 136 +++
gnu/packages/rdf.scm|2 +-
5 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 13c9391..ce48eca 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -141,7 +141,7 @@ with arguments to the field constructor.")
#t)
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)))
-(inputs
+(propagated-inputs
`(("python-py" ,python-py)
("python-pytest" ,python-pytest)))
(home-page "http://pytest-django.readthedocs.org/";)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index e4b38f0..f1ce75f 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -360,7 +360,7 @@ winner of the 2015 Password Hashing Competition.")
(native-inputs
`(("python-pycparser" ,python-pycparser)
("python-pytest" ,python-pytest)))
-(inputs
+(propagated-inputs
`(("python-cffi" ,python-cffi)
("python-six" ,python-six)))
(home-page "https://github.com/pyca/bcrypt/";)
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index d0907c6..cb366ea 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -63,7 +63,7 @@ internal RPC protocols and file formats.")
(base32
"1xbgbfg4g43bihkyw1a2giqa2gxmqc5wkh0fzqcb90qi1z1hpi7c"
(build-system python-build-system)
-(inputs
+(propagated-inputs
`(("python-six" ,python-six)))
(home-page "https://github.com/google/protobuf";)
(synopsis "Protocol buffers is a data interchange format")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7997c5b..51d7537 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -437,7 +437,7 @@ pidof, tty, taskset, pmap.")
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)))
-(inputs
+(propagated-inputs
`(("python-py-bcrypt" ,python-py-bcrypt)))
(arguments
`(#:phases
@@ -509,9 +509,8 @@ John the Ripper).")
"14k8z7ndc3zk5xivnm4d8lncchx475ll5izpf8vmfbq7rp9yp5rj"
(build-system python-build-system)
(propagated-inputs
- `(("python-pycrypto" ,python-pycrypto)))
-(inputs
- `(("python-ecdsa" ,python-ecdsa)))
+ `(("python-pycrypto" ,python-pycrypto)
+ ("python-ecdsa" ,python-ecdsa)))
(home-page "http://www.paramiko.org/";)
(synopsis "SSHv2 protocol library")
(description "Paramiko is a python implementation of the SSHv2 protocol,
@@ -590,7 +589,7 @@ making them easy to handle and incorporate into other
protocols.")
(base32
"177dfxsmk3k4cih6fh6v8d91bh4nqx7ns6pc07w7m7i3cvdx3c8n"
(build-system python-build-system)
-(inputs
+(propagated-inputs
`(("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)))
(home-page "https://github.com/pcmanus/ccm";)
@@ -638,7 +637,7 @@ using Python 2.4 or higher and provides access to the Olson
timezone d
37/57: gnu: python-pillow: Fix build.
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit 88eba9fabf30ab0bec96447e569bc40a8a8f3f68 Author: Hartmut Goebel Date: Fri Oct 7 20:32:47 2016 +0200 gnu: python-pillow: Fix build. * gnu/packages/python.scm (python-pillow)[check-installed]: Add installed site-package to PYTHONPATH. --- gnu/packages/python.scm |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4ea0265..f2e2a5b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3735,9 +3735,12 @@ services for your Python modules and applications.") `(#:phases (modify-phases %standard-phases (add-after 'install 'check-installed - (lambda _ + (lambda* (#:key outputs inputs #:allow-other-keys) (begin (setenv "HOME" (getcwd)) + ;; Make installed package available for running the + ;; tests + (add-installed-pythonpath outputs inputs) (and (zero? (system* "python" "selftest.py" "--installed")) (zero? (system* "python" "test-installed.py"))
12/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 3)
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit a56fad1c3b03670ec60ddb177c1eac0312dc267f
Author: Hartmut Goebel
Date: Wed Sep 28 13:31:42 2016 +0200
gnu: Remove python-setuptools and python2-setuptools from inputs (part 3)
This patch contains the changes where setuptools are used in an inherited
package and removing this input keeps the need for inheriting the package.
* gnu/packages/bioinformatics.scm: Remove python-setuptools respective
python2-setuptools from inputs, native-inputs and propagated-inputs in
Python 2 packages inheriting from a Python 3 package.
* gnu/packages/python.scm: Likewise.
* gnu/packages/statistics.scm: Likewise.
---
gnu/packages/bioinformatics.scm |4 +--
gnu/packages/python.scm | 51 ++-
gnu/packages/statistics.scm |5 +---
3 files changed, 15 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3beb38e..976c24f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -582,9 +582,7 @@ e.g. microbiome samples, genomes, metagenomes.")
(substitute* "setup.py"
(("install_requires.append\\(\"pyqi\"\\)") "pass"))
#t)))
- ,@(package-arguments base)))
- (native-inputs `(("python2-setuptools" ,python2-setuptools)
- ,@(package-native-inputs base))
+ ,@(package-arguments base))
(define-public bioperl-minimal
(let* ((inputs `(("perl-module-build" ,perl-module-build)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3862ad1..1fadb59 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1711,9 +1711,6 @@ same arguments.")
(let ((base (package-with-python2
(strip-python2-variant python-pytest-mock
(package (inherit base)
- (native-inputs
- `(("python2-setuptools" ,python2-setuptools)
- ,@(package-native-inputs base)))
(inputs
`(("python2-mock" ,python2-mock)
,@(package-inputs base))
@@ -2471,8 +2468,7 @@ OAuth request-signing logic.")
(let ((base (package-with-python2 (strip-python2-variant python-oauthlib
(package
(inherit base)
- (native-inputs `(("python2-setuptools" ,python2-setuptools)
- ("python2-unittest2" ,python2-unittest2)
+ (native-inputs `(("python2-unittest2" ,python2-unittest2)
,@(package-native-inputs base))
(define-public python-itsdangerous
@@ -4866,9 +4862,7 @@ and statistical routines from scipy and statsmodels.")
(package
(inherit base)
(propagated-inputs `(("python2-pytz" ,python2-pytz)
- ,@(package-propagated-inputs base)))
- (native-inputs `(("python2-setuptools" ,python2-setuptools)
- ,@(package-native-inputs base))
+ ,@(package-propagated-inputs base))
(define-public python-sympy
(package
@@ -5039,10 +5033,7 @@ connection to each user.")
`(("python2-backport-ssl-match-hostname"
,python2-backport-ssl-match-hostname)
("python2-singledispatch" ,python2-singledispatch)
- ,@(package-inputs tornado)))
- (native-inputs
- `(("python2-setuptools" ,python2-setuptools)
- ,@(package-native-inputs tornado))
+ ,@(package-inputs tornado))
;; the python- version can be removed with python-3.5
(define-public python-backports-abc
@@ -5433,10 +5424,7 @@ term.js Javascript terminal emulator library.")
(propagated-inputs
`(("python2-backport-ssl-match-hostname"
,python2-backport-ssl-match-hostname)
- ,@(package-propagated-inputs terminado)))
- (native-inputs
- `(("python2-setuptools" ,python2-setuptools)
- ,@(package-native-inputs terminado))
+ ,@(package-propagated-inputs terminado))
(define-public python-fonttools
(package
@@ -7400,8 +7388,7 @@ authenticated session objects providing things like
keep-alive.")
(let ((base (package-with-python2 (strip-python2-variant python-rauth
(package
(inherit base)
- (native-inputs `(("python2-setuptools" ,python2-setuptools)
- ("python2-unittest2" ,python2-unittest2)
+ (native-inputs `(("python2-unittest2" ,python2-unittest2)
,@(package-native-inputs base))
(define-public python2-functools32
@@ -8132,8 +8119,7 @@ and provides a uniform API regardless of which JSON
implementation is used.")
(arguments `(;; Unlike the python 3 variant, we do run tests. See above!
#:tests? #t
,@(package-arguments anyjson)))
- (native-inputs `(("python2-setuptools" ,python2-setuptools)
- ("python2-nose" ,python2-nose)
45/57: gnu: python-scipy: Fix build.
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit 20031c68a384132021aa0e856d21e97ae6af756e Author: Hartmut Goebel Date: Sun Oct 9 16:05:24 2016 +0200 gnu: python-scipy: Fix build. * gnu/packages/python.scm (python-scipy) Use add-installed-pythonpath. Add dummy newlines character to string to make emacs happy. --- gnu/packages/python.scm |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c886626..aa5a912 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3483,7 +3483,9 @@ functions.") libraries = openblas library_dirs = ~a/lib include_dirs = ~a/include -[atlas] + +# backslash-n to make emacs happy +\n[atlas] library_dirs = ~a/lib atlas_libs = openblas " @@ -3493,11 +3495,14 @@ atlas_libs = openblas #t) (alist-cons-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((data (string-append (assoc-ref outputs "doc") "/share")) (doc (string-append data "/doc/" ,name "-" ,version)) (html (string-append doc "/html")) (pyver ,(string-append "PYVER="))) + ;; Make installed package available for building the + ;; documentation + (add-installed-pythonpath outputs inputs) (with-directory-excursion "doc" ;; Fix generation of images for mathematical expressions. (substitute* (find-files "source" "conf\\.py")
39/57: gnu: python-zope-schema: Add missing inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 296c55a2c280435480453920f1e1526070df3952
Author: Hartmut Goebel
Date: Fri Oct 7 21:45:52 2016 +0200
gnu: python-zope-schema: Add missing inputs.
* gnu/packages.python.scm (python-zope-schema): Add python-coverage and
python-nose to native-inputs.
---
gnu/packages/python.scm |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c430026..1e8196b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6384,7 +6384,9 @@ internationalized messages within program source text.")
`(("python-zope-event" ,python-zope-event)
("python-zope-interface" ,python-zope-interface)))
(native-inputs
- `(("python-zope-testing" ,python-zope-testing)))
+ `(("python-zope-testing" ,python-zope-testing)
+ ("python-coverage" ,python-coverage)
+ ("python-nose" ,python-nose)))
(home-page "http://pypi.python.org/pypi/zope.schema";)
(synopsis "Zope data schemas")
(description "Zope.scheme provides extensions to zope.interface for
43/57: gnu: python-numpy-bootstrap, python-numpy: Fix build.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 51d4efb51757f146d20b76f4ea4e121e697d4594
Author: Hartmut Goebel
Date: Thu Oct 13 14:34:13 2016 +0200
gnu: python-numpy-bootstrap, python-numpy: Fix build.
* gnu/packages/python.scm (python-numpy-bootstrap): Correct inputs, use
modify-phases, add dummy newlines character to string to make emacs happy,
set PYTHONPATH prior to running tests. (python-numpy): propagate inputs,
set
PYTHONPATH prior to building docs.
---
gnu/packages/python.scm | 45 -
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 86af126..d620694 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2967,18 +2967,17 @@ writing C extensions for Python as easy as Python
itself.")
(base32
"1bjjhvncraka5s6i4lg644jrxij6bvycxy7an20gcz3a0m11iygp"
(build-system python-build-system)
-(native-inputs
- `(("python-nose" ,python-nose)))
(inputs
`(("openblas" ,openblas)
("lapack" ,lapack)))
(native-inputs
- `(("gfortran" ,gfortran)))
+ `(("python-nose" ,python-nose)
+ ("gfortran" ,gfortran)))
(arguments
`(#:phases
- (alist-cons-before
-'build 'set-environment-variables
-(lambda* (#:key inputs #:allow-other-keys)
+ (modify-phases %standard-phases
+(add-before 'build 'set-environment-variables
+ (lambda* (#:key inputs #:allow-other-keys)
(call-with-output-file "site.cfg"
(lambda (port)
(format port
@@ -2987,7 +2986,8 @@ libraries = openblas
library_dirs = ~a/lib
include_dirs = ~a/include
-[lapack]
+# backslash-n to make emacs happy
+\n[lapack]
lapack_libs = lapack
library_dirs = ~a/lib
include_dirs = ~a/include
@@ -3000,18 +3000,17 @@ include_dirs = ~a/include
(substitute* "numpy/distutils/system_info.py"
(("c = distutils\\.ccompiler\\.new_compiler\\(\\)")
"c = distutils.ccompiler.new_compiler();
c.set_executables(compiler='gcc',compiler_so='gcc',linker_exe='gcc',linker_so='gcc
-shared')"))
- #t)
+ #t))
;; Tests can only be run after the library has been installed and not
;; within the source directory.
-(alist-cons-after
- 'install 'check
- (lambda _
+(delete 'check)
+(add-after 'install 'check
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ ;; Make installed package available for running the tests
+ (add-installed-pythonpath outputs inputs)
(with-directory-excursion "/tmp"
(zero? (system* "python" "-c"
- "import numpy; numpy.test(verbose=2)"
- (alist-delete
- 'check
- %standard-phases)
+ "import numpy; numpy.test(verbose=2)"
(home-page "http://www.numpy.org/";)
(synopsis "Fundamental package for scientific computing with Python")
(description "NumPy is the fundamental package for scientific computing
@@ -3044,10 +3043,10 @@ capabilities.")
("python2-matplotlib" ,python2-matplotlib)
("python2-pandas" ,python2-pandas)
("python2-scikit-learn" ,python2-scikit-learn)
- ("python2-cython" ,python2-cython)
("python2-pysnptools" ,python2-pysnptools)))
(native-inputs
`(("unzip" ,unzip)
+ ("python2-cython" ,python2-cython)
("python2-mock" ,python2-mock)))
(home-page
"http://research.microsoft.com/en-us/um/redmond/projects/mscompbio/fastlmm/";)
(synopsis "Perform genome-wide association studies on large data sets")
@@ -3062,14 +3061,15 @@ association studies (GWAS) on extremely large data
sets.")
(name "python-numpy")
(outputs '("out" "doc"))
(inputs
- `(("which" ,which)
- ("python-matplotlib" ,python-matplotlib)
- ("python-sphinx" ,python-sphinx)
+ `(("which" ,which)))
+(propagated-inputs
+ `(("python-matplotlib" ,python-matplotlib)
("python-pyparsing" ,python-pyparsing)
- ("python-numpydoc" ,python-numpydoc)
,@(package-inputs python-numpy-bootstrap)))
(native-inputs
`(("pkg-config" ,pkg-config)
+ ("python-sphinx" ,python-sphinx)
+ ("python-numpydoc" ,python-numpydoc)
("texlive" ,texlive)
("texinfo" ,texinfo)
("perl" ,perl)
@@ -3080,7 +3080,10 @@ association studies (GWAS) on extremely large data
sets.")
((#:phases phases)
`(alist-cons-after
'install 'install-doc
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+;; Make installed package available for building the
+;; documentation
+(add-installed-pythonpath out
25/57: some inputs -> propagated-inputs
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 333e19069da1f7b34c0fd600566da3b46285c39c
Author: Hartmut Goebel
Date: Thu Oct 13 14:05:11 2016 +0200
some inputs -> propagated-inputs
---
gnu/packages/openstack.scm | 12 +
gnu/packages/python.scm| 60 +---
gnu/packages/qemu.scm |5 ++--
3 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 96ad32e..f574094 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -177,12 +177,13 @@ tested on Python version 3.2, 2.7 and 2.6.")
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;; Circular dependency with python-oslotest
-(inputs
+(propagated-inputs
`(("python-appdirs" ,python-appdirs)
+("python-pyyaml" ,python-pyyaml)))
+(native-inputs
+ `(("python-pbr" ,python-pbr)
("python-fixtures" ,python-fixtures)
("python-mimeparse" ,python-mimeparse)
-("python-pbr" ,python-pbr)
-("python-pyyaml" ,python-pyyaml)
("python-testrepository" ,python-testrepository)
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)))
@@ -789,9 +790,10 @@ permanence.")
(list git openssh))
(native-inputs
`(("python-pbr" ,python-pbr)))
+(propagated-inputs
+ `(("python-requests" ,python-requests)))
(inputs
- `(("python-requests" ,python-requests)
- ("git" ,git)
+ `(("git" ,git)
("openssh" ,openssh)))
(home-page "http://docs.openstack.org/infra/git-review/";)
(synopsis "Command-line tool for Gerrit")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6b4f374..3524b01 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3450,9 +3450,10 @@ operators such as union, intersection, and difference.")
(base32
"0nhan2qvrw7b7gg5zddwa22kybdv3x1g26vkd7q8lvnkgzrs4dga"
(build-system python-build-system)
+(propagated-inputs
+ `(("python-six" ,python-six)))
(inputs
- `(("python-six" ,python-six)
- ("readline" ,readline)
+ `(("readline" ,readline)
("icu4c" ,icu4c)
("pcre" ,pcre)
("r" ,r)))
@@ -3895,10 +3896,10 @@ a front-end for C compilers or analysis tools.")
"0655hzxv57h1a9ja9kwp0ichbkhf3djw32k33d66xp0q37dq2y81"
(build-system python-build-system)
(inputs
- `(("libxcb" ,libxcb)
- ("python-six" ,python-six)))
+ `(("libxcb" ,libxcb)))
(propagated-inputs
- `(("python-cffi" ,python-cffi))) ; used at run time
+ `(("python-cffi" ,python-cffi) ; used at run time
+ ("python-six" ,python-six)))
(arguments
`(#:phases
(alist-cons-after
@@ -5168,11 +5169,12 @@ complexity of Python source code.")
(base32
"0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc"
(build-system python-build-system)
-(inputs
+(propagated-inputs
`(("python-pep8" ,python-pep8)
("python-pyflakes" ,python-pyflakes)
-("python-mccabe" ,python-mccabe)
-("python-mock" ,python-mock)
+("python-mccabe" ,python-mccabe)))
+(inputs
+ `(("python-mock" ,python-mock)
("python-nose" ,python-nose)))
(home-page "https://gitlab.com/pycqa/flake8";)
(synopsis
@@ -5188,11 +5190,12 @@ complexity of Python source code.")
;; necessary once python-hacking > 0.10.2 is released.
(define-public python-flake8-2.2.4
(package (inherit python-flake8)
-(inputs
+(propagated-inputs
`(("python-pep8" ,python-pep8-1.5.7)
("python-pyflakes" ,python-pyflakes-0.8.1)
-("python-mccabe" ,python-mccabe-0.2.1)
-("python-mock" ,python-mock)
+("python-mccabe" ,python-mccabe-0.2.1)))
+(inputs
+ `(("python-mock" ,python-mock)
("python-nose" ,python-nose)))
(version "2.2.4")
(source
@@ -7457,11 +7460,12 @@ Pytest but stripped of Pytest specific details.")
;; FIXME: Tests require a newer version of pytest, but upgrading our
;; pytest breaks other packages.
'(#:tests? #f))
- (inputs
-`(("python-pluggy" ,python-pluggy)
+ (propagated-inputs
+`(("python-pluggy" ,python-pluggy) ; >=0.3.0,<0.4.0
("python-py" ,python-py)
- ("python-virtualenv" ,python-virtualenv)
- ("python-pytest" ,python-pytest)))
+ ("python-virtualenv" ,python-virtualenv)))
+ (inputs
+`(("python-pytest" ,python-pytest)))
(home-page "http://tox.testrun.org/";)
(synopsis "Virtualenv-based automation of test activities")
(description "Tox is a generic virtualenv management and test command line
@@ -7508,14 +7512,16 @@ document.")
(base32
"08vpvdixx1c1lfv6vzjig68bpiir7wfyhzf49ysxgvhbprg5ra0w"
(build-system python-build-system)
- (inputs
+
03/57: guix: python-build-system: Import setuptools before calling `setup.py'.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 746ab8080e688cd063228ff4e865d2ad4f901795
Author: Marius Bakke
Date: Thu Sep 29 18:41:35 2016 +0100
guix: python-build-system: Import setuptools before calling `setup.py'.
This is needed for packages using "distutils" instead of "setuptools" since
the former does not understand the "--single-version-externally-managed"
flag. Also export __file__ since it will be unset when setup.py is called
from
python "exec".
* guix/build/python-build-system.scm (call-setuppy): extend "python
setup.py"
call to import setuptools, export __file__, and call setup.py from
setuptools python environment.
Co-Authored-By: Hartmut Goebel
---
guix/build/python-build-system.scm | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/guix/build/python-build-system.scm
b/guix/build/python-build-system.scm
index d07b83f..f16abad 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -36,13 +36,23 @@
;;
;; Code:
+(define setuptools-shim
+ ;; Run setup.py with "setuptools" being imported, which will patch
+ ;; "distutils". This is needed for packages using "distutils" instead of
+ ;; "setuptools" since the former does not understand the
+ ;; "--single-version-externally-managed" flag.
+ ;; Python code taken from pip 8.1.2 pip/utils/setuptools_build.py
+ (string-append
+ "import setuptools, tokenize;__file__='setup.py';"
+ "exec(compile(getattr(tokenize, 'open', open)(__file__).read()"
+ ".replace('\\r\\n', '\\n'), __file__, 'exec'))"))
(define (call-setuppy command params)
(if (file-exists? "setup.py")
(begin
(format #t "running \"python setup.py\" with command ~s and
parameters ~s~%"
command params)
- (zero? (apply system* "python" "setup.py" command params)))
+ (zero? (apply system* "python" "-c" setuptools-shim command params)))
(error "no setup.py found")))
(define* (build #:rest empty)
55/57: gnu: python-testscenarios: remove needless input "mimetools".
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit c60158cacee12e3d8529f93ede90de9c48062f60
Author: Hartmut Goebel
Date: Thu Oct 6 16:59:36 2016 +0200
gnu: python-testscenarios: remove needless input "mimetools".
This does not occur in the source.
* gnu/packages/python.scm (python-testscenarios, python2-testscenarios)
[propagated-inputs]: Remove python-mimeparse.
---
gnu/packages/python.scm |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 746c8c4..7766c30 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1805,8 +1805,7 @@ compatibility.")
"1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg"
(build-system python-build-system)
(propagated-inputs
- `(("python-testtools" ,python-testtools)
- ("python-mimeparse" ,python-mimeparse)))
+ `(("python-testtools" ,python-testtools)))
(home-page "https://launchpad.net/testscenarios";)
(synopsis "Pyunit extension for dependency injection")
(description
50/57: gnu: python-pandas: Fix build.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 3331498967ef412e0cad55c102fc754eccfe0cdd
Author: Hartmut Goebel
Date: Mon Oct 10 11:39:29 2016 +0200
gnu: python-pandas: Fix build.
* gnu/packages/python.scm (python-pandas): Add python-cython to
native-inputs.
---
gnu/packages/python.scm |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e82083b..6918a96 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1009,7 +1009,8 @@ datetime module, available in Python 2.3+.")
("python-pytz" ,python-pytz)
("python-dateutil" ,python-dateutil-2)))
(native-inputs
- `(("python-nose" ,python-nose)))
+ `(("python-nose" ,python-nose)
+ ("python-cython" ,python-cython)))
(home-page "http://pandas.pydata.org";)
(synopsis "Data structures for data analysis, time series, and statistics")
(description
46/57: gnu: python-ipython: Fix build
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit e91f1ff8d2f38e6e05af897dee7cd9b0c94d1451 Author: Hartmut Goebel Date: Sun Oct 9 16:09:13 2016 +0200 gnu: python-ipython: Fix build * gnu/packages/python.scm (python-ipython, python2-ipython) [check] set PYTHONPATH prior to running tests. --- gnu/packages/python.scm |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index aa5a912..e82083b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4299,9 +4299,11 @@ without using the configuration machinery.") (delete 'check) (add-after 'install 'check - (lambda* (#:key outputs tests? #:allow-other-keys) + (lambda* (#:key inputs outputs tests? #:allow-other-keys) (if tests? (with-directory-excursion "/tmp" + ;; Make installed package available for running the tests + (add-installed-pythonpath outputs inputs) (setenv "HOME" "/tmp/") ;; required by a test (zero? (system* (string-append (assoc-ref outputs "out") "/bin/iptest"
01/07: gnu: python2-pytest-runner, python2-msgpack: Remove duplicate definitions.
htgoebel pushed a commit to branch master
in repository guix.
commit 32d045683d2db1e33bc8fa1b77d1ef90ca2ddb66
Author: Hartmut Goebel
Date: Mon Oct 10 11:45:05 2016 +0200
gnu: python2-pytest-runner, python2-msgpack: Remove duplicate definitions.
* gnu/packages/python.scm (python2-pytest-runner): Was defined twice, remove
duplicate definition. (python2-msgpack): Was defined twice, but
differently,
remove the obviously wrong second definition.
---
gnu/packages/python.scm |6 --
1 file changed, 6 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a9fd8eb..3c3a00c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1715,9 +1715,6 @@ supports coverage of subprocesses.")
(native-inputs `(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs base))
-(define-public python2-pytest-runner
- (package-with-python2 python-pytest-runner))
-
(define-public python-pytest-mock
(package
(name "python-pytest-mock")
@@ -5754,9 +5751,6 @@ reading and writing MessagePack data.")
(native-inputs
`(("python2-setuptools" ,python2-setuptools)
-(define-public python2-msgpack
- (package-with-python2 python-msgpack))
-
(define-public python-netaddr
(package
(name "python-netaddr")
03/07: gnu: python-zope-testing: Strip byte-code and backup-files from source.
htgoebel pushed a commit to branch master
in repository guix.
commit b02f7a21d1f143951170236aef3ef1e5e8a464c9
Author: Hartmut Goebel
Date: Fri Oct 7 21:50:29 2016 +0200
gnu: python-zope-testing: Strip byte-code and backup-files from source.
* gnu/package/python.scm (python-zope-testing,
python2-zope-testing)[source]:
Add snippet to strip byte-code and backup-files.
---
gnu/packages/python.scm |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index eca60bc..ec56c85 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6644,7 +6644,13 @@ that have uses outside of the Zope framework.")
"/zope.testing/zope.testing-" version ".tar.gz"))
(sha256
(base32
- "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s"
+ "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s"))
+ (modules '((guix build utils)))
+ (snippet
+'(begin
+ ;; Remove pre-compiled .pyc files backup files from source.
+ (for-each delete-file (find-files "." "(\\.pyc|~)$"))
+ #t
(build-system python-build-system)
(native-inputs
`(("python-zope-exceptions" ,python-zope-exceptions)))
48/57: gnu: thefuck: Fix build.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 8a11f2b9fd4ae9e08c86d9f74a128fcb5319f206
Author: Hartmut Goebel
Date: Mon Oct 10 11:13:36 2016 +0200
gnu: thefuck: Fix build.
Requires setuptools >= 17.1 due to some features used, while our
python currently only includes 12.0.
* gnu/packages/admin.scm (thefuck): Add setuptools to native-inputs.
---
gnu/packages/admin.scm |4
1 file changed, 4 insertions(+)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 325c2df..82281d0 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1695,6 +1695,10 @@ throughput (in the same interval).")
("python-decorator" ,python-decorator)
("python-psutil" ,python-psutil)
("python-six" ,python-six)))
+(inputs
+ ;; Requires setuptools >= 17.1 due to some features used, while our
+ ;; python currently only includes 12.0. TODO: Remove this input.
+ `(("python-setuptools" ,python-setuptools)))
(home-page "https://github.com/nvbn/thefuck";)
(synopsis "Correct mistyped console command")
(description
branch master updated (c8ed730 -> 635a7af)
htgoebel pushed a change to branch master in repository guix. from c8ed730 git: webkitgtk: Update to 2.14.1. new 32d0456 gnu: python2-pytest-runner, python2-msgpack: Remove duplicate definitions. new de585a7 gnu: python-pytest-xdist: Remove python byte-code files from source. new b02f7a2 gnu: python-zope-testing: Strip byte-code and backup-files from source. new 6a8f26a gnu: python-pylockfile: Update home-page url. new 190ba6c gnu: python-keyring: Update home-page url. new 7a8894e gnu: python-pathlib: Update description. new 635a7af guix: python-build-system: Fix an outdated comment. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/python.scm| 35 --- guix/build/python-build-system.scm |3 +-- 2 files changed, 25 insertions(+), 13 deletions(-)
47/57: gnu: vdirsyncer: Fix build by setting correct PYTHONPATH.
htgoebel pushed a commit to branch wip-python-build-system in repository guix. commit 229fb47d642b57d9d5ebcb94fd8e17a84bdbbff3 Author: Hartmut Goebel Date: Mon Oct 10 11:03:37 2016 +0200 gnu: vdirsyncer: Fix build by setting correct PYTHONPATH. For thus, use add-installed-pythonpath. * gnu/packages/dav.scm (vdirsyncer): set PYTHONPATH using add-installed-pythonpath. --- gnu/packages/dav.scm |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index be6c40f..d02 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -65,11 +65,8 @@ clients.") ;; vdirsyncer requires itself to be installed in order to build ;; the manpage. (add-after 'install 'manpage - (lambda* (#:key outputs #:allow-other-keys) - (setenv "PYTHONPATH" - (string-append - (getenv "PYTHONPATH") - ":" (assoc-ref outputs "out"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath outputs inputs) (zero? (system* "make" "--directory=docs/" "man")) (install-file "docs/_build/man/vdirsyncer.1"
10/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b)
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit e2ae76ba73c6cc9a6b8472aa361d3c3dc187f86d
Author: Hartmut Goebel
Date: Wed Sep 28 13:18:19 2016 +0200
gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b)
This patch contains the changes in all modules beside python.scm where
removing setuptools from the inputs could be achieved by removing complete
lines.
* gnu/packages/admin.scm: Remove all inputs, native-inputs and
propagated-inputs where python-setuptools and python2-setuptools are the
sole entries. Remove python-setuptools and python2-setuptools listed on a
line by its own from inputs, native-inputs and propagated-inputs.
* gnu/packages/backup.scm: Likewise.
* gnu/packages/bioinformatics.scm: Likewise.
* gnu/packages/django.scm: Likewise.
* gnu/packages/docker.scm: Likewise.
* gnu/packages/game-development.scm: Likewise.
* gnu/packages/key-mon.scm: Likewise.
* gnu/packages/mail.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/openstack.scm: Likewise.
* gnu/packages/tls.scm: Likewise.
---
gnu/packages/admin.scm|4
gnu/packages/backup.scm |2 --
gnu/packages/bioinformatics.scm |8
gnu/packages/django.scm |6 --
gnu/packages/docker.scm |2 --
gnu/packages/game-development.scm |2 --
gnu/packages/key-mon.scm |2 --
gnu/packages/mail.scm |2 --
gnu/packages/music.scm|1 -
gnu/packages/openstack.scm| 12
gnu/packages/tls.scm |1 -
11 files changed, 42 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d9b08ef..f0df5ff 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1332,8 +1332,6 @@ specified directories.")
(("/usr") out)
(("distro_ver = .*") "distro_ver = ''"))
#t))
- (inputs
-`(("python-setuptools" ,python2-setuptools)))
(home-page "https://github.com/shawn-sterling/graphios";)
(synopsis "Emit Nagios metrics to Graphite, Statsd, and Librato")
(description
@@ -1693,8 +1691,6 @@ throughput (in the same interval).")
(base32
"04q2cn8c83f6z6wn1scla1ilrpi5ssjc64987hvmwfvwvb82bvkp"
(build-system python-build-system)
-(native-inputs
- `(("python-setuptools" ,python-setuptools)))
(inputs
`(("python-colorama" ,python-colorama)
("python-decorator" ,python-decorator)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 797c06e..c56e4e8 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -346,8 +346,6 @@ errors.")
(base32
"1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"
(build-system python-build-system)
-(native-inputs
- `(("python2-setuptools" ,python2-setuptools)))
(inputs
`(("python" ,python-2)
("librsync" ,librsync)))
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 5fbfdf0..b2631ff 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2803,8 +2803,6 @@ HMMs).")
`(("python-numpy" ,python2-numpy)))
(inputs
`(("python-pysam" ,python2-pysam)))
-(native-inputs
- `(("python-setuptools" ,python2-setuptools)))
(home-page "http://www-huber.embl.de/users/anders/HTSeq/";)
(synopsis "Analysing high-throughput sequencing data with Python")
(description
@@ -3083,8 +3081,6 @@ data.")
#:tests? #f)) ; no test target
(inputs
`(("python-numpy" ,python2-numpy)))
-(native-inputs
- `(("python-setuptools" ,python2-setuptools)))
(home-page "http://github.com/taoliu/MACS/";)
(synopsis "Model based analysis for ChIP-Seq data")
(description
@@ -3510,7 +3506,6 @@ interrupted by stop codons. OrfM finds and prints these
ORFs.")
(native-inputs
`(("python-docutils" ,python2-docutils)
("python-nose" ,python2-nose)
- ("python-setuptools" ,python2-setuptools)
("python-sphinx" ,python2-sphinx)))
(propagated-inputs
`(("python-pyxb" ,python2-pyxb)))
@@ -4017,7 +4012,6 @@ BAM and Wiggle files in both transcript-coordinate and
genomic-coordinate.")
`(("python-cython" ,python2-cython)
("python-pysam" ,python2-pysam)
("python-numpy" ,python2-numpy)
- ("python-setuptools" ,python2-setuptools)
("zlib" ,zlib)))
(native-inputs
`(("python-nose" ,python2-nose)))
@@ -7401,8 +7395,6 @@ replacement for strverscmp.")
("python-click" ,python-click)
("python-matplotlib" ,python-matplotlib)
("python-numpy" ,python-numpy)))
-(native-inputs
- `(("python-setuptools" ,python-setuptools)))
(home-page "http://multiqc.info";)
(synopsis "Aggregate bioinformatics analysis reports")
22/57: gnu: Fix inputs in python.scm, part 2: native-inputs -> propagated-inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit b62cf1a044be28d04d862e633e33cc650709682b
Author: Hartmut Goebel
Date: Thu Oct 13 13:36:55 2016 +0200
gnu: Fix inputs in python.scm, part 2: native-inputs -> propagated-inputs.
This patch contains the changes in python.scm where all [native-inputs]
are changed to [propagated-inputs].
* python-feedgenerator
---
gnu/packages/python.scm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d1eac83..f8f784d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2727,7 +2727,7 @@ sources.")
(base32
"0mkimp1fpdan4p3882vzcws4l594k71ich4g0wq97jbra7p602n0"
(build-system python-build-system)
-(native-inputs
+(propagated-inputs
`(("python-pytz" ,python-pytz)
("python-six" ,python-six)))
(home-page "https://github.com/getpelican/feedgenerator";)
branch wip-python-build-system created (now ec6bb65)
htgoebel pushed a change to branch wip-python-build-system in repository guix. at ec6bb65 Add a series of FIXME and TODO comments. This branch includes the following new commits: new bb9042b gnu: ensure pip and setuptools are installed even for Python 2. new 2c37e36 guix: build all Python packages with --single-version-externally-managed. new 746ab80 guix: python-build-system: Import setuptools before calling `setup.py'. new 04c5019 guix: python-build-system: Add option "#:use-setuptools?" (default true). new 58b4921 guix: python-build-system: Add helpers for getting and setting PYTHONPATH. new df91d66 guix: python-build-system: Delete .egg-info file created in phase check. new 4241426 guix: Add lint-checker for packages which should be no inputs at all. new 81171cb lint: more packages to probably be a native input. new c3b9832 gnu: Remove python-setuptools and python2-setuptools from inputs (part 1a) new e2ae76b gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b) new 19f0155 gnu: Remove python-setuptools and python2-setuptools from inputs (part 2) new a56fad1 gnu: Remove python-setuptools and python2-setuptools from inputs (part 3) new 9910fc5 gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a) new fc810da gnu: Remove python-setuptools and python2-setuptools from inputs (part 4b) new 63c6e97 gnu: Remove needless inputs python-pip and python2-pip. new c27e06c gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs). new f6b8967 gnu: scons: Do not use setuptools for building. new f96fffc gnu: python-pytest: Propagate input "python-py". new 3d88956 gnu: python-pytest-cov: Use upstream options for testing. new aae9e45 gnu: Fix inputs in python.scm, part 1: inputs -> propagated-inputs. new bd0f78e gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs. new b62cf1a gnu: Fix inputs in python.scm, part 2: native-inputs -> propagated-inputs. new 8d8e901 inputs -> propagated-inputs: special new 42a11c4 gnu: python-sphinx-rtd-theme: Remove inputs. new 333e190 some inputs -> propagated-inputs new 0a304c6 make native-inputs: simple ones: one nose, docuitls, phinx, tests, … new da91b79 gnu: Ensure python-cython is a native-input. new 82826a0 gnu: python-ccm: Add missing input python-psutil. new 4a56805 gnu: python-ccm: Update synopsis and description. new 01edecf gnu: python-h5py: Remove needless "python2-variant" property. new ecc7fbc gnu: python-hdf5: Correct inputs. new 76d9ad4 gnu: python-fixture: Correct inputs. new 65ab564 gnu: python-fixture: Enable tests. new f998300 gnu: python-testrepositoryfixture: Correct inputs. new 5a3317f gnu: python-pbr: Rework bootstrapping. new 489d097 gnu: python-singledispatch: correct inputs. new 88eba9f gnu: python-pillow: Fix build. new a0df989 gnu: python-pytest-flakes: Fix build. new 296c55a gnu: python-zope-schema: Add missing inputs. new 7115421 gnu: python-zope-testing: Remove needless input. new 30a8527 gnu: python2-pysnptools: Correct inputs. new 1028ab1 gnu: python-fonttools: Remove intervening directory in site-packges. new 51d4efb gnu: python-numpy-bootstrap, python-numpy: Fix build. new 157265c gnu: python-matplotlib: Fix build. new 20031c6 gnu: python-scipy: Fix build. new e91f1ff gnu: python-ipython: Fix build new 229fb47 gnu: vdirsyncer: Fix build by setting correct PYTHONPATH. new 8a11f2b gnu: thefuck: Fix build. new 04b2a0c gnu: openstack: Correct inputs. new 3331498 gnu: python-pandas: Fix build. new 665dcbf gnu: python-scripttest: Correct inputs. new 8228da1 gnu: python-subunit, python-testrepository: Fix inputs new 0d7071c gnu: python-pytest-xdist: Remove needless input python-apipkg. new fd16601 gnu: python-setuptools: remove pre-built binaries from source. new c60158c gnu: python-testscenarios: remove needless input "mimetools". new 559e10d gnu: pytest-mock: remove needless propagated input "python-py". new ec6bb65 Add a series of FIXME and TODO comments. The 57 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
41/57: gnu: python2-pysnptools: Correct inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 30a8527e83fee16c989878a088ed6be71e1090bf
Author: Hartmut Goebel
Date: Fri Oct 7 22:03:39 2016 +0200
gnu: python2-pysnptools: Correct inputs.
dateutil, pytz, and six do not occur in the code.
Remove python-dateutil, python-pytz, python-six from inputs;
Move python-cython to native-inputs; move python-pandas to
propagated-inputs.
---
gnu/packages/python.scm |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7052ce7..57b54c0 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3386,12 +3386,9 @@ toolkits.")
(propagated-inputs
`(("python2-numpy" ,python2-numpy)
("python2-scipy" ,python2-scipy)
- ("python2-pytz" ,python2-pytz)
- ("python2-cython" ,python2-cython)))
-(inputs
- `(("python2-dateutil-2" ,python2-dateutil-2)
- ("python2-pandas" ,python2-pandas)
- ("python2-six" ,python2-six)))
+ ("python2-pandas" ,python2-pandas)))
+(native-inputs
+ `(("python2-cython" ,python2-cython)))
(native-inputs
`(("unzip" ,unzip)))
(home-page
"http://research.microsoft.com/en-us/um/redmond/projects/mscompbio/";)
57/57: Add a series of FIXME and TODO comments.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit ec6bb658699b2810d1322ad72b2515723f584a59
Author: Hartmut Goebel
Date: Fri Oct 7 20:31:07 2016 +0200
Add a series of FIXME and TODO comments.
---
gnu/packages/openstack.scm |3 +++
gnu/packages/python.scm| 27 +--
gnu/packages/samba.scm |1 +
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 84fa1b0..a098e8e 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -178,9 +178,12 @@ tested on Python version 3.2, 2.7 and 2.6.")
`(#:tests? #f)) ;; Circular dependency with python-oslotest
(propagated-inputs
`(("python-appdirs" ,python-appdirs)
+;; TODO: requirements.txt lists also keystoneauth1 and
+;; requestsexceptions
("python-pyyaml" ,python-pyyaml)))
(native-inputs
`(("python-pbr" ,python-pbr)
+;; TODO: test-requirements.txt lists a lot more
("python-fixtures" ,python-fixtures)
("python-mimeparse" ,python-mimeparse)
("python-testrepository" ,python-testrepository)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 598c8a1..102c45c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -559,6 +559,7 @@ other HTTP libraries.")
(sha256
(base32
"1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4"
+;; TODO: Remove the included test_pyecdsa.py file
(build-system python-build-system)
(inputs
`(("openssl" ,openssl)))
@@ -750,6 +751,8 @@ concepts.")
(build-system python-build-system)
(arguments '(#:test-target "check"))
(native-inputs
+ ;; for tests: nose
+ ;; sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
`(("python-pbr" ,python-pbr)))
(home-page "http://code.google.com/p/pylockfile/";)
(synopsis "Platform-independent file locking module")
@@ -1335,6 +1338,8 @@ backported for previous versions of Python from 2.4 to
3.3.")
"Parse_type extends the python parse module.")
(license license:bsd-3)))
+;; TODO: python2-parse-type: requirements.append("enum34")
+
(define-public python-parse
(package
(name "python-parse")
@@ -1402,6 +1407,7 @@ software.")
(base32
"1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s"
(build-system python-build-system)
+;; TODO: Think about removing the included test-suite in dir `tests`
(arguments
;; error in setup.cfg: command 'test' has no such option 'buffer'
'(#:tests? #f))
@@ -1573,6 +1579,7 @@ code introspection, and logging.")
(("def test_remove_dir_prefix\\(self\\):")
"@pytest.mark.xfail\ndef test_remove_dir_prefix(self):")
(build-system python-build-system)
+;; TODO: build docs, too.
(propagated-inputs
`(("python-py" ,python-py)))
(native-inputs
@@ -1774,6 +1781,7 @@ subprocess and see the output as well as any file
modifications.")
(base32
"1dyml28ykpl5jb9khdmcdvhy1cxqingys6qvj2k04fzlaj6z3bbx"
(build-system python-build-system)
+;; TODO: Think about removing the included test-suite in dir `tests`
(propagated-inputs
`(("python-mimeparse" ,python-mimeparse)
("python-extras" ,python-extras)))
@@ -1803,6 +1811,7 @@ compatibility.")
(base32
"1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg"
(build-system python-build-system)
+;; TODO: Think about removing the included test-suite in dir `tests`
(propagated-inputs
`(("python-testtools" ,python-testtools)))
(home-page "https://launchpad.net/testscenarios";)
@@ -1829,6 +1838,7 @@ style tests.")
(base32
"0cbj3plbllyz42c4b5xxgwaa7mml54lakslrn4kkhinxhdri22md"
(build-system python-build-system)
+;; TODO: Think about removing the included test-suite in dir `tests`
(home-page "https://launchpad.net/testresources";)
(synopsis
"Pyunit extension for managing test resources")
@@ -1944,6 +1954,7 @@ from git information.
(base32
"0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y"
(build-system python-build-system)
+;; TODO: Think about removing the included test-suite in dir `tests`
(propagated-inputs
`(("python-six" ,python-six)))
(native-inputs
@@ -1973,6 +1984,7 @@ Python tests.")
(base32
"1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"
(build-system python-build-system)
+;; TODO: Think about removing the included test-suite in dir `tests`
(propagated-inputs
`(("python-fixtures" ,python-fixtures)
("python-subunit" ,python-subunit)
@@ -2242,6 +2254,7 @@ installed with a newer @code{pip} or with wheel's own
command line utility.")
("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
("python-whe
27/57: gnu: Ensure python-cython is a native-input.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit da91b7981026fc9968e32b6194cfc6a51a051055
Author: Hartmut Goebel
Date: Thu Oct 13 14:33:55 2016 +0200
gnu: Ensure python-cython is a native-input.
* gnu/packages/audio.scm (python-pyliblo): [inputs] Move python-cyton to
[native-inputs].
* gnu/packages/bioinformatics.scm (python2-pybedtools): dito.
* gnu/packages/music.scm (beast, python-pyportmidi): dito.
* gnu/packages/python.scm (python2-fastlmm, python-kivy): dito.
---
gnu/packages/audio.scm |5 +++--
gnu/packages/bioinformatics.scm |6 +++---
gnu/packages/music.scm |8
gnu/packages/python.scm |6 +++---
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4d1505a..f3397e1 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1329,9 +1329,10 @@ implementation of the Open Sound Control (OSC)
protocol.")
"13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw"
(build-system python-build-system)
(arguments `(#:tests? #f)) ;no tests
+(native-inputs
+ `(("python-cython" ,python-cython)))
(inputs
- `(("python-cython" ,python-cython)
- ("liblo" ,liblo)))
+ `(("liblo" ,liblo)))
(home-page "http://das.nasophon.de/pyliblo/";)
(synopsis "Python bindings for liblo")
(description
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 1ffc848..11c32c5 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -520,13 +520,13 @@ intended to behave exactly the same as the original BWK
awk.")
(build-system python-build-system)
(arguments `(#:python ,python-2)) ; no Python 3 support
(inputs
- `(("python-cython" ,python2-cython)
- ("python-matplotlib" ,python2-matplotlib)))
+ `(("python-matplotlib" ,python2-matplotlib)))
(propagated-inputs
`(("bedtools" ,bedtools)
("samtools" ,samtools)))
(native-inputs
- `(("python-pyyaml" ,python2-pyyaml)
+ `(("python-cython" ,python2-cython)
+ ("python-pyyaml" ,python2-pyyaml)
("python-nose" ,python2-nose)))
(home-page "https://pythonhosted.org/pybedtools/";)
(synopsis "Python wrapper for BEDtools programs")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5822463..591964e 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -980,7 +980,6 @@ Laurens Hammond and Don Leslie.")
`(("rapicorn" ,rapicorn)
("guile" ,guile-1.8)
("python" ,python-2)
- ("cython" ,python2-cython)
("libgnomecanvas" ,libgnomecanvas)
("libogg" ,libogg)
("libmad" ,libmad)
@@ -991,6 +990,7 @@ Laurens Hammond and Don Leslie.")
(native-inputs
`(("pkg-config" ,pkg-config)
("glib:bin" ,glib "bin")
+ ("cython" ,python2-cython)
("perl" ,perl)
("perl-xml-parser" ,perl-xml-parser)))
(home-page "https://testbit.eu/wiki/Beast_Home";)
@@ -1273,10 +1273,10 @@ using a system-independent interface.")
#t)
(inputs
`(("portmidi" ,portmidi)
- ("alsa-lib" ,alsa-lib)
- ("python-cython" ,python-cython)))
+ ("alsa-lib" ,alsa-lib)))
(native-inputs
- `(("unzip" ,unzip)))
+ `(("python-cython" ,python-cython)
+ ("unzip" ,unzip)))
(home-page "http://portmedia.sourceforge.net/portmidi/";)
(synopsis "Python bindings to PortMidi")
(description
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f9b41bd..7aedc19 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9715,10 +9715,10 @@ and/or Xon/Xoff. The port is accessed in RAW mode.")
"/include/SDL2"))
#t)
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ("python-cython" ,python-cython)))
(inputs
- `(("python-cython" ,python-cython)
- ("gstreamer" ,gstreamer)
+ `(("gstreamer" ,gstreamer)
("mesa" ,mesa)
("sdl-union"
,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)
36/57: gnu: python-singledispatch: correct inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 489d097b5f9d678039527b8d587201597cbc97a1
Author: Hartmut Goebel
Date: Thu Oct 6 18:14:29 2016 +0200
gnu: python-singledispatch: correct inputs.
python-six is only required for conversion, not at run-time
* gnu/packages/python.scm (python-singledispatch, python2-singledispatch):
[inputs] Move python-six to [native-inputs].
---
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 1bfba78..4ea0265 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4863,8 +4863,8 @@ It is written entirely in Python.")
(base32
"171b7ip0hsq5qm83np40h3phlr36ym18w0lay0a8v08kvy3sy1jv"
(build-system python-build-system)
-(inputs
- `(("python-six" ,python-six)))
+(native-inputs
+ `(("python-six" ,python-six))) ; required for conversion, not at run-time
(home-page
"http://docs.python.org/3/library/functools.html#functools.singledispatch";)
(synopsis "Backport of singledispatch feature from Python 3.4")
49/57: gnu: openstack: Correct inputs.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 04b2a0c5b13fbe03ef385dad1d00f43e50a3a79c
Author: Hartmut Goebel
Date: Mon Oct 10 11:37:52 2016 +0200
gnu: openstack: Correct inputs.
* gnu/packages/openstack.scm (python-os-testr) Propagate input
python-subunit, change all other inputs to native-inputs.
(python-mox3): Remove needless input python-six.
(python-stevedore, python-requests-mock): Move python-pbr to
native-inputs.
---
gnu/packages/openstack.scm | 19 ---
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index f574094..84fa1b0 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -149,7 +149,6 @@ guidelines}.")
(native-inputs
`(("python-fixtures" ,python-fixtures)
("python-pbr" ,python-pbr)
-("python-six" ,python-six)
("python-testtools" ,python-testtools)))
(home-page "http://www.openstack.org/";)
(synopsis "Mock object framework for Python")
@@ -217,11 +216,11 @@ tested on Python version 3.2, 2.7 and 2.6.")
;; when building the package. Skip the tests for now.
`(#:tests? #f))
(propagated-inputs
+ `(("python-subunit" ,python-subunit)))
+(native-inputs
`(("python-pbr" ,python-pbr)
- ("python-subunit" ,python-subunit)
- ("python-testtools" ,python-testtools)))
-(inputs
- `(("python-babel" ,python-babel)))
+ ("python-testtools" ,python-testtools)
+ ("python-babel" ,python-babel)))
(home-page "http://www.openstack.org/";)
(synopsis "Testr wrapper to provide functionality for OpenStack projects")
(description
@@ -247,10 +246,9 @@ tested on Python version 3.2, 2.7 and 2.6.")
(propagated-inputs
`(("python-requests" ,python-requests)
("python-six" ,python-six)))
-(inputs
- `(("python-pbr" ,python-pbr)))
(native-inputs
- `(("python-discover" ,python-discover)
+ `(("python-pbr" ,python-pbr)
+ ("python-discover" ,python-discover)
("python-fixtures" ,python-fixtures)
("python-mock" ,python-mock)
("python-sphinx" ,python-sphinx)
@@ -280,10 +278,9 @@ portions of your testing code.")
(build-system python-build-system)
(propagated-inputs
`(("python-six" ,python-six)))
-(inputs
- `(("python-pbr" ,python-pbr)))
(native-inputs
- `(;; Tests
+ `(("python-pbr" ,python-pbr)
+;; Tests
("python-docutils" ,python-docutils)
("python-mock" ,python-mock)
("python-oslotest" ,python-oslotest)
05/07: gnu: python-keyring: Update home-page url.
htgoebel pushed a commit to branch master
in repository guix.
commit 190ba6c2afc773238573028f1d27e9645cbcd6dd
Author: Hartmut Goebel
Date: Wed Oct 5 16:37:42 2016 +0200
gnu: python-keyring: Update home-page url.
* gnu/packages/python.scm (python-keyring, python2-keyring): Update
home-page
url.
---
gnu/packages/python.scm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a1c2088..c890c68 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -900,7 +900,7 @@ etc.). The package is structured to make adding new
modules easy.")
`(("python-pycrypto" ,python-pycrypto)))
(arguments
`(#:tests? #f)) ;TODO: tests require pytest
-(home-page "http://bitbucket.org/kang/python-keyring-lib";)
+(home-page "https://github.com/jaraco/keyring";)
(synopsis "Store and access your passwords safely")
(description
"The Python keyring lib provides a easy way to access the system keyring
07/07: guix: python-build-system: Fix an outdated comment.
htgoebel pushed a commit to branch master in repository guix. commit 635a7af45d6e2105ad65d1a9531126cc232a2a50 Author: Hartmut Goebel Date: Sun Oct 2 18:48:56 2016 +0200 guix: python-build-system: Fix an outdated comment. The python-build-system uses phases the build and install, but not configure. So the old comment was plain wrong since Sept. 2013, when the build phase has been added. --- guix/build/python-build-system.scm |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 9109fb4..e906e60 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -137,8 +137,7 @@ installed with setuptools." #t)) (define %standard-phases - ;; 'configure' and 'build' phases are not needed. Everything is done during - ;; 'install'. + ;; 'configure' phase is not needed. (modify-phases gnu:%standard-phases (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980) (delete 'configure)
44/57: gnu: python-matplotlib: Fix build.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 157265c79efa99bf7ef8cb9a285b86f297149a7c
Author: Hartmut Goebel
Date: Sun Oct 9 13:19:50 2016 +0200
gnu: python-matplotlib: Fix build.
* gnu/packages/python.scm (python-matplotlib, python2-matplotlib): Correct
inputs. [install-doc] set PYTHONPATH prior to building docs.
---
gnu/packages/python.scm | 25 ++---
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d620694..c886626 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3254,6 +3254,11 @@ transcendental functions).")
("python-pygobject" ,python-pygobject)
("gobject-introspection" ,gobject-introspection)
("python-tkinter" ,python "tk")
+ ("python-dateutil" ,python-dateutil-2)
+ ("python-numpy" ,python-numpy-bootstrap)
+ ("python-pillow" ,python-pillow)
+ ("python-pytz" ,python-pytz)
+ ("python-six" ,python-six)
;; The 'gtk+' package (and 'gdk-pixbuf', 'atk' and 'pango' propagated
;; from 'gtk+') provides the required 'typelib' files used by
;; 'gobject-introspection'. The location of these files is set with the
@@ -3270,20 +3275,11 @@ transcendental functions).")
("python-pycairo" ,python-pycairo)
("python-cairocffi" ,python-cairocffi)))
(inputs
- `(("python-dateutil" ,python-dateutil-2)
- ("python-six" ,python-six)
- ("python-pytz" ,python-pytz)
- ("python-numpy" ,python-numpy-bootstrap)
- ("python-sphinx" ,python-sphinx)
- ("python-numpydoc" ,python-numpydoc)
- ("python-nose" ,python-nose)
- ("python-mock" ,python-mock)
- ("libpng" ,libpng)
+ `(("libpng" ,libpng)
("imagemagick" ,imagemagick)
("freetype" ,freetype)
("cairo" ,cairo)
("glib" ,glib)
- ("python-pillow" ,python-pillow)
;; FIXME: Add backends when available.
;("python-wxpython" ,python-wxpython)
;("python-pyqt" ,python-pyqt)
@@ -3291,6 +3287,10 @@ transcendental functions).")
("tk" ,tk)))
(native-inputs
`(("pkg-config" ,pkg-config)
+ ("python-sphinx" ,python-sphinx)
+ ("python-numpydoc" ,python-numpydoc)
+ ("python-nose" ,python-nose)
+ ("python-mock" ,python-mock)
("texlive" ,texlive)
("texinfo" ,texinfo)))
(arguments
@@ -3315,11 +3315,14 @@ backend = TkAgg~%"
(assoc-ref inputs "tk"))
(alist-cons-after
'install 'install-doc
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((data (string-append (assoc-ref outputs "doc") "/share"))
(doc (string-append data "/doc/" ,name "-" ,version))
(info (string-append data "/info"))
(html (string-append doc "/html")))
+ ;; Make installed package available for building the
+ ;; documentation
+ (add-installed-pythonpath outputs inputs)
(with-directory-excursion "doc"
;; Produce pdf in 'A4' format.
(substitute* (find-files "." "conf\\.py")
04/07: gnu: python-pylockfile: Update home-page url.
htgoebel pushed a commit to branch master
in repository guix.
commit 6a8f26a44154728e68e2e03304b8cff76d117bfa
Author: Hartmut Goebel
Date: Wed Oct 5 16:37:42 2016 +0200
gnu: python-pylockfile: Update home-page url.
* gnu/packages/python.scm (python-pylockfile, python2-pylockfile): Update
home-page url.
---
gnu/packages/python.scm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ec56c85..a1c2088 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -763,7 +763,7 @@ concepts.")
(arguments '(#:test-target "check"))
(native-inputs
`(("python-pbr" ,python-pbr)))
-(home-page "http://code.google.com/p/pylockfile/";)
+(home-page "https://launchpad.net/pylockfile";)
(synopsis "Platform-independent file locking module")
(description
"The lockfile package exports a LockFile class which provides a simple
29/57: gnu: python-ccm: Update synopsis and description.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 4a56805781ce003d809c2b2b5a049130f84846cd
Author: Hartmut Goebel
Date: Thu Oct 13 15:01:18 2016 +0200
gnu: python-ccm: Update synopsis and description.
* gnu/packages/python.scm (python-ccm): Update synopsis and description.
---
gnu/packages/python.scm |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b46dc58..37f7958 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -596,9 +596,11 @@ making them easy to handle and incorporate into other
protocols.")
("python-psutil" ,python-psutil)
("python-six" ,python-six)))
(home-page "https://github.com/pcmanus/ccm";)
-(synopsis "Cassandra Cluster Manager")
-(description "A script/library to create, launch and remove an Apache
-Cassandra cluster on localhost.")
+(synopsis "Cassandra Cluster Manager for Apache Cassandra clusters on
+localhost")
+(description "Cassandra Cluster Manager is a development tool for testing
+local Cassandra clusters. It creates, launches and removes Cassandra clusters
+on localhost.")
(license license:asl2.0)))
(define-public python2-ccm
02/07: gnu: python-pytest-xdist: Remove python byte-code files from source.
htgoebel pushed a commit to branch master
in repository guix.
commit de585a7e644fdcb6ea05abde23f900d4242fcb48
Author: Hartmut Goebel
Date: Mon Oct 10 11:59:04 2016 +0200
gnu: python-pytest-xdist: Remove python byte-code files from source.
* gnu/packages/python.scm (python-pytest-xdist,
python2-pytest-xdist)[source]: Add snippet.
---
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 3c3a00c..eca60bc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1764,7 +1764,15 @@ same arguments.")
(uri (pypi-uri "pytest-xdist" version ".zip"))
(sha256
(base32
- "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja"
+ "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja"))
+ (modules '((guix build utils)))
+ (snippet
+'(begin
+ ;; Remove pre-compiled .pyc files from source.
+ (for-each delete-file-recursively
+ (find-files "." "__pycache__" #:directories? #t))
+ (for-each delete-file (find-files "." "\\.pyc$"))
+ #t
(build-system python-build-system)
(native-inputs
`(("unzip" ,unzip)
06/07: gnu: python-pathlib: Update description.
htgoebel pushed a commit to branch master in repository guix. commit 7a8894e803d4fab62bdf4525be1564f2cee6a3d4 Author: Hartmut Goebel Date: Wed Oct 5 16:37:42 2016 +0200 gnu: python-pathlib: Update description. * gnu/packages/python.scm (python-pathlib, python2-pathlib): Update description. --- gnu/packages/python.scm |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c890c68..6207896 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8849,7 +8849,12 @@ be done easily through operators, attribute accesses, and method calls. comparing Windows paths ignores casing. @item Well-defined semantics, eliminating any inconsistencies or ambiguities (forward vs. backward slashes, etc.). -@end enumerate\n") +@end enumerate + +Note: In Python 3.4, pathlib is now part of the standard library. For other +Python versions please consider python-pathlib2 instead, which tracks the +standard library module. This module (python-pathlib) isn't maintained +anymore.") (license license:expat))) (define-public python2-pathlib
14/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4b)
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit fc810daad232316a0a024ff19f37cc6b7eb155f3
Author: Hartmut Goebel
Date: Wed Sep 28 14:54:59 2016 +0200
gnu: Remove python-setuptools and python2-setuptools from inputs (part 4b)
This patch contains the changes in python.scm where
setuptools are used in an inherited package and removing this input also
removes the need for inheriting the package. This is the case if adding
setuptools in the inherited packge was the only change.
Change this to not inherit and remove the new needless call to
"strip-python2-variant (if applicable).
* gnu/packages/python.scm.scm: Remove inheriting Python 2 packages
inheriting from a Python 3 package if adding python-setuptools respective
python2-setuptools to inputs, native-inputs and propagated-inputs in
have been the sole reason for inheriting. Remove now needless
property "python2-variant" where applicable.
* gnu/packages/python.scm: (python-lockfile, python-keyring,
python-dateutil-2, python-parsedatetime, python-pandas,
python-pyicu, python-pytest-cov, python-pytest-runner,
python-pytest-xdist, python-cov-core, python-itsdangerous,
python-numexpr, python-sqlalchemy-utils, python-alembic,
python-beautifulsoup4, python-msgpack, python-ipaddress,
python-atomicwrites, python-apipkg, python-execnet,
python-pytest-cache, python-wtforms, python-mako, python-waitress,
python-wsgiproxy2, python-pyquery, python-webtest,
python-translitcodec, python-editor,
python-sphinxcontrib-programoutput, python-psycopg2, python-vobject,
python-flask, python-cookies, python-responses, python-future,
python-ply, python-wcwidth, python-prompt-toolkit, python-jedi,
python-requests-oauthlib, python-pyserial, python-nltk,
python-pymongo, python-sh, python-schematics, python-publicsuffix,
python-publicsuffix2, python-url, python-freezegun,
python-cachecontrol, python-lit, python-pytest-pep8,
python-pytest-flakes, python-glances, python-graphql-core,
python-graphql-relay): Remove neesless input "python2-setuptools",
don't inherit, don't call strip-python2-variant.
(python-lockfile, python-keyring, python-dateutil-2,
python-parsedatetime, python-pandas, python-pyicu,
python-pytest-cov, python-pytest-runner, python-pytest-xdist,
python-cov-core, python-itsdangerous, python-numexpr,
python-sqlalchemy-utils, python-alembic, python-beautifulsoup4,
python-msgpack, python-ipaddress, python-atomicwrites,
python-apipkg, python-execnet, python-pytest-cache, python-wtforms,
python-mako, python-waitress, python-wsgiproxy2, python-pyquery,
python-webtest, python-translitcodec, python-editor,
python-sphinxcontrib-programoutput, python-psycopg2, python-vobject,
python-flask, python-cookies, python-responses, python-future,
python-ply, python-wcwidth, python-prompt-toolkit, python-jedi,
python-requests-oauthlib, python-pyserial, python-nltk,
python-pymongo, python-sh, python-schematics, python-nltk,
python-publicsuffix2, python-cachecontrol, python-lit,
python-pytest-pep8, python-pytest-flakes, python-glances,
python-graphql-core, python-graphql-relay): Remove "python2-variant"
property.
---
gnu/packages/python.scm | 508 +++
1 file changed, 111 insertions(+), 397 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1fadb59..cd1d5e4 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -753,15 +753,10 @@ concepts.")
(description
"The lockfile package exports a LockFile class which provides a simple
API for locking files.")
-(license license:expat)
-(properties `((python2-variant . ,(delay python2-lockfile))
+(license license:expat)))
(define-public python2-lockfile
- (let ((base (package-with-python2 (strip-python2-variant python-lockfile
-(package
- (inherit base)
- (native-inputs `(("python2-setuptools" ,python2-setuptools)
- ,@(package-native-inputs base))
+ (package-with-python2 python-lockfile))
(define-public python-mock
(package
@@ -890,15 +885,10 @@ etc.). The package is structured to make adding new
modules easy.")
service from python. It can be used in any application that needs safe
password storage.")
;; "MIT" and PSF dual license
-(license license:x11)
-(properties `((python2-variant . ,(delay python2-keyring))
+(license license:x11)))
(define-public python2-keyring
- (let ((base (package-with-python2 (strip-python2-variant python-keyring
-(package
- (inherit base)
- (native-inputs `(("python2-setuptools" ,python2-setuptools)
- ,@(package-native-inputs base))
+ (package-with-py
26/57: make native-inputs: simple ones: one nose, docuitls, phinx, tests, …
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 0a304c62ae2ef0227d1bb0d4eae98e10dd5f23c8
Author: Hartmut Goebel
Date: Fri Oct 7 21:27:08 2016 +0200
make native-inputs: simple ones: one nose, docuitls, phinx, tests, …
---
gnu/packages/python.scm | 30 --
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3524b01..f9b41bd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2330,7 +2330,7 @@ version numbers.")
(base32
"0hddbqjm4jq63y8jf44nswina1crjs16l9snb6m3vvgyg31klrrn"
(build-system python-build-system)
-(inputs
+(native-inputs
`(("python-vcversioner" ,python-vcversioner)))
(home-page "http://github.com/Julian/jsonschema";)
(synopsis "Implementation of JSON Schema for Python")
@@ -2840,8 +2840,9 @@ and is very extensible.")
(system* "nosetests" "-v" "sklearn")))
(alist-delete 'check %standard-phases)
(inputs
- `(("openblas" ,openblas)
- ("python-nose" ,python-nose)))
+ `(("openblas" ,openblas)))
+(native-inputs
+ `(("python-nose" ,python-nose)))
(propagated-inputs
`(("python-numpy" ,python-numpy)
("python-scipy" ,python-scipy)))
@@ -3003,9 +3004,10 @@ writing C extensions for Python as easy as Python
itself.")
(base32
"1bjjhvncraka5s6i4lg644jrxij6bvycxy7an20gcz3a0m11iygp"
(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
(inputs
- `(("python-nose" ,python-nose)
- ("openblas" ,openblas)
+ `(("openblas" ,openblas)
("lapack" ,lapack)))
(native-inputs
`(("gfortran" ,gfortran)))
@@ -3222,7 +3224,7 @@ that client code uses to construct the grammar directly
in Python code.")
(substitute* "numpydoc/tests/test_plot_directive.py"
(("3") "2"))
(build-system python-build-system)
-(inputs
+(native-inputs
`(("python-docutils" ,python-docutils)
("python-sphinx" ,python-sphinx)
("python-nose" ,python-nose)))
@@ -5092,7 +5094,7 @@ PEP 8.")
(base32
"0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws"
(build-system python-build-system)
-(inputs
+(native-inputs
`(("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner)))
(home-page "https://github.com/flintwork/mccabe";)
@@ -5173,8 +5175,8 @@ complexity of Python source code.")
`(("python-pep8" ,python-pep8)
("python-pyflakes" ,python-pyflakes)
("python-mccabe" ,python-mccabe)))
-(inputs
- `(("python-mock" ,python-mock)
+(native-inputs
+ `(("python-mock" ,python-mock) ; TODO: only required for < 3.3
("python-nose" ,python-nose)))
(home-page "https://gitlab.com/pycqa/flake8";)
(synopsis
@@ -5224,7 +5226,7 @@ complexity of Python source code.")
(base32
"17zqjp9m4d1w3jf2rbbq5xshcw24q1vlcv24gkgfqqyyymajxahx"
(build-system python-build-system)
-(inputs
+(native-inputs
`(("python-nose" ,python-nose)
("python-cython" ,python-cython)))
(home-page "https://github.com/lepture/mistune";)
@@ -5283,7 +5285,7 @@ markdown_py is also provided to convert Markdown files to
HTML.")
(base32
"0nggns5kikn32yyda2zrj1xdmh49pi3v0drggcdwljbv36r8zdyw"
(build-system python-build-system)
-(inputs
+(native-inputs
`(("python-nose" ,python-nose)))
(arguments
`(#:phases
@@ -5600,7 +5602,7 @@ fractional seconds) of a clock which never goes
backwards.")
(base32
"02bhhzijfhv8hmi1i54d4b0v43liwhnywhflvxsv4x3zax9s3afq"
(build-system python-build-system)
-(inputs
+(native-inputs
`(("python-nose" ,python-nose)))
(home-page "http://webob.org/";)
(synopsis "WSGI request and response object")
@@ -6927,7 +6929,7 @@ applications.")
(base32
"1iks5701qnp3dlr3q1d9qm68y2plp2m029irhpz92a44psfkjf1f"
(build-system python-build-system)
-(inputs
+(native-inputs
`(("python-pytest" ,python-pytest)))
(synopsis "Namespace control and lazy-import mechanism")
(description "With apipkg you can control the exported namespace of a
Python
@@ -8037,7 +8039,7 @@ RabbitMQ messaging server is the most popular
implementation.")
(strip-python2-variant python-kombu
(package
(inherit kombu)
- (inputs `(("python2-unittest2" ,python2-unittest2)
+ (native-inputs `(("python2-unittest2" ,python2-unittest2)
,@(package-inputs kombu))
(define-public python-billiard
16/57: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs).
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit c27e06c6994540b70d0adf830b1c292253823c0f
Author: Hartmut Goebel
Date: Wed Sep 28 15:23:10 2016 +0200
gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs).
Bug 20765 is solved since we build all Python packages using
option "--single-version-externally-managed".
* gnu/packages/bioinformatics.scm (pbtranscript-tofu): Remove
configure-flags. (pepr): remove phase "disable-egg-generation".
* gnu/packages/pdf.scm (reportlab): Remove configure-flags.
* gnu/packages/python.scm (python-sphinx-rtd-theme, python2-elib.intl,
python-pkgconfig, python-pytest-pep8, python-pytest-flakes): Remove
configure-flags. (python-pillow) remove phase
"disable-egg-generation". (python-libarchive-c) Remove patching
setup.cfg.
* gnu/packages/statistics.scm (python-patsy): remove phase
"prevent-generation-of-egg-archive".
* gnu/packages/tls.scm (python-acme): remove phase
"disable-egg-compression".
* gnu/packages/tor.scm (onionshare): Remove configure-flags.
---
gnu/packages/bioinformatics.scm | 19 +---
gnu/packages/pdf.scm|5 -
gnu/packages/python.scm | 47 ---
gnu/packages/statistics.scm |8 +--
gnu/packages/tls.scm|9
gnu/packages/tor.scm|6 +
6 files changed, 7 insertions(+), 87 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d1572e2..1ffc848 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3553,11 +3553,6 @@ the phenotype as it models the data.")
(build-system python-build-system)
(arguments
`(#:python ,python-2
- ;; With standard flags, the install phase attempts to create a zip'd
- ;; egg file, and fails with an error: 'ZIP does not support timestamps
- ;; before 1980'
- #:configure-flags '("--single-version-externally-managed"
- "--record=pbtranscript-tofu.txt")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-directory
@@ -7282,19 +7277,7 @@ may optionally be provided to further inform the
peak-calling process.")
(build-system python-build-system)
(arguments
`(#:python ,python-2 ; python2 only
- #:tests? #f ; no tests included
- #:phases
- (modify-phases %standard-phases
- ;; When setuptools is used a ".egg" archive is generated and
- ;; installed. This makes it hard to actually run PePr. This issue
- ;; has been reported upstream:
- ;; https://github.com/shawnzhangyx/PePr/issues/9
- (add-after 'unpack 'disable-egg-generation
- (lambda _
- (substitute* "setup.py"
- (("from setuptools import setup")
-"from distutils.core import setup"))
- #t)
+ #:tests? #f)) ; no tests included
(propagated-inputs
`(("python2-numpy" ,python2-numpy)
("python2-scipy" ,python2-scipy)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 614816f..c8a6e05 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -622,11 +622,6 @@ using a stylus.")
(base32
"0rz2pg04wnzjjm2f5a8ik9v8s54mv4xrjhv5liqjijqv6awh12gl"
(build-system python-build-system)
-(arguments
- ;; Prevent creation of the egg. Without this flag, various artifacts
- ;; from the build inputs end up in the final python3 output. It also
- ;; works around https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 .
- `(#:configure-flags '("--single-version-externally-managed" "--root=/")))
(propagated-inputs
`(("python-pillow" ,python-pillow)))
(home-page "http://www.reportlab.com";)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2a96c06..a7ca1dc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2693,12 +2693,6 @@ sources.")
(base32
"19nw3rn7awplcdrz63kg1njqwkbymfg9lwn7l2grhdyhyr2gaa8g"
(build-system python-build-system)
-(arguments
- `(;; With standard flags, the install phase attempts to create a zip'd
- ;; egg file, and fails with an error: 'ZIP does not support timestamps
- ;; before 1980'
- #:configure-flags '("--single-version-externally-managed"
- "--record=sphinx-rtd-theme.txt")))
(inputs
`(("python-docutils" ,python-docutils)
("python-sphinx" ,python-sphinx)))
@@ -3733,12 +3727,7 @@ Python's distutils.")
(arguments
;; incompatible with Python 3 (exception syntax)
`(#:python ,python-2
- #:tests? #f
- ;; With standard flags, the install phase attempts to create a zip'd
- ;; egg file, and fails with an error: 'ZIP does no
56/57: gnu: pytest-mock: remove needless propagated input "python-py".
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 559e10db1ffd0e19fc3d8e7aeb92093b8dbb978c
Author: Hartmut Goebel
Date: Thu Oct 6 17:00:28 2016 +0200
gnu: pytest-mock: remove needless propagated input "python-py".
This is not listed as an requirement and is already propagated by
python-pytest.
* gnu/packages/python.scm (python-pytest-mock, python2-pytest-mock):
[propagated-inputs]: Remove python-py.
---
gnu/packages/python.scm |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7766c30..598c8a1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1679,8 +1679,7 @@ supports coverage of subprocesses.")
(native-inputs
`(("unzip" ,unzip)))
(propagated-inputs
- `(("python-py" ,python-py)
- ("python-pytest" ,python-pytest)))
+ `(("python-pytest" ,python-pytest)))
(home-page "https://github.com/pytest-dev/pytest-mock/";)
(synopsis "Thin-wrapper around the mock package for easier use with
py.test")
(description
11/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 2)
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 19f0155bdbd0fd32ec9f75a3dbe6cdb4a129d171
Author: Hartmut Goebel
Date: Wed Sep 28 13:30:54 2016 +0200
gnu: Remove python-setuptools and python2-setuptools from inputs (part 2)
This patch contains the changes where removing setuptools from the inputs
affected some code-lines beside.
* gnu/packages/admin.scm: Remove all inputs, native-inputs and
propagated-inputs where python-setuptools and python2-setuptools are the
sole entries. Remove python-setuptools and python2-setuptools listed on a
line by its own from inputs, native-inputs and propagated-inputs.
* gnu/packages/backup.scm: Likewise.
* gnu/packages/bioinformatics.scm: Likewise.
* gnu/packages/docbook.scm: Likewise.
* gnu/packages/freedesktop.scm: Likewise.
* gnu/packages/lirc.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/nutrition.scm: Likewise.
* gnu/packages/openstack.scm: Likewise.
* gnu/packages/password-utils.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/rdf.scm: Likewise.
* gnu/packages/terminals.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
---
gnu/packages/admin.scm |3 +-
gnu/packages/backup.scm |3 +-
gnu/packages/bioinformatics.scm | 46 +++-
gnu/packages/docbook.scm |3 +-
gnu/packages/freedesktop.scm |3 +-
gnu/packages/lirc.scm|3 +-
gnu/packages/mp3.scm |3 +-
gnu/packages/nutrition.scm |6 +-
gnu/packages/openstack.scm | 18 +--
gnu/packages/password-utils.scm |3 +-
gnu/packages/python.scm | 227 +-
gnu/packages/rdf.scm |3 +-
gnu/packages/terminals.scm |3 +-
gnu/packages/version-control.scm |3 +-
gnu/packages/xdisorg.scm |3 +-
15 files changed, 110 insertions(+), 220 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index f0df5ff..325c2df 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1354,8 +1354,7 @@ of supported upstream metrics systems simultaneously.")
"1bfc2xiplpad6f2nwi48y0kps7xqnsll85dlz63cy8k5bysl6d20"
(build-system python-build-system)
(native-inputs
- `(("python2-setuptools" ,python2-setuptools)
- ("python2-pycrypto" ,python2-pycrypto)
+ `(("python2-pycrypto" ,python2-pycrypto)
("python2-httplib2" ,python2-httplib2)
("python2-passlib" ,python2-passlib)
("python2-nose" ,python2-nose)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index c56e4e8..25e17e0 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -66,8 +66,7 @@
"duplicity-test_selection-tmp.patch"
(build-system python-build-system)
(native-inputs
- `(("python2-setuptools" ,python2-setuptools)
- ("util-linux" ,util-linux))) ;setsid command, for the tests
+ `(("util-linux" ,util-linux))) ;setsid command, for the tests
(inputs
`(("python" ,python-2)
("librsync" ,librsync)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index b2631ff..3beb38e 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -213,8 +213,7 @@ structure of the predicted RNA.")
("libtool" ,libtool)
("zlib" ,zlib)
("python-nose" ,python2-nose)
- ("python-pysam" ,python2-pysam)
- ("python-setuptools" ,python2-setuptools)))
+ ("python-pysam" ,python2-pysam)))
(inputs
`(("htslib" ,htslib)
("samtools" ,samtools)
@@ -528,8 +527,7 @@ intended to behave exactly the same as the original BWK
awk.")
("samtools" ,samtools)))
(native-inputs
`(("python-pyyaml" ,python2-pyyaml)
- ("python-nose" ,python2-nose)
- ("python-setuptools" ,python2-setuptools)))
+ ("python-nose" ,python2-nose)))
(home-page "https://pythonhosted.org/pybedtools/";)
(synopsis "Python wrapper for BEDtools programs")
(description
@@ -1336,8 +1334,7 @@ well as many of the command line options.")
`(("python-numpy" ,python2-numpy)
("zlib" ,zlib)))
(native-inputs
- `(("python-nose" ,python2-nose)
- ("python-setuptools" ,python2-setuptools)))
+ `(("python-nose" ,python2-nose)))
(home-page "http://bitbucket.org/james_taylor/bx-python/";)
(synopsis "Tools for manipulating biological data")
(description
@@ -1401,7 +1398,6 @@ multiple sequence alignments.")
("zlib" ,zlib)))
(native-inputs
`(("python-cython" ,python-cython)
- ("python-setuptools" ,python-setuptools)
;; Dependencies below are are for tests only.
("samtools" ,samtools)
("bcftools" ,bcftools
42/57: gnu: python-fonttools: Remove intervening directory in site-packges.
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 1028ab13a6786f4fa8358611967f47985b9e2072
Author: Hartmut Goebel
Date: Sat Oct 8 14:54:39 2016 +0200
gnu: python-fonttools: Remove intervening directory in site-packges.
* gnu/packages/python.scm (python-fonttools): Add phase patch-setuppy.
---
gnu/packages/python.scm | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 57b54c0..86af126 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5317,12 +5317,23 @@ term.js Javascript terminal emulator library.")
(base32
"08ay3x4ijarwhl60gqx2i9jzq6pxs20p4snc2d1q5jagh4rn39lb"
(build-system python-build-system)
-(arguments '(#:test-target "check"))
+(arguments
+ '(#:test-target "check"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-setuppy
+ ;; Remove the undocumented "extra_path" argument, which adds an
+ ;; intervening directories between site-packages and the package
+ ;; directory.
+ (lambda _
+ (substitute* "setup.py"
+ (("^[ \t]*extra_path *= *'FontTools',") ""))
+ #t)
(home-page "http://github.com/behdad/fonttools";)
(synopsis "Tools to manipulate font files")
(description
"FontTools/TTX is a library to manipulate font files from Python. It
-supports reading and writinfg of TrueType/OpenType fonts, reading and writing
+supports reading and writing of TrueType/OpenType fonts, reading and writing
of AFM files, reading (and partially writing) of PS Type 1 fonts. The package
also contains a tool called “TTX” which converts TrueType/OpenType fonts to and
from an XML-based format.")
01/01: Revert "guix: python-build-system: Fix an outdated comment."
mhw pushed a commit to branch master in repository guix. commit 41935673252a00a859a9ab8132d52eecf420823b Author: Mark H Weaver Date: Thu Oct 13 15:27:16 2016 -0400 Revert "guix: python-build-system: Fix an outdated comment." This reverts commit 635a7af45d6e2105ad65d1a9531126cc232a2a50. --- guix/build/python-build-system.scm |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index e906e60..9109fb4 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -137,7 +137,8 @@ installed with setuptools." #t)) (define %standard-phases - ;; 'configure' phase is not needed. + ;; 'configure' and 'build' phases are not needed. Everything is done during + ;; 'install'. (modify-phases gnu:%standard-phases (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980) (delete 'configure)
branch master updated (4193567 -> 71d3ee1)
alezost pushed a change to branch master in repository guix. from 4193567 Revert "guix: python-build-system: Fix an outdated comment." new ce74e52 gnu: Add emacs-goto-chg. new 2edbfbf gnu: Add emacs-evil. new 71d3ee1 gnu: Add emacs-nginx-mode. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/emacs.scm | 71 +++- 1 file changed, 70 insertions(+), 1 deletion(-)
02/03: gnu: Add emacs-evil.
alezost pushed a commit to branch master
in repository guix.
commit 2edbfbf58843f20114d555445d38f6e0ffd1f4e7
Author: ng0
Date: Wed Oct 12 23:00:27 2016 +
gnu: Add emacs-evil.
* gnu/packages/emacs.scm (emacs-evil): New variable.
Co-authored-by: Alex Kost
---
gnu/packages/emacs.scm | 25 +
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1228ab2..18360e0 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2981,6 +2981,31 @@ Lua programing language}.")
news items, openrc and runscripts.")
(license license:gpl2+)))
+(define-public emacs-evil
+ (package
+(name "emacs-evil")
+(version "1.2.12")
+(source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://bitbucket.org/lyro/evil/get/";
+ version ".tar.bz2"))
+ (file-name (string-append name "-" version ".tar.bz2"))
+ (sha256
+(base32
+ "17cda9fnbq3gmjcxs3lyq64gxswrf37y864bm53rldwsk3khq2yi"
+(build-system emacs-build-system)
+(propagated-inputs
+ `(("emacs-undo-tree" ,emacs-undo-tree)
+ ("emacs-goto-chg" ,emacs-goto-chg)))
+(home-page "https://bitbucket.com/lyro/evil";)
+(synopsis "Extensible Vi layer for Emacs")
+(description
+ "Evil is an extensible vi layer for Emacs. It emulates the
+main features of Vim, and provides facilities for writing custom
+extensions.")
+(license license:gpl3+)))
+
(define-public emacs-goto-chg
(package
(name "emacs-goto-chg")
01/03: gnu: Add emacs-goto-chg.
alezost pushed a commit to branch master
in repository guix.
commit ce74e520115a6d51b237a953fdf1468bc2b54d44
Author: ng0
Date: Wed Oct 12 23:00:26 2016 +
gnu: Add emacs-goto-chg.
* gnu/packages/emacs.scm (emacs-goto-chg): New variable.
Co-authored-by: Alex Kost
---
gnu/packages/emacs.scm | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1b345db..1228ab2 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2016 David Thompson
;;; Copyright © 2016 Matthew Jordan
;;; Copyright © 2016 Roel Janssen
-;;; Copyright © 2016 ng0
+;;; Copyright © 2016 ng0
;;; Copyright © 2016 Alex Griffin
;;; Copyright © 2016 Nicolas Goaziou
;;; Copyright © 2016 Alex Vong
@@ -2981,6 +2981,29 @@ Lua programing language}.")
news items, openrc and runscripts.")
(license license:gpl2+)))
+(define-public emacs-goto-chg
+ (package
+(name "emacs-goto-chg")
+(version "1.6")
+(source
+ (origin
+ (method url-fetch)
+ ;; There is no versioned source.
+ (uri "https://www.emacswiki.org/emacs/download/goto-chg.el";)
+ (sha256
+(base32
+ "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij"
+(build-system emacs-build-system)
+;; There is no other home page.
+(home-page "https://www.emacswiki.org/emacs/goto-chg.el";)
+(synopsis "Go to the last change in the Emacs buffer")
+(description
+ "This package provides @code{M-x goto-last-change} command that goes to
+the point of the most recent edit in the current Emacs buffer. When repeated,
+go to the second most recent edit, etc. Negative argument, @kbd{C-u -}, is
+used for reverse direction.")
+(license license:gpl2+)))
+
(define-public emacs-writegood-mode
(package
(name "emacs-writegood-mode")
03/03: gnu: Add emacs-nginx-mode.
alezost pushed a commit to branch master in repository guix. commit 71d3ee1cbbccdf984c8f53d4b9596a4e06489769 Author: Arun Isaac Date: Thu Oct 13 11:19:57 2016 +0530 gnu: Add emacs-nginx-mode. * gnu/packages/emacs.scm (emacs-nginx-mode): New variable. Signed-off-by: Alex Kost --- gnu/packages/emacs.scm | 21 + 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 18360e0..6e9c181 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3231,3 +3231,24 @@ display and edit the text. This package contains the library runtime.") (license license:lgpl2.1+))) + +(define-public emacs-nginx-mode + (package +(name "emacs-nginx-mode") +(version "1.1.4") +(source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/ajc/nginx-mode/archive/v"; + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 +(base32 + "1lvkj07kq0jkskr2f61vqb5rlrbnaz9a76ikq40w6925i2r970rr" +(build-system emacs-build-system) +(home-page "https://github.com/ajc/nginx-mode";) +(synopsis "Emacs major mode for editing nginx config files") +(description "This package provides an Emacs major mode for +editing nginx config files.") +(license license:gpl2+)))
branch master updated (635a7af -> 4193567)
mhw pushed a change to branch master in repository guix. from 635a7af guix: python-build-system: Fix an outdated comment. new 4193567 Revert "guix: python-build-system: Fix an outdated comment." The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: guix/build/python-build-system.scm |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
13/14: gnu: Add gx-switchless-wah-lv2.
rekado pushed a commit to branch master in repository guix. commit d75e8f5a9254a6c9800c02429d8278bc433556e3 Author: Ricardo Wurmus Date: Wed Oct 12 20:08:24 2016 +0200 gnu: Add gx-switchless-wah-lv2. * gnu/packages/music.scm (gx-switchless-wah-lv2): New variable. --- gnu/packages/music.scm | 20 1 file changed, 20 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7209ed7..7452052 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2231,3 +2231,23 @@ adjusts the amount of harmonics." (synopsis "Slow gear audio effect") (description "This package provides the LV2 plugin \"GxSlowGear\", a slow gear audio effect to produce volume swells." + +(define-public gx-switchless-wah-lv2 + (let ((commit "1d466240c482b7ce9136aee39044068ab96f1c92") +(revision "1")) +(package (inherit gx-guvnor-lv2) + (name "gx-switchless-wah-lv2") + (version (string-append "0-" revision "." (string-take commit 9))) + (source (origin +(method git-fetch) +(uri (git-reference + (url "https://github.com/brummer10/GxSwitchlessWah.lv2";) + (commit commit))) +(sha256 + (base32 + "0g6njgsm8s76n6yys09a8w77z93pjjgqq9hzhhsrl73hhvyr9qmy")) +(file-name (string-append name "-" version "-checkout" + (home-page "https://github.com/brummer10/GxSwitchlessWah.lv2";) + (synopsis "Wah emulation with switchless activation") + (description "This package provides the LV2 plugin \"GxSwitchlessWah\", +a simulation of an analog Wah pedal with switchless activation."
11/14: gnu: Add gx-vintage-fuzz-master-lv2.
rekado pushed a commit to branch master in repository guix. commit 40bffdfa2a1039383e26ba643c2ecf4376baa029 Author: Ricardo Wurmus Date: Wed Oct 12 20:07:48 2016 +0200 gnu: Add gx-vintage-fuzz-master-lv2. * gnu/packages/music.scm (gx-vintage-fuzz-master-lv2): New variable. --- gnu/packages/music.scm | 20 1 file changed, 20 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4f8d14a..90c29aa 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2191,3 +2191,23 @@ parallel with a DarkBooster, followed by a volume control." analog simulation of the UniVox SuperFuzz pedal. In this simulation the trim pot, which is usualy in the housing, is exposed as a control parameter. It adjusts the amount of harmonics." + +(define-public gx-vintage-fuzz-master-lv2 + (let ((commit "c3ab9a3019a8381a398718b98615940b4a225b9e") +(revision "1")) +(package (inherit gx-guvnor-lv2) + (name "gx-vintage-fuzz-master-lv2") + (version (string-append "0-" revision "." (string-take commit 9))) + (source (origin +(method git-fetch) +(uri (git-reference + (url "https://github.com/brummer10/GxVintageFuzzMaster.lv2";) + (commit commit))) +(sha256 + (base32 + "0s1ghysggx6psalyhcpgjnmf38vama6jcqgbldqmxii5c2w2ybsc")) +(file-name (string-append name "-" version "-checkout" + (home-page "https://github.com/brummer10/GxVintageFuzzMaster.lv2";) + (synopsis "Fuzz effect simulation of the vintage Fuzz Master") + (description "This package provides the LV2 plugin +\"GxVintageFuzzMaster\", a simulation of the vintage Fuzz Master pedal."
03/14: gnu: Add gx-overdriver-lv2.
rekado pushed a commit to branch master in repository guix. commit cdc7a021b5232b50c097202f2ef924db50e01efe Author: Ricardo Wurmus Date: Wed Oct 12 20:05:17 2016 +0200 gnu: Add gx-overdriver-lv2. * gnu/packages/music.scm (gx-overdriver-lv2): New variable. --- gnu/packages/music.scm | 20 1 file changed, 20 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1f59719..8fff7b9 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2026,3 +2026,23 @@ simulation of an overdrive or distortion pedal for guitars.") (description "This package provides the LV2 plugin \"GxVBassPreAmp\", a pre-amplifier simulation modelled after the 1984 Vox Venue Bass 100 Pre Amp Section." + +(define-public gx-overdriver-lv2 + (let ((commit "ed71801987449414bf3adaa0dbfac68e8775f1ce") +(revision "1")) +(package (inherit gx-guvnor-lv2) + (name "gx-overdriver-lv2") + (version (string-append "0-" revision "." (string-take commit 9))) + (source (origin +(method git-fetch) +(uri (git-reference + (url "https://github.com/brummer10/GxOverDriver.lv2";) + (commit commit))) +(sha256 + (base32 + "13j614jh525fbkby79nnzwj0z1ac0c9wclyn5pfqvkmx6a7j24r8")) +(file-name (string-append name "-" version "-checkout" + (home-page "https://github.com/brummer10/GxOverDriver.lv2";) + (synopsis "Overdrive effect with level and tone control") + (description "This package provides the LV2 plugin \"GxOverDriver\", an +overdrive effect."
01/14: gnu: Add gx-guvnor-lv2.
rekado pushed a commit to branch master
in repository guix.
commit 49604680cd2574a199eb0143ee3a49425a5e14f1
Author: Ricardo Wurmus
Date: Wed Oct 12 20:04:23 2016 +0200
gnu: Add gx-guvnor-lv2.
* gnu/packages/music.scm (gx-guvnor-lv2): New variable.
---
gnu/packages/music.scm | 40
1 file changed, 40 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4539339..cb13f9a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1965,3 +1965,43 @@ CSV file in the format created by midicsv may be
converted back into a
standard MIDI file with the csvmidi program.")
(home-page "http://www.fourmilab.ch/webtools/midicsv/";)
(license license:public-domain)))
+
+(define-public gx-guvnor-lv2
+ (let ((commit "9f528a7623a201383e119bb6a2df32b18396a9d5")
+(revision "1"))
+(package
+ (name "gx-guvnor-lv2")
+ (version (string-append "0-" revision "." (string-take commit 9)))
+ (source (origin
+(method git-fetch)
+(uri (git-reference
+ (url "https://github.com/brummer10/GxGuvnor.lv2";)
+ (commit commit)))
+(sha256
+ (base32
+ "10zx84p2vd7i1yqc5ma9p17927265j4g0zfwv9rxladw0nm8y45k"))
+(file-name (string-append name "-" version "-checkout"
+ (build-system gnu-build-system)
+ (arguments
+ `(;; The check target is used only to output a warning.
+ #:tests? #f
+ #:make-flags
+ (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (substitute* "Makefile"
+ (("INSTALL_DIR = .*") "INSTALL_DIR=/lib/lv2\n")
+ ;; Avoid rebuilding everything
+ (("install : all") "install:"))
+ #t)
+ (inputs
+ `(("lv2" ,lv2)))
+ (home-page "https://github.com/brummer10/GxGuvnor.lv2";)
+ (synopsis "Overdrive/distortion pedal simulation")
+ (description "This package provides the LV2 plugin \"GxGuvnor\", a
+simulation of an overdrive or distortion pedal for guitars.")
+ ;; The LICENSE file says GPLv3 but the license headers in the files say
+ ;; GPLv2 or later.
+ (license license:gpl2+
