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

dwarf-fortress: Fix themes & package Legends Browser #43043

Merged
merged 2 commits into from Jul 4, 2018

Conversation

Baughn
Copy link
Contributor

@Baughn Baughn commented Jul 4, 2018

Motivation for this change

Theme support was broken, throwing errors if used.

Legends-browser is useful, and a good addition to the pack.

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.

@Baughn Baughn force-pushed the nix-df branch 2 times, most recently from e86ed5a to 2f918a4 Compare July 4, 2018 20:46
@@ -17,15 +17,15 @@ let
else theme;

# These are in inverse order for first packages to override the next ones.
pkgs = lib.optional (theme != null) ptheme
++ lib.optional enableDFHack dfhack_
themePkg = lib.optional (theme != null) ptheme;
Copy link
Member

Choose a reason for hiding this comment

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

Can you show what the error was? It may have been the compatible check? If so it may be we just need to add that attribute to the new themes.

Copy link
Member

Choose a reason for hiding this comment

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

Oops that's not in the .json file but I think we can add it.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe it will be easier to just remove the compatibility check - it doesn't really make sense to have any way because we only support the latest version of dwarf fortress.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was the compatibility check. But most of the themes aren't updated to the newest DF version, and they work anyway -- generally the case, of course; the worst case scenario is usually one or two new items reverting to ascii.

Which is to say that I believe the version check does more harm than good in this case, and so there's no reason to maintain it. That is, unless you're offering to test every theme with every bump, in which case I'd be happy to do as you suggest.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah do you think it's worth it to check for everything else though? like dfhack, soundsense, etc? I'm thinking not and just make everyone use the latest version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Having mismatched versions of dfhack and df would make the game crash unpredictably, so I'm inclined to say yes. There's no reason not to update them in lockstep, of course; this just provides a sanity check to make sure we do so.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm less sure about soundsense, but it does tend to update along with DF, so probably still yes. The reason I don't want to keep the test for the tilesets is that they don't update that predictably, and they by and large keep working anyway.

@grahamc
Copy link
Member

grahamc commented Jul 4, 2018

@GrahamcOfBorg eval

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants