| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
I could have added this to the upstream <nixpkgs>, but we only include
and support release versions. This fixes the following failed build for
VirtualBox:
https://headcounter.org/hydra/build/748430
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I was glad that the issues because of the longstanding GHC determinism
bug (https://ghc.haskell.org/trac/ghc/ticket/4012) happened less
frequently with GHC 7.10.
Unfortunately, they still happen, as reported by @Profpatsch at
headcounter/deployment#19 so we're going to override the GHC derivation
with an additional attribute that is exported into the environment of
the builder.
This attribute causes GHC and all dependant packages to be rebuilt on
the Headcounter Hydra. The original issue was because we're using the
official NixOS binary cache as well as building everything from source.
It's helpful for not needing to rebuild the entire world, but for
Haskell packages it's harmful until the mentioned GHC bug has been
fixed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We were using environment.sessionVariables before, but
NixOS/nixpkgs@3f1354a added an option exclusively for this. It
internally still sets environment.sessionVariables, so it doesn't change
anything for us because we're overriding the full list anyway.
But should we switch from overriding to appending/prepending someday, we
could get unexpected behaviour, so that's why I'm switching to
nix.nixPath here.
Thanks to @devhell for bringing this to my attention.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
The option is no longer called services.virtualboxHost but now
virtualisation.virtualbox.host. See NixOS/nixpkgs@6440e9b for more
details.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Here we have our actual implementation. Note however, that one can still
build an ISO image out of any machine by using:
nix-build machines -A machine.attr.iso.config.system.build.isoImage
However, none of these ISOs are built by default, except for kzerza,
which has vuizvui.createISO enabled.
The implementation has one little goof as it creates empty attrsets if a
particular machine doesn't have createISO enabled. But for our current
purposes that's okay "enough".
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
We only really need an ISO image for kzerza, as mentioned in the
previous commit, because that's the one that's really dd'ed onto an USB
stick.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Building ISO images for all machines really doesn't make sense if we
only have _one_ machine at the moment, where we really use it (kzerza).
So we now have an option which can be defined for a particular machine
configuration, which is then going te be excempted from the ISO building
process.
The latter isn't yet implemented however, only the option is here right
now.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts the following commits:
b0a2a69: profiles/base: Temporarily disable hinotify tests.
fc35a3d: profiles/base: Properly disable hinotify tests.
These are no longer needed as it has been quickly fixed upstream at
NixOS/nixpkgs@e75e0d9, thanks to @peti.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Using nixpkgs.config.haskellPackageOverrides isn't going to work for
NixOS configurations, because the other packageOverrides will override
the haskellPackageOverrides with a new instantiation of <nixpkgs>.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Build failure is here:
https://headcounter.org/hydra/build/722122/nixlog/1/raw
I'm overriding this in the base profile for now to get my main
workstations up to date ASAP.
Cc: @peti
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
It has been a long time (~2 months) since I've been back to my
workstations, so there was a new kernel release in-between.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@e3a5bca, signed binary caches are mandatory, so
let's set it in our default profile for vuizvui.
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>
|
|
|
|
|
|
|
|
|
|
| |
Since d2ff1a9, we now set a new NIX_PATH instead of patching <nixpkgs>,
which is way less error-prone and get less unexpecting results if we
evaluate against an unmodified <nixpkgs>.
So, patching <nixpkgs> is obsolete and thus removed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
We don't want the ExecStopPost action to run whenever GrandPA exits with
a failure state, because this would make debugging very nasty ("Noooo,
don't shut doooooooow... DAMN!"), especially on read-only media.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was the behaviour back then when NixOS still used upstart and after
some searching I found that ExecStopPost is what we want here, despite
its name (I'd imply that it is used in parts to stop the service rather
than executed after the service has stopped).
So in turn, it means that using Ctrl-Q within GrandPA shuts down the
whole system.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
We can't really do a "mkForce {}" or "mkForce null" on the submodule
type and the upstream module throws an error on null values, so we
simply define a dummy fileSystem with the noauto option set.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
This has been enabled before, but got lost while refactoring my base
profile in fb1ddce32989fdea137f2b225ae4c24d2badf3a4.
It is okay to have it only in the workstation profile, but if it comes
to kzerza, the GrandPA application depends on it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
The default font changed to Terminus in NixOS/nixpkgs@0b68b92.
I personally hate Terminus with a passion, so I simply don't want it to
cause eye cancer on any of my machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We now do it the exact opposite way than introduced in 27dce7b. Instead
of evaluating the machine config and stripping off the options we don't
want to conflict with the iso-image.nix module, we now wrap the
iso-image.nix module itself and just mkForce the values we don't want to
collide.
The reason for this is that the previous implementation just didn't work
because dependent module options from the machine config (for example
config.system.build.*) were already evaluated and thus we end up with
overriding configuration options but get an initrd with the machine
options (which we actually want to override) instead of the
fileSystem/boot options that come with the iso-image.nix module.
Although I'm not quite happy with this approach, it's still better than
the old one and if iso-image.nix gets conflicting options we at least
get a better error message rather than the definitions simply being
stripped off.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Introduced in NixOS/nixpkgs@f9bd72f24cfc8c160d144615522b0bc692cde9d0.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Namespacing the options with "vuizvui." now leads to failing tests,
which I probably should have checked in the previous commit, my bad!
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
The machine was using only configuration-internal options, which is why
I missed it when I was introducing a common namespace. Still, the
machine needs to be refactored, but right now I'm just going to give it
a proper namespace in order to fix evaluation of the ISO images.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
Originally only needed for "kzerza", because that machine has always
resided on an USB stick, but could be useful for "arilou" and others as
well. That way you always have a (hopefully working) USB and CD image
available for all machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I know it's a somewhat hacky approach to strip off "_module",
"boot.loader" and "fileSystems" from the machine config, but that should
be the options which are to be set by iso-image.nix but that way we can
re-use the upstream module.
Also, if one of our modules sets an option without a proper "vuizvui."
namespace, we get an error as well. But it's our policy anyway to always
namespace with "vuizvui." so it's even good to get an error here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@e212e07, boolean options don't default to true
anymore if they're defined multiple times. So we need to explicitly
override the value for networking.wireless.enable, because we have set
it to false in the base profile.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Ugh... I must have been quite distracted while writing this.
Of course, doing a mkOverride on environment.sessionVariables instead of
environment.sessionVariables.NIX_PATH is going to clear *all*
sessionVariables instead of just replacing NIX_PATH.
This time however, I did a short test with:
nix-instantiate --eval --strict -E '
(import <nixpkgs/nixos/lib/eval-config.nix> {
modules = [ ./modules/profiles/common.nix ];
}).config.environment.sessionVariables
'
... to make sure I just didn't break it *again*.
Also, I'm going to immediately test this after the next evaluation, as
my current system is lacking quite a lot of necessary sessionVariables.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
That way we no longer need to rewrite anything from <nixpkgs> anymore,
because we only need to build one generation of the system and have the
right system-wide NIX_PATH for vuizvui.
For now however, let's test this properly before we can drop the rewrite
of nixos-rebuild and friends.
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>
|
| |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Fixes typos in the README for the modules subdirectory.
I have a long track record of bad grammar and spelling, so thanks a lot
to @devhell for the corrections.
|