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

add openttd nml and grfcodec tools #85698

Merged
merged 3 commits into from Jul 3, 2021
Merged

add openttd nml and grfcodec tools #85698

merged 3 commits into from Jul 3, 2021

Conversation

ToxicFrog
Copy link
Contributor

Motivation for this change

OpenTTD is already in nixpkgs; this adds two tools used in developing mods for it.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

prusnak
prusnak requested changes Apr 21, 2020
View reviewed changes
pkgs/games/openttd/grfcodec.nix Outdated Show resolved Hide resolved
pkgs/games/openttd/nml.nix Outdated Show resolved Hide resolved
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
prusnak
prusnak requested changes Apr 22, 2020
View reviewed changes
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/games/openttd/nml.nix Outdated Show resolved Hide resolved
pkgs/games/openttd/grfcodec.nix Outdated Show resolved Hide resolved
@ToxicFrog
Copy link
Contributor Author

All suggested changes implemented, also updated nml to 0.5.0.

@ToxicFrog
Copy link
Contributor Author

Ping?

prusnak
prusnak requested changes Nov 23, 2020
View reviewed changes
Copy link
Member

@prusnak prusnak left a comment

Choose a reason for hiding this comment

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

Please do the following changes

  • change commit message Add myself to maintainer list to maintainers: add ToxicFrog
  • split openttd: init grfcodec & nml at 6.0.6 and 0.5.0 into 2 commits openttd-grfcodec: init at 6.0.6 and openttd-nml: init at 0.5.0
  • update openttd-nml to recently released 0.5.3

@stale
Copy link

stale bot commented Jun 3, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 3, 2021
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 3, 2021
@ToxicFrog
Copy link
Contributor Author

@prusnak done

@prusnak
Copy link
Member

prusnak commented Jul 3, 2021

@GrahamcOfBorg build openttd-nml openttd-grfcodec

@prusnak
Copy link
Member

prusnak commented Jul 3, 2021

In the meantime, stdenv.lib alias has been dropped, so we need to do the following:

  1. replace { stdenv, with { stdenv, lib, on the first line
  2. replace meta = with stdenv.lib; { with meta = with lib; {

@ToxicFrog
Copy link
Contributor Author

Done, also bumped grfcodec from 6.0.6 to latest git to pick up a fix for it not building under modern gcc

prusnak
prusnak requested changes Jul 3, 2021
View reviewed changes
Copy link
Member

@prusnak prusnak left a comment

Choose a reason for hiding this comment

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

Last suggestion - we use unstable-YYYY-MM-DD for version when we don't use the release.

Please also remove commented-out sections prePatch and configurePhase

pkgs/games/openttd/grfcodec.nix Outdated Show resolved Hide resolved
@ToxicFrog
openttd-grfcodec: init at 6.0.6+git20210310
277d1a1 
N.b. 6.0.6 release version is ~5 years old now, and doesn't build under gcc10
@ToxicFrog
openttd-nml: init at 0.5.3
82c4085
@prusnak prusnak merged commit 9a2966f into NixOS:master Jul 3, 2021
@prusnak
Copy link
Member

prusnak commented Jul 3, 2021

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prusnak prusnak prusnak requested changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ToxicFrog @prusnak