| 
4 | 4 |   inputs = {  | 
5 | 5 |     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";  | 
6 | 6 |     flake-utils.url = "github:numtide/flake-utils";  | 
7 |  | -    # for default.nix  | 
 | 7 | +    # For default.nix  | 
8 | 8 |     flake-compat = {  | 
9 | 9 |       url = "github:edolstra/flake-compat";  | 
10 | 10 |       flake = false;  | 
11 | 11 |     };  | 
12 | 12 |   };  | 
13 | 13 | 
 
  | 
14 | 14 |   outputs =  | 
15 |  | -    inputs@{ self, nixpkgs, flake-utils, ... }:  | 
 | 15 | +    { nixpkgs, flake-utils, ... }:  | 
16 | 16 |     flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]  | 
17 | 17 |     (system:  | 
18 | 18 |       let  | 
 | 
50 | 50 | 
 
  | 
51 | 51 |         mkDevShell = hpkgs: with pkgs; mkShell {  | 
52 | 52 |           name = "haskell-language-server-dev-ghc${hpkgs.ghc.version}";  | 
53 |  | -          # For binary Haskell tools, we use the default nixpkgs GHC  | 
54 |  | -          # This removes a rebuild with a different GHC version  | 
55 |  | -          # The drawback of this approach is that our shell may pull two GHC  | 
56 |  | -          # version in scope.  | 
 | 53 | +          # For binary Haskell tools, we use the default Nixpkgs GHC version.  | 
 | 54 | +          # This removes a rebuild with a different GHC version. The drawback of  | 
 | 55 | +          # this approach is that our shell may pull two GHC versions in scope.  | 
57 | 56 |           buildInputs = [  | 
58 |  | -            # our compiling toolchain  | 
 | 57 | +            # Compiler toolchain  | 
59 | 58 |             hpkgs.ghc  | 
60 | 59 |             pkgs.haskellPackages.cabal-install  | 
61 |  | -            # Dependencies needed to build some parts of hackage  | 
 | 60 | +            # Dependencies needed to build some parts of Hackage  | 
62 | 61 |             gmp zlib ncurses  | 
63 | 62 |             # Changelog tooling  | 
64 | 63 |             (gen-hls-changelogs pkgs.haskellPackages)  | 
65 | 64 |             # For the documentation  | 
66 | 65 |             pythonWithPackages  | 
67 |  | -            # @guibou: I'm not sure this is needed.  | 
68 |  | -            hlint  | 
69 | 66 |             (pkgs.haskell.lib.justStaticExecutables (pkgs.haskell.lib.dontCheck pkgs.haskellPackages.opentelemetry-extra))  | 
70 | 67 |             capstone  | 
71 |  | -            # ormolu  | 
72 | 68 |             stylish-haskell  | 
73 | 69 |             pre-commit  | 
74 | 70 |             ] ++ lib.optionals (!stdenv.isDarwin)  | 
 | 
92 | 88 |           '';  | 
93 | 89 |         };  | 
94 | 90 | 
 
  | 
95 |  | -      in with pkgs; rec {  | 
 | 91 | +      in rec {  | 
96 | 92 |         # Developement shell with only dev tools  | 
97 | 93 |         devShells = {  | 
98 | 94 |           default = mkDevShell pkgs.haskellPackages;  | 
 | 
102 | 98 |           shell-ghc910 = mkDevShell pkgs.haskell.packages.ghc910;  | 
103 | 99 |         };  | 
104 | 100 | 
 
  | 
105 |  | -        packages = {  | 
106 |  | -          docs = docs;  | 
107 |  | -        };  | 
 | 101 | +        packages = { inherit docs; };  | 
108 | 102 | 
 
  | 
109 | 103 |         # The attributes for the default shell and package changed in recent versions of Nix,  | 
110 | 104 |         # these are here for backwards compatibility with the old versions.  | 
 | 
0 commit comments