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 08cba8ab5886899d1f58abd6a32484ff3d35327a
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
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
