Vladimír Čunát
625f40151b
Merge branch 'master' into x-updates
...
Conflicts (a little tricky, I did some cleanup of interacting changes):
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/tools/package-management/nixops/default.nix
pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Vladimír Čunát
d239d24a89
mesa: bugfix update 9.1.4 -> 9.1.6
2013-08-02 17:13:54 +02:00
Mathijs Kwik
114b961b8c
idris: upgrade to 0.9.9
2013-08-02 11:47:38 +02:00
Mathijs Kwik
bdb525e020
add haskell-llvm-general
2013-08-02 11:47:38 +02:00
Peter Simons
4fb87e91ff
Merge pull request #800 from edanaher/master
...
Add simple hsetroot package.
2013-08-02 02:32:19 -07:00
aszlig
9b9fa35ebd
blivet: Update sha256, as it changed upstream.
...
The sha256 was magically changed upstream with the same contents but
different timestamps, so let's update it. Thanks to @rbvermaa for
noticing.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-02 10:59:06 +02:00
aszlig
1362d479cb
nixpart: Update to bugfix version 0.4.1.
...
Contains the following fix:
- Fix mounting btrfs when mount_only (-m) is used.
I would like to update blivet as well, but at the moment it breaks for
nixpart, so let's retry later when we're at 0.5.x or even 1.x :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-02 07:36:08 +02:00
Michael Raskin
bfbbb12e35
Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations
2013-08-02 09:39:20 +04:00
Evan Danaher
35333935d6
Add simple hsetroot package.
2013-08-01 20:16:37 +02:00
Eelco Dolstra
65ad55c425
git-subtree: Remove
...
This package is obsolete because it's now part of git (see
https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE ).
2013-08-01 16:37:36 +02:00
Eelco Dolstra
80a82a2858
git: Install git-subtree
2013-08-01 16:36:54 +02:00
Eelco Dolstra
4ec1f8b68a
git: Update to 1.8.3.4
2013-08-01 16:26:02 +02:00
Eelco Dolstra
4342a32deb
VM builds: Reduce kernel verbosity
2013-08-01 14:35:31 +02:00
Eelco Dolstra
d077851b7d
VM builds: Use the default kernel
2013-08-01 14:35:31 +02:00
Eelco Dolstra
f155a35d7d
Move kernelExtraConfig to common-config.nix (for x86)
...
It's bad to have the kernel config scattered across two places. (This
should also be done for the other architectures.)
Also, restore Xen and KVM guest support in Linux 3.10.
2013-08-01 14:35:31 +02:00
Sander van der Burg
9a2b9ba6b3
Turn LD_LIBRARY_PATH into a suffix to allow NVIDIA's OpenGL driver to be used
2013-08-01 12:43:33 +02:00
Sander van der Burg
c81e70fc30
Shut up annoying question to configure hardware profiles
2013-08-01 11:32:57 +02:00
Sander van der Burg
77dd343e1e
- System images are not required for building. Disabling them makes building faster.
...
- Make ant flags configurable
2013-08-01 11:21:54 +02:00
Eelco Dolstra
14ca9c0bf1
linux: Include "NixOS" in "uname -v"
2013-08-01 01:40:41 +02:00
Eelco Dolstra
d1de0e2d6d
linux: Enable detection of hung tasks
2013-08-01 01:40:41 +02:00
Eelco Dolstra
f2f00c56e4
linux: Enable stack protector
...
This may prevent exploitation of buffer overflows.
2013-08-01 01:40:41 +02:00
Eelco Dolstra
c564d012f8
Style fix
2013-08-01 01:40:41 +02:00
Eelco Dolstra
b976e00ff2
linux: Remove obsolete AUFS 3.7 patch
2013-08-01 01:40:40 +02:00
Eelco Dolstra
ff99631753
linux: Remove CIFS timeout patch
...
We longer use CIFS in the VM tests so we don't need this anymore.
2013-08-01 01:40:40 +02:00
Eelco Dolstra
956d71f843
linux: Remove some unused patches
2013-08-01 01:40:40 +02:00
Eelco Dolstra
bc8186be1e
linux: Disable /dev/kmem
...
See e.g.
https://wiki.ubuntu.com/Security/Features#A.2BAC8-dev.2BAC8-kmem_disabled
2013-08-01 01:40:40 +02:00
Eelco Dolstra
e1a7be4294
iwlwifi4965ucodeV1: Remove
...
This is verrrry obsolete.
2013-08-01 01:40:40 +02:00
Eelco Dolstra
7ce325f3e0
Unify the Linux kernel configurations
...
Having N different copies of the NixOS kernel configuration is bad
because these copies tend to diverge. For instance, our 3.10 config
lacked some modules that were enabled in older configs, probably
because the 3.10 config had been copied off an earlier version of some
older kernel config.
So now there is a single kernel config in common-config.nix. It has a
few conditionals to deal with new/removed kernel options, but
otherwise it's pretty straightforward.
Also, a lot of cut&paste boilerplate between the kernel Nix
expressions is gone (such as preConfigure).
2013-08-01 01:40:40 +02:00
Eelco Dolstra
dccbdcf520
linux: Don't put the kernel version in meta
2013-08-01 01:40:40 +02:00
Bjørn Forsman
2238a23352
wicd: wrapper env vars prefix -> postfix
...
Change PATH=$PATH:deps to PATH=deps:$PATH in the wicd wrappers, because
the latter is more deterministic; it prevents possibly wrong versions of
dependencies to sneak in from the environment.
Do the same for PYTHONPATH.
2013-07-31 21:54:09 +02:00
Sander van der Burg
dc183167cb
Merge branch 'master' of github.com:NixOS/nixpkgs
2013-07-31 18:56:36 +02:00
Sander van der Burg
1c8b4c8950
Now x86 and mips images from external repositories are supported + added GPU option to the emulate function
2013-07-31 18:56:27 +02:00
Joachim Schiele
6b1116cfce
Merge branch 'dhex'
2013-07-31 15:21:54 +00:00
Joachim Schiele
afbc5cd5e9
added dhex, a nice ncurses based hex editor for the shell
2013-07-31 15:20:23 +00:00
Sander van der Burg
c324091a77
Fixed incorrect platform-tools sha1 value
2013-07-31 16:14:47 +02:00
Sander van der Burg
ab9be1b809
Updated Android SDK to version 22.05, updated all plugins, and added mesa to the search path of the emulators to enable OpenGL acceleration
2013-07-31 16:00:57 +02:00
Domen Kožar
b6d43bb6a3
Merge pull request #735 from garbas/networkmanager
...
openconnect and vpnc NetworkManager plugins added
2013-07-31 06:45:34 -07:00
Rok Garbas
77063f3f75
adding description to networkmanager plugins
2013-07-31 15:36:17 +02:00
Rok Garbas
537a71a51e
openconnect and vpnc NetworkManager plugins added
...
also openvpn plugin updated to the same version as NetworkManager
2013-07-31 15:36:17 +02:00
Eelco Dolstra
32b036a430
apr-util: Update to 1.5.2
2013-07-31 15:02:54 +02:00
Eelco Dolstra
ab7f2aea8e
apr: Update to 1.4.8
...
Also drop the accept4 hack because Linux 2.6.32 is now the minimal
kernel version supported by Nixpkgs.
2013-07-31 15:02:23 +02:00
Eelco Dolstra
c8c817a3b4
qemu-kvm: Disambiguate
2013-07-31 14:53:35 +02:00
Eelco Dolstra
b5fcb5b67d
Use the qemu-kvm wrapper
2013-07-31 14:53:35 +02:00
Eelco Dolstra
00e311e438
qemu-kvm: Remove
...
But install a qemu-kvm wrapper in qemu.
2013-07-31 14:53:34 +02:00
Eelco Dolstra
945c70202f
qemu: Update to 1.5.2
2013-07-31 14:53:34 +02:00
Domen Kožar
7999e2b2a7
Merge pull request #794 from NixOS/python_move_nameprefix_packages
...
Move namePrefix="" python packages out of python-packges.nix
2013-07-31 05:11:43 -07:00
Domen Kožar
332dd4854f
Move namePrefix="" python packages out of python-packges.nix
...
It doesn't make sense to build tools/applications with three different
python interpreter versions, so move them out of python modules list.
Also reverts 53ffc6e0ef
.
2013-07-31 13:34:11 +02:00
Peter Simons
ef659fa8c0
haskell-unix-process-conduit: update to version 0.2.1.2
2013-07-31 11:09:17 +02:00
Peter Simons
5f960aac0f
haskell-haskell-src-meta: update to version 0.6.0.3
2013-07-31 11:09:17 +02:00
Peter Simons
34db77c302
haskell-feed: update to version 0.3.9
2013-07-31 11:09:02 +02:00