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.0.6 -> 3.1 #58029

Merged
merged 1 commit into from Apr 5, 2019
Merged

godot: 3.0.6 -> 3.1 #58029

merged 1 commit into from Apr 5, 2019

Conversation

tilpner
Copy link
Member

@tilpner tilpner commented Mar 21, 2019

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Moredread
Copy link
Contributor

I tried the PR with nix-review and get

builder for '/nix/store/md5wmgwbyradx0jbb67bl67z7qrxnb0w-godot-3.1.drv' failed with exit code 2; last 8 log lines:
  unpacking sources
  unpacking source archive /nix/store/babbqrsgdig50ddxwb9mqr2rh5x9pcb3-source
  source root is source
  patching sources
  applying patch /nix/store/sh1yzanh647zbr7jcbw0wd3g1drdrbpp-pkg_config_additions.patch
  patching file platform/x11/detect.py
  patch: **** malformed patch at line 14: @@ -264,7 +270,7 @@ def configure(env):
cannot build derivation '/nix/store/lx75f4bsjig5i9j4nnxaia9ldaladxa8-env.drv': 1 dependencies couldn't be built
[1 built (1 failed), 5 copied (10.1 MiB), 1.8 MiB DL]
error: build of '/nix/store/lx75f4bsjig5i9j4nnxaia9ldaladxa8-env.drv' failed

@tilpner tilpner force-pushed the godot-update branch 3 times, most recently from 2bc1118 to b1bb32c Compare March 21, 2019 18:21
@tilpner
Copy link
Member Author

tilpner commented Mar 21, 2019

@Moredread Ahh, sorry, I forgot to adjust the line numbers after I deleted a redundant line from the patch. I pushed a patch that applies properly now. :)

@grahamc grahamc merged commit d656b73 into NixOS:master Apr 5, 2019
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

5 participants