about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove references to pkgs.lib within modules.aszlig2015-04-044-7/+7
| | | | | | | | 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>
* aszlig/workstation: Disable KSM again.aszlig2015-04-031-1/+0
| | | | | | | | | | | | | | | | | | | | 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>
* tomahawk: Update to latest upstream master.aszlig2015-04-031-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: small mouse improvementOpenlab Labtop2015-04-031-1/+1
|
* labtop: device ID for grupOpenlab Labtop2015-04-031-1/+1
|
* labtop tmux & fish, mouse configOpenlab Labtop2015-04-031-8/+22
|
* labtop: Add slic3r to systemPackages.aszlig2015-04-021-4/+1
| | | | | | Also, since NixOS/nixpkgs@6b467ad we no longer need to use allowBroken. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: Actually enable trackpoint support.aszlig2015-04-021-0/+1
| | | | | | | So far only emulateWheel has been set, but it doesn't work if you don't also enable the module. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: Add pronterface to systemPackages.aszlig2015-04-021-1/+1
| | | | | | Its upstream package is called "printrun" and includes Pronterface. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Update to latest upstream master.aszlig2015-04-021-2/+2
| | | | | | | Contains a bunch of fixes especially some related to the Hetzner backend. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Revert new system module to enable KSM.aszlig2015-04-013-23/+1
| | | | | | | | This reverts commit fc53a72f48ae6b567e7bf9901a2bd3657853633c. Applied upstream at NixOS/nixpkgs@224ed7e. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mainlineKernel: Update to version 4.0.0-rc6.aszlig2015-04-011-3/+3
| | | | | | | | | | They're just a few commits from 7fc377e..6c310bc and 24 changed files, with 156 insertions and 93 deletions, so this really isn't necessary, but I want to have that -rc6 instead of -rc5. Actually, this isn't really -rc6 anyway, but -rc6 plus 9 more commits. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/workstation: Enable KSM by default.aszlig2015-04-011-0/+2
| | | | | | | | I can't stand it anymore when my excessive use of "lots of xterms" is getting my machines into the need to use swapspace. The last time one of my machines got to a crawl was with >300 open xterms. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add a new system module to enable KSM.aszlig2015-04-012-0/+21
| | | | | | | | This is very useful if you're running a lot of the same instances of particular applications. For example virtual machines or even lots of terminals. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: Merge hardware config into one labtop.nix.aszlig2015-04-012-34/+25
| | | | | | | | | | This reverts the split up of the config from 55ec3a1 and puts all the stuff from the hardware configuration file into the main config. The reason for this is that vuizvui is structured so that the machine definition *IS* the actual hardware configuration which deviates from a common profile. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Improved Config for LabtopOpenlab Labtop2015-04-012-15/+59
|
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-11 05:34:38 +0000