Merge remote-tracking branch 'origin/master' into hkm/combined-derivations

hamishmack · hamishmack · commit af62a325a05d · 2022-08-19T00:07:13.000+12:00
# Conflicts:
#	builder/make-config-files.nix
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,9 @@ docs/reference/modules.md
 result*
 /nt
 
+# https://github.com/nix-community/nix-direnv
+.direnv
+
 # Created by https://www.gitignore.io/api/haskell,emacs,vim
 
 ### Emacs ###
diff --git a/build.nix b/build.nix
@@ -34,7 +34,6 @@ in rec {
             "ghc884" = "3.3.6";
           }.compiler-nix-name or "latest";
       };
-    } // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc921" "ghc922" "ghc923" "ghc924"]) {
       hls-latest = tool compiler-nix-name "haskell-language-server" { inherit evalPackages; };
     })
   );
diff --git a/ci.nix b/ci.nix
@@ -10,7 +10,6 @@
   inherit (import ./ci-lib.nix { inherit pkgs; }) dimension platformFilterGeneric filterAttrsOnlyRecursive;
   inherit (pkgs.haskell-nix) sources;
   nixpkgsVersions = {
-    "R2111" = "nixpkgs-2111";
     "R2205" = "nixpkgs-2205";
     "unstable" = "nixpkgs-unstable";
   };
@@ -30,17 +29,14 @@
     # cabal-install and nix-tools plans.  When removing a ghc version
     # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
     # Update supported-ghc-versions.md to reflect any changes made here.
-    nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
+    nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
       ghc865 = false;
-      ghc8107 = true;
-    } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
-      ghc865 = false;
-      ghc8107 = true;
+      ghc8107 = false;
     } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
       ghc865 = false;
       ghc884 = false; # Native version is used to boot 9.0.1
       ghc8107 = true;
-      ghc902 = true;
+      ghc902 = false;
       ghc924 = true;
     });
   systems = nixpkgsName: nixpkgs: compiler-nix-name: nixpkgs.lib.genAttrs (
diff --git a/docs/reference/supported-ghc-versions.md b/docs/reference/supported-ghc-versions.md
@@ -21,12 +21,12 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
 
 | Nixpkgs version  | Nixpkgs pinning    | GHC version | `compiler-nix-name`   | Tested in CI? |
 |------------------|--------------------|-------------|-----------------------|---------------|
-| 21.11            | `nixpkgs-2111`     | 8.6.5       | `ghc865`              | No            |
-| 21.11            | `nixpkgs-2111`     | 8.10.7      | `ghc8107`             | Yes           |
+| 22.05            | `nixpkgs-2205`     | 8.6.5       | `ghc865`              | No            |
+| 22.05            | `nixpkgs-2205`     | 8.10.7      | `ghc8107`             | No            |
 | unstable         | `nixpkgs-unstable` | 8.6.5       | `ghc865`              | No            |
 | unstable         | `nixpkgs-unstable` | 8.8.4       | `ghc884`              | No            |
 | unstable         | `nixpkgs-unstable` | 8.10.7      | `ghc8107`             | Yes           |
-| unstable         | `nixpkgs-unstable` | 9.0.2       | `ghc902`              | Yes           |
+| unstable         | `nixpkgs-unstable` | 9.0.2       | `ghc902`              | No            |
 | unstable         | `nixpkgs-unstable` | 9.2.4       | `ghc924`              | Yes           |
 
 See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix)
diff --git a/docs/tutorials/development.md b/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][],
diff --git a/docs/tutorials/getting-started-flakes.md b/docs/tutorials/getting-started-flakes.md
@@ -92,12 +92,12 @@ Add `flake.nix`:
       ];
       pkgs = import nixpkgs { inherit system overlays; inherit (haskellNix) config; };
       flake = pkgs.helloProject.flake {
-        # This adds support for `nix build .#js-unknown-ghcjs-cabal:hello:exe:hello`
+        # This adds support for `nix build .#js-unknown-ghcjs:hello:exe:hello`
         # crossPlatforms = p: [p.ghcjs];
       };
     in flake // {
       # Built by `nix build .`
-      defaultPackage = flake.packages."hello:exe:hello";
+      packages.${system}.default = flake.packages."hello:exe:hello";
     });
 }
 ```
diff --git a/docs/tutorials/getting-started.md b/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= [...]
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -137,7 +137,7 @@
 
       packages = ((self.internal.compat { inherit system; }).hix).apps;
 
-      devShell = with self.legacyPackages.${system};
+      devShells.${system}.default = with self.legacyPackages.${system};
         mkShell {
           buildInputs = [
             nixUnstable
diff --git a/modules/configuration-nix.nix b/modules/configuration-nix.nix
@@ -60,6 +60,7 @@ in {
   packages.ghc-lib-parser.patches = [
     (fromUntil "8.10.0.0" "9.2" ../overlays/patches/ghc-lib-parser-8.10-global-unique-counters-in-rts.patch)
     (fromUntil "9.2.0.0" "9.3" ../overlays/patches/ghc-lib-parser-9.2-global-unique-counters-in-rts.patch)
+    (fromUntil "9.4.0.0" "9.5" ../overlays/patches/ghc-lib-parser-9.4-global-unique-counters-in-rts.patch)
   ];
 
   # See https://github.com/haskell-nix/hnix/pull/1053
diff --git a/modules/hackage-quirks.nix b/modules/hackage-quirks.nix
@@ -5,8 +5,8 @@ let
   # Easier than importing nixpkgs just for this
   mapAttrsToList = f: attrs:
     map (name: f name attrs.${name}) (__attrNames attrs);
-in [(
-  {config, lib, pkgs, ...}:
+in [
+  ({config, lib, pkgs, ...}:
     { _file = "haskell.nix/overlays/hackage-quirks.nix#cabal-install"; } //
     # FIXME: this is required to build cabal-install 3.2 with ghc 8.6,
     # but also for
@@ -23,25 +23,34 @@ in [(
           packages.cabal-install.src = pkgs.buildPackages.haskell-nix.sources.cabal-32 + "/cabal-install";
         })
       ];
-    })]
+    }
+  )
+
+  # TODO remove this when `dependent-sum-0.7.1.0` constraint on `some` has been updated.
+  # See https://github.com/haskell/haskell-language-server/issues/2969
+  # and https://github.com/obsidiansystems/dependent-sum/issues/71
+  ({config, lib, pkgs, ...}:
+    { _file = "haskell.nix/overlays/hackage-quirks.nix#haskell-language-server"; } //
+    lib.mkIf (config.name == "haskell-language-server") {
+      cabalProject = lib.mkDefault (''
+        packages: .
+        constraints: dependent-sum >=0.7.1.0
+      ''
+      # TODO Remove this flag once the hls-haddock-comments-plugin is updated in hackage to work with ghc 9.2
+      + lib.optionalString (__elem config.compiler-nix-name ["ghc921" "ghc922" "ghc923" "ghc924"]) ''
+        package haskell-language-server
+          flags: -haddockcomments
+      '');
+    }
+  )
 
   # Map the following into modules that use `mkIf` to check the name of the
   # hackage package in a way that is lazy enought not to cause infinite recursion
   # issues.
-  ++ mapAttrsToList (n: v: {config, lib, ...}:
+  ] ++ mapAttrsToList (n: v: {config, lib, ...}:
     { _file = "haskell.nix/overlays/hackage-quirks.nix#${n}"; } //
     lib.mkIf (n == config.name) v) {
 
-    # TODO remove this when `dependent-sum-0.7.1.0` constraint on `some` has been updated.
-    # See https://github.com/haskell/haskell-language-server/issues/2969
-    # and https://github.com/obsidiansystems/dependent-sum/issues/71
-    haskell-language-server = {
-      cabalProject = ''
-        packages: .
-        constraints: dependent-sum >=0.7.1.0
-      '';
-    };
-
     lsp-test = {
       cabalProject = ''
         packages: .
@@ -76,13 +85,4 @@ in [(
       })];
     };
 
-    ormolu = {
-      modules = [
-        ({ lib, ... }: {
-          options.nonReinstallablePkgs =
-            lib.mkOption { apply = lib.remove "Cabal"; };
-        })
-      ];
-    };
-
   }
diff --git a/overlays/patches/ghc-lib-parser-9.4-global-unique-counters-in-rts.patch b/overlays/patches/ghc-lib-parser-9.4-global-unique-counters-in-rts.patch
@@ -0,0 +1,13 @@
+diff --git a/compiler/cbits/genSym.c b/compiler/cbits/genSym.c
+index 0897547..8627f5a 100644
+--- a/compiler/cbits/genSym.c
++++ b/compiler/cbits/genSym.c
+@@ -9,7 +9,7 @@
+ //
+ // The CPP is thus about the RTS version GHC is linked against, and not the
+ // version of the GHC being built.
+-#if !MIN_VERSION_GLASGOW_HASKELL(9,3,0,0)
++#if !MIN_VERSION_GLASGOW_HASKELL(9,2,0,0)
+ HsInt ghc_unique_counter = 0;
+ HsInt ghc_unique_inc     = 1;
+ #endif
diff --git a/release.nix b/release.nix
@@ -21,8 +21,8 @@ let
     # added here will also included without aggregation, making it easier
     # to find a failing test.  Keep in mind though that adding too many
     # of these will slow down eval times.
-    x86_64-linux = allJobs.R2111.ghc8107.x86_64-linux.native or {};
-    x86_64-darwin = allJobs.R2111.ghc8107.x86_64-darwin.native or {};
+    x86_64-linux = allJobs.unstable.ghc8107.x86_64-linux.native or {};
+    x86_64-darwin = allJobs.unstable.ghc8107.x86_64-darwin.native or {};
   };
   names = x: lib.filter (n: n != "recurseForDerivations" && n != "meta")
     (builtins.attrNames x);
diff --git a/test/cabal-simple/default.nix b/test/cabal-simple/default.nix
@@ -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";
diff --git a/test/haskell-language-server/cabal.nix b/test/haskell-language-server/cabal.nix
@@ -7,6 +7,6 @@ in recurseIntoAttrs {
   };
   build = project.getComponent "haskell-language-server:exe:haskell-language-server";
 
-  # Haskell Language Server in hackage does not build for GHC 9.2 yet
-  meta.disabled = __elem compiler-nix-name ["ghc921" "ghc922" "ghc923" "ghc924"] || stdenv.hostPlatform != stdenv.buildPlatform;
+  # hls does not need to be cross compiled.
+  meta.disabled = stdenv.hostPlatform != stdenv.buildPlatform;
 }
diff --git a/test/shell-for/default.nix b/test/shell-for/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;
   };
