Skip to content
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.

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

Add an argument to allow users to specify nixpkgs overlays from their project default.nix #1019

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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
7 changes: 4 additions & 3 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
}
, reflex-platform-func ? import ./dep/reflex-platform
, useGHC810 ? false #true if one wants to use ghc 8.10.7
, nixpkgsOverlays ? []
}:
let
reflex-platform = getReflexPlatform { inherit system; };
Expand All @@ -22,7 +23,7 @@ let

nixpkgsOverlays = [
(import ./nixpkgs-overlays)
];
] ++ nixpkgsOverlays;

haskellOverlays = [
(import ./haskell-overlays/misc-deps.nix { inherit hackGet; __useNewerCompiler = useGHC810; })
Expand Down Expand Up @@ -413,8 +414,8 @@ in rec {
exe = serverOn mainProjectOut dummyVersion;
server = args@{ hostName, adminEmail, routeHost, enableHttps, version, module ? serverModules.mkBaseEc2, redirectHosts ? [], configHash ? "" }:
server (args // { exe = linuxExe version; });
obelisk = import (base' + "/.obelisk/impl") {};
};
obelisk = import (base' + "/.obelisk/impl") { inherit system profiling iosSdkVersion config terms reflex-platform-func useGHC810 nixpkgsOverlays ; };
Copy link
Contributor Author

@cgibbard cgibbard Feb 7, 2023

Choose a reason for hiding this comment

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

I hope this is cromulent, does it make sense to pass these same arguments along? At least without this the overrides didn't take effect, but perhaps we could just pass the overrides, if it doesn't make sense to just pass everything.

};
haskellPackageSets = {
inherit (reflex-platform) ghc ghcjs;
};
Expand Down