Skip to content

Update haskell.nix and use nixpkgs-2505 #220

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Update haskell.nix and use nixpkgs-2505 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff8c93b
Disable macOS builds
hamishmack Jul 24, 2025
a5fe362
Update haskell.nix and use nixpkgs-2505
hamishmack Jul 24, 2025
cdd7377
`nix flake update`
hamishmack Jul 25, 2025
317d71b
Bump cabal-experimental
hamishmack Jul 28, 2025
d4f042a
Bump head.hackage
hamishmack Jul 28, 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
1 change: 1 addition & 0 deletions .github/workflows/aarch64-darwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:

jobs:
build:
if: false # Disabled until macOS hydra builders are back online
name: Prebuild and Upload
uses: ./.github/workflows/main.yml
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/aarch64-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: DevX closures for aarch64-linux

on:
# Disabled until we have a new aarch64-linux hydra builder
# push:
push:

jobs:
build:
if: false # Disabled until we have a new aarch64-linux hydra builder
name: Prebuild and Upload
uses: ./.github/workflows/main.yml
with:
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/hello.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
fail-fast: false
matrix:
platform:
- x86_64-darwin
- x86_64-linux
# Disabled until macOS hydra builders are back online.
#- x86_64-darwin
# Skipping because we do not have runners for these set up.
#- aarch64-darwin
#- aarch64-linux
compiler-nix-name:
- ghc810
- ghc96
- ghc98
- ghc910
Expand All @@ -34,9 +34,6 @@ jobs:
- false
- true
exclude:
# Just cross compiling javascript with ghc 9.6 and above
- compiler-nix-name: ghc810
target-platform: "-js"
# Windows cross compilation only works on x86_64 right now.
- platform: aarch64-darwin
target-platform: "-windows"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
nix_path: nixpkgs=channel:nixos-unstable
- run: |
nix profile install github:Kha/nixprof
nixprof record nix develop .#ghc8107 --accept-flake-config
nixprof record nix develop .#ghc96 --accept-flake-config
nixprof report -p
nixprof report -a
nixprof report -s
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/x86_64-darwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:

jobs:
build:
if: false # Disabled until macOS hydra builders are back online
name: Prebuild and Upload
uses: ./.github/workflows/main.yml
with:
Expand Down
124 changes: 88 additions & 36 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.

16 changes: 8 additions & 8 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-2505";
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 @@ -60,10 +60,11 @@
};
supportedSystems = [
"x86_64-linux"
"x86_64-darwin"
# Currently no aarch64 linux builders
# "aarch64-linux"
"aarch64-darwin"
# TODO put these back (macOS hydra builders are currently down)
# "x86_64-darwin"
# "aarch64-darwin"
];
in let flake-outputs = flake-utils.lib.eachSystem supportedSystems (system:
let
Expand All @@ -90,7 +91,6 @@
# 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"
"ghc96"
"ghc98"
"ghc910"
Expand Down Expand Up @@ -256,9 +256,9 @@
})) devShells)
// (pkgs.lib.mapAttrs' (name: drv:
pkgs.lib.nameValuePair "${name}-plans" drv.plans) devShells);
packages.cabalProjectLocal.static = (import ./quirks.nix { pkgs = static-pkgs; static = true; }).template;
packages.cabalProjectLocal.cross-js = (import ./quirks.nix { pkgs = js-pkgs; }).template;
packages.cabalProjectLocal.cross-windows = (import ./quirks.nix { pkgs = windows-pkgs; }).template;
packages.cabalProjectLocal-static = (import ./quirks.nix { pkgs = static-pkgs; static = true; }).template;
packages.cabalProjectLocal-cross-js = (import ./quirks.nix { pkgs = js-pkgs; }).template;
packages.cabalProjectLocal-cross-windows = (import ./quirks.nix { pkgs = windows-pkgs; }).template;
});
# we use flake-outputs here to inject a required job that aggregates all required jobs.
in flake-outputs // {
Expand Down
Loading
Loading