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

Factorio update #22032

Merged
merged 3 commits into from Jan 25, 2017
Merged

Factorio update #22032

merged 3 commits into from Jan 25, 2017

Conversation

bflyblue
Copy link
Contributor

Motivation for this change

A new version of Factorio was released on 24 Nov 2016.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@bflyblue, thanks for your PR! By analyzing the history of the files in this pull request, we identified @Baughn, @elitak and @vikstrous to be potential reviewers.

@vikstrous
Copy link
Contributor

Just tested this out. The game starts normally. I haven't tried any of the server stuff though.

@Baughn
Copy link
Contributor

Baughn commented Jan 23, 2017

I don't think I'm a good reviewer for this anymore. There's a whole lot of code in here which I didn't write, and never used...

The hash update looks fine, but I can't comment on the server code either. It's possible that @bflyblue is the only person using it, in which case... it should probably not be in nixpkgs? I'm not sure, there isn't much of a downside.

@@ -120,6 +201,7 @@ in
"--config=${cfg.configFile}"
"--port=${toString cfg.port}"
"--start-server=${mkSavePath cfg.saveName}"
"--server-settings=${serverSettingsFile}"
(optionalString (cfg.mods != []) "--mod-directory=${modDir}")
(optionalString (cfg.autosave-interval != null) "--autosave-interval ${toString cfg.autosave-interval}")
Copy link
Contributor

Choose a reason for hiding this comment

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

autosave-interval shouldn't need to go on cmdline if it's in the config file. Does the config file support changing the mod directory as well? If so, that can move there as well.

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 didn't see an option in the sample file bundled with Factorio to specify the mods so I only exposed a few options I thought may be useful.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh! I meant to take it off the command line.. will do that now. Thanks for the catch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in commit d78f684

Game will be broadcast on LAN.
'';
};
username = mkOption {
Copy link
Contributor

Choose a reason for hiding this comment

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

username and password are also given and used by nixpkgs.config.factorio.username/password. Should they be kept independent or merged into one or the other?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's a good question, I wasn't sure which is preferable. Does anyone know if it would be desirable for a server to authenticate using different credentials to a player?

Copy link
Contributor

Choose a reason for hiding this comment

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

I suppose it's fine to leave them independent for now, since the nixpkgs one is used only to fetch the tarball and may eventually disappear. It does have the advantage of not being world-readable, however.

Anyway, we can sort it out later; the PR looks okay to me for a merge, as it is now.

@globin globin merged commit 462ef74 into NixOS:master Jan 25, 2017
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

6 participants