| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Should make it easier to patch the channel expressions.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Yes, I know that it's only two more commits we don't really care about,
but I needed my Hydra to evaluatio the jobset again in order to test
channels.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
In the latest not-yet-public implementation of Hydra channel
improvements, we now have a meta attribute to designate a channel.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This is because I've changed the the WIP implementation to use a product
type instead of a subtype.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
The third argument in hydra-build-products is actually the base
directory and not a name, Alzheimer's near!
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
We're going to create several channels and we don't want to code
duplicates across vuizvui. This essentially not only creates a channel
but also ties it to constituents, which make sure that channels are only
updated whenever all constituent builds are successful.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Patch is from pull request NixOS/nixops#280 and can hopefully be dropped
in favour of the latest master version.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Contains a bunch of fixes especially some related to the Hetzner
backend.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The generalization is done by symlinking include dirs and libraries to
the corresponding suffixed versions *only* if there isn't a ...5 suffix
already.
We now no longer need to pass QUAZIP_INCLUDE_DIR and QUAZIP_LIBRARIES as
cmakeFlags, because the Tomahawk cmake build is able to find it by
itself.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Same as with 9ea16e0 and d3bfedd.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's not a big issue, because due to Nix's stdenv it's going to be able
to link anyway, but there still is a nasty warning, we're getting rid by
this:
WARNING: Target "tomahawklib" requests linking to directory
"/nix/store/ybw942c8jw0dyjah0r0pcsgn8q0sv02h-quazip-0.7.1/lib". Targets
may link only to libraries. CMake is dropping the item.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Just as with echonest vs. echonest5 we now have lastfm vs. lastfm5.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Tomahawk expects the echonest library to have a "5" suffix in its
include dir, so let's simply symlink it to the unsuffixed version.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Thanks to @muesli for mentioning this, so we no longer need to patch
Tomahawk's CMakeList.txt.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
The libraries are searched in $KDE4_INCLUDE_DIR or in some other paths
but with a prefix. On Nix however we don't need a prefix and our
dependencies are strictly separate so searching in KDE4_INCLUDE_DIR
won't work either.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
The upstream cmake script wasn't able to find it by itself, but haven't
looked into it whether this is only a Nix specific problem or whether it
applies generally.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
The upstream Tomahawk CMakeLists.txt contains a distro-specific name,
which doesn't work well when using the name from upstream Qca. So let's
rename it accordingly.
Cc: @muesli
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Building qtkeychain with Qt5 requires Qt5LinguistTools.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
It is included in Qt5 already and the separate one also won't build with
newer Qt, so let's null it out for echonest and remove it from
Tomahawk's buildInputs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Using the attica version from the KDE frameworks attribute set.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This was changed in tomahawk-player/tomahawk@873c35a, so let's adapt
accordingly and jump straight to Qt 5.4 instead of plain old 5.3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|