Merge remote-tracking branch 'origin/master' into hkm/hls-ghc92

Author: hamishmack

builder/make-config-files.nix

@@ -11,7 +11,9 @@ let
 
   flagsAndConfig = field: xs: lib.optionalString (xs != []) ''
     echo ${lib.concatStringsSep " " (map (x: "--${field}=${x}") xs)} >> $out/configure-flags
-    echo "${field}: ${lib.concatStringsSep " " xs}" >> $out/cabal.config
+    ${lib.concatStrings (map (x: ''
+      echo "${field}: ${x}" >> $out/cabal.config
+    '') xs)}
   '';
 
   target-pkg = "${ghc.targetPrefix}ghc-pkg";
@@ -127,8 +129,11 @@ let
     done
 
     ${ # Note: we pass `clear` first to ensure that we never consult the implicit global package db.
-      flagsAndConfig "package-db" ["clear" "$out/${packageCfgDir}"]
+       # However in `cabal.config` `cabal` requires `global` to be first.
+      flagsAndConfig "package-db" ["clear"]
     }
+    echo "package-db: global" >> $out/cabal.config
+    ${ flagsAndConfig "package-db" ["$out/${packageCfgDir}"] }
 
     echo ${lib.concatStringsSep " " (lib.mapAttrsToList (fname: val: "--flags=${lib.optionalString (!val) "-" + fname}") flags)} >> $out/configure-flags
 

docs/tutorials/development.md

@@ -175,7 +175,7 @@ Emacs to use it. The way I do it is:
 
 ## Using `nix repl`
 
-It's sometimes useful to load [Haskell.nix][] in the REPL to explore
+It's sometimes useful to load [Haskell.nix][] in the [REPL](https://nixos.org/manual/nix/unstable/command-ref/new-cli/nix3-repl.html) to explore
 attrsets and try examples.
 
 ```
@@ -190,19 +190,19 @@ rec {
 Load the example file:
 
 ```
-$ nix repl '<nixpkgs>' example.nix
-Welcome to Nix version 2.3pre6631_e58a7144. Type :? for help.
+$ nix repl
+Welcome to Nix 2.10.3. Type :? for help.
 
-Loading '<nixpkgs>'...
-Added 10403 variables.
+nix-repl> :l <nixpkgs>
+Added 16938 variables.
 
-Loading 'example.nix'...
+nix-repl> :l example.nix
 Added 2 variables.
 
 nix-repl> lib.take 5 pkgNames
-[ "ALUT" "ANum" "Allure" "Boolean" "BoundedChan" ]
+[ "AC-Angle" "ALUT" "ANum" "Agda" "Allure" ]
 
-nix-repl>
+nix-repl> :q
 ```
 
 Now that you have `nix-tools` and are able to import [Haskell.nix][],

docs/tutorials/getting-started.md

@@ -14,7 +14,7 @@ IMPORTANT: you *must* do this or you *will* build several copies of GHC!
 
 You can configure Nix to use our binary cache, which is pushed to by CI, so should contain the artifacts that you need.
 
-You need to add the following sections to `/etc/nix/nix.conf` or, if you are a trusted user, `~/.config/nix/nix.conf` (if you don't know what a "trusted user" is, you probably want to do the former).
+You need to add the following sections to `/etc/nix/nix.conf` or, if you are a trusted user, `~/.config/nix/nix.conf` (if you don't know what a "trusted user" is, you probably want to do the former). `[...]` denote any existing entries.
 
 ```
 trusted-public-keys = [...] hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= [...]

flake.lock

@@ -30,7 +30,7 @@ in recurseIntoAttrs {
   };
 
   # Used for testing externally with nix-shell (../tests.sh).
-  test-shell = project.shellFor { tools = { cabal = "3.6.2.0"; }; withHoogle = !__elem compiler-nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924"]; };
+  test-shell = project.shellFor { tools = { cabal = "latest"; }; withHoogle = !__elem compiler-nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924"]; };
 
   run = stdenv.mkDerivation {
     name = "cabal-simple-test";

test/cabal-simple/default.nix

@@ -23,7 +23,7 @@ let
     packages = ps: with ps; [ pkga pkgb ];
     # This adds cabal-install to the shell, which helps tests because
     # they use a nix-shell --pure. Normally you would BYO cabal-install.
-    tools = { cabal = "3.2.0.0"; };
+    tools = { cabal = "latest"; };
     exactDeps = true;
     # Avoid duplicate package issues when runghc looks for packages
     packageSetupDeps = false;
@@ -34,7 +34,7 @@ let
     packages = ps: with ps; [ pkga ];
     # This adds cabal-install to the shell, which helps tests because
     # they use a nix-shell --pure. Normally you would BYO cabal-install.
-    tools = { cabal = "3.2.0.0"; };
+    tools = { cabal = "latest"; };
     exactDeps = true;
     # Avoid duplicate package issues when runghc looks for packages
     packageSetupDeps = false;
@@ -46,7 +46,7 @@ let
     #   packages = ps: with ps; [ pkga pkgb ];
     # This adds cabal-install to the shell, which helps tests because
     # they use a nix-shell --pure. Normally you would BYO cabal-install.
-    tools = { cabal = "3.2.0.0"; };
+    tools = { cabal = "latest"; };
     # Avoid duplicate package issues when runghc looks for packages
     packageSetupDeps = false;
   };