Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 15 additions & 14 deletions devShells/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,9 @@ in
pkgs.gcc
pkgs.gnumake
];
emacs-lisp = extendDevShell nix [
## TODO: This works on aarch64-darwin in unstable and master, but not
## 25.05. I haven’t needed it, so it’s easier to disable until 25.11
## than to work around.
# pkgs.cask
pkgs.emacs
pkgs.emacsPackages.eldev
dhall = extendDevShell nix [
pkgs.dhall
pkgs.dhall-docs
];
haskell = extendDevShell nix ([
pkgs.cabal-install
Expand All @@ -88,24 +84,29 @@ in
++ [
pkgs.cargo
pkgs.cargo-fuzz
pkgs.cargo-semver-checks
(pkgs.cargo-semver-checks.overrideAttrs (old: {
## NB: Checks fail on aarch64 systems with Nixpkgs 25.11.
doCheck = !pkgs.stdenv.isAarch64;
}))
pkgs.rust-analyzer
pkgs.rustPackages.clippy
pkgs.rustc
pkgs.rustfmt
(pkgs.rustup.overrideAttrs (old: {
## NB: Fails on i686-linux with Nixpkgs 24.11.
doCheck = pkgs.system != "i686-linux";
## NB: Checks fail on aarch64-darwin with Nixpkgs 25.11.
doCheck = pkgs.system != "aarch64-darwin";
}))
]);
}
// (
if pkgs.system != sys.i686-linux
then {
## `cborg-0.2.9.0` fails to build on i686-linux
dhall = extendDevShell nix [
pkgs.dhall
pkgs.dhall-docs
## guile is broken on i686-linux in Nixpkgs 25.11
emacs-lisp = extendDevShell nix [
## TODO: Doesn’t build on Nixpkgs 25.11
# pkgs.cask
pkgs.emacs
pkgs.emacsPackages.eldev
];
## `openjdk-19.0.2+7` isn’t supported on i686-linux
scala = extendDevShell nix [pkgs.sbt];
Expand Down
28 changes: 14 additions & 14 deletions flake.lock

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

26 changes: 7 additions & 19 deletions templates/haskell/.config/flake/outputs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ in
"ghc" + nixpkgs.lib.replaceStrings ["."] [""] version;

## TODO: Extract this automatically from `pkgs.haskellPackages`.
defaultGhcVersion = "9.8.4";
defaultGhcVersion = "9.10.3";

## Test the oldest revision possible for each minor release. If it’s not
## available in nixpkgs, test the oldest available, then try an older
Expand All @@ -105,14 +105,11 @@ in
## maps to in the nixpkgs we depend on.
testedGhcVersions = system: [
self.lib.defaultGhcVersion
"8.10.7"
"9.0.2"
"9.2.8"
"9.4.7"
"9.6.3"
"9.8.1"
"9.10.1"
"9.12.1"
"9.4.8"
"9.6.7"
"9.8.4"
"9.10.2"
"9.12.2"
# "ghcHEAD" # doctest doesn’t work on current HEAD
];

Expand All @@ -138,16 +135,7 @@ in

## However, provide packages in the default overlay for _every_
## supported version.
supportedGhcVersions = system:
self.lib.testedGhcVersions system
++ [
"9.4.8"
"9.6.4"
"9.6.5"
"9.8.2"
"9.10.2"
"9.12.2"
];
supportedGhcVersions = self.lib.testedGhcVersions;
};
}
// flake-utils.lib.eachSystem supportedSystems
Expand Down
14 changes: 7 additions & 7 deletions templates/haskell/core/{{project.name}}.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ tested-with:
8.4.1,
8.6.1,
8.8.1,
8.10.1, 8.10.7,
9.0.1, 9.0.2,
9.2.1, 9.2.8,
9.4.1, 9.4.7,
9.6.1, 9.6.3,
8.10.1,
9.0.1,
9.2.1,
9.4.1, 9.4.8,
9.6.1, 9.6.7,
9.8.1, 9.8.4,
9.10.1,
9.12.1
9.10.1, 9.10.2, 9.10.3,
9.12.1, 9.12.2
}

homepage: https://github.com/{{project.repo}}#readme
Expand Down