Merge remote-tracking branch 'origin/master' into hkm/fix-warnings

Author: hamishmack

builder/comp-builder.nix

@@ -371,7 +371,14 @@ let
                 echo "package-id $id" >> $out/envDep
               else
                 echo 'ERROR: ${package.identifier.name} id could not be found with ${target-pkg-and-db}'
-                exit 0
+                exit 1
+              fi
+              if ver=$(${target-pkg-and-db} field ${package.identifier.name} version --simple-output); then
+                echo "constraint: ${package.identifier.name} == $ver" >> $out/exactDep/cabal.config
+                echo "constraint: ${package.identifier.name} installed" >> $out/exactDep/cabal.config
+              else
+                echo 'ERROR: ${package.identifier.name} version could not be found with ${target-pkg-and-db}'
+                exit 1
               fi
             ''
             else
@@ -389,17 +396,10 @@ let
                 echo "--dependency=${package.identifier.name}:''${name#z-${package.identifier.name}-z-}=$id" >> $out/exactDep/configure-flags
               else
                 echo 'ERROR: ${package.identifier.name} id could not be found with ${target-pkg-and-db}'
-                exit 0
+                exit 1
               fi
               '')
         }
-        if ver=$(${target-pkg-and-db} field ${package.identifier.name} version --simple-output); then
-          echo "constraint: ${package.identifier.name} == $ver" >> $out/exactDep/cabal.config
-          echo "constraint: ${package.identifier.name} installed" >> $out/exactDep/cabal.config
-        else
-          echo 'ERROR: ${package.identifier.name} version could not be found with ${target-pkg-and-db}'
-          exit 0
-        fi
       ''}
       ${(lib.optionalString (haskellLib.isTest componentId || haskellLib.isBenchmark componentId) ''
         mkdir -p $out/bin

builder/make-config-files.nix

@@ -93,12 +93,24 @@ let
 
     for l in "${cfgFiles}"; do
       if [ -n "$l" ]; then
-        cp -f "$l/${packageCfgDir}/"*.conf $out/${packageCfgDir}
+        files=("$l/${packageCfgDir}/"*.conf)
+        if (( ''${#files[@]} )); then
+          cp -f "''${files[@]}" $out/${packageCfgDir}
+        else
+          echo "$l/${packageCfgDir} didn't contain any *.conf files!"
+          exit 1
+        fi
       fi
     done
     for l in "${libs}"; do
       if [ -n "$l" ]; then
-        cp -f "$l/package.conf.d/"*.conf $out/${packageCfgDir}
+        files=("$l/package.conf.d/"*.conf)
+        if (( ''${#files[@]} )); then
+          cp -f "''${files[@]}" $out/${packageCfgDir}
+        else
+          echo "$l/package.conf.d didn't contain any *.conf files!"
+          exit 1
+        fi
       fi
     done
 

changelog.md

@@ -1,6 +1,10 @@
 This file contains a summary of changes to Haskell.nix and `nix-tools`
 that will impact users.
 
+## Feb 8, 2021
+* Removed older versions of haskell-language-server from custom-tools
+  (0.8.0 is in hackage so we can still get that version).
+
 ## Jan 14, 2021
 * Added support for cross package refs (with a project).  Relative
   directory references between packages within a project should now

ci.nix

@@ -25,15 +25,14 @@
     # Update supported-ghc-versions.md to reflect any changes made here.
     {
       ghc865 = true;
+      ghc884 = false; # Just included because the native version is needed at eval time
     } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
-      ghc883 = false;
       ghc884 = true;
-      ghc8102 = false;
-      ghc8103 = true;
+      ghc8104 = true;
       ghc810220201118 = false;
     } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
       ghc884 = true;
-      ghc8103 = true;
+      ghc8104 = true;
     });
   systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
     # I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!
@@ -47,13 +46,16 @@
     in lib.optionalAttrs (nixpkgsName == "R2009" && (__elem compiler-nix-name ["ghc865" "ghc884"])) {
     inherit (lib.systems.examples) ghcjs;
   } // lib.optionalAttrs (system == "x86_64-linux" && (
-         (nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc810220201118"])
+         (nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810220201118"])
       || (nixpkgsName == "R2003" && __elem compiler-nix-name ["ghc865"]))) {
     # Windows cross compilation is currently broken on macOS
     inherit (lib.systems.examples) mingwW64;
-  } // lib.optionalAttrs (system == "x86_64-linux") {
+  } // lib.optionalAttrs (system == "x86_64-linux"
+      && !(nixpkgsName == "R2003" && compiler-nix-name == "ghc884")) {
     # Musl cross only works on linux
     # aarch64 cross only works on linux
+    # We also skip these for the R2003 was build of ghc884 (we only need the
+    # native so ifdLevel 1 includes compiler needed in ifdLevel2 eval)
     inherit (lib.systems.examples) musl64 aarch64-multiplatform;
   };
   isDisabled = d:

compiler/ghc/default.nix

@@ -285,19 +285,19 @@ stdenv.mkDerivation (rec {
     # Sanity checks for https://github.com/input-output-hk/haskell.nix/issues/660
     if ! "$out/bin/${targetPrefix}ghc" --version; then
       echo "ERROR: Missing file $out/bin/${targetPrefix}ghc"
-      exit 0
+      exit 1
     fi
     if ! "$out/bin/${targetPrefix}ghc-pkg" --version; then
       echo "ERROR: Missing file $out/bin/${targetPrefix}ghc-pkg"
-      exit 0
+      exit 1
     fi
     if [[ ! -d "$out/lib/${targetPrefix}ghc-${version}" ]]; then
       echo "ERROR: Missing directory $out/lib/${targetPrefix}ghc-${version}"
-      exit 0
+      exit 1
     fi
     if (( $(ls -1 "$out/lib/${targetPrefix}ghc-${version}" | wc -l) < 30 )); then
       echo "ERROR: Expected more files in $out/lib/${targetPrefix}ghc-${version}"
-      exit 0
+      exit 1
     fi
   '';
 

docs/reference/supported-ghc-versions.md

@@ -5,7 +5,7 @@ The following GHC versions are defined in `haskell.nix` (i.e. there is a derivat
 - 8.4.4
 - 8.6.{1,2,3,4,5}
 - 8.8.{1,2,3,4}
-- 8.10.{1,2,3}
+- 8.10.{1,2,3,4}
 
 The following table shows the nixpkgs/GHC versions which are built by CI, and which of those are tested.
 If you use a combination of nixpkgs version and GHC version which is in this table, you should get cache hits from our cache.
@@ -15,13 +15,11 @@ The "nixpkgs versions" refer to the versions that `haskell.nix` provides; if you
 |------------------|-------------|---------|
 | 20.03            | 8.6.5       | Y       |
 | 20.09            | 8.6.5       | Y       |
-| 20.09            | 8.8.3       | N       |
 | 20.09            | 8.8.4       | Y       |
-| 20.09            | 8.10.2      | N       |
-| 20.09            | 8.10.3      | Y       |
+| 20.09            | 8.10.4      | Y       |
 | nixpkgs-unstable | 8.6.5       | Y       |
 | nixpkgs-unstable | 8.8.4       | Y       |
-| nixpkgs-unstable | 8.10.3      | Y       |
+| nixpkgs-unstable | 8.10.4      | Y       |
 
 See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix) for the source of truth about what is built and tested.
 

hackage-src.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/input-output-hk/hackage.nix",
-  "rev": "b921f6fba13a7b5a282803b903b6951ad0968106",
-  "date": "2021-02-05T01:15:42+00:00",
-  "path": "/nix/store/34czr3nhx43gqgf7q6kwc65yjmpfj4s3-hackage.nix-b921f6f",
-  "sha256": "1y28rz8kcp7nvqsffd3kv3kzdxzarmcpnn062r4jxbdpr0wk29lw",
+  "rev": "848cd2e840a6cc9ea11108d468fd9cd5fa12ab06",
+  "date": "2021-02-10T01:11:00+00:00",
+  "path": "/nix/store/daab1587b53ihlxr4lx8rw8yfp1681rx-hackage.nix-848cd2e",
+  "sha256": "1awg54wyq2v9qds14wrrmxhh5y4xzrs2fvzmip3ywd3qq50ld54r",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false