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-ng: use upstream commit that is compatible with Nix 2.13 #228541

Merged
merged 1 commit into from
Jun 21, 2023

Conversation

ivan
Copy link
Member

@ivan ivan commented Apr 27, 2023

Description of changes

This fixes nix-serve-ng, which I think has been broken (aristanetworks/nix-serve-ng#22) in nixpkgs master ever since nix was upgraded to 2.13.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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.

I tested this on x86_64 NixOS master and confirmed that nix-serve-ng was successfully serving packages.

cc last person to touch it @sternenseemann

cc reporter @jkarni and issue commenter @rectcircle

@cdepillabout
Copy link
Member

Would it be possible to instead ask them to make a release to Hackage? Then we can stop carrying around the src override.

@jkarni
Copy link
Contributor

jkarni commented Apr 28, 2023

I think this change means nix-serve-ng won't work with nix < 2.13 (see here). But since presumably people will be using nix > 2.13, LGTM.

@figsoda figsoda added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Apr 30, 2023
@qbit
Copy link
Contributor

qbit commented Jun 6, 2023

Result of nixpkgs-review pr 228541 run on x86_64-linux 1

3 packages built:
  • haskellPackages.nix-serve-ng
  • haskellPackages.nix-serve-ng.doc
  • nix-serve-ng

@mweinelt mweinelt added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Jun 14, 2023
@maralorn
Copy link
Member

I have tested this. Upstream does not seem to be very active right now, so I am going to merge this. Thanks!

@maralorn maralorn merged commit db261a3 into NixOS:master Jun 21, 2023
@github-actions
Copy link
Contributor

Successfully created backport PR for release-23.05:

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

Successfully merging this pull request may close these issues.

7 participants