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

[20.09] cheesecutter: unstable-2019-12-06 -> unstable-2020-04-03 #99613

Conversation

OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Oct 5, 2020

(cherry picked from commit e782471)

Backport of PR #97939

Motivation for this change

Fix build failure on macOS. ZHF #97479

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.

@risicle
Copy link
Contributor

risicle commented Oct 5, 2020

WFM macos 10.14, non-nixos linux x86_64, but you've used cherry-pick information from your original commit, while your PR was rebase-merged, so that isn't the actual commit id that made it into master.

@OPNA2608 OPNA2608 force-pushed the backport-20.09-update-cheesecutter-unstable-2020-04-03 branch from 596e27a to 724d372 Compare October 5, 2020 17:58
@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Oct 5, 2020

Whoops, apologies. This better?

Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect

@domenkozar domenkozar merged commit 298cda4 into NixOS:release-20.09 Oct 13, 2020
@OPNA2608 OPNA2608 deleted the backport-20.09-update-cheesecutter-unstable-2020-04-03 branch September 27, 2022 17:39
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.

None yet

3 participants