Browse Source

rename haskell repository and tweaks

Peter Salvatore 10 years ago
parent
commit
5ace0d632c
2 changed files with 7 additions and 8 deletions
  1. 6 7
      haskell/content.md
  2. 1 1
      update.sh

+ 6 - 7
haskell/content.md

@@ -10,22 +10,21 @@ A large number of production-quality Haskell libraries are available from [Hacka
 
 ## About this image
 
-This image ships a minimal Haskell toolchain with the following packages:
+This image ships a minimal Haskell toolchain with the following packages from the [hvr PPA](https://launchpad.net/~hvr/+archive/ubuntu/ghc):
 
 -	`ghc`
 -	`alex`
 -	`cabal-install`
 -	`happy`
 
+The most recent GHC release in the 7.8 series is also available, though no longer receiving updates from upstream, so users are encouraged to upgrade to 7.10.
+
 ## How to use this image
 
 Start an interactive interpreter session with `ghci`:
 
-	$ docker run -it --rm haskell:7.8
-	GHCi, version 7.8.3: http://www.haskell.org/ghc/  :? for help
-	Loading package ghc-prim ... linking ... done.
-	Loading package integer-gmp ... linking ... done.
-	Loading package base ... linking ... done.
+	$ docker run -it --rm haskell:7.10
+	GHCi, version 7.10.1: http://www.haskell.org/ghc/  :? for help
 	Prelude>
 
 Dockerize a [Hackage](http://hackage.haskell.org) app with a Dockerfile inheriting from the base image:
@@ -61,4 +60,4 @@ Iteratively develop then ship a Haskell app with a Dockerfile utilizing the buil
 
 ### Examples
 
-See the application snippet above in more detail in the [example snap application](https://github.com/darinmorrison/docker-haskell/tree/master/examples/7.8.3/snap).
+See the application snippet above in more detail in the [example snap application](https://github.com/freebroccolo/docker-haskell/tree/master/examples/7.8.3/snap).

+ 1 - 1
update.sh

@@ -33,7 +33,7 @@ declare -A otherRepos=(
 	[docker-dev]='https://github.com/docker/docker'
 	[fedora]='https://github.com/lsm5/docker-brew-fedora'
 	[glassfish]='https://github.com/aws/aws-eb-glassfish'
-	[haskell]='https://github.com/darinmorrison/docker-haskell'
+	[haskell]='https://github.com/freebroccolo/docker-haskell'
 	[hipache]='https://github.com/dotcloud/hipache'
 	[hylang]='https://github.com/hylang/hy'
 	[iojs]='https://github.com/iojs/docker-iojs'