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.

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

Jump to bottom

Flakify all inputs #1180

Merged
merged 25 commits into from Aug 6, 2021
Merged

Flakify all inputs #1180

merged 25 commits into from Aug 6, 2021

Conversation

hamishmack
Copy link
Collaborator

This is #1151 with conflicts solved.

balsoft and others added 4 commits June 25, 2021 17:21
@balsoft
Flakify all inputs
f200989
@shlevy
Fix update-* scripts to update flake.lock
a786011
@balsoft
Merge pull request #2 from tweag/flake-update-script
14739b2 
Fix update-* scripts to update flake.lock
@hamishmack
Merge master into balsoft/flake
1f8f956 
# Conflicts:
#	default.nix
#	flake.nix
#	overlays/haskell.nix
@hamishmack hamishmack mentioned this pull request Jul 28, 2021
Closed
@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Jul 28, 2021
@iohk-bors
Try #1180:
c814f55
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 28, 2021

try

Build failed:

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Jul 28, 2021
@iohk-bors
Try #1180:
9ad72e0
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 28, 2021

try

Build failed:

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Jul 28, 2021
@iohk-bors
Try #1180:
0378815
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 28, 2021

try

Build failed:

@michaelpj
Copy link
Collaborator

I think we probably don't want to change the update scripts to only update the flake inputs, most of our users are not using flakes and I don't think we want to enforce that, so we had better keep updating the other way too!

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Jul 28, 2021
@iohk-bors
Try #1180:
5a112ad
@hamishmack
Copy link
Collaborator Author

I think we probably don't want to change the update scripts to only update the flake inputs, most of our users are not using flakes and I don't think we want to enforce that, so we had better keep updating the other way too!

This change uses flake-campat so that non flake projects will use flake.lock and nix/sources.json goes away.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 28, 2021

try

Build failed:

@michaelpj
Copy link
Collaborator

This change uses flake-campat so that non flake projects will use flake.lock and nix/sources.json goes away.

Hmmm, does that mean we lose the eval-on-current behaviour? I guess not, since now it's conditional on the presence of bultins.currentSystem, so it'll "know" whether it's in a flake eval or not. Spooky.

@hamishmack
Copy link
Collaborator Author

Hmmm, does that mean we lose the eval-on-current behaviour? I guess not, since now it's conditional on the presence of bultins.currentSystem, so it'll "know" whether it's in a flake eval or not. Spooky.

I think it should still work and @jbgi made is less convoluted in #1176.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 28, 2021

try

Build failed:

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Jul 29, 2021
@iohk-bors
Try #1180:
d3a2ded
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 29, 2021

try

Build failed:

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Jul 29, 2021
@iohk-bors
Try #1180:
db51b1a
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 29, 2021

try

Build succeeded:

shlevy
shlevy reviewed Jul 29, 2021
View reviewed changes
build.nix Outdated Show resolved Hide resolved
@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Jul 30, 2021
@iohk-bors
Try #1180:
bafc495
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 30, 2021

try

Build succeeded:

@hamishmack hamishmack mentioned this pull request Aug 2, 2021
Closed
shlevy
shlevy reviewed Aug 4, 2021
View reviewed changes
test/tests.sh Outdated Show resolved Hide resolved
shlevy
shlevy approved these changes Aug 5, 2021
View reviewed changes
Copy link
Contributor

@shlevy shlevy left a comment

Choose a reason for hiding this comment

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

Overall looks good to me! Thanks for pushing this over the finish line.

@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Aug 6, 2021
@iohk-bors
Try #1180:
17b34aa
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 6, 2021

try

Build failed:

@hamishmack hamishmack merged commit d5d304d into master Aug 6, 2021
@iohk-bors iohk-bors bot deleted the balsoft/flake branch August 6, 2021 03:54
@amesgen amesgen mentioned this pull request Aug 8, 2021
Closed
booniepepper pushed a commit to booniepepper/haskell.nix that referenced this pull request Feb 4, 2022
@hamishmack @balsoft
@shlevy @booniepepper
Flakify all inputs (input-output-hk#1180)
e128720 
* Include dependencies of haskell.nix that were tracked in `nix/sources.json`
  as flake inputs (`flake.lock` replaces `nix/sources.json`).
* Use `flake-compat` to continue to provide a compatible interface for non
  flake projects.

Co-authored-by: Alexander Bantyev <balsoft@balsoft.ru>
Co-authored-by: Shea Levy <shea@shealevy.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelpj michaelpj michaelpj left review comments

@shlevy shlevy shlevy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@hamishmack @michaelpj @shlevy @balsoft