| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
| |
Installing the GRUB bootloader to non-existing devices of mmrnmhrm to
for example dnyarri is not going to help anyone, right? ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Useful to call the machine from configuration.nix like this:
(import <vuizvui/machines> {}).aszlig.mmrnmhrm.use
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
This is actually a store path consisting of the vuizvui sources
themselves and currently doesn't depend on anything else, so it usually
won't fail when mandatory tests or builds fail.
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 renomed in NixOS/nixpkgs@8591b7b.
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>
|
|
|
|
|
|
| |
We're feeling to old, don't we? ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
As of NixOS/nixpkgs@ee7c9bd this is no longer needed, as the new
upstream version of QCA2 includes the plugin already.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Stress over the last few days affected my machines being not up-to-date
anymore. This has to change!
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@738cf42, the attribute is now simply called
"packagePlatforms".
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
We don't want to build non-free stuff on our Hydra and also we want to
have builds for all supported systems. In addition, this should get rid
of a few evaluation errors that happen because Hydra tries to create
jobs out of attributes which are not derivations.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Regression is from 903106efb392dc6235dd02523c29b3fbfed37462.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
This is where I previously left off and I'm currently not enough "in
zone" to remember the details. But even though the tests are failing,
I'm adding it here for reference and for picking it up later.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
This is for @richi235 only, but the module is generic enough to be
included in the top-level modules. I highly doubt that anyone else would
have a use for this, at least until we have replaced the module with a
kernel space variant of the same.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Regression is from 012fc8e4f399af06ab013ba136fe1d2cffb913f1.
We have renamed the package, so let's put in the right attribute path.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
I've moved the restrictions config of Postfix into the default module
for now and actually fixed it so that it's actually working (the config
value wasn't set before). Also, the option type was incorrectly set to
types.list, which aliases to types.listOf and expects another function
(kind) as its argument.
This marks the end of LaberNix and the beginning of a new Vuizvui!
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
The only thing that was missing was the pkgs attribute.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Just moving the overrides into the base profile isn't enough here,
as we wouldn't be able to refer to packages anymore, because the global
nixpkgs.config override is now gone.
Instead, we're now putting pkgs.vuizvui.* into the NixOS module system
by a new profiles/common.nix, which is used unconditionally for all
machines.
Of course, the result of this is that we now need to change all
references to vuizvui-related packages, which also is a good thing,
because we will no longer shadow existing packages from upstream
nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Unfortunately, we can't just explicitely override the zsh package and
refer to it in systemPackages, so we need to override it using
nixpkgs.config.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's currently only BeeHive, but our goal is to dissolve labernix step
by step until nothing is left.
Also, we're now no longer namespace the pkgs with vuizvui directly in
the package list. Before it wasn't even namespaced correctly (except for
inside pkgs/ directly) and we did override the packages using the dirty
approach in overrides/.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
Similar to callMachine, we now have callTest. The latter uses
make-test.nix, so we don't need to import the file explicitly anymore
and can just write our VM test by using either an attrset or a lambda
function which also gets our own packages in a vuizvui namespace.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
We're going to write much more tests and don't want to clutter up the
tests/ directory.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
I want to have a useful zsh configuration on all of my machines, so
let's not only enable it for the workstation profile.
Also, this removes a redundant zsh reference in the systemPackages of
the base profile.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Gets rid of my own crap in the vuizvui pkgs namespace and makes it
easier for other users to selectively use my Vim configuration.
It's still not as fleshed out as I wish it would be, but let's do that
later if needed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This means, we don't have that lib directory anymore and also we're not
doing text substitution on the kernel config but instead override the
original attributes.
However, this needs to be refactored even further, so we can use the
NixOS kernel system, which allows for certain modules to require
specific kernel features. That way we can automatically create a kernel
config from the list of required features and we only need to set a
specific base config instead of specifying the *full* kernel config.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
On upstream nixpkgs we have "system" and "hardware" but in our case the
amount of modules should be rather small, so it doesn't make sense to
separate those categories.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Thus we now got rid of the cfgfiles directory, especially because the
Synergy server config file is rather small, so inlining makes sense
here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Now we no longer pollute the repository root with Gajim (for example in
cfgfiles/) and it's also easier to enable/disable my personal Gajim
config among my own machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Using "import ../machines" is a bit ugly here, so we might want to
integrate this into make-test.nix, but other than that it should work
nevertheless.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
So far I'm not quite sure whether mailserver really belongs to labnet,
so I'm leaving it at the labernix subtree. Maybe it even makes sense to
just make it a profile until we have it on a real machine.
We no longer need common.nix for these machines, because it is already
done via callMachine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
Using package.nix as a module would mean that we would need to check for
the workstation profile in there again, so let's just make it a list and
import it from the default.nix where we only once check whether the
profile is enabled.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
We already have abstracted the injection of the module list in labernix,
so we can reuse this with only minor changes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
The profile is now a directory with a default.nix, which makes it more
managable without shovelling the whole packages.nix into the profile
module.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Both files are specific to my machines only and need to be generalized
in order to be useful for anyone else.
Moving these files has a few other censequences, such that we now need
to automatically import the module-list.nix in callMachine.
Speaking of module-list.nix, the file is now alphabetically sorted.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|