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

nixUnstable: pre20220127 -> pre20220207 #158455

Merged
merged 2 commits into from
Feb 26, 2022
Merged

Conversation

NickCao
Copy link
Member

@NickCao NickCao commented Feb 7, 2022

Motivation for this change

fixes NixOS/nix#5985

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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@NickCao
Copy link
Member Author

NickCao commented Feb 7, 2022

this breaks hydra-unstable due to recent changes.

@trofi
Copy link
Contributor

trofi commented Feb 13, 2022

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

1 package failed to build:
  • hydra-unstable
1 package built:
  • nixVersions.unstable

@NickCao
Copy link
Member Author

NickCao commented Feb 14, 2022

I did figure out a patch: NickCao@a89e608 , and have being running with it on my hydra for days without problems, still need someone familiar with hydra-eval-jobs to review it. Pinning nix to nixVersions.stable is not a viable fix as restricted evaluation is broken on nix 2.6.0.

@L-as
Copy link
Member

L-as commented Feb 18, 2022

Do note that this also fixes NixOS/nix#6036

@Artturin
Copy link
Member

@ofborg build hydra-unstable

@NickCao
Copy link
Member Author

NickCao commented Feb 26, 2022

I'm not in favor of blocking this indefinitely. as these bugs fixes are critical to our users. If nobody objects the hydra patch, shall we just merge this.

@Artturin
Copy link
Member

Let's merge, please submit the patch upstream

@NickCao
Copy link
Member Author

NickCao commented Feb 26, 2022

Let's merge, please submit the patch upstream

Shall I mark hydra-unstable as broken for now?

@Artturin
Copy link
Member

Let's merge, please submit the patch upstream

Shall I mark hydra-unstable as broken for now?

No, I meant let's merge and submit the patch upstream

@Artturin
Copy link
Member

It would be better to create a pr in the hydra repo and then fetchpatch and add a comment to the pr

@NickCao
Copy link
Member Author

NickCao commented Feb 26, 2022

Currently hydra's policy is to support the stable version of nix, upstream pr has no where to target until hydra have a staging branch for us.

@Artturin Artturin merged commit b398f19 into NixOS:master Feb 26, 2022
@NickCao
Copy link
Member Author

NickCao commented Feb 26, 2022

Oops, that patch was a little bit out dated, I will submit a new one soon.

@NickCao NickCao deleted the nix-unstable branch February 26, 2022 05:50
@NickCao NickCao mentioned this pull request Feb 26, 2022
13 tasks
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.

Interrupting Nix during a download causes it to hang
4 participants