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

Make oa_ded link as well as openarena. #71122

Merged
merged 2 commits into from
Oct 31, 2019
Merged

Make oa_ded link as well as openarena. #71122

merged 2 commits into from
Oct 31, 2019
+11 −16

Conversation

kevincox
Copy link
Contributor

@kevincox kevincox commented Oct 14, 2019 •
edited
Loading

Motivation for this change
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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Sorry, something went wrong.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 14, 2019
@kevincox kevincox requested a review from Ericson2314 October 14, 2019 20:28
@kevincox kevincox requested a review from Ericson2314 October 25, 2019 14:24
@kevincox kevincox merged commit e12df0e into master Oct 31, 2019
@kevincox kevincox deleted the kevincox-oa_ded branch October 31, 2019 22:26
@tomfitzhenry
Copy link
Contributor

Renaming openarena-server to oa_ded has broken

nixpkgs/nixos/modules/services/games/openarena.nix

Line 46 in 2921e8a

ExecStart = "${pkgs.openarena}/bin/openarena-server +set fs_basepath ${pkgs.openarena}/openarena-0.8.8 +set fs_homepath /var/lib/openarena ${concatStringsSep " " cfg.extraFlags}";
and consequently openarena's test: https://hydra.nixos.org/build/105060313/nixlog/9

machine# [    6.863817] systemd[636]: openarena.service: Failed at step EXEC spawning /nix/store/k493fk4ms79mzpks86v763850j5x8lmz-openarena-0.8.8/bin/openarena-server: No such file or directory

@kevincox
Copy link
Contributor Author

kevincox commented Nov 5, 2019

Hmm, I'm really confused because while the diff shows that I removed that link the blame view doesn't show the openarena-server link at all https://github.com/NixOS/nixpkgs/blame/67effde499ffb60da484ebbbd643c6dc69f8eb77/pkgs/games/openarena/default.nix. Either way, I'll change the oa_ded to openarena-server and that should fix everything.

kevincox added a commit that referenced this pull request Nov 5, 2019
@kevincox
openarena: Update link from oa_ded to openarena-server
e7314d1 
230fc22 was lost in #71122
kevincox added a commit that referenced this pull request Nov 5, 2019
@kevincox
openarena: Update link from oa_ded to openarena-server
a72fd47 
230fc22 was lost in #71122
@kevincox kevincox mentioned this pull request Nov 5, 2019
Closed
10 tasks
@tomfitzhenry tomfitzhenry mentioned this pull request Nov 17, 2019
Merged
10 tasks
Lassulus pushed a commit that referenced this pull request Nov 24, 2019
@tomfitzhenry @Lassulus
nixos/openarena: fix service's binary name
58498ae 
The binary name was recently changed from openarena-server to oa_ded in
#71122 .

That change broke the openarena module and consequently the openarena
test too. This commit fixes both.

As an alternative, we considered reverting the name change in
#72824 but we decided oa_ded was
a better name for the binary (it's the name upstream use).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314

Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 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
@kevincox @tomfitzhenry @Ericson2314