aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-13 15:52:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-13 15:52:23 -0400
commit2dc10840e7c49b5ca97d6b1b2a3f68c40fdb78ef (patch)
tree207fac2266d58ffa3ab2d0a7362dfdc05bab290f
parentb88ecbdc1bf1826e3361732484263bd359cef8d3 (diff)
parentcff772031dd1fc924f717b3d22b5c6ef2612f4de (diff)
Merge branch 'master' of ssh://git-annex.branchable.com3.20120113
-rw-r--r--doc/NixOS.mdwn5
-rw-r--r--doc/install.mdwn1
-rw-r--r--doc/news/version_3.20120106/comment_3_29ccda9ac458fd5cc9ec5508c62df6ea._comment12
3 files changed, 18 insertions, 0 deletions
diff --git a/doc/NixOS.mdwn b/doc/NixOS.mdwn
new file mode 100644
index 000000000..864184a23
--- /dev/null
+++ b/doc/NixOS.mdwn
@@ -0,0 +1,5 @@
+Users of the [Nix package manager](http://nixos.org/) can install it by running:
+
+ nix-env -i git-annex
+
+The build status of the package within Nix can be seen on the [Hydra Build Farm](http://hydra.nixos.org/job/nixpkgs/trunk/gitAndTools.gitAnnex).
diff --git a/doc/install.mdwn b/doc/install.mdwn
index a5d029a06..7da46b351 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -7,6 +7,7 @@
* [[FreeBSD]]
* [[openSUSE]]
* [[ArchLinux]]
+* [[NixOS]]
* Windows: [[sorry, not possible yet|todo/windows_support]]
## Using cabal
diff --git a/doc/news/version_3.20120106/comment_3_29ccda9ac458fd5cc9ec5508c62df6ea._comment b/doc/news/version_3.20120106/comment_3_29ccda9ac458fd5cc9ec5508c62df6ea._comment
new file mode 100644
index 000000000..1bb0c32cb
--- /dev/null
+++ b/doc/news/version_3.20120106/comment_3_29ccda9ac458fd5cc9ec5508c62df6ea._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://peter-simons.myopenid.com/"
+ ip="77.186.134.113"
+ subject="comment 3"
+ date="2012-01-13T18:48:28Z"
+ content="""
+For what it's worth, the package `cabal-install` is pretty good for uploading packages to Hackages, among other things. It allows users to configure their username/password, and then making a release to Hackage is as simple as running:
+
+ cabal upload foo-version.tar.gz
+
+I use that to do releases of my stuff, too, and I'm quite happy. `cabal-install` has other features, too, of course.
+"""]]