| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
We only did simple substitutions of <path/references/like/this/one> but
completely ignored the --find-file argument of nix-instantiate.
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 is needed because we're relying on nixpkgs-path.nix to point to a
valid nixpkgs tree, which we deliberately don't have anymore because we
wanted to avoid references to <nixpkgs>.
So providing vuizvuiSrc instead of vuizvui has another advantage that we
now are no longer dependant on the channel name and also have a safety
net (Hydra) to inform us of references to <vuizvui> in the form of
failed builds and/or evaluations.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Yeah, probably will work a bit better without evaluation errors ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
This causes an infinite recursion on evaluation if we import something
from a module argument. So until we have an importsArgs module attribute
we're going to refer to ../../nixpkgs-path.nix.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We now use nixpkgsSrc to make sure that Hydra builds will fail as soon
as we hit a reference of <nixpkgs> in either vuizvui of nixpkgs.
This also means, that we don't rewrite all of vuizvui and nixpkgs
anymore and we only really need to rewrite nixos-rebuild.sh.
Although we're using patched nixpkgs for Hydra builds, the release.nix
still has a fallback to <nixpkgs> to make development easier (patching
nixpkgs on every tiny change will take a long time otherwise).
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>
|
|
|
|
|
|
|
| |
We want to ensure that we possibly have only *one* point where we decide
on the path of nixpkgs, so it's easier to switch.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
We want to update the vuizvui channel alongside of the nixos channel in
"nixos-rebuild subcommand --upgrade", because we include machines and
NixOS modules.
Might be splitted off into the machine-specific channels later.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Symlinking is actually a pretty bad idea, because we can only have one
channel expression tarball. Evaluation however doesn't realize the
referenced store paths, so we need to include them directly in the
channel tarball.
This also simplifies rewriting of the NIX_PATH references, because we
need to recurse the directory structure only once.
In order to be correctly recognized by nixos-rebuild and display useful
version info, we generate .git-version and .version-suffix now as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
We're now symlinking the nixpkgs store path into vuizvui/nixpkgs and
reference it from within nixos-rebuild. Unfortunately we can't simply
patch it with the hardcoded store path because we'll end up having the
*previous* version on every nixos-rebuild instead of the new version
delivered by the channel.
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>
|
|
|
|
|
|
| |
Well, it won't work without it, duh!
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Right now, this is done by replacing all NIX_PATH references with
<nixpkgs...> by the path from Hydra input and silently hope that we
won't replace the wrong reference ;-)
Of course we're only replacing it in files that end with a .nix suffix,
so we shouldn't accidentally replace documentation.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Should make it easier to patch the channel expressions.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
It was redundant anyway, see previous commit (e08f399).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
No longer necessary since NixOS/nixpkgs@a2a3508. Now overriding with
`systemd = null` should be enough to disable support for systemd (which
we don't want anyway).
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>
|
|
|
|
|
|
|
|
|
|
|
| |
Those channels only depend on whether the build of the particular
machine succeed and currently don't include any VM tests.
Also, this is quite repetitious, because we're recursing through the
whole set of machines again instead of re-using the corresponding Hydra
jobs.
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>
|
|
|
|
|
|
| |
Regression introduced by a610560bb4b5a05eb480a4dbab3e24c553727047.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
The channel now serves more or less as a generic channel, which has no
constituents and thus should always be the most up-to-date channel for
vuizvui.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
In the end we want to have something like (import <vuizvui> {}), which
exports all stuff we need for building machines, packages, providing
custom helper functions and much more. And all that by using a channel
instead of setting NIX_PATH directly :-)
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>
|
|
|
|
|
|
|
|
| |
Mainly to make it a bit easier to distinguish, but also because we want
to make the release attribute set recursive, so we don't run into weird
evaluation errors.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Forgot to remove the slash from the end of the replacement of the
transformation expression in tar.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
DUH! Finger fart, as I was writing a tar.bz2 in the first place and
later changed it to tar.xz.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
With my previous implementation (NixOS/hydra#203) the tarball was
created by Hydra itself on the fly. Our new implementation actually
generates the tarball via Nix and Hydra only picks up the build product.
And exactly that's what we're doing here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Fast-forward for 23 commits, which include fixes for sound, pci,
pm-sleep and nios2.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Plus 30 commits more (akpm, drm-fixes, media-fixes).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Adds the openlab user to the dialout group to allow access to 3D
printers and other USB serial devices.
This might be just temporary and in the long term we might want to use a
udev rule after all to allow access to *all* USB devices to the openlab
user.
|
| |
| |
| | |
by default usb <-> rs232 interfaces which are used to connect to 3d printers are owned by the group `dialout`.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
By default, there are 10 workspaces defined and since the module system
changes, we need to assign default priorities to all values instead of
the full attribute set, because whenever there is an override of the
default, the whole attrset is replaced by the override instead of just
the values.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|/
|
|
|
|
|
|
| |
It's mainly to test whether the workspace assignment is done correctly
and if not, the screenshot on the test will be showing one of the
default workspaces instead.
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>
|
|
|
|
|
|
|
|
| |
We now no longer can (or even should) refer to pkgs.lib within modules
since the merge of the module system improvements in
NixOS/nixpkgs@889f72b.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I wanted to use it for my countless XTerms, so I patched xterm+zsh to
use madvise() with MADV_MERGEABLE on every allocation and the results
weren't *that* bright:
pages_shared: 83
pages_sharing: 1498
pages_unshared: 942
pages_volatile: 1
With 20 terminals, so roughly 5.85 MB "saved" and ~9 for 120 instances.
That really isn't worth the CPU overhead, thus I'm turning it off again.
So, I need a better strategy to support my habit of running hundreds of
terminals (or better: shells, because that's really what's actually
eating up my RAM).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
| |
|