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

nix-serve: unstable-2018-03-20 → unstable-2024-09-17 #342714

Merged
merged 2 commits into from
Sep 20, 2024

Conversation

fabianhjr
Copy link
Member

@fabianhjr fabianhjr commented Sep 18, 2024

Description of changes

Draft while upstream decides way forward

edolstra/nix-serve#60

Fixes broken nixosTests.nix-serve after

#335342

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@fabianhjr
Copy link
Member Author

@ofborg test nix-serve

@Aleksanaa
Copy link
Member

We should probably pin to 2.18 if it isn't merged in one or two days. Better not send a broken nix-serve to nixos-unstable

@fabianhjr
Copy link
Member Author

pinning nix to 2.18 for this package also sounds like an acceptable solution, we could even create a PR and merge that meanwhile + rebase this to remove that pinning.

@fabianhjr
Copy link
Member Author

@ofborg test nix-serve

@Mic92
Copy link
Member

Mic92 commented Sep 18, 2024

alternative approach: #342754

@fabianhjr
Copy link
Member Author

Upstream merged, leaving as draft due to alternative offered by @Mic92 though not closing for the time being.

@Mic92 Mic92 marked this pull request as ready for review September 20, 2024 08:34
@Mic92 Mic92 merged commit eb678b4 into NixOS:master Sep 20, 2024
24 of 26 checks passed
@fabianhjr
Copy link
Member Author

fabianhjr commented Sep 20, 2024

This will be broken due to the nix 2.24 revert :s

@Mic92
Copy link
Member

Mic92 commented Sep 20, 2024

Indeed. I will pin nix 2.24.

@Mic92
Copy link
Member

Mic92 commented Sep 20, 2024

Follow up: #343274

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants