diff options
author | Peter Simons <simons@cryp.to> | 2015-09-09 21:30:03 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2015-09-09 21:30:42 +0200 |
commit | d6396cc5d884113c52a8d57506f16b1aaa3ef854 (patch) | |
tree | 6bba690bb8d590ede4a27ec6c245508601f44703 /doc | |
parent | 1aebbb7b6ae4720307cf168d41336e8363966091 (diff) |
doc: update haskell-users-guide.xml to reflect that we've update GHC 7.10.1 to 7.10.2
Diffstat (limited to 'doc')
-rw-r--r-- | doc/haskell-users-guide.xml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml index c3d4ae8fb51a5..87c8e1b92ddb1 100644 --- a/doc/haskell-users-guide.xml +++ b/doc/haskell-users-guide.xml @@ -119,7 +119,7 @@ $ nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc763 </programlisting> <para> The name <literal>haskellPackages</literal> is really just a synonym - for <literal>haskell.packages.ghc7101</literal>, because we prefer + for <literal>haskell.packages.ghc7102</literal>, because we prefer that package set internally and recommend it to our users as their default choice, but ultimately you are free to compile your Haskell packages with any GHC version you please. The following command @@ -134,7 +134,7 @@ haskell.compiler.ghc722 ghc-7.2.2 haskell.compiler.ghc742 ghc-7.4.2 haskell.compiler.ghc763 ghc-7.6.3 haskell.compiler.ghc784 ghc-7.8.4 -haskell.compiler.ghc7101 ghc-7.10.1 +haskell.compiler.ghc7102 ghc-7.10.2 haskell.compiler.ghcHEAD ghc-7.11.20150402 haskell.compiler.ghcNokinds ghc-nokinds-7.11.20150704 haskell.compiler.ghcjs ghcjs-0.1.0 @@ -167,7 +167,7 @@ $ nix-env -f "<nixpkgs>" -iA haskellPackages.ghc haskellPackages <para> Instead of the default package set <literal>haskellPackages</literal>, you can also use the more - precise name <literal>haskell.compiler.ghc7101</literal>, which + precise name <literal>haskell.compiler.ghc7102</literal>, which has the advantage that it refers to the same GHC version regardless of what Nixpkgs considers "default" at any given time. @@ -254,7 +254,7 @@ $ nix-shell -p haskell.compiler.ghc784 --command "cabal configure" $ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" [nix-shell:~]$ ghc-pkg list mtl -/nix/store/zy79...-ghc-7.10.1/lib/ghc-7.10.1/package.conf.d: +/nix/store/zy79...-ghc-7.10.2/lib/ghc-7.10.2/package.conf.d: mtl-2.2.1 </programlisting> <para> @@ -266,7 +266,7 @@ $ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" { packageOverrides = super: let self = super.pkgs; in { - myHaskellEnv = self.haskell.packages.ghc7101.ghcWithPackages + myHaskellEnv = self.haskell.packages.ghc7102.ghcWithPackages (haskellPackages: with haskellPackages; [ # libraries arrows async cgi criterion @@ -281,7 +281,7 @@ $ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" <literal>nix-env -f "<nixpkgs>" -iA myHaskellEnv</literal>. If you'd like to switch that development environment to a different version of GHC, just replace the - <literal>ghc7101</literal> bit in the previous definition with the + <literal>ghc7102</literal> bit in the previous definition with the appropriate name. Of course, it's also possible to define any number of these development environments! (You can't install two of them into the same profile at the same time, though, because @@ -296,11 +296,11 @@ $ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" <programlisting> $ cat $(type -p ghc) #! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e -export NIX_GHC=/nix/store/19sm...-ghc-7.10.1/bin/ghc -export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.1/bin/ghc-pkg -export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.1/share/doc/ghc/html -export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.1/lib/ghc-7.10.1 -exec /nix/store/j50p...-ghc-7.10.1/bin/ghc "-B$NIX_GHC_LIBDIR" "$@" +export NIX_GHC=/nix/store/19sm...-ghc-7.10.2/bin/ghc +export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.2/bin/ghc-pkg +export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.2/share/doc/ghc/html +export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.2/lib/ghc-7.10.2 +exec /nix/store/j50p...-ghc-7.10.2/bin/ghc "-B$NIX_GHC_LIBDIR" "$@" </programlisting> <para> The variables <literal>$NIX_GHC</literal>, @@ -371,7 +371,7 @@ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc <literal>shell.nix</literal> that looks like this: </para> <programlisting> -{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }: +{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }: let inherit (nixpkgs) pkgs; ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [ @@ -451,7 +451,7 @@ $ cabal2nix . >foo.nix <literal>default.nix</literal>: </para> <programlisting> -{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }: +{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }: nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { } </programlisting> <para> @@ -459,7 +459,7 @@ nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { } <literal>shell.nix</literal>: </para> <programlisting> -{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }: +{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }: (import ./default.nix { inherit nixpkgs compiler; }).env </programlisting> <para> |