aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2022-10-09 09:11:26 -0500
committerPjotr Prins2022-12-04 10:56:19 -0600
commit3aecad6fb8812ef79d1464f72a6a23c298e72734 (patch)
tree149285a13c98247ed4fc8663e149a49928e054b9
parenta8481f8fda599be8af4c14663cc57e538f8117c3 (diff)
downloadguix-bioinformatics-3aecad6fb8812ef79d1464f72a6a23c298e72734.tar.gz
gn: Replace IPFS links in python24 and python with GN file server
-rw-r--r--gn/packages/python.scm25
-rw-r--r--gn/packages/python24.scm9
2 files changed, 5 insertions, 29 deletions
diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index d9c4511..9dc8297 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -251,12 +251,6 @@ Python 3 support.")
(package-with-python2 python-avro))
-; env IPFS_PATH=/export/ipfs/ ipfs add -r htmlgen/
-; added QmUD9LMJTE8q5wYkUyAwLdz2QCGXWt457iFnyYQAGfsN3j htmlgen/htmlgen-2.2.2-gn.tar.gz
-; added QmZLWsPHLFTU3hWAfdTwj3RXFrS8Ma7KEixne1suWuYqeG htmlgen
-; penguin2:~/tmp$ env IPFS_PATH=/export/ipfs/ ipfs pin add -r QmZLWsPHLFTU3hWAfdTwj3RXFrS8Ma7KEixne1suWuYqeG
-; pinned QmZLWsPHLFTU3hWAfdTwj3RXFrS8Ma7KEixne1suWuYqeG recursively
-
(define-public python2-htmlgen-gn ; guix obsolete
(package
(name "python2-htmlgen-gn")
@@ -265,7 +259,7 @@ Python 3 support.")
(method url-fetch)
;; http://files.genenetwork.org/software/contrib/htmlgen-2.2.2-gn.tar.gz
(uri (string-append
- "http://ipfs.genenetwork.org/ipfs/QmZLWsPHLFTU3hWAfdTwj3RXFrS8Ma7KEixne1suWuYqeG/htmlgen-" version "-gn.tar.gz"))
+ "https://files.genenetwork.org/software/htmlgen-2.2.2-gn.tar.gz"))
(sha256
(base32
"1lwsk56rymhrma46cbyh3g64ksmq1vsih3qkrc2vh0lpba825y7r"))
@@ -360,13 +354,6 @@ Python 3 support.")
(description #f)
(license #f)))
-; penguin2:~/tmp$ env IPFS_PATH=/export/ipfs/ ipfs add -r Imaging/
-; added QmV8Rew1re8gBTLsaqMU4bd7euFUPEpjiD572mtoz6KhPn Imaging/Imaging-1.1.6-gn.tar.gz
-; added QmdkzQpVMLZVtywpYesynt9c7H8w7hHZRYKq8woN7stfpD Imaging
-; env IPFS_PATH=/export/ipfs/ ipfs pin add -r QmdkzQpVMLZVtywpYesynt9c7H8w7hHZRYKq8woN7stfpD
-; pinned QmdkzQpVMLZVtywpYesynt9c7H8w7hHZRYKq8woN7stfpD recursively
-
-
(define-public python2-pil1-gn ; guix obsolete
(package
(name "python2-pil1") ; works with GN2
@@ -427,11 +414,6 @@ capabilities to the Python interpreter.")
"file://README"
"See 'README' in the distribution."))))
-; agrigento:~/izip/git/opensource/genenetwork$ scp ./contrib/piddle-1.0.15-gn.tgz penguin2.genenetwork.org
-; penguin2:~$ env IPFS_PATH=/export/ipfs/ ipfs add piddle-1.0.15-gn.tgz
-; added QmSMptV2VALL2s7igqRqKJ8ALNvhqFRUYVG54kEF7ac6ve piddle-1.0.15-gn.tgz
-; penguin2:~$ env IPFS_PATH=/export/ipfs/ ipfs pin add -r QmSMptV2VALL2s7igqRqKJ8ALNvhqFRUYVG54kEF7ac6ve
-; pinned QmSMptV2VALL2s7igqRqKJ8ALNvhqFRUYVG54kEF7ac6ve recursively
(define-public python2-piddle-gn ; guix obsolete
(package
@@ -440,7 +422,7 @@ capabilities to the Python interpreter.")
(source (origin
(method url-fetch)
(uri (string-append
- "http://ipfs.genenetwork.org/ipfs/QmeKcMb8AdwZNUcAaTASVpZ39ipwJn8eBoqqDfoCzQYmNk/piddle-" version ".tgz"))
+ "https://files.genenetwork.org/software/piddle-1.0.15-gn.tgz"))
(sha256
(base32
"05gjnn31v7p0kh58qixrpcizcxqf3b7zv4a5kk8nsmqwgxh0c6gq"))))
@@ -707,8 +689,7 @@ clusters (computers connected via network).")
(define GN1-thirdparty-sources
(origin
(method url-fetch/tarbomb)
- ;; ipfs get QmTPwYT2pehdxdG1TiHEzVzLgbeuhJ4utXShuz3twA84AB
- (uri "file:///gnu/store/p33a2sh3x2nhiiphdw9nly80njg6p8fi-thirdparty.tgz")
+ (uri "https://files.genenetwork.org/software/thirdparty.tgz")
(file-name "GN1-thirdparty")
(sha256
(base32
diff --git a/gn/packages/python24.scm b/gn/packages/python24.scm
index 35cd91e..7450a45 100644
--- a/gn/packages/python24.scm
+++ b/gn/packages/python24.scm
@@ -182,7 +182,7 @@ pre-defined variants."
(define GN1-thirdparty-sources
(origin
(method url-fetch/tarbomb)
- (uri "http://ipfs.genenetwork.org/ipfs/QmTPwYT2pehdxdG1TiHEzVzLgbeuhJ4utXShuz3twA84AB/thirdparty.tgz")
+ (uri "https://files.genenetwork.org/software/thirdparty.tgz")
(file-name "GN1-thirdparty")
(sha256
(base32
@@ -461,18 +461,13 @@ algorithm can be found in Gablonsky's
thesis}.")
(license license:expat)))
-; env IPFS_PATH=/export/ipfs/ ipfs add direct.so
-; added QmYUZiuAP6DJeubu69JqvRWSsn53qCZCS3FkRWgTowtWkA direct.so
-; penguin2:~/tmp$ env IPFS_PATH=/export/ipfs/ ipfs pin add QmYUZiuAP6DJeubu69JqvRWSsn53qCZCS3FkRWgTowtWkA
-; pinned QmYUZiuAP6DJeubu69JqvRWSsn53qCZCS3FkRWgTowtWkA recursively
-
(define-public python24-direct-gn
(package
(name "python24-direct-gn")
(version "GN")
(source (origin
(method url-fetch)
- (uri "http://ipfs.genenetwork.org/ipfs/QmYUZiuAP6DJeubu69JqvRWSsn53qCZCS3FkRWgTowtWkA")
+ (uri "https://files.genenetwork.org/software/direct.so")
(file-name "direct.so")
(sha256
(base32