Skip to content

Update nixpkgs to the latest revision of nixos-unstable branch#457

Merged
iohk-bors[bot] merged 3 commits intomasterfrom
nixpkgs-bump
Jan 19, 2021
Merged

Update nixpkgs to the latest revision of nixos-unstable branch#457
iohk-bors[bot] merged 3 commits intomasterfrom
nixpkgs-bump

Conversation

@nikolaglumac
Copy link
Contributor

@nikolaglumac nikolaglumac commented Jan 4, 2021

This PR fixes Daedalus build issues on OSX Big Sur.
Without it, Daedalus developers can not run Daedalus in local dev environment (nix-shell) given that they are on OSX Big Sur.
It is connected to the following Daedalus PR: input-output-hk/daedalus#2289

@nikolaglumac nikolaglumac self-assigned this Jan 4, 2021
@nikolaglumac
Copy link
Contributor Author

@disassembler @cleverca22 please review this one 🙏

@jbgi
Copy link
Contributor

jbgi commented Jan 4, 2021

indeed the fix has not been backported to nixos-20.09 yet (NixOS/nixpkgs#105799), and this probably impact other projects as well.
I opened IntersectMBO/cardano-node#2250 to check if cardano-node still build against this PR. If yes, I'm ok to merge this. If not I think it's probably best to do the bump locally in Daedalus until the backport is merged.

@nikolaglumac
Copy link
Contributor Author

indeed the fix has not been backported to nixos-20.09 yet (NixOS/nixpkgs#105799), and this probably impact other projects as well.
I opened input-output-hk/cardano-node#2250 to check if cardano-node still build against this PR. If yes, I'm ok to merge this. If not I think it's probably best to do the bump locally in Daedalus until the backport is merged.

Thanks @jbgi! Looking forward to your results...

@jonringer
Copy link

Short term, I would say try to find a good point in time for nixpkgs-unstable. Even if the backport is merged, it would take a while for the contents to end up in the release channel (because of a staging cycle that would take about a week)

@jbgi
Copy link
Contributor

jbgi commented Jan 4, 2021

https://hydra.iohk.io/jobset/Cardano/cardano-node-pr-2250#tabs-errors

Failed to evaluate profiteur-0.4.5.1: «broken»: is marked as broken

I'll look into it tomorrow.

@cleverca22
Copy link
Contributor

@jbgi NixOS/nixpkgs#108452 should fix it upstream

@cleverca22
Copy link
Contributor

@jbgi fix is now in the haskell-updates branch and will eventually wind up in master when the next hackage2nix run happens

@nikolaglumac
Copy link
Contributor Author

So what should we do from Daedalus perspective @cleverca22?

@jbgi
Copy link
Contributor

jbgi commented Jan 8, 2021

@nikolaglumac I would suggest targeting this PR branch until it get merged soon (tm).

@nikolaglumac
Copy link
Contributor Author

That is what we did here input-output-hk/daedalus#2289
Please let us know once this is merged into master 🙏

@nikolaglumac
Copy link
Contributor Author

@jbgi should we update Daedalus to use the tip of this branch now that you have updated it?

@jbgi
Copy link
Contributor

jbgi commented Jan 18, 2021

right. hopefully, it should be merged today if cardano-node build correctly against it.

@jbgi
Copy link
Contributor

jbgi commented Jan 19, 2021

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 19, 2021

👎 Rejected by too few approved reviews

@jbgi
Copy link
Contributor

jbgi commented Jan 19, 2021

bors r+

Copy link

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

as long as hydra passes, I'm good :)

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 19, 2021

@iohk-bors iohk-bors bot merged commit 5d149b3 into master Jan 19, 2021
@iohk-bors iohk-bors bot deleted the nixpkgs-bump branch January 19, 2021 18:11
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.

5 participants