aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDannyArends2016-11-08 16:29:50 +0100
committerDannyArends2016-11-08 16:29:50 +0100
commitc84f4b662169adb518e6775d97d71ba4593ade11 (patch)
tree8e95ac1d289a5730854f13d18d98ac020508d700 /doc
parent3fc1902c20d37038e06e94f02a7ff0bb288e0e4d (diff)
parent4cd2b9769c726e53fed636c1201b93e752da34f1 (diff)
downloadgenenetwork2-c84f4b662169adb518e6775d97d71ba4593ade11.tar.gz
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing
Diffstat (limited to 'doc')
-rw-r--r--doc/README.org14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/README.org b/doc/README.org
index cf76d7ab..9c57953d 100644
--- a/doc/README.org
+++ b/doc/README.org
@@ -105,15 +105,15 @@ guix package -i git
export GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt
#+end_src
-check out the git repositories (gn-stable branch)
+check out the git repositories (gn-deploy branch)
#+begin_src bash
cd ~
mkdir genenetwork
cd genenetwork
-git clone --branch gn-stable https://github.com/genenetwork/guix-bioinformatics
-git clone --branch gn-stable --recursive https://github.com/genenetwork/guix guix-gn-stable
-cd guix-gn-stable
+git clone --branch gn-deploy https://github.com/genenetwork/guix-bioinformatics
+git clone --branch gn-deploy --recursive https://github.com/genenetwork/guix guix-gn-deploy
+cd guix-gn-deploy
#+end_src bash
** Step 3: Authorize the GN Guix server
@@ -147,7 +147,7 @@ GNU Guix package path by pointing the package path to our repository:
#+begin_src bash
rm /root/.config/guix/latest
-ln -s ~/genenetwork/guix-gn-stable/ /root/.config/guix/latest
+ln -s ~/genenetwork/guix-gn-deploy/ /root/.config/guix/latest
#+end_src
Now check whether you can find the GN2 package with
@@ -368,7 +368,7 @@ Create, install and run a recent version of the guix-daemon by
compiling the guix repository you have installed with git in
step 2. Follow [[https://github.com/pjotrp/guix-notes/blob/master/INSTALL.org#building-gnu-guix-from-source-using-guix][these]] steps carefully after
-: cd ~/genenetwork/guix-gn-stable
+: cd ~/genenetwork/guix-gn-deploy
Make sure to restart the guix daemon and run guix client from this
directory.
@@ -487,7 +487,7 @@ and a download of the test database.
<pjotrp> right?
<user01> yep
<user01> set to the ones in ~/.guix-profile/
-<pjotrp> good, and you are in gn-stable-guix repo [07:06]
+<pjotrp> good, and you are in gn-deploy-guix repo [07:06]
<user01> yep [07:07]
<pjotrp> git log shows