Skip to content

nix: bump nixpkgs and use GHC 9.2.2 #2832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

nix: bump nixpkgs and use GHC 9.2.2 #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 configuration-ghc-901.nix → configuration-ghc-90.nix
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions configuration-ghc-921.nix → configuration-ghc-92.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ let
hlsDisabledPlugins = disabledPlugins;

fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu {};
primitive-extras = hself.primitive-extras_0_10_1_2;
ghc-exactprint = hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint {};
constraints-extras = hself.callCabal2nix "constraints-extras" inputs.constraints-extras {};
retrie = hself.callCabal2nix "retrie" inputs.retrie {};

# Hlint is still broken
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint {});
hiedb = hself.hiedb_0_4_1_0;

# Re-generate HLS drv excluding some plugins
haskell-language-server =
Expand Down
50 changes: 25 additions & 25 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 18 additions & 20 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@
github = overrideCabal hsuper.github (drv: { patches = []; });
# GHCIDE requires hie-bios ^>=0.9.1
hie-bios = hself.callCabal2nix "hie-bios" inputs.hie-bios {};
# We need an older version
hiedb = hself.hiedb_0_4_1_0;

lsp = hsuper.callCabal2nix "lsp" inputs.lsp {};
lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {};
Expand Down Expand Up @@ -206,17 +204,17 @@
};
};

ghc901Config = (import ./configuration-ghc-901.nix) { inherit pkgs; };
ghc921Config = (import ./configuration-ghc-921.nix) { inherit pkgs inputs; };
ghc901Config = (import ./configuration-ghc-90.nix) { inherit pkgs; };
ghc922Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };

# GHC versions
ghcDefault = pkgs.hlsHpkgs ("ghc"
+ pkgs.lib.replaceStrings [ "." ] [ "" ]
pkgs.haskellPackages.ghc.version);
ghc884 = pkgs.hlsHpkgs "ghc884";
ghc8107 = pkgs.hlsHpkgs "ghc8107";
ghc901 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901");
ghc921 = ghc921Config.tweakHpkgs (pkgs.hlsHpkgs "ghc921");
ghc88 = pkgs.hlsHpkgs "ghc884";
ghc810 = pkgs.hlsHpkgs "ghc8107";
ghc90 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901");
ghc92 = ghc922Config.tweakHpkgs (pkgs.hlsHpkgs "ghc922");

# For markdown support
myst-parser = pkgs.python3Packages.callPackage ./myst-parser.nix {};
Expand Down Expand Up @@ -334,27 +332,27 @@
# Developement shell with only compiler
simpleDevShells = {
haskell-language-server-dev = mkDevShell ghcDefault "cabal.project";
haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project";
haskell-language-server-8107-dev = mkDevShell ghc8107 "cabal.project";
haskell-language-server-901-dev = mkDevShell ghc901 "cabal-ghc90.project";
haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc921.project";
haskell-language-server-88-dev = mkDevShell ghc884 "cabal.project";
haskell-language-server-810-dev = mkDevShell ghc8107 "cabal.project";
haskell-language-server-90-dev = mkDevShell ghc901 "cabal-ghc90.project";
haskell-language-server-92-dev = mkDevShell ghc922 "cabal-ghc922.project";
};

# Developement shell, haskell packages are also provided by nix
nixDevShells = {
haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project";
haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project";
haskell-language-server-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal-ghc90.project";
haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc921.project";
haskell-language-server-88-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project";
haskell-language-server-810-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project";
haskell-language-server-90-dev-nix = mkDevShellWithNixDeps ghc901 "cabal-ghc90.project";
haskell-language-server-92-dev-nix = mkDevShellWithNixDeps ghc922 "cabal-ghc92.project";
};

allPackages = {
haskell-language-server = mkExe ghcDefault;
haskell-language-server-884 = mkExe ghc884;
haskell-language-server-8107 = mkExe ghc8107;
haskell-language-server-901 = mkExe ghc901;
haskell-language-server-921 = mkExe ghc921;
haskell-language-server-88 = mkExe ghc88;
haskell-language-server-810 = mkExe ghc810;
haskell-language-server-90 = mkExe ghc90;
haskell-language-server-92 = mkExe ghc92;
};

devShells = simpleDevShells // nixDevShells;
Expand Down