| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
So far I've used the proprietary download and patched it up to work on
NixOS. This now goes through the hurdles of trying to package it by
building it from source, although there are still some precompiled
dependencies used:
commons-beanutils-1.8.3
commons-digester3-3.2
jcommon-1.0.20
jfreechart-1.0.16
swingx-all-1.6.4
In order to push this into upstream <nixpkgs> we first need to package
these.
Another issue which I didn't dig into is that the interface now looks
quite ugly. I'm not sure whether it is because of some packaging choices
or because we're now at version 3.x and it's supposed to look like this.
Nevertheless, the application works and it makes more sense to improve
the source package than the patched up binary package.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
We can now drop the kernel 4.4 patch and use the upstream version,
because kernel 4.4 has been released since quite a while.
The names for the patches changed a bit on the BFQ scheduler page but
they represent the same commits nevertheless.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
SDL 2 has an environment variable called SDL_GAMECONTROLLERCONFIG, which
lists button/axis mappings of various game controllers attached to the
system.
The game controllers are themselves identified using a GUID which is SDL
2 specific and this tool is there to just dump the name of a particular
game controller along with the GUID so it's easier to get the GUID.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
| |
We're going to use it for another machine, so it makes sense to put it
inside the pkgs.vuizvui namespace to be available for all machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
In NixOS/nixpkgs@1d33148, quazip moved from a top-level attribute down
to a sub-attribute of qt5LibsFun, which in turn gets exposed via the
"qt5" top-level attribute.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@0a81a0d, kf5_latest expects an attribute set as an
argument (in this case the attribute set/scope for qt55libs).
This however is passed by kde5_latest, so let's switch to use that
attribute set instead.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Contains a fix for the stage setup (bar 9 flipped upside down).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Contains a few fixes/changes needed to make stage lighting operation a
bit of a more "smooth" experience :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
The __GFP_WAIT macro has been renamed in torvalds/linux@71baba4 and
torvalds/linux@d0164ad introduced the gfpflags_allow_blocking() helper,
which we're going to use to avoid false positives.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
I have no idea why the upstream patch went from v7r9 to v7r8 now,
essentially reverting the changes described in a8b6eeb. But after
checking the patch against kernel 4.4, there is quite a lot more to fix
up in r9 rather than r8, so I'm crossing fingers and go with this
instead.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
We need to add our own patch and don't want to clutter up the kpatches
directory.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 7f9f88e90b8ab41a97a86fa4ff8a501e0e0eea27.
The reason why I'm reverting this is because while it indeed fixes the
volume mapping, it doesn't fix my main problem that it takes a few
seconds to go from 100% volume to the desired volume level that's
currently set.
So instead of applying this patch and maintaining it until it may
eventually hit mainline, it's better to debug the original issue rather
than applying a patch that _may_ fix an unrelated issue.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This build doesn't build for a long time and I'm currently not
interested in fixing it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes the following build error:
https://headcounter.org/hydra/build/764598
Of course, we could have fixed this by overriding Lucene++, but we want
to stay on the latest Qt version for Tomahawk anyway.
We no longer need qcaQT5, because that has been packaged upstream.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Now with even more upstream fixes:
https://github.com/NixOS/nixops/compare/d6631b6ea7...9076dbc722
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Includes more fixes regarding "nixops ssh" which fix problems in
relation to TTY allocation.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
As all my important changes to NixOps so far have either been pushed by
me or merged in, this version now should contain all the fixes necessary
to do painless deployment for Hetzner machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of merging all those PRs via the patches attribute, I've now
created a branch that has all those PRs merged, which are:
* NixOS/nixops#201: Use dedicated SSH keypair for "none" backend
* NixOS/nixops#348: Fixup and refactor Hetzner backend tests
* NixOS/nixops#349: hetzner: Don't create /root/.ssh/authorized_keys
* NixOS/nixops#350: Fix tests for the "none" backend
So our version of NixOps now should now correctly cope with
users.mutableUsers set to false.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
It's already in version 4.3-rc5, but the following patch seems to be
more correct:
http://mailman.alsa-project.org/pipermail/alsa-devel/2015-August/096516.html
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This by coincidence is version 1.3.1 with our own patches (which still
apply).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
From the changelog:
* IMPROVEMENT: Changed BFQ to use the blkio controller instead of its
own controller. BFQ now registers itself as a policy to
the blkio controller and implements its hierarchical
scheduling support using data structures that already
exist in blk-cgroup. The bfqio controller's code is
completely removed.
* CODE IMPROVEMENTS: Applied all suggestions from Tejun Heo,
received on the last submission to LKML:
https://lkml.org/lkml/2014/5/27/314
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Includes changes for the new Rockfabrik dancefloor/stage setup.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
The current master version includes a few fixes I made for setting
default values for the Rockfabrik stage setup, which is to be used by my
machine called "kzerza" (booted solely via USB storage device).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
In NixOS/nixpkgs@be5f408, the "pulseaudio" attribute has been removed to
prevent accidentally using it if we just want to have the library, so
let's fix this on our side.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Drop patch for NixOS/nixops#280 because it has been applied upstream.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
It's kinda pointless to shovel the whole source to a remote machine and
then shovel the whole source back to the Hydra master without doing any
real compiling or other CPU-intensive processing.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
For packageOverrides, we only want to return the vuizvui attribute set
and nothing more. But if we want to import <vuizvui/pkgs>, we want to
have access to <nixpkgs> as well, which is especially useful when using
the <vuizvui> channel.
However, in callPackageWith we're explicitely using the vuizvui
attribute which should override the whole set of <nixpkgs>, so that
references to vuizvui packages don't need to be explicitly namespaced
within vuizvui itself and we can easily override existing packages with
this method as well (like just define a vuizvui package and it overrides
the dependency for all of vuizvui's packages).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
The reason why the manual is needed is that we implicitly rely on the
tarball job of the upstream project's release.nix. Let's fix that at
some later point if we really need to (because it might become quite
tricky).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
We could use find to recursively replace all references, but let's just
do it one-by-one, because NixOps still has a few references that cannot
be changed right now.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
So now we're seeing exactly the right thing happen: Builds breaking on
Hydra when they *should* break.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
This file is just defaulting to <nixpkgs>, but we're going to substitue
it by the channel generator. We also need to make sure that we don't
have any other references to <nixpkgs>, but the latter can best be done
on Hydra's side if we don't make <nixpkgs> available to vuizvui builds.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
The problem here was that the attributes were added to the resulting
derivation of mkDerivation instead of the input attribute set.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|