Navigation Menu

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

vvvvvv: init at 2.3-git-2a514b2 #78319

Closed
wants to merge 464 commits into from
Closed

vvvvvv: init at 2.3-git-2a514b2 #78319

wants to merge 464 commits into from

Conversation

anna328p
Copy link
Member

@anna328p anna328p commented Jan 22, 2020 •
edited

Adds a package for VVVVVV, a platform game based on inverting gravity.

Motivation for this change

Adds the game VVVVVV to nixpkgs.

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.

@thefloweringash
Copy link
Member

See also #77519

@anna328p anna328p mentioned this pull request Jan 22, 2020
Closed
12 tasks
peterhoeg
peterhoeg reviewed Jan 23, 2020
View reviewed changes
pkgs/games/vvvvvv/default.nix Outdated Show resolved Hide resolved
pkgs/games/vvvvvv/default.nix Outdated Show resolved Hide resolved
pkgs/games/vvvvvv/default.nix Outdated Show resolved Hide resolved
pkgs/games/vvvvvv/default.nix Outdated Show resolved Hide resolved
nh2
nh2 approved these changes Jan 24, 2020
View reviewed changes
Copy link
Contributor

@nh2 nh2 left a comment

Choose a reason for hiding this comment

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

I tried it on NixOS, game works great!

@leo60228
Copy link
Member

leo60228 commented Jan 24, 2020 •
edited

Giving Make and Play a different license from the full version is pretty clearly incorrect. Maybe the binaries should be in a derivation with a new license, and the wrappers for both should be unfree? We could probably get an exception for the Make and Play data.zip by asking the developer.

Oh, this was already covered in a review comment...

@jakobrs
Copy link
Contributor

jakobrs commented Jan 26, 2020

You probably need pkgs.darwin.apple_sdk.frameworks.Foundation for this to work on macOS. There will also (probably) be hard-coded paths to the macOS SDK in the resulting executable.

@jakobrs
Copy link
Contributor

jakobrs commented Jan 26, 2020

Also, do we really want to put data.zip in $out/bin?

@leo60228
Copy link
Member

data.zip is searched for next to argv[0]. I have a patch at v6cord/VVVVVV-CE@8300615 to search in the cwd, it could probably be modified pretty easily to search in a path specified at compile-time.

@jakobrs
Copy link
Contributor

jakobrs commented Jan 26, 2020 •
edited

Could one put data.zip somewhere in $out/share (or somewhere else) and have $out/bin/VVVVVV be a wrapper that calls the executable with a different argv[0]?

#! ${bash}/bin/bash

exec -a $out/share/.../VVVVVV .VVVVV-unwrapped

Something like that.

@leo60228
Copy link
Member

Probably, yeah.

@leo60228
Copy link
Member

Oh, looks like it uses /proc/self/exe and only falls back to argv[0].

@leo60228
Copy link
Member

This can be worked around by mounting something else over proc after unshare -rm, but that's pretty hacky.

Ma27 and others added 13 commits February 1, 2020 18:42
@Ma27 @anna328p
llvm_{3,4}: re-add attributes with an error message about their removal
83d163a 
With this change, expressions relying on those old LLVM versions will
fail with a meaningful error message.
@mmahut @anna328p
dat: remove and link to nodePackages.dat
c686292
@mmahut @anna328p
chrome-token-signing: adding meta
eb9bbc2
@Izorkin @anna328p
fail2ban: 0.10.5 -> 0.11.1
5d0db17
@Izorkin @anna328p
nixos/fail2ban: clean-up configuration
44ddc1f
@Izorkin @anna328p
nixos/fail2ban: add options to enable work service with iptables-compat
ae69b96
@Izorkin @anna328p
nixos/fail2ban: update serviceConfig
47e09e4
@Izorkin @anna328p
nixos/fail2ban: add custom options
43cbedb
@das-g @anna328p
gdal: 3.0.1 -> 3.0.3
f2fbe40 
GDAL/OGR 3.0.3 contains bugfixes to be shipped with QGIS 3.10.2
(NixOS#78755)

See https://lists.osgeo.org/pipermail/qgis-developer/2020-January/060056.html
and https://blog.qgis.org/2020/01/24/public-service-announcement-update-to-the-latest-point-release-now/
@Izorkin @anna328p
nixos/fail2ban: enable sandboxing
09eb2a9
@jtojnar @anna328p
Merge pull request NixOS#77796 from 101100/fix-quodlibet
45c7a34 
quodlibet: fix tests
@veprbl @anna328p
Merge pull request NixOS#78916 from sikmir/gpxlab
4b55495 
gpxlab: enable on darwin
@worldofpeace @anna328p
Merge pull request NixOS#78239 from andrew-d/andrew/networking-proxy-…
807c8db 
…tests-python

nixosTests.networkingProxy: port to Python
@anna328p
Copy link
Member Author

anna328p commented Feb 2, 2020

uhh

I messed up my nixpkgs fork :/

@anna328p
Copy link
Member Author

anna328p commented Feb 2, 2020

I am going to create a new PR with the correct branch this time

@anna328p anna328p mentioned this pull request Feb 2, 2020
Closed
10 tasks
@anna328p
Copy link
Member Author

anna328p commented Feb 2, 2020

#79068

@anna328p anna328p closed this Feb 2, 2020
jakobrs added a commit to jakobrs/nixpkgs that referenced this pull request Mar 13, 2020
@anna328p @jakobrs @leo60228
vvvvvv: init at unstable-2020-03-13
771d1e7 
Adds a package for VVVVVV, a platform game based on inverting gravity.

Relevant:

- NixOS#77519
- NixOS#78319
- NixOS#79068
- TerryCavanagh/VVVVVV#139
- TerryCavanagh/VVVVVV#153
- TerryCavanagh/VVVVVV#155
- TerryCavanagh/VVVVVV#156

- git log at eb3527f

Co-authored-by: jakobrs <jakobrs100@gmail.com>
Co-authored-by: leo60228 <iakornfeld@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nh2 nh2 nh2 approved these changes

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

@andir andir Awaiting requested review from andir

@basvandijk basvandijk Awaiting requested review from basvandijk

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@edolstra edolstra Awaiting requested review from edolstra

@etu etu Awaiting requested review from etu

@FRidh FRidh Awaiting requested review from FRidh

@infinisil infinisil Awaiting requested review from infinisil

@jonringer jonringer Awaiting requested review from jonringer

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@nbp nbp Awaiting requested review from nbp

@peti peti Awaiting requested review from peti

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees
No one assigned
Labels
6.topic: emacs 6.topic: erlang 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell 6.topic: lua 6.topic: nixos 6.topic: pantheon The Pantheon desktop environment 6.topic: policy discussion 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: rust 6.topic: stdenv Standard environment 6.topic: steam 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 0 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet