about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge aszlig/nixgames into vuizvuiaszlig2016-02-0823-0/+1222
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Merge pull request aszlig/nixgames#1 from @layusaszlig2016-02-084-13/+95
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Unepic to the humblebundle games list and also fixes Bastion, or at least it *should* fix Bastion. I have tested Unepic, though I had to fix the download, which I'm going to commit later. As for Bastion, at least with the humblebundle fetcher it's not able to fetch "bastion_linux" (it doesn't even show up), however on my Humble library I can see the download (maybe it's because I bought this along with HIB 5). Nevertheless, it's at least a small step forward and we need to fix these issues later.
| | * bastion: update (fix?) buildGuillaume Maudoux2015-07-141-11/+48
| | |
| | * unepic: Add unepic at version 1.50.5Guillaume Maudoux2015-07-142-0/+45
| | |
| | * fecthHumbleBundle: Allow to provide real file nameGuillaume Maudoux2015-07-141-3/+3
| | | | | | | | | | | | | | | By overriding the real file name, it is possible to prefetch the game archive with `nix-prefetch-url --type md5 file://<path>/realname`.
| * | steam: Add Starboundaszlig2016-02-082-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comes in two flavors: stable (beta) and unstable (beta), though at the moment, both are the same version. I've renamed prefixed the command names with starbound-... and also converted underscores to dashes to make the commands a bit more consistent. Also, I made room for Mac OS X and Windows so in *theory* it should also work on these platforms. However I only tested it on NixOS with a 64bit Linux. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | Add support for fetching non-DRM Steam gamesaszlig2016-02-084-1/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to the folks at @SteamRE there is a reverse-engineered Steam library and a downloader for Steam depots. The downloader actually uses mcbyte-it/DepotDownloader@5fa6621 which is a fork that has added proper exit codes. We also patch the downloader to show the latest manifest ID, so we can check whether we're up to date. The reason we're pinning the manifest ID is that we make sure that the SHA256 will always match, no matter whether there is a new upstream version or not. Obviously the whole steam/ namespace is only for Steam games that can run without Steam, which in turn is the entire purpose of it. For a list of Steam games without DRM, have a look at: http://steam.wikia.com/wiki/List_of_DRM-free_games Also if you want to look up the depotId or appId, this is a good resource: https://steamdb.info/ Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | humblebundle: Add Lovers In A Dangerous Spacetimeaszlig2016-02-082-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | Yes, they're serious with that name, hence I have abbreviated it to "liads", so you don't have to type something like this: nix-build -A humblebundle.lovers-in-a-dangerous-spacetime Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | fetch-humble-bundle: Escape Python stringsaszlig2016-02-081-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | This fixes aszlig/nixgames#2 but instead of using """ for the strings, we now have a pyStr function which is taking care of escaping nasty characters :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | humblebundle: Add GuacaMeleeaszlig2016-01-252-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comes with an LD_PRELOAD wrapper that is just used for the initial chdir() where the game tries to set its working directory to the data files. After that all loading of the preload wrapper will fail, but that's okay because we just need to set the data directory and be done with it. We also introduce a callPackage_i686 which is equivalent to the one in <nixpkgs> but also adds our own packages to the set. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | fetch-humble-bundle: Fix path to ca-bundle.crt.aszlig2015-07-221-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | This has changed twice in upstream <nixpkgs>: * NixOS/nixpkgs@d6cbb061e3bb5d2a93196a4543cfbd7c2359bd84 $out/etc/ca-bundle.crt -> $out/ca-bundle.crt * NixOS/nixpkgs@ffd0539eba473348f752fa8ab1f1f55388634f8f $out/ca-bundle.crt -> $out/etc/ssl/certs/ca-bundle.crt Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Use the NixOS module system for configuration.aszlig2015-04-174-29/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's use the module system to allow specifying things such as HumbleBundle or Steam or $whatnot's usernames and passwords, so we can not only typecheck these options but also modularize it before this whole repository is beginning to get very messy. Right now, if you use the default.nix without a configuration, you'll still get message saying that you may want to supply HumbleBundle credentials, even though it's no longer only about HumbleBundle anymore. Nevertheless, the only tree existing right now is the HumbleBundle one, so never mind about that :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * fetch-humble-bundle: Update to version 0.1.1.aszlig2015-04-161-7/+2
| | | | | | | | | | | | | | The upstream API has changed, so the previous version now no longer works. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Rename stdenv.cc.gcc to stdenv.cc.cc.aszlig2015-04-164-4/+4
| | | | | | | | | | | | This has been changed in NixOS/nixpkgs@48f63c2. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * humblebundle: Allow config file for email/passwd.aszlig2014-12-312-4/+28
| | | | | | | | | | | | | | | | Rather than passing email and password using --argstr to nix-build, we now read them from a config file in XDG_CONFIG_HOME (or ~/.config if unset). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Put Nix expressions under the Apache License 2.0.aszlig2014-12-312-0/+222
| | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Move everything into /humblebundle/.aszlig2014-12-3112-0/+0
| | | | | | | | | | | | | | We don't just want HumbleBundle games, so let's try to keep the directory structure that way very early. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Change CC references from $NIX_GCC to $NIX_CC.aszlig2014-12-315-5/+5
| | | | | | | | | | | | | | The variable name has changed to a more generic NIX_CC in NixOS/nixpkgs@05edd656f6bdecde31eb0270209cfc7e2320caad. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Fix humble bundle library in fetchHumbleBundle.aszlig2014-12-311-1/+6
| | | | | | | | | | | | | | Uses patch from pull request saik0/humblebundle-python#7 to fix handling of CSRF token. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * Add a (broken) collection of HumbleBundle games.aszlig2014-12-3112-0/+449
| | | | | | | | | | | | | This is more or less a bunch of expressions for a few HumbleBundle games. Right now none of them are working, because fetchHumbleBundle is broken. But apart from that only ftl and cavestoryplus really work. The main reason for this commit is to collect those expressions together, sort them out and refactor them to have a working set of (maybe not only HumbleBundle) games that are difficult to package in nixpkgs, because the upstream binaries are not public. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profpatsch: remove insane experimentProfpatsch2016-02-084-99/+0
|
* profpatsch: sane experimentProfpatsch2016-02-085-1/+100
|
* default.nix: Just make an alias to ./machinesaszlig2016-02-081-4/+3
| | | | | | | | | | | | | Suggestion by @Profpatsch to introduce consistent behaviour of the top- level expression so we can now use: nix-build '<vuizvui>' -A machines.aszlig.tishtushi.build .. the same way as: nix-build '<vuizvui/machines>' -A aszlig.tishtushi.build Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib/call-machine: Introduce .build shortcutaszlig2016-02-083-6/+8
| | | | | | | | | | | | | | | | | | | The shortcut is mainly to make things a bit easier, instead of: nix-build '<vuizvui/machines>' \ -A aszlig.tishtushi.eval.config.system.build.toplevel We can now do something like this: nix-build '<vuizvui/machines>' \ -A aszlig.tishtushi.build ... in order to get a system store path out of a machine definition. This also fixes an evaluation error in the top-level default.nix. Thanks to @Profpatsch for bringing this to my attention. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profpatsch/katara: packagesProfpatsch2016-02-071-1/+2
|
* schnurrkadse: initlukasepple2016-02-051-0/+111
|
* fliewatuet: bumplukasepple2016-02-051-40/+40
|
* profpatsch/programs: add support for scanningProfpatsch2016-02-043-0/+16
|
* call-machine: Don't patch iso-image.nix anymoreaszlig2016-01-291-12/+7
| | | | | | | | | This reverts commit 3bf7b0dc9d087d7c141f317456e7abdd60ceda2a. Since NixOS/nixpkgs@269f261 there is a separate "nomodeset" boot menu option, so we no longer need this workaround. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/axbo: Re-package with open source codeaszlig2016-01-282-65/+37
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* machines/tishtushi: Fix overriding kernel patchesaszlig2016-01-281-3/+3
| | | | | | | | | | | | | | | | | | | | The commit NixOS/nixpkgs@23f5e3c directly provides kernelPatches to the build attributes and we did an override by passing back the kernelPatches attributes from the result instead of the original arguments. So instead of using the resulting arguments, we simply reinject the kernelPatches attribute from the input arguments. Tested using: nix-instantiate --eval --strict -I nixpkgs=/home/aszlig/nixpkgs -E ' with import <nixpkgs/lib>; let with ((import ./machines {}).aszlig.tishtushi) eval; in map (getAttr "name") eval.config.boot.kernelPackages.kernel.kernelPatches ' Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/katara: Fix evaluation erroraszlig2016-01-281-1/+1
| | | | | | | | | | | The attribute "diffoscopes" doesn't exist in <nixpkgs> and should be "diffoscope" (without "s"). Evaluation tested with: nix-instantiate release.nix -A machines.profpatsch.katara Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* katara: a few more packagesProfpatsch2016-01-271-1/+6
|
* pkgs/bfqsched: Update to version 4.4.0-v7r11aszlig2016-01-262-32/+10
| | | | | | | | | | 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>
* profiles/workstation: Add my PlayStation 2 gamepadaszlig2016-01-261-0/+26
| | | | | | | This one is a PlayStation 2 gamepad connected via USB using some GreenAsia adapter. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add a new gamecontroller moduleaszlig2016-01-262-0/+110
| | | | | | | | This module is for declaratively specifying SDL_GAMECONTROLLERCONFIG, an environment variable used by SDL 2 to map arbitrary controllers to that of an XBox reference controller. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add a small utility to dump joystick GUIDsaszlig2016-01-263-0/+42
| | | | | | | | | | | | 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>
* profiles/base: Add Headcounter Hydra as log serveraszlig2016-01-191-0/+1
| | | | | | | | | | Quite useful for paging logs so that I don't all the time need to either scroll back the buffer (which is also limited so it's not very useful for large builds) or use something like: curl https://headcounter.org/hydra/log/$drvbasename | less Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/taalo-build: Directly connect to taaloaszlig2016-01-191-3/+3
| | | | | | | | As I'm moving away the deployment from mmrnmhrm, it's not a very good idea to rely on the deployment machine being up, which also makes it two machines that need to be up in order to build from tishtushi. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/labtop: Fix syntax erroraszlig2016-01-171-1/+1
| | | | | | | | | | Regression introduced by d99fd1ba860dd513508a7460bf139e9ee990a5d3. Fixes the following evaluation error: error: syntax error, unexpected '}', expecting ';', at labtop.nix:110:55 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* thinkpad firmwareOpenlab Labtop2016-01-161-12/+38
|
* profiles/tests: Revert disabling quake3 testaszlig2016-01-161-2/+0
| | | | | | | | | This reverts commit 71d24b28c16fbae58d1ecfeaecf5a26c7ec015da. Evaluation has been fixed upstream at NixOS/nixpkgs@c4de45b and the test should succeed after NixOS/nixpkgs@5caa8ab as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* katara: some more programsProfpatsch2016-01-161-3/+10
|
* katara: set EDITOR env var to vimProfpatsch2016-01-161-0/+2
|
* profiles/tests: Temporarily disable quake3 testaszlig2016-01-151-0/+2
| | | | | | | | | | | | | The Quake 3 demo data have been marked as "unfreeRedistributable" in NixOS/nixpkgs@6b447a3, which causes this test to not evaluate unless we set config.allowUnfree to true. I guess the best solution to fix this upstream is to use something like OpenArena for the Quake 3 tests, because I didn't manage to find anything regarding the demo files and/or whether those are redistributable or not. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Factor out T100HA specific stuffaszlig2016-01-143-5/+23
| | | | | | | | This should go into its own hardware module, so it might be helpful for others as well (especially if we're going to put it into upstream <nixpkgs>). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Put hardware into own namespaceaszlig2016-01-141-1/+5
| | | | | | | | That way we can separate completely hardware-related stuff from things like bootup and kernel, although the lines between kernel and hardware are quite blurry. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add my own custom xpdf configurationaszlig2016-01-144-1/+22
| | | | | | | | | It's only a very handy keybinding for toggling the outline, because it sometimes gets very annoying if you don't want to go full screen but still don't want that outline eating up space (and no, I don't want to reach for the mouse). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Add more printing driversaszlig2016-01-141-0/+1
| | | | | | | For example at the place where I am right now, I need hplip to access the printer. Also, it won't hurt to include gutenprint as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tyree: Refine and fix nix optionsaszlig2016-01-141-1/+3
| | | | | | | | | | We actually have 4 cores in this machine, so let's raise maxJobs to 4, as I had in the original hardware-configuration.nix. While at it, using buildCores = 0 should get us more parallelism, which is especially useful for recompiling kernels ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>