summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge branch 'master' into x-updatesVladimír Čunát2013-08-02
|\
| * Merge pull request #800 from edanaher/masterPeter Simons2013-08-02
| |\
| | * Add simple hsetroot package.Evan Danaher2013-08-01
| * | blivet: Update sha256, as it changed upstream.aszlig2013-08-02
| * | nixpart: Update to bugfix version 0.4.1.aszlig2013-08-02
| * | Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lis...Michael Raskin2013-08-02
| |/
| * git-subtree: RemoveEelco Dolstra2013-08-01
| * git: Install git-subtreeEelco Dolstra2013-08-01
| * git: Update to 1.8.3.4Eelco Dolstra2013-08-01
| * VM builds: Reduce kernel verbosityEelco Dolstra2013-08-01
| * VM builds: Use the default kernelEelco Dolstra2013-08-01
| * Move kernelExtraConfig to common-config.nix (for x86)Eelco Dolstra2013-08-01
| * Turn LD_LIBRARY_PATH into a suffix to allow NVIDIA's OpenGL driver to be usedSander van der Burg2013-08-01
| * Shut up annoying question to configure hardware profilesSander van der Burg2013-08-01
| * - System images are not required for building. Disabling them makes building ...Sander van der Burg2013-08-01
| * linux: Include "NixOS" in "uname -v"Eelco Dolstra2013-08-01
| * linux: Enable detection of hung tasksEelco Dolstra2013-08-01
| * linux: Enable stack protectorEelco Dolstra2013-08-01
| * Style fixEelco Dolstra2013-08-01
| * linux: Remove obsolete AUFS 3.7 patchEelco Dolstra2013-08-01
| * linux: Remove CIFS timeout patchEelco Dolstra2013-08-01
| * linux: Remove some unused patchesEelco Dolstra2013-08-01
| * linux: Disable /dev/kmemEelco Dolstra2013-08-01
| * iwlwifi4965ucodeV1: RemoveEelco Dolstra2013-08-01
| * Unify the Linux kernel configurationsEelco Dolstra2013-08-01
| * linux: Don't put the kernel version in metaEelco Dolstra2013-08-01
| * wicd: wrapper env vars prefix -> postfixBjørn Forsman2013-07-31
| * Merge branch 'master' of github.com:NixOS/nixpkgsSander van der Burg2013-07-31
| |\
| | * Merge branch 'dhex'Joachim Schiele2013-07-31
| | |\
| | | * added dhex, a nice ncurses based hex editor for the shellJoachim Schiele2013-07-31
| * | | Now x86 and mips images from external repositories are supported + added GPU ...Sander van der Burg2013-07-31
| |/ /
| * | Fixed incorrect platform-tools sha1 valueSander van der Burg2013-07-31
| * | Updated Android SDK to version 22.05, updated all plugins, and added mesa to ...Sander van der Burg2013-07-31
| * | Merge pull request #735 from garbas/networkmanagerDomen Kožar2013-07-31
| |\ \
| | * | adding description to networkmanager pluginsRok Garbas2013-07-31
| | * | openconnect and vpnc NetworkManager plugins addedRok Garbas2013-07-31
| |/ /
| * | apr-util: Update to 1.5.2Eelco Dolstra2013-07-31
| * | apr: Update to 1.4.8Eelco Dolstra2013-07-31
| * | qemu-kvm: DisambiguateEelco Dolstra2013-07-31
| * | Use the qemu-kvm wrapperEelco Dolstra2013-07-31
| * | qemu-kvm: RemoveEelco Dolstra2013-07-31
| * | qemu: Update to 1.5.2Eelco Dolstra2013-07-31
| * | Merge pull request #794 from NixOS/python_move_nameprefix_packagesDomen Kožar2013-07-31
| |\ \
| | * | Move namePrefix="" python packages out of python-packges.nixDomen Kožar2013-07-31
| |/ /
| * | haskell-unix-process-conduit: update to version 0.2.1.2Peter Simons2013-07-31
| * | haskell-haskell-src-meta: update to version 0.6.0.3Peter Simons2013-07-31
| * | haskell-feed: update to version 0.3.9Peter Simons2013-07-31
| * | haskell-cmdargs: update to version 0.10.5Peter Simons2013-07-31
| * | all-packages.nix: drop trailing whitespacePeter Simons2013-07-31
| * | Drop recurseIntoAttrs from python33Packages and pypyPackages.Peter Simons2013-07-31