Skip to content

Commit

Permalink
Merge pull request #4860 from IntersectMBO/coot/flake.nix-update-tools
Browse files Browse the repository at this point in the history
nix: updated tools
  • Loading branch information
coot committed Apr 25, 2024
2 parents 46a691f + fbe5de4 commit 204cba0
Show file tree
Hide file tree
Showing 4 changed files with 201 additions and 133 deletions.
173 changes: 122 additions & 51 deletions flake.lock

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

8 changes: 4 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
];

# default compiler used on all systems, also provided within the shell
defaultCompiler = "ghc963";
defaultCompiler = "ghc982";

# the compiler used for cross compilation
# alternative compilers only used on Linux
Expand Down Expand Up @@ -119,13 +119,13 @@
# tools we want in our shell, from hackage
shell.tools =
{
cabal = "3.10.1.0";
ghcid = "0.8.8";
cabal = "3.10.3.0";
ghcid = "0.8.9";
}
// lib.optionalAttrs (config.compiler-nix-name == defaultCompiler) {
# tools that work only with default compiler
stylish-haskell = "0.14.6.0";
haskell-language-server = "2.0.0.1";
haskell-language-server = "2.7.0.0";
};
# and from nixpkgs or other inputs
shell.nativeBuildInputs = with nixpkgs; [ gh jq ];
Expand Down

0 comments on commit 204cba0

Please sign in to comment.