diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-29 15:29:45 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-29 15:29:45 +0100 |
| commit | 21b808cd76bb3db3ba0cd2053e7a26447d9ed81f (patch) | |
| tree | 40d48f7c9f7735f1766c0a3c8ca4737e025572e7 /doc | |
| parent | 29142e67b11f8f9f63d1395c1a1b9d21b8f633c9 (diff) | |
| parent | 79217339d26ff51ccacf10967de700d785f088e5 (diff) | |
| download | nixpkgs-21b808cd76bb3db3ba0cd2053e7a26447d9ed81f.tar nixpkgs-21b808cd76bb3db3ba0cd2053e7a26447d9ed81f.tar.gz nixpkgs-21b808cd76bb3db3ba0cd2053e7a26447d9ed81f.tar.bz2 nixpkgs-21b808cd76bb3db3ba0cd2053e7a26447d9ed81f.tar.lz nixpkgs-21b808cd76bb3db3ba0cd2053e7a26447d9ed81f.tar.xz nixpkgs-21b808cd76bb3db3ba0cd2053e7a26447d9ed81f.tar.zst nixpkgs-21b808cd76bb3db3ba0cd2053e7a26447d9ed81f.zip | |
Merge staging-next into staging
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/languages-frameworks/crystal.section.md | 2 | ||||
| -rw-r--r-- | doc/languages-frameworks/haskell.section.md | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md index 07bfc65a553..af0853dbf75 100644 --- a/doc/languages-frameworks/crystal.section.md +++ b/doc/languages-frameworks/crystal.section.md @@ -66,6 +66,6 @@ crystal.buildCrystalPackage rec { shardsFile = ./shards.nix; crystalBinaries.mint.src = "src/mint.cr"; - buildInputs = [ openssl_1_0_2 ]; + buildInputs = [ openssl ]; } ``` diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index b485ec583ec..944c17a137e 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -84,18 +84,18 @@ nix-env -qaP -A nixos.haskellPackages nix-env -iA nixos.haskellPackages.cabal-install ``` -Our current default compiler is GHC 8.6.x and the `haskellPackages` set +Our current default compiler is GHC 8.8.x and the `haskellPackages` set contains packages built with that particular version. Nixpkgs contains the last three major releases of GHC and there is a whole family of package sets available that defines Hackage packages built with each of those compilers, too: ```shell -nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc844 -nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc882 +nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc865 +nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc8101 ``` The name `haskellPackages` is really just a synonym for -`haskell.packages.ghc865`, because we prefer that package set internally and +`haskell.packages.ghc882`, 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 displays the complete list of available compilers: @@ -112,8 +112,10 @@ haskell.compiler.ghc865 ghc-8.6.5 haskell.compiler.integer-simple.ghc865 ghc-8.6.5 haskell.compiler.ghc881 ghc-8.8.1 haskell.compiler.integer-simple.ghc881 ghc-8.8.1 -haskell.compiler.ghc882 ghc-8.8.1.20191211 -haskell.compiler.integer-simple.ghc882 ghc-8.8.1.20191211 +haskell.compiler.ghc882 ghc-8.8.2 +haskell.compiler.integer-simple.ghc882 ghc-8.8.2 +haskell.compiler.ghc883 ghc-8.8.3 +haskell.compiler.integer-simple.ghc883 ghc-8.8.3 haskell.compiler.ghcjs ghcjs-8.6.0.1 ``` |