about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* release.nix: Fix evaluation error with mkChannel.aszlig2015-05-071-1/+1
| | | | | | | | Since we now have everything within the vuizvui namespace at the top- level Nix expression we also need to reference mkChannel from within that namespace. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Don't build upstream nixpkgs.aszlig2015-05-051-1/+1
| | | | | | | | We don't want to build the whole <nixpkgs> package set, which I accidentally introduced when rewriting the package namespacing in 6ffc2e86150e625266e6836a1404a3e79fc74d49. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/tomahawk: Update to latest upstream master.aszlig2015-05-041-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Properly namespace package under "vuizvui".aszlig2015-05-042-5/+5
| | | | | | | | | | | | | | | | 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>
* machines/tishtushi: Add Synaptics configuration.aszlig2015-05-041-0/+5
| | | | | | | | | | Not really optimized to what I would like it to, but much better than with the default setup and it's annoying tap buttons. Odds are greater that I might switch back to keynav instead of investing more time in configuring a pointing device. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Fix get-version-suffix in tarball.aszlig2015-05-041-0/+2
| | | | | | | | | | | | | | This gets rid of an ugly error message during nixos-rebuild, because the stock get-version-suffix tries to find <nixpkgs>, which will either lead to the wrong channel (if it even exists at all) or an ugly error. In both cases however, it doesn't have an effect, because the channel expression store path is read-only and ships with a .version-suffix already. It really only gets rid of ugly error messages. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release: Patch --find-file in nixos-rebuild.aszlig2015-05-041-1/+3
| | | | | | | 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>
* Integrate machine into vuizvui.Profpatsch2015-04-301-0/+3
|
* Initial config for katara.Profpatsch2015-04-301-0/+126
|
* nixops: Fix nixpkgs reference in manual/resource.aszlig2015-04-291-1/+1
| | | | | | | | | 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>
* nixops: Patch manual expression file as well.aszlig2015-04-291-1/+1
| | | | | | | | 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>
* nixops: Patch release.nix to use nixpkgs-path.nix.aszlig2015-04-291-0/+5
| | | | | | | 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>
* release.nix: Also patch vuizvui itself.aszlig2015-04-291-16/+29
| | | | | | | | | | | | | 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>
* release.nix: Provide a name to patchedNixpkgs.aszlig2015-04-291-2/+4
| | | | | | Yeah, probably will work a bit better without evaluation errors ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Work around NixOS/nixpkgs#7272.aszlig2015-04-292-2/+6
| | | | | | | | 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>
* release.nix: Refactor to use patched nixpkgs.aszlig2015-04-291-13/+20
| | | | | | | | | | | | | | 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>
* Handle all <nixpkgs> paths with nixpkgs-path.nix.aszlig2015-04-2910-21/+36
| | | | | | | | | 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>
* modules/gajim: Get rid of <nixpkgs>.aszlig2015-04-292-2/+2
| | | | | | | 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>
* release.nix: Add ".update-on-nixos-rebuild".aszlig2015-04-281-0/+1
| | | | | | | | | | 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>
* release.nix: Include nixpkgs tarball in channel.aszlig2015-04-281-19/+8
| | | | | | | | | | | | | | | 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>
* release.nix: Use vuizvui/nixpkgs in nixos-rebuild.aszlig2015-04-281-2/+7
| | | | | | | | | | 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>
* channel: Fix passing attributes to mkChannel.aszlig2015-04-281-2/+2
| | | | | | | 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>
* release.nix: Provide src attr to patchedNixpkgs.aszlig2015-04-281-0/+1
| | | | | | Well, it won't work without it, duh! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Tie nixpkgs to channel tarball.aszlig2015-04-281-0/+15
| | | | | | | | | | | 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>
* channel: Add patchPhase to phases.aszlig2015-04-281-1/+1
| | | | | | Should make it easier to patch the channel expressions. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Remove pulseaudio override.aszlig2015-04-271-3/+0
| | | | | | It was redundant anyway, see previous commit (e08f399). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Remove obsolete attr useSystemd.aszlig2015-04-271-3/+0
| | | | | | | | 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>
* tomahawk: Update to latest upstream master.aszlig2015-04-211-2/+2
| | | | | | | | 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>
* channel: Pass meta.isHydraChannel = true.aszlig2015-04-211-1/+5
| | | | | | | 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>
* channel: Switch from product subtype to type.aszlig2015-04-211-1/+1
| | | | | | | 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>
* tomahawk: Update to latest upstream master.aszlig2015-04-181-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Generate channels for all machines.aszlig2015-04-151-4/+14
| | | | | | | | | | | 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>
* mkChannel: Remove channelName attribute.aszlig2015-04-152-8/+5
| | | | | | | 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>
* release.nix: Fix evaluation of manual.aszlig2015-04-151-3/+3
| | | | | | Regression introduced by a610560bb4b5a05eb480a4dbab3e24c553727047. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Switch channel over to mkChannel.aszlig2015-04-151-10/+3
| | | | | | | | 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>
* Add a default.nix which servers as vuizvui root.aszlig2015-04-152-3/+17
| | | | | | | | | 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>
* pkgs: Add helper function for creating channels.aszlig2015-04-152-0/+31
| | | | | | | | | 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>
* release.nix: Rename upstream pkgs to pkgsUpstream.aszlig2015-04-151-4/+4
| | | | | | | | 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>
* release.nix: Remove unnecessary double slash.aszlig2015-04-131-1/+1
| | | | | | | Forgot to remove the slash from the end of the replacement of the transformation expression in tar. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Fix Hydra product file name.aszlig2015-04-131-1/+1
| | | | | | | 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>
* release.nix: Put channel exprs into a tarball.aszlig2015-04-131-1/+10
| | | | | | | | | | 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>
* mainlineKernel: Update to latest upstream master.aszlig2015-04-111-2/+2
| | | | | | | Fast-forward for 23 commits, which include fixes for sound, pci, pm-sleep and nios2. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/tomahawk: Update to latest upstream master.aszlig2015-04-111-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mainlineKernel: Update to version 4.0.0-rc7.aszlig2015-04-091-3/+3
| | | | | | Plus 30 commits more (akpm, drm-fixes, media-fixes). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/tomahawk: Update to latest upstream master.aszlig2015-04-091-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Merge pull request #2 from waaaaargh/master.aszlig2015-04-081-1/+1
|\ | | | | | | | | | | | | | | | | 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.
| * Add `openlab` user to group dialoutJohannes Fürmann2015-04-071-1/+1
| | | | | | by default usb <-> rs232 interfaces which are used to connect to 3d printers are owned by the group `dialout`.
* | services/i3: Fix override of default workspaces.aszlig2015-04-081-8/+9
| | | | | | | | | | | | | | | | | | | | 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>
* | tests/i3: Define a "first" test workspace.aszlig2015-04-081-1/+9
|/ | | | | | | | 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>
* nixops: Add patch to fix circular lib reference.aszlig2015-04-041-0/+4
| | | | | | | 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>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-26 22:34:12 +0000