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

solarus: 1.5.3 -> 1.6.0 #52773

Merged
merged 2 commits into from Dec 31, 2018
Merged

solarus: 1.5.3 -> 1.6.0 #52773

merged 2 commits into from Dec 31, 2018

Conversation

r-ryantm
Copy link
Contributor

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/solarus/versions.

meta.description for solarus is: '"A Zelda-like ARPG game engine"'.

Checks done (click to expand)
  • built on NixOS
  • Warning: no invocation of /nix/store/jh9gbb71rbw6dbsl8w25pr36l3x2kxls-solarus-1.6.0/bin/solarus-run had a zero exit code or showed the expected version
  • Warning: no invocation of /nix/store/jh9gbb71rbw6dbsl8w25pr36l3x2kxls-solarus-1.6.0/bin/solarus-launcher had a zero exit code or showed the expected version
  • 0 of 2 passed binary check by having a zero exit code.
  • 0 of 2 passed binary check by having the new version present in output.
  • found 1.6.0 with grep in /nix/store/jh9gbb71rbw6dbsl8w25pr36l3x2kxls-solarus-1.6.0
  • directory tree listing: https://gist.github.com/0a04ed7e8ea909babc8becdaa341b4fa
  • du listing: https://gist.github.com/1b76ea0fe33685b071072770ffba8dd9
Rebuild report (if merged into master) (click to expand)

6 total rebuild path(s)

2 package rebuild(s)

2 x86_64-linux rebuild(s)
2 i686-linux rebuild(s)
0 x86_64-darwin rebuild(s)
2 aarch64-linux rebuild(s)

First fifty rebuilds by attrpath
solarus
solarus-quest-editor

Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/jh9gbb71rbw6dbsl8w25pr36l3x2kxls-solarus-1.6.0 \
  --option binary-caches 'https://cache.nixos.org/ https://r-ryantm.cachix.org/' \
  --option trusted-public-keys '
  r-ryantm.cachix.org-1:gkUbLkouDAyvBdpBX0JOdIiD2/DP1ldF3Z3Y6Gqcc4c=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(r-ryantm's Cachix cache is only trusted for this store-path realization.)

Or, build yourself:

nix-build -A solarus https://github.com/r-ryantm/nixpkgs/archive/e21e3983eb5af474d8591b456d36d5afb064ee76.tar.gz

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/jh9gbb71rbw6dbsl8w25pr36l3x2kxls-solarus-1.6.0
ls -la /nix/store/jh9gbb71rbw6dbsl8w25pr36l3x2kxls-solarus-1.6.0/bin

@r-ryantm
solarus: 1.5.3 -> 1.6.0
e21e398 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/solarus/versions
@worldofpeace
Copy link
Contributor

Added an update for solarus-quest-editor too but that fails to build with

[ 19%] Generating solarus_editor_es.qm
Updating '/build/source/build/solarus_editor_es.qm'...
    Generated 948 translation(s) (948 finished and 0 unfinished)
Scanning dependencies of target solarus-quest-editor
[ 20%] Building CXX object CMakeFiles/solarus-quest-editor.dir/src/entities/block.cpp.o
In file included from /nix/store/jh9gbb71rbw6dbsl8w25pr36l3x2kxls-solarus-1.6.0/include/solarus/core/MapData.h:21:0,
                 from /build/source/include/entities/entity_traits.h:21,
                 from /build/source/include/entities/entity_model.h:20,
                 from /build/source/include/entities/block.h:20,
                 from /build/source/src/entities/block.cpp:17:
/nix/store/jh9gbb71rbw6dbsl8w25pr36l3x2kxls-solarus-1.6.0/include/solarus/core/Size.h:22:10: fatal error: glm/vec2.hpp: No such file or directory
 #include <glm/vec2.hpp>
          ^~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [CMakeFiles/solarus-quest-editor.dir/build.make:388: CMakeFiles/solarus-quest-editor.dir/src/entities/block.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:73: CMakeFiles/solarus-quest-editor.dir/all] Error 2
make: *** [Makefile:130: all] Error 2
builder for '/nix/store/g9lg9kllr22scl9sy0p5pnkbsxsv51di-solarus-quest-editor-1.6.0.drv' failed with exit code 2
error: build of '/nix/store/g9lg9kllr22scl9sy0p5pnkbsxsv51di-solarus-quest-editor-1.6.0.drv' failed

@samueldr Any ideas?

@samueldr
Copy link
Member

@worldofpeace looks like they have a new dependency on glm, a geader-only maths lib. Kinda surprised how solarus itself doesn't rely on it, but their editor does.

diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix
index 5646f9397a4..991edf9b568 100644
--- a/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/pkgs/development/tools/solarus-quest-editor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, cmake, luajit,
   SDL2, SDL2_image, SDL2_ttf, physfs,
   openal, libmodplug, libvorbis, solarus,
-  qtbase, qttools, fetchpatch }:
+  qtbase, qttools, fetchpatch, glm }:
 
 stdenv.mkDerivation rec {
   name = "solarus-quest-editor-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake luajit SDL2
     SDL2_image SDL2_ttf physfs
     openal libmodplug libvorbis
-    solarus qtbase qttools ];
+    solarus qtbase qttools glm ];
 
   meta = with stdenv.lib; {
     description = "The editor for the Zelda-like ARPG game engine, Solarus";

Works on my end with that.

@worldofpeace
Copy link
Contributor

From looking at https://gitlab.com/solarus-games/solarus/commit/6971934dc6f771a83cd34b3b5bdceabf789b3715 and https://gitlab.com/solarus-games/solarus/merge_requests/1213/ maybe solarus should depend on glm.

@samueldr
Copy link
Member

They reverted before the release.

@worldofpeace worldofpeace merged commit 39efe3d into NixOS:master Dec 31, 2018
@r-ryantm r-ryantm deleted the auto-update/solarus branch January 1, 2019 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@r-ryantm @worldofpeace @samueldr @GrahamcOfBorg