Skip to content

Update skeleton to cabalProject and overlays, and use nixpkgs19.09 as default #317

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

Merged
merged 9 commits into from
Feb 7, 2020

Conversation

jbgi
Copy link
Contributor

@jbgi jbgi commented Jan 31, 2020

No description provided.

@jbgi jbgi added wip Work In Progress DO NOT MERGE labels Jan 31, 2020
default.nix Outdated
, extraOverlays ? nixpkgsOverlays
, system ? system'
, globalConfig ? globalConfig'
, config ? config'
, crossSystem ? crossSystem' }: import nixpkgs ({
overlays = [ jemallocOverlay ] ++ extraOverlays;
overlays = overlays ++ extraOverlays;
Copy link
Contributor

Choose a reason for hiding this comment

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

Wouldn't we want overlays ++ [ jemallocOverlay ] ++ extraOverlays? lest we loose the jemallocOverlay once someone passes in the overlays arg?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, though existing behavior is preserved. only a new capacity to set all overlays is added.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah also, apparently jemallocOverlay is only useful for 18.03, the new jemalloc version that fix the issue is the default since 18.09.

@jbgi jbgi force-pushed the update-nixpkgs-haskell-nix branch 3 times, most recently from 270e44d to 8b89032 Compare February 4, 2020 08:22
Copy link
Collaborator

@disassembler disassembler left a comment

Choose a reason for hiding this comment

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

good start. Could use a lot more cleanup/pruning of unused functionality.

@jbgi jbgi force-pushed the update-nixpkgs-haskell-nix branch 8 times, most recently from 246c48e to 3d49709 Compare February 5, 2020 22:17
@jbgi jbgi requested a review from disassembler February 5, 2020 22:18
@jbgi jbgi force-pushed the update-nixpkgs-haskell-nix branch from 3d49709 to 46d2fb2 Compare February 5, 2020 22:26
@jbgi jbgi removed DO NOT MERGE wip Work In Progress labels Feb 5, 2020
@jbgi jbgi changed the title WIP Update haskell.nix and default nixpkgs to latest 19.09 Update skelteon to haskell.nix and use nixpkgs 19.09 as default Feb 5, 2020
@jbgi jbgi force-pushed the update-nixpkgs-haskell-nix branch 7 times, most recently from 98bd2ff to 4e4a658 Compare February 6, 2020 00:23
@jbgi jbgi force-pushed the update-nixpkgs-haskell-nix branch 3 times, most recently from c8ef226 to af3f56b Compare February 6, 2020 13:52
@jbgi jbgi requested a review from angerman February 6, 2020 14:41
@jbgi jbgi force-pushed the update-nixpkgs-haskell-nix branch 5 times, most recently from ce71455 to 6b37241 Compare February 7, 2020 09:02
@jbgi jbgi force-pushed the update-nixpkgs-haskell-nix branch from 6b37241 to ff4c98e Compare February 7, 2020 11:30
@jbgi jbgi requested review from rvl, manveru and michaelpj February 7, 2020 14:00
@jbgi jbgi changed the title Update skelteon to haskell.nix and use nixpkgs 19.09 as default Update skelteon to cabalProject and overlays, and use nixpkgs19.09 as default Feb 7, 2020
@jbgi jbgi changed the title Update skelteon to cabalProject and overlays, and use nixpkgs19.09 as default Update skeleton to cabalProject and overlays, and use nixpkgs19.09 as default Feb 7, 2020
Copy link
Collaborator

@disassembler disassembler left a comment

Choose a reason for hiding this comment

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

bors r+

@jbgi
Copy link
Contributor Author

jbgi commented Feb 7, 2020

bors ping

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 7, 2020

pong

@jbgi
Copy link
Contributor Author

jbgi commented Feb 7, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Feb 7, 2020
317: Update skeleton to cabalProject and overlays, and use nixpkgs19.09 as default r=jbgi a=jbgi



Co-authored-by: Jean-Baptiste Giraudeau <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 7, 2020

@iohk-bors iohk-bors bot merged commit ff4c98e into master Feb 7, 2020
@iohk-bors iohk-bors bot deleted the update-nixpkgs-haskell-nix branch February 7, 2020 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants