Skip to content

Nix updates #222

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 2 commits into from
Closed

Nix updates #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c13c480
bump
angerman Sep 21, 2025
7def577
update timestamp; and disable source filter
angerman Sep 21, 2025
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
128 changes: 81 additions & 47 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.

9 changes: 4 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
description = "Minimal devshell flake for haskell";

inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
inputs.nixpkgs.follows = "haskellNix/nixpkgs-2411";
inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.iohk-nix.url = "github:input-output-hk/iohk-nix";
inputs.cabal.url = "github:stable-haskell/cabal";
inputs.cabal.flake = false;
inputs.cabal-experimental.url = "github:stable-haskell/cabal?ref=angerman/cross";
inputs.cabal-experimental.url = "github:stable-haskell/cabal?ref=stable-haskell/feature/cross-compile";
inputs.cabal-experimental.flake = false;

outputs = { self, nixpkgs, flake-utils, haskellNix, iohk-nix, ... }:
Expand Down Expand Up @@ -61,8 +61,7 @@
supportedSystems = [
"x86_64-linux"
"x86_64-darwin"
# Currently no aarch64 linux builders
# "aarch64-linux"
"aarch64-linux"
"aarch64-darwin"
];
in let flake-outputs = flake-utils.lib.eachSystem supportedSystems (system:
Expand Down Expand Up @@ -90,7 +89,7 @@
# Map the compiler-nix-name to a final compiler-nix-name the way haskell.nix
# projects do (that way we can use short names)
let compilers = pkgs: pkgs.lib.genAttrs [
"ghc810"
# "ghc810"
"ghc96"
"ghc98"
"ghc910"
Expand Down
8 changes: 6 additions & 2 deletions tool-map.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ compiler-nix-name: tool: {
happy = { version = "1.20.1.1"; inherit cabalProjectLocal; };
alex = { version = "3.2.7.3"; inherit cabalProjectLocal; };
cabal = {
src = self.inputs.cabal;
# cabal has a project-cabal/constraints.config now, which is
# cleaned by the source clean logic, so we need to sidestep this for now
# until the filter is changed in haskell.nix
src = #self.inputs.cabal;
{ outPath = self.inputs.cabal; filterPath = { path, ... }: path; };
Comment on lines +49 to +53
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hamishmack should we update haskell.nix?

# We use the cabal.boostrap.project file, as we don't
# want an of the cabal complexities they have. The
# bootstrap file, also neatly doesn't do any `import`s.
Expand All @@ -56,7 +60,7 @@ compiler-nix-name: tool: {
#
cabalProjectFileName = "cabal.bootstrap.project";
cabalProjectLocal = ''
index-state: hackage.haskell.org 2025-03-17T00:00:00Z
index-state: hackage.haskell.org 2025-09-17T00:00:00Z
'';
};
hlint = {
Expand Down
Loading