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

godot: 3.1.2 -> 3.2 #79957

Merged
merged 1 commit into from Mar 6, 2020
Merged

godot: 3.1.2 -> 3.2 #79957

merged 1 commit into from Mar 6, 2020

Conversation

@mirrexagon
Copy link
Contributor

@mirrexagon mirrexagon commented Feb 13, 2020

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.

I successfully loaded and ran a small game project on NixOS.

@mirrexagon
Copy link
Contributor Author

@mirrexagon mirrexagon commented Feb 13, 2020

cc @Twey

@juliendehos juliendehos mentioned this pull request Feb 18, 2020
3 of 10 tasks complete
@xelaushi
Copy link

@xelaushi xelaushi commented Feb 18, 2020

Tested on my machine using sandboxing, works perfectly.

@aanderse aanderse requested review from tilpner and Moredread Mar 2, 2020
@aanderse
Copy link
Contributor

@aanderse aanderse commented Mar 2, 2020

Does anyone have the context to speak to the changes in pkgs/development/tools/godot/dont_clobber_environment.patch so someone can hit 'merge' and feel good about it?

@Moredread
Copy link
Contributor

@Moredread Moredread commented Mar 2, 2020

@aanderse not directly, but it seems that only the patch context changed, the actual patched code remains the same. So it should behave like before, I think.

Copy link
Contributor

@Moredread Moredread left a comment

+1, tested execution with sandbox build and the FPS demo project

@mirrexagon
Copy link
Contributor Author

@mirrexagon mirrexagon commented Mar 3, 2020

@aanderse @Moredread Yeah, I just edited the patch context to get it to apply again. I believe it functions the same as it used to.

@aanderse
Copy link
Contributor

@aanderse aanderse commented Mar 6, 2020

Ok thanks everyone. Merging based on feedback 👍

@aanderse aanderse merged commit 7218f3a into NixOS:master Mar 6, 2020
15 checks passed
15 checks passed
godot on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
godot on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
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
@mirrexagon mirrexagon deleted the mirrexagon:godot-3.2 branch Mar 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.