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

feat: introduce nixpkgsNix, set nix version to 2.20; chore: bump nix-darwin and fix darwin deploy script #92

Merged
merged 5 commits into from
May 17, 2024

Conversation

steveej
Copy link
Member

@steveej steveej commented May 16, 2024

deployed to

  • linux-builder-01
  • macos-01 currently broken
  • macos-03:1
  • macos-06: 1
  • macos-02 2
  • macos-05 2

postponing due to unavailability:

postponing these until #68 is resolved. these are not involved with the holochain CI nix builds, thus they only need nix to build their own system derivation.

  • dweb-reverse-tls-proxy
  • turn-0
  • turn-1
  • turn-2
  • turn-3

potentially fixes holochain/holochain#3556.

Footnotes

  1. could only get to 2.19 at first as 2.20 would show: error: 'show-config' is a deprecated alias for 'config show'. was held back by the lack of flake(inputs/nix-darwin): use upstream instead of fork #91 until i rebased that in 11db2c4. 2

  2. @peeech @alastairong any contraindications for deploying this on our shared darwin machines? 2

@steveej steveej added automation bug Something isn't working labels May 16, 2024
@steveej steveej changed the title chore: bump nixpkgs, set nix version to 2.20 chore: introduce nixpkgsNix, set nix version to 2.20 May 17, 2024
@steveej steveej changed the title chore: introduce nixpkgsNix, set nix version to 2.20 feat: introduce nixpkgsNix, set nix version to 2.20 May 17, 2024
@r-vdp
Copy link
Collaborator

r-vdp commented May 17, 2024

Seems ok to me. But I'm not much in favour of having multiple nixpkgs instances.

24.05 will be released in two weeks and will contain this nix version, so if we merge this, I would propose to update to 24.05 as soon as possible and get rid of the separate nixpkgs instance again.

@steveej
Copy link
Member Author

steveej commented May 17, 2024

@r-vdp

Seems ok to me. But I'm not much in favour of having multiple nixpkgs instances.

so there are no foreseeable side-effects of upgrading nix to v2.20 on the darwin machines that are used as builders by Holo's hydra instance?

@steveej steveej changed the title feat: introduce nixpkgsNix, set nix version to 2.20 feat: introduce nixpkgsNix, set nix version to 2.20; chore: bump nix-darwin and fix darwin deploy script May 17, 2024
@r-vdp
Copy link
Collaborator

r-vdp commented May 17, 2024

Barring any bugs, the nix builder protocol is versioned, so it's usually fine to have different versions of the daemons talk with each other.

I couldn't look through the code a lot from my phone, are we upgrading nix on the Mac builders but not on hydra? Because they are managed by different repos?

@steveej
Copy link
Member Author

steveej commented May 17, 2024

I couldn't look through the code a lot from my phone, are we upgrading nix on the Mac builders but not on hydra? Because they are managed by different repos?

yes, that's the case.

@steveej
Copy link
Member Author

steveej commented May 17, 2024

Barring any bugs, the nix builder protocol is versioned, so it's usually fine to have different versions of the daemons talk with each other.

based on this i'm going ahead with the update on those builders.

@steveej steveej merged commit ab15426 into develop May 17, 2024
1 check passed
@steveej steveej deleted the bump-nix branch May 21, 2024 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Nix remote builds socket error
2 participants