aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2016-04-04 11:38:15 +0000
committerPjotr Prins2016-04-20 10:19:12 +0000
commitaa47bf9d94c3f5232cabfd1bef2eb3b54241d076 (patch)
tree3e3d0398aba8d4bf3e05621691a9b24f5689b2a2
parent87cb8afc55a22f795ed2f0df42d9e952cdbaaa2f (diff)
downloadgenenetwork2-aa47bf9d94c3f5232cabfd1bef2eb3b54241d076.tar.gz
README: point to gn-latest SHA values
-rw-r--r--README.md2
-rw-r--r--doc/README.org17
2 files changed, 10 insertions, 9 deletions
diff --git a/README.md b/README.md
index ce435f61..4fe739bf 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ developers). See the [installation docs](doc/README.org).
## License
The GeneNetwork2 source code is released under the Affero General
-Public License 3 (AGPLv3). See also LICENSE.txt
+Public License 3 (AGPLv3). See [LICENSE.txt](LICENSE.txt).
## More information
diff --git a/doc/README.org b/doc/README.org
index 1894d8d3..5fffa108 100644
--- a/doc/README.org
+++ b/doc/README.org
@@ -14,14 +14,15 @@
* Introduction
-Large system deployments tend to get very complex. In this document we
-explain the GeneNetwork deployment system which is based on GNU Guix
-(see also Pjotr's [[https://github.com/pjotrp/guix-notes/blob/master/README.md][Guix-notes]]). The Guix system can be used to install
-GN with all its files and dependencies.
-
-The official installation path is via a GNU Guix installation from a
-checked out version of the Guix package tree (this is required for
-reproducibility).
+Large system deployments can get very complex. In this document we
+explain the GeneNetwork version 2 (GN2) reproducible deployment system
+which is based on GNU Guix (see also Pjotr's [[https://github.com/pjotrp/guix-notes/blob/master/README.md][Guix-notes]]). The Guix
+system can be used to install GN with all its files and dependencies.
+
+The official installation path is from a checked out version of the
+main Guix package tree and that of the Genenetwork package
+tree. Current supported versions can be found as the SHA values of
+'gn-latest' branches of [[https://github.com/genenetwork/guix-bioinformatics/tree/gn-latest][Guix bioinformatics]] and [[https://github.com/genenetwork/guix/tree/gn-latest][GNU Guix main]].
* Source deployment
** Install guix