Skip to content

Fix splitmix on android #2388

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

Merged
merged 2 commits into from
Jun 12, 2025
Merged

Fix splitmix on android #2388

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
293741b
Fix splitmix on android
hamishmack Jun 11, 2025
0c22717
Fix defaults used when passing args to `shellFor`
hamishmack Jun 12, 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
10 changes: 4 additions & 6 deletions overlays/haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,10 +827,11 @@ final: prev: {
# ];
# }
#
shellFor = extraArgs: shellFor' (rawProject.args.shell // extraArgs).crossPlatforms extraArgs;
shellFor' = crossPlatforms: extraArgs:
shellFor = extraArgs: (appendModule { shell = extraArgs; }).shell;
shell = shellFor' rawProject.args.shell.crossPlatforms;
shellFor' = crossPlatforms:
let
shellArgs = builtins.removeAttrs (rawProject.args.shell // extraArgs) [ "crossPlatforms" ];
shellArgs = builtins.removeAttrs rawProject.args.shell [ "crossPlatforms" ];
# These are the args we will pass to the shells for the corss compiler
argsCross =
# These things should match main shell
Expand All @@ -848,9 +849,6 @@ final: prev: {
inputsFrom = shellArgs.inputsFrom or [] ++ crossShells;
});

# Default shell
shell = shellFor {};

# Like `.hsPkgs.${packageName}` but when compined with `getComponent` any
# cabal configure errors are defered until the components derivation builds.
getPackage = packageName:
Expand Down
7 changes: 7 additions & 0 deletions test/cabal.project.local
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-- See https://github.com/haskellari/splitmix/pull/97
source-repository-package
type: git
location: https://github.com/hamishmack/splitmix.git
tag: e3549473b124a7ba078408ac0d2c8aa8111c3888
--sha256: sha256-o18DEF4+z3/jGhMZbow8PFtYBiIm6+b4B+6o5tM6ez0=

if impl(ghc>=9.12.1)
-- allow newer packages, that are bound to be newer due to
-- being shipped with a newer compiler. If you extend this
Expand Down
Loading