about summary refs log tree commit diff
path: root/nixpkgs
Commit message (Collapse)AuthorAgeFilesLines
* nixpkgs/config: Set allowBroken to true.aszlig2014-08-251-0/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move all aszligEnv packages to systemPackages.aszlig2014-08-041-5/+2
| | | | | | | | | As we have a build farm at our disposal, it really makes sense to put the whole set of packages + overrides into systemPackages. The new packages list is now sorted by name rather than category so it's easier to spot duplicates. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Set allowUnfree for CPU microcode.aszlig2014-04-211-0/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Disable Google Talk plugin.aszlig2013-05-271-2/+0
| | | | | | I'm switching away from G+ and Hangouts, so I'm not going to need it anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* overrides: Completely separate environments.aszlig2013-01-141-1/+4
| | | | | | | | | Environments are now handled through nixpkgs/config.nix and get all packages from nixpkgs plus the packageOverrides in ../overrides. So we can actually remove "p" in overrides/default.nix which was recursively referencing the overrides attrs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Move aszlig-env into ../envs.aszlig2013-01-141-10/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Move packageOverrides into ../overrides.aszlig2013-01-141-283/+1
| | | | | | | This currently just to clearly separate these from the nixpkgs configuration and will be refined further in upcoming commits. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Enhance build for axbo-research.aszlig2013-01-141-9/+89
| | | | | | | Still not usable, but at least now it should possible to install it. Now also adds librxtx_java as a dependency instead of the bundled one. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Update kernel to v3.8.0-rc3.aszlig2013-01-101-3/+3
| | | | | | Actually it's a few commits past rc3 :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Move package list into ../collections.aszlig2013-01-091-79/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Update to kernel 3.8.0-rc2.aszlig2013-01-091-3/+3
| | | | | | 3.8.0-rc1 is quite old, so we really _need_ to upgrade, right? :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Add xpdf to aszlig-env.aszlig2013-01-091-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Add manpages to aszlig-env.aszlig2013-01-091-0/+2
| | | | | | | Might come in handy if you want to look up documentation to syscalls or libc calls. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs/config: Update kernel sources to 3.8-rc1.aszlig2012-12-271-3/+3
| | | | | | | In reality it's not the -rc1 tag directly but the master branch, so we are a few commits ahead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixpkgs: Remove obsolete comments.aszlig2012-12-271-28/+0
| | | | | | | | | | | | | | | | | The first one was for ffmpeg and x11grab support. Maybe I'll need this someday again if I happen to create a screencast again. But for now, just remove it. And the second one actually was an attempt to patch git to always sign commits. I have found a better and more selective solution by just adding the following alias: rebase-sign = !EDITOR=cat git rebase -i -x 'git commit --amend --no-edit -S' This should make it easy to sign all commits prior to pushing easily with: git rebase-sign upstream/master Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* 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>