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

crispy-doom: init at 5.2 #44536

Merged
merged 2 commits into from Aug 8, 2018
Merged

crispy-doom: init at 5.2 #44536

merged 2 commits into from Aug 8, 2018

Conversation

neonfuz
Copy link
Contributor

@neonfuz neonfuz commented Aug 6, 2018

Motivation for this change

Crispy doom is enhanced version of chocolate doom (which in turn is a sourceport of doom). Some of it's features are optionally doubling the original resolution from 320x200 to 640x400, removing or raising static limits set by the original game, and adding compatibility for the "Doom Classic" WADs shipped with the "Doom 3: BFG Edition", especially the "No Rest For The Living" episode shipped in the NERVE.WAD file.

Nixos already has chocolate doom so the port was pretty straight-forward from that. Some people would probably enjoy the features of this sourceport, the more the merrier IMO.

Also, there is a comment remaining from chocolate-doom that hydra darwin times out, I don't know if this is still true but I left the comment because this package is similar to chocolate doom so it's probably true. Someone might want to re-test this.

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)
  • Fits CONTRIBUTING.md.

@srhb
Copy link
Contributor

srhb commented Aug 6, 2018

@GrahamcOfBorg build crispyDoom

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: crispyDoom

Partial log (click to expand)

make[2]: Nothing to be done for 'install-exec-am'.
 /nix/store/gv40kn2pfzwmqzwlinl18qr3464xs83m-coreutils-8.29/bin/mkdir -p '/nix/store/dikcj459cgy3mcz36fw7546z46wlghfs-crispy-doom-5.2/share/doc/crispy-doom/../crispy-doom'
 /nix/store/gv40kn2pfzwmqzwlinl18qr3464xs83m-coreutils-8.29/bin/install -c -m 644 COPYING.md README.md README.Music.md NEWS.md PHILOSOPHY.md ChangeLog NOT-BUGS.md '/nix/store/dikcj459cgy3mcz36fw7546z46wlghfs-crispy-doom-5.2/share/doc/crispy-doom/../crispy-doom'
make[2]: Leaving directory '/private/tmp/nix-build-crispy-doom-5.2.drv-0/crispy-doom-crispy-doom-5.2'
make[1]: Leaving directory '/private/tmp/nix-build-crispy-doom-5.2.drv-0/crispy-doom-crispy-doom-5.2'
post-installation fixup
strip is /nix/store/qfxcr8c4fg7lkybrny9n2sb77bmippdx-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/dikcj459cgy3mcz36fw7546z46wlghfs-crispy-doom-5.2/bin
patching script interpreter paths in /nix/store/dikcj459cgy3mcz36fw7546z46wlghfs-crispy-doom-5.2
/nix/store/dikcj459cgy3mcz36fw7546z46wlghfs-crispy-doom-5.2

@srhb
Copy link
Contributor

srhb commented Aug 6, 2018

Since ofborg is able to build this on Darwin in a timely fashion, I think we should try and let it be enabled on Hydra as well.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: crispyDoom

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/zzqxvvyvh09j0lbaia57cssdigf7q8cd-crispy-doom-5.2
shrinking /nix/store/zzqxvvyvh09j0lbaia57cssdigf7q8cd-crispy-doom-5.2/bin/crispy-doom-setup
shrinking /nix/store/zzqxvvyvh09j0lbaia57cssdigf7q8cd-crispy-doom-5.2/bin/crispy-server
shrinking /nix/store/zzqxvvyvh09j0lbaia57cssdigf7q8cd-crispy-doom-5.2/bin/crispy-doom
strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/zzqxvvyvh09j0lbaia57cssdigf7q8cd-crispy-doom-5.2/bin
patching script interpreter paths in /nix/store/zzqxvvyvh09j0lbaia57cssdigf7q8cd-crispy-doom-5.2
checking for references to /build in /nix/store/zzqxvvyvh09j0lbaia57cssdigf7q8cd-crispy-doom-5.2...
/nix/store/zzqxvvyvh09j0lbaia57cssdigf7q8cd-crispy-doom-5.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: crispyDoom

Partial log (click to expand)

make[1]: Leaving directory '/build/crispy-doom-crispy-doom-5.2'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/cng32a3g1dazbjbndicprvlf678vfv29-crispy-doom-5.2
shrinking /nix/store/cng32a3g1dazbjbndicprvlf678vfv29-crispy-doom-5.2/bin/crispy-doom
shrinking /nix/store/cng32a3g1dazbjbndicprvlf678vfv29-crispy-doom-5.2/bin/crispy-doom-setup
shrinking /nix/store/cng32a3g1dazbjbndicprvlf678vfv29-crispy-doom-5.2/bin/crispy-server
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/cng32a3g1dazbjbndicprvlf678vfv29-crispy-doom-5.2/bin
patching script interpreter paths in /nix/store/cng32a3g1dazbjbndicprvlf678vfv29-crispy-doom-5.2
checking for references to /build in /nix/store/cng32a3g1dazbjbndicprvlf678vfv29-crispy-doom-5.2...

@srhb srhb merged commit 2038ac3 into NixOS:master Aug 8, 2018
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
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@neonfuz @srhb @GrahamcOfBorg