about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* starbound: Update to version 1.3.0aszlig2017-06-092-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major upstream changes are: * Navigation Overhaul: The cockpit navigation interface has been completely overhauled. Planets, moons and ships are all visible and orbit each other in real time. Systems will now contain NPC stations, friendly and hostile NPC ships, and strange space anomalies to visit! * Customizable Mechs: Explore these new space locations in customizable spacefaring mechs! Traverse hostile space in zero gravity, fight powerful new space monsters, and collect unique rewards as you upgrade your mech to progress through more difficult hazards. Mechs can also be deployed to planets, to crush your enemies with overwhelming firepower! * Modular Space Stations: Make a permanent home among the stars with player-owned stations! Use a station transponder to place your station into orbit, then expand it with modular rooms to suit your needs. The full changes can be found at the announcement blog post at: http://playstarbound.com/spacefarer-update/ One of the changes not listed there is that the archive now consists of a server_linux and client_linux directory, where the latter is structured the same as in previous versions. However, both contain the server binary and both of these binaries match in content. So I'm assuming that the server_linux directory is only a trimmed-down version in terms of assets but otherwise pretty much the same. I've also fixed the VM test, which didn't recognize the font of "Species" anymore, so we're now matching on "randomise". In addition to that I've added a sleep of 30 seconds before the final screenshot, so we get a picture of the fully rendered intro scenario. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* humble-bundle: Add helper for solving captchasaszlig2017-06-091-2/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not only a major annoyance for us but seems to bother a few other people using the humblebundle-python API: * saik0/humblebundle-python#11 * saik0/humblebundle-python#14 * saik0/humblebundle-python#15 While digging through the reCaptcha2 API and also the implementation of the Humble Bundle site, I stumbled over this code from https://www.humblebundle.com/user/captcha: var captcha = new Recaptcha2('captcha-holder'); $('input[type=submit]').click(function(e){ e.preventDefault(); // recaptcha v2 only cares about response, but we can let the Android app interface stay the same var challenge = ''; var response = captcha.get_response(); var android_defined = false; if (typeof Android != 'undefined') { Android.setCaptchaResponse(challenge, response); } }) So we only need the response, which we do now using a very ugly written Qt 5 QWebEngine GUI which we use to ask the user to solve the captcha. Combined with our downloader, it works like this: Whenever the login fails with a HumbleCaptchaException, we print a message with the store path to the GUI helper. We're inside a fixed-output derivation builder, so we do have networking. The GUI helper also runs a small TCP server listening on port 18123 and the downloader inside the Nix builder constantly tries to connect to that port and waits until it gets just one string (the connection is directly closed afterwards and the GUI helper exits), which is the response. This is then passed as recaptcha_response keyword argument to the login() method of the HumbleApi object. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* stackenblocken: add volume optionProfpatsch2017-06-013-4/+17
|
* machines/katara: change mouse speedsProfpatsch2017-05-312-18/+19
|
* pkgs/profpatsch/backlight: initProfpatsch2017-05-314-1/+59
|
* machines/fliewatuet: only redistributable firmwaresternenseemann2017-05-141-1/+1
|
* move to `enableRedistributableFirmware` for Profpatsch/OpenlabProfpatsch2017-05-122-2/+2
| | | | | This is because `enableAllFirmware` now contains a new entry that is unfree. Other machines probably want to move as well, cc @aszlig @sternenseemann.
* machines/katara: Fix attribute for hledgeraszlig2017-05-021-1/+1
| | | | | | | | | | | | | | Evaluation error introduced by 736e0da1e251df836b1669ffee80cecfd6bbf0e9. The attribute "hledger" isn't a top-level pkgs attribute but resides within haskellPackages. This fixes evaluation, as tested by: nix-instantiate machines -A profpatsch.katara.build Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* machines/katara: add hledgerProfpatsch2017-05-021-0/+1
|
* machines/katara: maybe not nix-gen yetProfpatsch2017-04-272-11/+11
|
* pkgs/games: add antichamberProfpatsch2017-04-262-0/+59
| | | | Written by @aszlig.
* machines/katara: add nix-gen and modified searxProfpatsch2017-04-262-14/+19
|
* machines/katara: misc packagesProfpatsch2017-04-261-3/+6
|
* machines/katara: fontconfig presetProfpatsch2017-04-261-0/+1
|
* machines/katara: switch to network-manager againProfpatsch2017-04-261-18/+20
| | | | Hopefully temporarily.
* machines/profpatsch: move mutableUsers to baseProfpatsch2017-04-262-2/+3
|
* pkgs: Add an overridden Gajim with old pycryptoaszlig2017-04-235-8/+40
| | | | | | | | This is for the time being until either NixOS/nixpkgs#21671 has been resolved or the next major version of Gajim has been released, because the latter no longer uses pycrypto. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Move callPackageScope into pkgs/libaszlig2017-04-232-25/+30
| | | | | | | | Now the pkgs/default.nix is a lot more readable because it has only the top-level derivations and the callPackageScope invocations for the corresponding sub-scopes. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/show-qr-code: Move into pkgs/profpatschaszlig2017-04-234-4/+4
| | | | | | | | | Tested evaluation using: nix-instantiate pkgs -A vuizvui.profpatsch.show-qr-code Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* pkgs: Use callPackageScope wherever applicableaszlig2017-04-234-43/+50
| | | | | | | | | | | | | This should remove a lot of clutter from pkgs/default.nix into corresponding sub-scopes, eg. pkgs/openlab/default.nix. Apart from restructuring there is no change of runtime functionality involved. Tested by evaluating with "nix-env -f pkgs -qaP". Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch, @sternenseemann
* pkgs: Improve callPackageScope customisationaszlig2017-04-231-2/+18
| | | | | | | | | | | | | | | By default callPackageWith adds an overrideDerivation attribute, but that won't work with our new package scopes, so we add an override attribute by ourselves without the overrideDerivation attribute. That aside, we now use functionArgs on not only the superset of packages but also for the scope utility functions (callPackage/callPackage_i686) that we pass down to our new package scope. If we didn't do that, the Nix expression of the subscope would always need to define callPackage and callPackage_i686 in their function arguments, regardless of whether it's needed or not. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Move all of my packages into pkgs/aszligaszlig2017-04-2323-28/+41
| | | | | | | | | | | | | This already has started in e0abe1dbbda54c1f048b5d38df05e1a3289216a6 with @Profpatsch putting his packages into its own namespace, so let's continue on that and move my crap into my own namespace as well. The only difference in my approach is that I'm now also using a new function called callPackageScope, which declutters pkgs/default.nix a bit and moves the individual callPackage invocations into aszlig/default.nix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Move jmtpfs to pkgs/profpatschaszlig2017-04-233-6/+9
| | | | | | | | This clearly is something currently only @Profpatsch wants, so lets move it into the user namespace. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @Profpatsch
* pkgs: Remove unused/obsolete packagesaszlig2017-04-2312-714/+1
| | | | | | | A lot of crap has been accumulated there over the years, so I'm removing at least the stuff that I have introduced. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/fliewatuet: add spotifysternenseemann2017-04-231-0/+1
|
* core/common: Add Headcounter Hydra to binaryCachesaszlig2017-04-234-20/+5
| | | | | | | | | | | | | | | | | | This makes sense to put into the core module here, because we already have the public key in there as well and if we want to use the binary cache outside of a channel it's a good idea to provide it here by default. Being a default of course also means that users can easily override this using: nix.binaryCaches = mkForce [ "something else" ]; I've also removed the redundant setting of that option in all of the machine configurations. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @sternenseemann
* modules/core/tests: Add test for SLiMaszlig2017-04-231-0/+3
| | | | | | Added in NixOS/nixpkgs@dc87b5587e3fb39e96e6b965a26f324daf7508f8. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* taalo-build: Use Nix 1.11 for the backendaszlig2017-04-231-1/+10
| | | | | | | | | | | | | | | | | | Nix 1.12 already got rid of most of the Perl stuff so the Perl script backing taalo-build doesn't work anymore because Nix/CopyClosure.pm is no longer available. One way to fix this properly is to part the backend to C++ and use the new ssh-ng store backend. This would also have the advantage that we don't need to hardcode protocol internals here anymore. Unfortunately, Nix 1.12 isn't stable yet and we would break Nix 1.11 if we use the new store API. So that's why I'm pinning the backend to use Nix 1.11 instead and leave that ugly Perl script until Nix 1.2 is stable. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Fix BFQ patch for kernel 4.11-rc7aszlig2017-04-191-141/+257
| | | | | | | | | | | | | | Previously in d6848012b86088cbfd70666a0cfae95c567e7199 I've just rebased the patch I had against 4.10 against kernel 4.11, but that didn't work out so well. So this is now a rebase against the new branch from Paolo Valente at: https://github.com/linusw/linux-bfq/tree/bfq-v8 Hopefully this time it will compile ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Add gpodder instead of miroaszlig2017-04-191-1/+1
| | | | | | | | Miro is unmaintained and very buggy, while gpodder is a bit more minimal it's still maintained and also more reliable. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @dwenola
* profiles/packages: Switch to Chromium stableaszlig2017-04-191-1/+1
| | | | | | | | I'm fed up with fixing up Chromium beta and currently the included GN doesn't bootstrap as well. So for now let's run with Chromium stable until I'm masochistic enough to dig into Chromium again. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Rebase BFQ patch on kernel 4.11-rc4aszlig2017-04-192-11/+10052
| | | | | | | | | | | | It's basically only a very small change, because block/Makefile now contains objects for block-MQ schedulers (one of these will also include BFQ in possibly the next mainline kernel) and thus the patch no longer applies. Having that potch here in the source tree is a lot of crap lying around, so we better get rid of it ASAP. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Fix build of nix-replaszlig2017-04-191-0/+1
| | | | | | | | Compiling nix-repl with Nix 1.12pre5152_915f62fa will only work by enabling support for ISO C++ 2014, because nix/util.hh uses includes from <experimental/*>. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/santander: Whitelist webkitgtk2 for dwbaszlig2017-04-191-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | WebKitGTK+ has a bunch of security vulnerabilities: * WSA-2017-0002 * WSA-2017-0001 * WSA-2016-0006 * WSA-2016-0005 * WSA-2016-0004 We're using dwb in conjunction with this insecure version only for *one* specific application with *one* specific web site, so the attack surface is relatively low. The main issue with this is that the plugin required for the Santander page is based on NPAPI and most of the browsers out there do not support NPAPI, except a few ones: https://en.wikipedia.org/wiki/NPAPI#Browser_support I've tried to embed the plugin within Midori but I couldn't get it to work so far (Midori just says "No plugin available"), so I'm sticking with dwb for now, because the other browsers listed here either have the same problem (uzbl) or are simply too heavyweight. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri: Fix allowUnfreePredicate match of hplipaszlig2017-04-191-1/+1
| | | | | | | | | | | The derivation name now is just "hplip-VERSION" (eg. "hplip-3.16.11") instead of "pythonX.Y-hplip-VERSION". The upstream commit changing this was: NixOS/nixpkgs@3760c8c7fde6e8b15d19b063579d05018fc2d8b3 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Update to latest upstream masteraszlig2017-04-191-8/+2
| | | | | | | | We can now safely drop the patch for NixOS/nixops#508, because it has long been applied to master and also partially reverted as well in NixOS/nixops@4bbceb294fc50146a4fd47352fba786ee1af6654. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* core/tests: Update upstream NixOS testsaszlig2017-04-191-5/+30
| | | | | | | | | | | | | | | | | New tests as of NixOS/nixpkgs@b0179351036a870da8c1a89c991a359a73aab0e2: * containers-restart_networking * nginx * pgjwt * postgresql (now with subtests per package) * sddm (now with subtest "autoLogin" and "default") * wordpress The following tests were renamed: * kde5 -> plasma5 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Update to latest master and fix buildaszlig2017-04-191-3/+9
| | | | | | | | | I'm no longer using Tomahawk at the moment, so I'm not very ambitous to get this build running in a *clean* way. So this is more or less a "get this shit to build no matter what" fix rather than investigating why it really fails to discover the dependencies. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/aszlig: Revert whitelisting webkitgtkaszlig2017-04-195-22/+0
| | | | | | | | | | | | | | This reverts the following commits: * f34f60216a94f41e684b2b2a29be9ca5f8f72940 * fb6cd06936a469fad708e1095b5ee25ad1298375 Using permittedInsecurePackages on all my machines isn't something I want to pursue, because this really affects *one* single package and I really don't want to whitelist webkitgtk-2.4.11 across all of my machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/mmrnmhrm: Merge machine into dnyarriaszlig2017-04-183-113/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, mmrnmhrm has died because of three blown up capacitors which resulted in hard shut downs due to CPU0 temperature values that were out of range. At first I assumed a real temperature problem and thus vacuumed the fan and everything else, applied new thermal paste and it still failed after a few minutes. What I found a bit odd was the fact that the machine powered off even though the last reading of the CPU temperature was 40 degrees Celsius, so that definitly wasn't the problem. So I went on to look for any blown capacitors on the main board, because that's probably one of the most frequent cause of hardware failure... at least for mainboards and monitors. One of the three capacitors I found to be leaking seems to be leading to the CPU temperature sensor as far as I can tell (I didn't test with a multimeter though, because I have lent it out to someone else). While it shouldn't be hard to fix the blown capacitors (apart from the fact that we had national holiday during the Easter week), my long-term goal was to make mmrnmhrm obsolete anyway, so it was a good opportunity to do exactly that. The reason why I wanted to get rid of mmrnmhrm was that it has been a very slow machine since commit 2df7ee103a01da34c9c82235bc286dde35e0f1ba, which was essentially a hardware downgrade back then. Dnyarri always has been the better machine hardware-wise but I couldn't use it to its full potential because it had a cooling issue. The latter has been resolved a few weeks ago, where I replaced the CPU fan and it's now not only less noisy but stays at below 50 degrees Celsius even on high load. Merging mmrnmhrm into dnyarri also means, that we now have a new disk layout: +---------------+--------------+--------------+--------------+ | Disk 1 | Disk 2 | Whole disk 3 | Whole disk 4 | +---------------+--------------+--------------+--------------+ | EFI partition | crypt-vault | crypt-root-3 | crypt-root-4 | | crypt-swap-1 | crypt-swap-2 +-----------------------------+ | crypt-root-1 | crypt-root-2 | +---------------+--------------+ Disk 1 and 2 use GUID partitions while disk 3 and 4 don't have a partition table but use btrfs across the whole device. The crypt-vault partition is solely for unlocking other crypto volumes so that a single passphrase unlocks all of the LUKS containers rather than needing to provide 6 passphrases. Also, I've migrated to using UEFI for booting, which is why there now is an EFI partition as well. Having no redundancy on the EFI and the crypt-vault partitions doesn't hurt so much because in the event of drive failure all of the containers can still be unlocked via a passphrase instead of the vault key. Disk 3 and 4 are the disks that were formerly installed into mmrnmhrm and now comprise one big btrfs volume together with the two disks (1 and 2) already present inside dnyarri. Instead of RAID1 on data and metadata, the btrfs file system layout now is RAID10 for data and metadata. This merge also removes synergy for obvious reasons (no other machine anymore) and disables kmscon because it was just a test in the first place and I found it a bit annoying to work with. Summary: Mmrnmhrm is (are?) dead, long live dnyarri! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/fliewatuet: back to herbstluftsternenseemann2017-04-081-4/+1
|
* pkgs/profpatsch: add nmanProfpatsch2017-04-064-0/+94
|
* machines/katara: fix changes with fontconfig.ultimateProfpatsch2017-04-041-2/+4
|
* modules/core/tests: comment out quaggaProfpatsch2017-04-041-3/+4
| | | | Fixes evaluation.
* machines/fliewatuet: 2bwm config update, reenable bluetoothsternenseemann2017-04-023-145/+97
|
* machines/fliewatuet: 2bwmsternenseemann2017-04-013-8/+139
|
* machines/schnurrkadse: reflect ultimate updatesternenseemann2017-03-271-1/+1
|
* machines/schnurrkadse: fix evaluation errorsternenseemann2017-03-261-1/+1
|
* machines/fliewatuet: reflect ultimate updatesternenseemann2017-03-261-2/+4
|
* machines/sternenseemann: refactoringsternenseemann2017-03-264-17/+81
|