Skip to content

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

Merged
Mic92 merged 2 commits intoNixOS:masterfrom
fabianhjr:update-nix-serve
Sep 20, 2024
Merged

nix-serve: unstable-2018-03-20 → unstable-2024-09-17#342714
Mic92 merged 2 commits intoNixOS:masterfrom
fabianhjr:update-nix-serve

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.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Sep 18, 2024
@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.

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Sep 18, 2024
@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
@github-actions github-actions bot removed the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Sep 20, 2024
@Mic92 Mic92 merged commit eb678b4 into NixOS:master Sep 20, 2024
@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

@fabianhjr fabianhjr deleted the update-nix-serve branch September 27, 2024 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants