| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Since 771ed59b48bc1257439b4529426cc9047aebc27b, there is no top-level
attribute anymore, so let's fix this.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The archive format changed back to zip (as it was prior to version
1.1.0) and there is no longer an "update_tilesets" binary in the
upstream distribution.
Also a few library dependencies have been changed, so it's no longer
sufficient to just provide mesa and SDL2 but we now also need to add a
few X libraries.
Upstream changes:
* Make previously captured monsters and previously completed fossils
unlock their relevant collectible entries
* Pets and fossils will need to be dropped and picked back up as item
drops in order to register as collectables
* Better handling of status effects applied by weather, e.g. acid rain
* Fix bug with Snuffish and Gosmet not being properly added to monster
collection
* Fix swapped collection entries for Avian and Apex skeleton fossils
* Prevent critters captured in previous versions from also being
relocatable
* Add a few missing recipe unlocks for cooking recipes to relevant
items
* Add missing documentation for a few new Lua functions
Upstream announcement of version 1.1.1 can be found here:
http://playstarbound.com/1-1-1-changelog/
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The upstream archive is now a RAR archive, so we need to use unrar
instead of unzip.
Major upstream changes:
* Fishing
* Two tiers of fishing rods are now craftable from the Foraging
Table and can be used to fish on ocean planets (including arctic,
toxic and magma oceans)
* Added 48 unique fish types to catch
* Rare fish can give valuable rewards, including reel and lure
upgrades to enhance your fishing rod
* Collections
* New Collections interface tracks various kinds of collectables
including captured pets, figurines, fish, cooking recipes,
fossils, and bugs
* Added the Relocator tool, which allows non-hostile creatures such as
critters, fish, bugs, and farm animals to be moved
* Added friendly Novakid villages including a variety of new
Novakid-themed furniture and objects
The full list of upstream changes can be found at:
http://playstarbound.com/starbound-1-1-changelog/
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
Let's use the new upstream qt5.qtkeychain attribute instead of
overriding it on our own, introduced in:
NixOS/nixpkgs@1187b00e5872c8b65919158f2f908efb29117649
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Not really a game but a emulator of an imaginary console, so close
enough.
This package uses the dynamically linked pico-8 version, the (probably)
statically linked one had an inexplicable issue with SDL.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@b6c204f substituting a file which doesn't exist will
fail and the preFixup phase tries to substitute something in the
"install-dependency" script, which doesn't exist here in vuizvui (we're
using a later version directly from upstream Git).
I'm suppressing this simply by null'ing out the preFixup phase instead
of fixing this properly because I'm not going to stay at this bank for a
very long time.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Ugh! I haven't looked at the source code of this library before, but I'm
glad I'm not using it for anything serious (who'd want to use *any* Java
application for serious things anyway).
Those patches fix only a few printf-related overflows, so it's only the
tip of the iceberg I don't really want to uncover X-D
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
I've also simplified the Nix expression a bit using the exact names from
the upstream URL instead of using antiquotations, because it's easier to
copy & paste them.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
A script that executes a nice STACKENBLOCKEN into the air.
|
| |
|
|
|
|
|
|
|
| |
This should make sure it can be evaluated on NixOS versions where the
closure-size branch has not yet been merged.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
The top-level package doesn't exist anymore and has been removed in
NixOS/nixpkgs@11d1fdfd8bf5411218571ef9fb9441705b23c459.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
So far we only had the Steam version of Starbound, but since July 22nd
2016 version 1.0 got released and since then had a few bugfixes already.
The Nix implementation here is based on the Steam version but has quite
some improvements: Instead of wrapping the Starbound client and server
with a shell script which sets up the bootconfig, we now use patchelf to
override specific symbols from external libraries and thus can live
without supplying a -bootconfig arg.
By replacing the sbinit.config in the .rdata section of the binaries
with a magic value (13 times the bell character) we can later match the
magic value during open() and provide a default bootconfig using a
temporary file.
Note that it has to be a temporary file instead of fork() and writing to
a pipe() because Starbound is using lseek() during parsing of JSON.
With all this in place we now have everything Starbound related in
$XDG_DATA_HOME/starbound, which is the main reason for doing the
preloading in the first place.
Starbound without patching expects a file called sbinit.config in the
same directory as the executable and even if we'd supply a bootconfig
via the -bootconfig arg, we can only have static paths in there, because
Starbound doesn't do environment variable expansion within paths in the
bootconfig.
Another difference to the Steam packaging is that we now produce
multiple outputs, the default one plus lib for the preload library and
the assets in its own store path.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes the build for Tomahawk because some of these dependencies
were already refactored in upstream <nixpkgs> and hence we can simply
specify the dependencies directly.
Alongside of this, I've broken out some of the buildInputs into
nativeBuildInputs, so this will stay safe for cross compilation.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
This reverts commit 267b8363695190f2d0834892b4b1159d7918d447.
Issue NixOS/nixpkgs#15498 is already fixed upstream, so this ugly
workaround isn't needed anymore.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
| |
Docbook XSL got updated in NixOS/nixpkgs@fb893a8, so we need to adjust
the path to the namespace URL to reflect the current version.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This also fixes our hack for libxslt.bin, because it has been fixed
upstream at NixOS/nixops@3e823357f3f4825cd24c3361e511a234f6726105.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This one explicitly includes a MIT license, so let's actually prefer
this branch instead of the master brach.
I've also included commons and streamflyer to the list of bundled JARs
that are needed from the upstream repository. Of course, in the long
term it would be a good idea to actually package those in <nixpkgs> so
it's just temporary.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 65435d827c846ab2eef966601cd0490591b8dbe9.
Commit d730df7 fixed the meta.hydraPlatforms attribute, so the generic
channel now should build the patched gitit version as part of its
constituents and we don't need a dummy machine just for that anymore.
Other than that, the package now also gets built as a separate job to
allow for one-click installs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Within mapTestOn, meta.hydraPlatforms attribute has precedence over
meta.platforms. The original gitit derivation has hydraPlatforms set to
an empty list and it's aliased to meta.platforms.
Unfortunately that alias doesn't work with overrideCabal, because we'd
need to override the attributes passed to the callPackage'd function
(the mentioned alias is done during function attrset unpacking).
This fixes building gitit within the generic channel as well as
including it in the pkgs.* Hydra jobs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
According to 302fb4f4bc0213b231b9bf5b98093c60d3917313 the package should
be included in the hydra build, but it is not usable, because there is
no channel that waits for the gitit build to succeed.
This stub exists until someone finds out how to create such a
channel (aka the channel building mechanism is documented in a way that
it can be used by people not deeply familiar with both nixpkgs and
hydra).
cc @aszlig
|
|
|
|
| |
By disabling.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I didn't get the starcoscard to run with aqbanking so far and the bank
itself is very uncooperative if it comes to giving specific details
about their implementation of FinTS 3.00, so in the end I'm going to
move away from the bank.
But during transition this will work much better than running a Windows
VM (which I didn't have access to in the meantime, so I *had* to get
this running somehow), especially because we can wrap this plugin in
*any* browser that supports NPAPI.
Also, there seems to be some work implementing PPAPI support for
pipelight, but the branch is stale since quite a while:
https://bitbucket.org/mmueller2012/pipelight/branch/ppapi
Going back to the pesky Santander plugin:
In order to support PC/SC-Lite, we need to patch Wine to get support for
the winscard API. We also patch out unixfs, so while there definitely
are better sandboxing options this should suffice so that the plugin
doesn't write garbage on any location of the system (basically it works
entirely read-only).
So in the end we get a nice and small dwb browser, which directly opens
up the login page along with the plugin. The browser is wrapped so that
it only writes to a temporary location, so as soon as it is closed all
the cruft is cleaned up afterwards.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Just tested it a bit but haven't really played it (and probably won't
have time to during the next weeks).
This is the version that got released on 2016-06-02 and it needs a small
preload wrapper because it tries to load assets and other stuff relative
to the current directory. The preloader makes sure that the correct
store path is read instead.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Since the merge of the closure-size branch, the curl binary now is in a
dedicated output ".bin".
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's a small helper tool which I specifically use for running NixOS
tests (especially the installer ones) that require <nixpkgs> to be
copied to the store.
What git-detach does is creating a temporary working directory which
only contains a trimmed-down (without untracked files and .git
directory) version of the current Git repository.
So in case of <nixpkgs> this is especially useful to keep down the
closure size whenever the working dir is going to be exported to the
store.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of setting meta.platforms, we're setting just "platforms" here,
because the cabal build expression passes it through as meta.platforms.
Note that I'm currently setting the platforms attribute to just
x86_64-linux for now, because that is the architecture the workaround
machine "website-vm" so far has been built for.
Of course, if we'd not set the platforms at all, it would include all
supported architectures by default.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
|
|
|
|
|
|
|
|
| |
Otherwise, neither nix-env nor packagePlatforms will able to pick up the
nested derivations.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Just a small workaround for NixOS/nixpkgs#15498, because putting the
Vuizvui version of Tomahawk into systemPackages will propagate Qt 5.5
into the system path, which in turn causes KDE initalization to
dlopen() Qt 5.5 libraries while being linked against Qt 5.6 libraries.
We currently can't link Tomahawk against Qt 5.6, because it depends on
QtWebKit, so moving Tomahawk to Qt 5.6 is not an option yet until
QtWebEngine is packaged.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
It's been a while since the last update, so let's change that.
I haven't tested whether the current version works, only tested building
against it and it built fine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Right now we haven't packaged QtWebEngine for Qt 5.6, so we can't easily
switch towards using the qt5 attribute, which is Qt 5.6 already.
So we need to make sure that attica, extra-cmake-modules and qca are
using qt55 explicitly as well so we don't have any reference to Qt 5.6
anymore left (checked using nix-store -qR on the .drv).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
This attribute has been renamed in NixOS/nixpkgs@a2e40003a19de448.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Since the closure-size has been merged into nixpkgs master, the xsltproc
binary now resides in a separate store path.
Ideally we want to fix that in NixOps directly, so I'm marking this as a
hack for now until we have upgraded.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
First of all, we need to create another wrapper around the command line
arguments, because Starbound will bail out whenever there is more than
one -bootconfig argument.
In addition, we are now putting in build time information into
$out/etc/sbboot.config so we can easily re-use them, for example for a
NixOS service module.
Also, the hasBootconfigArg is now used for all flavors, because even the
stable version supports that argument already.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
New we can reference the games using pkgs.vuizvui.games.*, although game
configuration currently still resorts to using ~/.config/nixgames.nix if
there is no nixpkgs.config.vuizvui.games set. In this vein, this should
also avoid Hydra to try to build those games, because those aren't
publicly available for free.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Makes it easier for DE users not used to a terminal to start the game.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
While JQ is a beast of its own implementing its own turing complete
language, it *is* certainly useful and better than sed to replace path
values.
Now we have a new bootOverrides attribute set, which is converted into
JSON and then merged with the original sbboot.config by JQ at the time
we're setting up the XDG_DATA_HOME directory.
The reason this is necessary is that we can't use environment variables
directly in the boot configuration of Starbound, so we need to write the
boot configuration at initialization time with the absolute paths to
XDG_DATA_HOME.
Another change here is that we now reference the upstream store path
directly instead of copying over almost everything to our build result.
This has the advantage that we have fewer duplication and thus fewer
disk I/O while building.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Currently this is not useful for anything but just a placeholder because
currently the depot downloader isn't able to pick from a particular
branch but only fetches based on the manifest ID.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
The patch was introduced because there was a breaking nixpkgs commit at
NixOS/nixpkgs@cad8957, which later got reverted (NixOS/nixpkgs@f3d94cf),
so we no longer need this patch.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Actually, it's the latest upstream master plus one pull request by me
(NixOS/nixops#407), which fixes the build of the manual.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This also fixes the date for the stable version, so that it closer
matches the steamdb entry.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We already cover that by the main project so we don't need to go by two
different licenses.
I've asked @layus whether the license change would be okay for his
contributions and he agreed:
https://github.com/aszlig/nixgames/pull/1#issuecomment-174551671
Other than that I'm the only author of every other commit and I
obviously agree as well :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a subtree merge of the full nixgames repository including
history. Right now it isn't linked to vuizvui at all but we're going to
do that very soon.
The reason why I'm merging both repositories together is that it's
easier for me to manage updates and also facilitate contributions by
people from the OpenLab.
Another reason to merge it is that we can write more generic functions
for building both, the games and the rest.
Right now the licensing is still the Apache License version 2.0, but
we're going to change it to the vuizvui license as well.
|