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

crawl: 0.21.1 -> 0.22.0 #44882

Merged
merged 1 commit into from Aug 11, 2018
Merged

crawl: 0.21.1 -> 0.22.0 #44882

merged 1 commit into from Aug 11, 2018

Conversation

ghost
Copy link

@ghost ghost commented Aug 10, 2018

Motivation for this change

crawl update

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.

Both crawl and crawl-tiles binaries works (crawl and crawlTiles packages).
@abbradar

@timokau
Copy link
Member

timokau commented Aug 10, 2018

While you're at it, would you mind quoting the variable in patchShebangs $i? Also just in case you know what the purpose of the patch is, it would be nice to document that.

@ghost
Copy link
Author

ghost commented Aug 11, 2018

@timokau I'm sorry, but my time was only enough to update the version 😑
crawl_purify.patch changes SQLITE_INCLUDE_DIR in /crawl-ref/source/Makefile
It also changes /crawl-ref/source/util/find_font script (FONTDIRS value, find now has an -L flag)

@timokau
Copy link
Member

timokau commented Aug 11, 2018

Well I would appreciate if you make the change once you find the time :)

Now that I think about it that for loop should be unnecessary anyways, patchShebangs 'util' should work just as well. Please also add an explanation comment to the patch ("Patch hard-coded paths in the makefile"). If you want to go the extra mile, it would be best to contact upstream and ask them about configurability. But that's not a hard requirement for me to merge this.

@ghost
Copy link
Author

ghost commented Aug 11, 2018

I've made some changes (including changes to all-packages.nix).

Now I'm much more interested in roguelikes such as IVAN or NetHack. So I wouldn't want to spend a lot of time on crawl. However, this time (0.22.0) the crawl-tiles interface looks great 😃

The serious problem is that the file init.txt, which defines the crawl configuration (including language), is loading from the nix store. Crawl shows the path to the used init.txt immediately after loading on the main screen of the app.Thus, it is not possible to play with a configuration other than the default 😞 But I'm not ready to take on this problem 😉

@timokau
Copy link
Member

timokau commented Aug 11, 2018

I've made some changes (including changes to all-packages.nix).

Thanks :)

The serious problem is that the file init.txt, which defines the crawl configuration (including language), is loading from the nix store. Thus, it is not possible to play with a configuration other than the default configuration 😢

That sounds like it really should be a user-configuration and not part of the package. It would be best to fix that. But if its not a regression and you don't want to spend the time, I'm happy with the PR as-is.

I'm not sure why you made the all-packages.nix change, but I don't have much of an opinion about that either way. The old way had the advantage/disadvantage that an override to crawl would automatically propagate to crawl-tiles.

init.txt

By the way, stuff like code, filenames etc. is usually enclosed in backticks in markdown, like this: `init.txt` (init.txt). You can also enclose larger code segments in three backticks:

multi
line

@GrahamcOfBorg build crawl crawl-tiles

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: crawl, crawl-tiles

Partial log (click to expand)

in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


Cannot nix-instantiate `crawl-tiles' because:
error: attribute 'crawl-tiles' in selection path 'crawl-tiles' not found

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: crawl, crawl-tiles

Partial log (click to expand)

in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


Cannot nix-instantiate `crawl-tiles' because:
error: attribute 'crawl-tiles' in selection path 'crawl-tiles' not found

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: crawl

The following builds were skipped because they don't evaluate on aarch64-linux: crawl-tiles

Partial log (click to expand)

chown 2>/dev/null  /nix/store/dfhzcnc28wqhgxlssryyna007x1irmm9-crawl-0.22.0/bin/crawl || true
chmod 2>/dev/null  /nix/store/dfhzcnc28wqhgxlssryyna007x1irmm9-crawl-0.22.0/bin/crawl || true
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/dfhzcnc28wqhgxlssryyna007x1irmm9-crawl-0.22.0
shrinking /nix/store/dfhzcnc28wqhgxlssryyna007x1irmm9-crawl-0.22.0/bin/crawl
strip is /nix/store/ah0va6j4cnwj9nx4j6rwcfc8nh785jwm-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dfhzcnc28wqhgxlssryyna007x1irmm9-crawl-0.22.0/bin
patching script interpreter paths in /nix/store/dfhzcnc28wqhgxlssryyna007x1irmm9-crawl-0.22.0
checking for references to /build in /nix/store/dfhzcnc28wqhgxlssryyna007x1irmm9-crawl-0.22.0...
/nix/store/dfhzcnc28wqhgxlssryyna007x1irmm9-crawl-0.22.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: crawl

The following builds were skipped because they don't evaluate on aarch64-linux: crawl-tiles

Partial log (click to expand)

Cannot nix-instantiate `crawl-tiles' because:
error: attribute 'crawl-tiles' in selection path 'crawl-tiles' not found

these derivations will be built:
  /nix/store/0w11xajz1mi7nmiwb31ahi8y4hjfhrwg-crawl-0.22.0.drv
waiting for locks or build slots...
/nix/store/dfhzcnc28wqhgxlssryyna007x1irmm9-crawl-0.22.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: crawl

The following builds were skipped because they don't evaluate on x86_64-linux: crawl-tiles

Partial log (click to expand)

chown 2>/dev/null  /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0/bin/crawl || true
chmod 2>/dev/null  /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0/bin/crawl || true
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0
shrinking /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0/bin/crawl
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0/bin
patching script interpreter paths in /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0
checking for references to /build in /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0...
/nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0

@ghost
Copy link
Author

ghost commented Aug 11, 2018

Thanks! :)

I'm not sure why you made the all-packages.nix change, but I don't have much of an opinion about that either way. The old way had the advantage/disadvantage that an override to crawl would automatically propagate to crawl-tiles.

We had some discussion on this topic: #42766 (outdated branch).
Although I personally have no preference on how it will be better.

By the way, stuff like code, filenames etc. is usually enclosed in backticks in markdown, like this: init.txt (init.txt). You can also enclose larger code segments in three backticks:

Thanks! I'll keep that in mind. I'm just a little bit lazy for quality markup 😈

That sounds like it really should be a user-configuration and not part of the package. It would be best to fix that. But if its not a regression and you don't want to spend the time, I'm happy with the PR as-is.

I'm afraid I'm not ready to do that (at least for now) 😑 I will be pleased if you would accept PR as is 😎

@timokau
Copy link
Member

timokau commented Aug 11, 2018

We had some discussion on this topic: #42766 (outdated branch).

I think you misunderstood matthewbauer there: He was saying that nethack-x11 shouldn't be in all-packages at all. Users should instead override it themselves if they need it. But apparently he didn't care enough to further argue and I don't really know if I agree.

Anyways, thanks for your contribution.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: crawl

The following builds were skipped because they don't evaluate on x86_64-linux: crawl-tiles

Partial log (click to expand)

chown 2>/dev/null  /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0/bin/crawl || true
chmod 2>/dev/null  /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0/bin/crawl || true
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0
shrinking /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0/bin/crawl
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0/bin
patching script interpreter paths in /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0
checking for references to /build in /nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0...
/nix/store/d7j3h5kfj5p7nzd0bfs4ddrszf2cl9w2-crawl-0.22.0

@timokau timokau merged commit c85748b into NixOS:master Aug 11, 2018
@ghost
Copy link
Author

ghost commented Aug 11, 2018

Maybe I did misunderstand him 😞 Fortunately, all this can be easily fixed at any time.

Thanks for merging the pull requests and for your patience! 😎

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

2 participants