about summary refs log tree commit diff
path: root/nixpkgs
Commit message (Collapse)AuthorAgeFilesLines
* nixpkgs: Update kernel source to latest mainline.aszlig2012-12-131-3/+3
| | | | | | Great, more updates from the 3.8.0 merge window :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Remove samplicator and vbindiff.aszlig2012-12-131-22/+0
| | | | | | | | | | Thes packages are now in upstream nixpkgs, please have a look at these commits for more details: NixOS/nixpkgs@e42dc52f4266cd39a0c3a30c2b12f9bc4360a7e5 NixOS/nixpkgs@6acc5289fc3a6c82de1b5099c0b27fbaca7cb252 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Directly override chromium package.aszlig2012-12-131-10/+7
| | | | | | | | | | | | The chromium package in upstream nixpkgs no longer uses the config attribute set in order to determine package build options, so we don't need to pass around fake config attributes anymore. In addition we now have a convenient chromiemBetaWrapper attribute which allows us to directly specify a specific channel, which is possibly already built by Hydra. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Update kernel sources to v3.7.0-rc7.aszlig2012-11-261-3/+3
| | | | | | | So, as promised, finally upgrading kernels on both machines to the latest version :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move kernel source expr into nixpkgs/config.nix.aszlig2012-11-261-0/+9
| | | | | | | | | | | | I'm just using the kernel source from mmrnmhrm, even though it's older than dnyarri's kernel config. The reason is because I want to make sure that a nixos-rebuild won't bring up any changes. It is rather unlikely, but I better want to make sure it won't happen. Afterwards, let's upgrade that old kernel, because the 3.7.0-rc7 tag was pushed by Linus just about two hours ago. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Add expressions from ~/.nixpkgs/config.nix.aszlig2012-11-261-0/+338
Luckily, this file is already common on all my machines, so there's no need to consolidate anything, except that it may be useful to set nixpkgs.config to those expressions as well. The expressions in this new file are partly unfinished and not yet cleaned up packages I'm either working on or just needed "right now", so these will eventually become part of upstream nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>