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.

Sign up for GitHub

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

Jump to bottom

amoeba: xlibs -> xorg, fix borg #104697

Merged
merged 1 commit into from Nov 23, 2020
Merged

amoeba: xlibs -> xorg, fix borg #104697

merged 1 commit into from Nov 23, 2020

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Nov 23, 2020 •
edited

Motivation for this change

what #104686 was supposed to be

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.

@jonringer
Copy link
Contributor Author

I will let the ofborg CI finish this time

@SuperSandro2000
Copy link
Member

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

@SuperSandro2000 SuperSandro2000 mentioned this pull request Nov 23, 2020
Merged
10 tasks
@jonringer
Copy link
Contributor Author

now I remember why I would just run ofborg locally.. could wait up to 6+ hrs

@jonringer
Copy link
Contributor Author

jonringer commented Nov 23, 2020 •
edited

I'm going to merge this because I have to attend to other things (been almost 2 hours), and I don't want ofborg permanently broken.

The diff looks right. I was able to build it locally

@jonringer jonringer merged commit a748764 into NixOS:master Nov 23, 2020
@jonringer jonringer deleted the fix-amoeba-borg branch November 23, 2020 19:40
@SuperSandro2000
Copy link
Member

I'm going to merge this because I have to attend to other things (been almost 2 hours), and I don't want ofborg permanently broken.

Me neither. I try to keep an eye on it and try to hotfix if anything bubbles up.

@jonringer
Copy link
Contributor Author

@SuperSandro2000 thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jonringer @SuperSandro2000