From: "Gábor Boskovits" <boskovits@gmail.com>
To: 29146@debbugs.gnu.org
Cc: "Gábor Boskovits" <boskovits@gmail.com>
Subject: [bug#29146] [PATCH] gnu: add python-networkx2.
Date: Mon, 6 Nov 2017 12:15:32 +0100 [thread overview]
Message-ID: <20171106111532.663-1-boskovits@gmail.com> (raw)
In-Reply-To: <20171104204510.1673-1-boskovits@gmail.com>
* gnu/packages/python.scm (python-networkx2): New variable.
* gnu/local.mk (python-networkx2-reproducible-build.patch): New patch registered.
* gnu/package/patches/python-networkx2-reproducible-build.patch: New file.
---
gnu/local.mk | 1 +
.../python-networkx2-reproducible-build.patch | 29 ++++++++++++++++++++++
gnu/packages/python.scm | 27 ++++++++++++++++++++
3 files changed, 57 insertions(+)
create mode 100644 gnu/packages/patches/python-networkx2-reproducible-build.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index dbfe6829e..85969a041 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -993,6 +993,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-genshi-isstring-helper.patch \
%D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
+ %D%/packages/pathces/python-networkx2-reproducible-build.patch \
%D%/packages/patches/python-nose-timer-drop-ordereddict.patch \
%D%/packages/patches/python-parse-too-many-fields.patch \
%D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
diff --git a/gnu/packages/patches/python-networkx2-reproducible-build.patch b/gnu/packages/patches/python-networkx2-reproducible-build.patch
new file mode 100644
index 000000000..8274767ab
--- /dev/null
+++ b/gnu/packages/patches/python-networkx2-reproducible-build.patch
@@ -0,0 +1,29 @@
+From c065b972ed294769a41936d6b9feb336473af5d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <boskovits@gmail.com>
+Date: Sat, 4 Nov 2017 15:28:47 +0100
+Subject: Fix SOURCE_DATE_EPOCH ignored bug (#2735)
+
+* Fix SOURCE_DATE_EPOCH ignored bug
+
+Fix a bug in networkx/release.py that makes build
+non-reproducible.
+---
+ networkx/release.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/networkx/release.py b/networkx/release.py
+index e81fc0c0..6322cf0d 100644
+--- a/networkx/release.py
++++ b/networkx/release.py
+@@ -135,7 +135,7 @@ def get_revision():
+
+ def get_info(dynamic=True):
+ # Date information
+- date_info = datetime.datetime.now()
++ date_info = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
+ date = time.asctime(date_info.timetuple())
+
+ revision, version, version_info, vcs_info = None, None, None, None
+--
+2.14.2
+
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e506f6dfd..4965d9185 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6624,6 +6624,33 @@ of the structure, dynamics, and functions of complex networks.")
(define-public python2-networkx
(package-with-python2 python-networkx))
+;define new package, because current version of python-colormath does not compile
+(define-public python-networkx2
+ (package (inherit python-networkx)
+ (name "python-networkx2")
+ (version "2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/networkx/networkx.git")
+ (commit "networkx-2.0")))
+ (sha256
+ (base32
+ "0wsfmbsqzvpb0vdz09rf6rfrkvyq56r8863nn3g4x0m7swygi1w3"))
+ (patches
+ (search-patches "python-networkx2-reproducible-build.patch"))))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'reset-gzip-timestamps 'fix-permissions
+ (lambda _
+ (chmod (string-append (assoc-ref %outputs "out") "/lib/python3.5/site-packages/networkx/generators/atlas.dat.gz") #o666)
+ (chmod (string-append (assoc-ref %outputs "out") "/share/doc/networkx-2.0/examples/drawing/knuth_miles.txt.gz") #o666)
+ (chmod (string-append (assoc-ref %outputs "out") "/share/doc/networkx-2.0/examples/graph/roget_dat.txt.gz") #o666)
+ (chmod (string-append (assoc-ref %outputs "out") "/share/doc/networkx-2.0/examples/graph/words_dat.txt.gz") #o666)
+ #t)))))))
+
(define-public snakemake
(package
(name "snakemake")
--
2.14.2
prev parent reply other threads:[~2017-11-06 11:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-04 20:45 [bug#29146] [PATCH] gnu: add python-networkx2 Gábor Boskovits
2017-11-05 16:39 ` Marius Bakke
2017-11-06 10:56 ` Gábor Boskovits
2017-11-07 20:23 ` bug#29146: " Marius Bakke
2017-11-06 11:15 ` Gábor Boskovits [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171106111532.663-1-boskovits@gmail.com \
--to=boskovits@gmail.com \
--cc=29146@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.