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

Staging next #76705

Merged
merged 720 commits into from Jan 3, 2020
Merged

Staging next #76705

merged 720 commits into from Jan 3, 2020

Conversation

@FRidh
Copy link
Member

@FRidh FRidh commented Dec 30, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

jtojnar added 4 commits Dec 31, 2019
This reverts commit 7084c05.
This reverts commit 5aff75d.
This reverts commit aa6c894.
@FRidh FRidh requested review from adisbladis, etu and thoughtpolice as code owners Dec 31, 2019
@jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Dec 31, 2019

Sorry about creating this mess, I was cherry-picking the compatible changes from #72074 and the did not notice changes in dependent files from master. NIX_* are in fact environment variables so they need to be strings, not arrays (and it is going to be enforced by #72074) – only because of these unnoticed conflicts the eval failed.

I have reverted your fixes and merged staging where proper fixes were introduced:

I have decided to restart the cycle by merging staging here because it also includes lot of build fixes to issues I introduced yesterday, even if they do not impact evaluation.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Dec 31, 2019

sounds good to me, just tryingto get ofborg to eval it

@FRidh
Copy link
Member Author

@FRidh FRidh commented Dec 31, 2019

Hydra is stuck evaluating staging-next
https://hydra.nixos.org/jobset/nixpkgs/staging-next

FRidh added 2 commits Jan 2, 2020
This broke sudo.

This reverts commit 91a1f20.
@FRidh FRidh requested a review from Infinisil as a code owner Jan 2, 2020
@FRidh FRidh merged commit 9ec439e into master Jan 3, 2020
2 of 4 checks passed
2 of 4 checks passed
grahamcofborg-eval Beginning Evaluations
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 3, 2020

hurray! I can finally work on stabilizing a bunch of stuff on master :)

@misuzu misuzu mentioned this pull request Jan 3, 2020
5 of 10 tasks complete
@teh

This comment has been minimized.

Copy link
Contributor

@teh teh commented on 6209486 Jan 4, 2020

Just as an FYI this breaks duplicity but AFAICT duplicity 0.8+ has python 3 support, so should sort itself out eventually.

(https://answers.launchpad.net/duplicity/+question/687576)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.