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

Jump to bottom

colobot: init at 0.1.12-alpha #103077

Merged
merged 1 commit into from Dec 30, 2020
Merged

colobot: init at 0.1.12-alpha #103077

merged 1 commit into from Dec 30, 2020

Conversation

freezeboy
Copy link
Contributor

@freezeboy freezeboy commented Nov 7, 2020 •
edited

Motivation for this change

Initial integration without the game musics to reduce the size of the
game. It works without them

Data are in another derivation to let them live their live independently
as they are quite big.

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.

@freezeboy freezeboy changed the title colobot: init 0.1.12-alpha colobot: init at 0.1.12-alpha Nov 7, 2020
SuperSandro2000
SuperSandro2000 reviewed Nov 7, 2020
View reviewed changes
pkgs/games/colobot/data.nix Show resolved Hide resolved
pkgs/games/colobot/default.nix Outdated

stdenv.mkDerivation rec {
pname = "colobot";
version = "0.1.12-alpha";
Copy link
Member

Choose a reason for hiding this comment

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

We should probably add a comment to also update the data derivation and vice versa.

Copy link
Contributor

Choose a reason for hiding this comment

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

@freezeboy Ideally the comment saying updates to this derivation should go along with updates to ./data.nix, should be here, right above the version, and it shouldn't have typos :)

pkgs/games/colobot/data.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 103077 run on x86_64-linux 1

2 packages marked as broken and skipped:
  • colobot
  • colobot-data

@freezeboy freezeboy force-pushed the add-colobot branch 2 times, most recently from d62b4d5 to 14084c6 Compare November 7, 2020 16:34
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 103077 run on x86_64-darwin 1

1 package marked as broken and skipped:
  • colobot

@freezeboy
Copy link
Contributor Author

freezeboy commented Nov 9, 2020 •
edited

Why is it broken ?

Edit: Ok: physfs is broken

@freezeboy
Copy link
Contributor Author

I don't understand why ofborg is not happy, looks like an unrelated problem

@doronbehar
Copy link
Contributor

doronbehar commented Nov 28, 2020 •
edited

The ofborg error is not a problem with ofborg. There's a policy that within nixpkgs, all packages should be able to evaluate without using declarations from aliases.nix - as that's usually a place where attributes are declared only for backwards compatibility. In your case, you are using xlibs which is an alias:

nixpkgs/pkgs/top-level/aliases.nix

Line 683 in 7d75a77

xlibs = xorg; # added 2015-09

So, use xorg, not xlibs.

@freezeboy
Copy link
Contributor Author

Oh ok, didn't know that, is there a way to check it locally as nix-build succeeds anyway ?

@freezeboy
Copy link
Contributor Author

apparently was caused by another package

doronbehar
doronbehar reviewed Nov 28, 2020
View reviewed changes
pkgs/games/colobot/default.nix Outdated
Comment on lines 12 to 11
# Mayb require an update tp package colobot-data as well
# in file data.nix next to this one
Copy link
Contributor

Choose a reason for hiding this comment

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

So I'd remove these and rewrite it upwards.

Suggested change
# Mayb require an update tp package colobot-data as well
# in file data.nix next to this one

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What do you mean "upwards"?

Copy link
Contributor

Choose a reason for hiding this comment

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

What do you mean "upwards"?

Right above version = "...";.

@doronbehar
Copy link
Contributor

Oh ok, didn't know that, is there a way to check it locally as nix-build succeeds anyway ?

This one is easy:

nix-env -qa --json --file . --arg config '{ allowAliases = false; }'

@freezeboy freezeboy force-pushed the add-colobot branch 2 times, most recently from 908004f to 98ad579 Compare December 4, 2020 21:25
@freezeboy
colobot: init at 0.1.12-alpha
80bff15 
Initial integration without the game musics to reduce the size of the
game. It works without them

Data are in another derivation to let them live their live independently
as they are quite big.

Limited to linux platform only because physfs is currently broken on
darwin.
@freezeboy
Copy link
Contributor Author

Just rebased the commit, I think it should be ok

@doronbehar doronbehar merged commit f423aea into NixOS:master Dec 30, 2020
@freezeboy freezeboy deleted the add-colobot branch December 30, 2020 08:55
@FliegendeWurst FliegendeWurst mentioned this pull request Dec 6, 2021
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaghavSood RaghavSood RaghavSood left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@jonringer jonringer jonringer left review comments

@doronbehar doronbehar doronbehar approved these changes

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@freezeboy @SuperSandro2000 @doronbehar @RaghavSood @jonringer