Commit graph

2426 commits

Author SHA1 Message Date
Rickard Nilsson
bafdf87367 wpa_supplicant: Update to 1.1 2013-01-01 17:15:20 +01:00
Rickard Nilsson
fe128bf31e wpa_supplicant: Update to 1.1 2013-01-01 17:13:33 +01:00
Lluís Batlle i Rossell
a8dedfc1d0 Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-29 09:05:13 +00:00
Eelco Dolstra
01acc493ca Merge branch 'stdenv-updates' of github.com:NixOS/nixpkgs into stdenv-updates 2012-12-29 02:02:33 +01:00
Eelco Dolstra
0a0c7a352d linux-headers: Update to 3.7 2012-12-29 01:12:31 +01:00
Lluís Batlle i Rossell
67aa9243f0 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial.
2012-12-28 23:30:53 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Lluís Batlle i Rossell
719ba63004 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.6/default.nix
	pkgs/development/compilers/gcc/4.7/default.nix

The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
Eelco Dolstra
88b11196c1 Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
Eelco Dolstra
84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
e2d505b24e More renames 2012-12-28 19:42:10 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell
ab2520c383 Adding linux-3.6-rpi
I picked the change from
7b4d69eeff
2012-12-27 21:29:56 +00:00
Eelco Dolstra
99f7c4e324 Merge branch 'master' into systemd 2012-12-27 01:28:25 +01:00
Jack Cummings
c73e542634 zfs-0.6.0-rc13, spl-0.6.0-rc13 2012-12-21 16:30:19 -08:00
Lluís Batlle i Rossell
03cadda7ea v4l-utils: updating. They didn't build in the new stdenv. 2012-12-21 11:58:31 +01:00
Shea Levy
9247552a91 Linux 3.7.1 2012-12-17 17:45:01 -05:00
Shea Levy
baa5ebfbdf Linux 3.0.57 2012-12-17 17:43:02 -05:00
Shea Levy
55196223c7 Linux 3.4.24 2012-12-17 17:42:38 -05:00
Shea Levy
cc12516cf0 Linux 3.6.11 2012-12-17 17:33:44 -05:00
Shea Levy
2fc426577b Unmaintain aufs 2012-12-17 17:16:48 -05:00
Eelco Dolstra
3644f9124a pam_ssh_agent_auth: Allow multiple authorized keys files
We need this because of https://github.com/NixOS/nixos/pull/52.
2012-12-17 21:11:10 +01:00
Eelco Dolstra
f8cf626b5e pam_ssh_agent_auth: Update to 0.9.4 2012-12-17 21:11:10 +01:00
Lluís Batlle i Rossell
faf821e501 Adding USB cameras to linux 3.7
Details changed since the 3.6 config to get this enabled.
2012-12-17 11:52:47 +01:00
Shea Levy
88e43775fd fuse 2.9.2 2012-12-16 16:25:24 -05:00
Lluís Batlle i Rossell
5a475f7250 utillinux: fixing mount/umount, for our case of /etc/mtab symlinking to /proc/mounts
In systemd, without this patch, 'mount' for 'user' fstab devices works, but
umount does not; it says to require root.
All gets normal with this patch.
2012-12-16 15:43:47 +01:00
aszlig
639edcb829
manual-kernel: Fix handling spaces in readConfig.
The previos version did a for loop over the output of set, which spits out _all_
defined variables and their contents. This not only is dangerous if there is a
variable starting with CONFIG_ but also can't handle whitespace, as the IFS is
set to any (horizontal _and_ vertical) whitespace by default.

So, imagine (actually don't imagine, something like this is the case in a lot of
kernel configuration files) you have the following variable:

CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi ..."

A loop with for and the default IFS would result in the following variable
pieces:

0: CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi
1: -fcall-saved-rsi
2: ..."

This obviously leads to the problem that this config variable is being cut off
at the first whitespace.

Another downside of this approach is that set not only returns variables but
functions as well. This could lead to quite a lot of unexpected behaviour and
confusion.

So the new approach doesn't source the kernel configuration anymore but uses
`read` to parse the file line-by line, setting IFS to '=', thus splitting all
configuration lines into key/value pairs.

Using parameter expansion, we ensure that we only read lines starting with
"CONFIG_". This particularily has the advantage of not being bash-specific,
should we choose to change to a different default shell someday.

Now, after we got a correct "CONFIG_" line, we're using a temporary variable to
split off the first quote from the result. Particularily the reason behind this
is shell compatibility again, as ${${foo#"}%"} only works in Bash, Zsh and
whatnot but not in plain SH.

And within the next line we obviously insert the no_firstquote variable without
it's last quote removed.

But, what about escaping?

First of all, if we'd just eval the $val variable, we would correctly unescape
the value, but this has the downside that variables within the content would be
expanded, for example look at this:

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

Well, obviously this is a bad example at the Nix sense, but just to show that
variables within kernel configuration entries aren't impossible.

And second, which would have been a show stopper if \" would be within $val: It
simply would end up being an invalid Nix expression, because \" would end up as
a ploin " within a double quoted string.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-13 22:54:57 +01:00
Mathijs Kwik
caf561d41a aufs3: upgrade to 1210 release, add linux-3.7 support 2012-12-13 14:00:28 +01:00
Eelco Dolstra
b11e1305b5 udisks: Hack to work with the latest udev
We should probably update to udisks2, but I'm not sure if it's
compatible at the D-Bus interface level.

http://hydra.nixos.org/build/3488623
2012-12-13 13:14:58 +01:00
Eelco Dolstra
726b1bebbc Remove udev 173 2012-12-13 11:42:00 +01:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
Eelco Dolstra
6a176c79cf Merge remote-tracking branch 'origin/master' into systemd 2012-12-12 16:09:19 +01:00
Shea Levy
9ddd1cc78b Linux 3.7
Kernel configuration succeeds, I'll let hydra test the build
2012-12-11 11:57:04 -05:00
Rickard Nilsson
6d8109555e Add legacy version 304.64 of the Nvidia driver
The current 310.x version of the Nivida driver has dropped support
for some cards (for example 6200LE).
2012-12-11 11:33:40 +01:00
Shea Levy
ce5ba30f64 Linux 3.6.10 2012-12-10 19:26:36 -05:00
Shea Levy
ed994dcbe2 Linux 3.4.23 2012-12-10 19:26:20 -05:00
Shea Levy
81a856c878 Linux 3.0.56 2012-12-10 19:25:00 -05:00
Eelco Dolstra
179df95090 Merge remote-tracking branch 'origin/master' into systemd 2012-12-10 12:39:14 +01:00
Eelco Dolstra
88ca46bfa0 linux: Update to 3.2 2012-12-07 13:24:40 +01:00
Jack Cummings
462b2b5d7f ztest: fix hardcoded paths 2012-12-04 14:08:34 -08:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Mathijs Kwik
fe070086fb linux-3.6: upgrade to 3.6.9 2012-12-04 12:02:36 +01:00
Mathijs Kwik
38740214cb linux-3.4: upgrade to 3.4.21 2012-12-04 12:02:36 +01:00
Mathijs Kwik
47362f67ea linux-3.0: upgrade to 3.0.54 2012-12-04 12:02:36 +01:00
Michael Raskin
51bf29de63 Upstream tracking files for asymptote and fbterm 2012-12-04 14:55:19 +04:00
Michael Raskin
2ab2b27e93 Update FBTerm to current URL of tarball 2012-12-04 11:47:40 +04:00
aszlig
9938f5267a
alsa-plugins: Update to upstream version 1.0.26.
Add alsa.cybermirror.org as an alternative URL because at the time of this
commit, ftp.alsa-project.org wasn't available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-03 11:10:17 +01:00
Eelco Dolstra
2122adcdd1 systemd: Update to 196
Main change is that systemd now has its own PCI/USB IDs database, so
it no longer depends on pciutils/usbutils.
2012-11-29 18:50:07 +01:00
Eelco Dolstra
59e979177d Remove duplicate tcp-wrappers package 2012-11-29 15:26:13 +01:00
Eelco Dolstra
79725bb5bc Mark some packages as low priority and disambiguate some others 2012-11-29 15:26:13 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Jack Cummings
4775e71049 Need pthread_cancel for zdb to work properly. Add -lgcc_s. 2012-11-26 21:32:24 -08:00
Shea Levy
9b0879bf85 Linux 3.6.8 2012-11-26 15:42:07 -05:00
Shea Levy
d4d1100123 Linux 3.4.20 2012-11-26 15:41:55 -05:00
Shea Levy
1180478089 Linux 3.0.53 2012-11-26 15:37:06 -05:00
Eelco Dolstra
7194db80e9 Merge branch 'master' into systemd 2012-11-23 18:06:49 +01:00
Eelco Dolstra
e31cd88d9e nvidia-x11: Update to 310.19 2012-11-23 11:11:01 +01:00
Peter Simons
15e2bf6050 busybox: fix build by adding a missing <sys/resource.h> include
This patch is going to be in the next release: http://lists.busybox.net/pipermail/busybox/2012-May/077766.html
2012-11-21 16:31:32 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Peter Simons
c5f9242cb6 iwlwifi-6000g2a-ucode: update to version 18.168.6.1 2012-11-18 13:20:46 +01:00
Mathijs Kwik
3ee85e3a8d linux-3.6: upgrade to 3.6.7 2012-11-18 11:13:04 +01:00
Mathijs Kwik
6a46699855 linux-3.4: upgrade to 3.4.19 2012-11-18 11:13:04 +01:00
Mathijs Kwik
0404c409cc linux-3.2: upgrade to 3.2.34 2012-11-18 11:13:04 +01:00
Mathijs Kwik
d45b239dcc linux-3.0: upgrade to 3.0.52 2012-11-18 11:13:03 +01:00
Mathijs Kwik
f215bda5b4 linux-2.6.32: upgrade to 2.6.32.60 2012-11-18 11:13:03 +01:00
Cillian de Róiste
3aef242cc0 Update xf86-video-nested to work on current NixOS Xorg 2012-11-17 20:03:34 +01:00
David Guibert
085825bc3c spl: remove useless patch 2012-11-15 09:13:03 +01:00
David Guibert
2f98255be8 zfs: remove useless patch 2012-11-15 09:02:27 +01:00
David Guibert
87d2a82628 update spl/zfs to 0.6.0-rc12 2012-11-15 08:58:34 +01:00
David Guibert
c604ff045e add cifs_timeout to kernel 3.5 2012-11-15 07:41:11 +01:00
Jack Cummings
b61ed12ea3 Add missing patch 2012-11-15 07:41:11 +01:00
Jack Cummings
0611a8b223 Linux-3.6 fixes. Need to ./autogen.sh in zfs now, as the linux-3.6 patch adds autoconf macros. Which means that all of my Makefile.in patches need to be puplifted to Makefile.am patches. 2012-11-15 07:41:11 +01:00
Jack Cummings
b999698440 - add back the plaform, as it is permitted to distribute the binary kernel modules. See https://github.com/NixOS/nixpkgs/pull/145 2012-11-15 07:41:11 +01:00
Jack Cummings
2dd60084f8 - updates from the license discussion in https://github.com/NixOS/nixpkgs/pull/145 2012-11-15 07:41:11 +01:00
Jack Cummings
3dbb87ec8e - make 'platforms' empty to prohibit building on hydra. 2012-11-15 07:41:11 +01:00
Jack Cummings
abd6046168 - fix spl license, add workarounds for zfs on i686-linux 2012-11-15 07:41:11 +01:00
Eelco Dolstra
9322bee988 Use systemd instead of udev, and don't use consolekit 2012-11-06 13:02:11 +01:00
Lluís Batlle i Rossell
bb3b603ea7 mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6
I made it apply to all Mips, although the bug works only for n32 and o32 ABIs.
We don't support any n64 by now.
2012-11-06 00:16:13 +01:00
Mathijs Kwik
b56a899320 linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption 2012-11-05 21:11:21 +01:00
Mathijs Kwik
97c5b93402 linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption 2012-11-05 21:11:21 +01:00
Mathijs Kwik
a1c54023ce linux-3.0: upgrade to 3.0.51 2012-11-05 21:11:20 +01:00
aszlig
2a58708d74
acpid: Update to version 2.0.17.
The reason behind this is because /proc/acpi/event has long been deprecated in
kernel 2.6.24 and is only there far backwards-compatibility reasons. New ACPI
events are delivered by either the input layer or the netlink interface.

As we no longer use kernels down to 2.6.24, I guess it's safe to make this
switch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-02 23:56:13 +01:00
Eelco Dolstra
1d384b0fe0 linux: Update to 3.2.33 2012-10-31 13:48:04 +01:00
Eelco Dolstra
094c1fd108 systemd: Fix a systemd crash when doing "systemctl list-unit-files" 2012-10-31 13:46:51 +01:00
Michael Raskin
472c5a5d77 Update Bluez/Obex 2012-10-29 23:56:26 +04:00
Shea Levy
9f221073c2 Linux 3.6.4 2012-10-28 22:13:59 -04:00
Shea Levy
1da5d34957 Linux 3.4.16 2012-10-28 22:09:25 -04:00
Shea Levy
d843ec6b28 Linux 3.0.49 2012-10-28 22:05:33 -04:00
Eelco Dolstra
0f8345a7f2 Small cleanup 2012-10-26 11:08:29 +02:00
Eelco Dolstra
7268c1c008 nvidia-x11: Update to 304.60 2012-10-26 11:08:29 +02:00
David Guibert
4f31337f07 fix mount/umount into libzfs 2012-10-25 22:24:33 +02:00
Vladimír Čunát
1dac30b689 Merge pull request #140 from MarcWeber/fixes/ati-proprietary
making ati dirvers compile again
2012-10-23 11:54:56 -07:00
Peter Simons
6d73db319d jujuutils: fix reference to non-existent version of 'linuxHeaders'
Plus minor cosmetic changes to the expression.
2012-10-23 18:47:31 +02:00
Eelco Dolstra
8b9f3e9de4 systemd: Update to 195 2012-10-23 13:51:13 +02:00
Shea Levy
125f6a02a4 Linux 3.6.3 2012-10-21 22:40:13 -04:00
Shea Levy
e71103deef Linux 3.4.15 2012-10-21 22:38:53 -04:00
Shea Levy
c01c02a74b Linux 3.0.47 2012-10-21 22:36:33 -04:00
Peter Simons
00d03f2f50 ipsec-tools: add version 0.8.0 2012-10-20 13:06:09 +02:00
Peter Simons
094cbf9b4d Move lxc from "applications/virtualization" to "os-specific/linux". 2012-10-20 12:36:44 +02:00
Lluís Batlle i Rossell
35a3fc060a alsalib: update + more urls.
I can't connect to the main ftp url of alsaproject, then
I add a mirror I quickily found by web search.
2012-10-20 10:53:21 +02:00
Eelco Dolstra
76c010b928 linux: Update to 3.2.32 2012-10-18 12:22:17 -04:00
Eelco Dolstra
2947f91371 nvidia-x11: Update to 304.51 2012-10-18 10:10:49 -04:00
Lluís Batlle i Rossell
57dcac2d2a nvidia-legacy-173: updating to build with linux 3.6 2012-10-17 22:08:31 +02:00
Eelco Dolstra
ca298b5fe6 net-tools: Update to 1.60_p20120127084908
Apparently token ring support is gone in the kernel.

http://hydra.nixos.org/build/3081969
2012-10-16 14:29:31 -04:00
Eelco Dolstra
dee64b4c2c Work around timeouts after creating a LUKS device 2012-10-15 15:36:52 -04:00
Eelco Dolstra
3aae32372a Work around some crazy race condition in devicemapper device creation 2012-10-15 14:46:15 -04:00
Eelco Dolstra
ba2911fe1e lvm2: Update to 2.02.98 2012-10-15 13:14:12 -04:00
Eelco Dolstra
5af277bbd1 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-15 12:16:58 -04:00
Mathijs Kwik
fb62b5fb91 linux-3.0: upgrade to 3.0.46 2012-10-13 12:22:48 +02:00
Mathijs Kwik
444b136eee linux-3.4: upgrade to 3.4.14 2012-10-13 12:22:47 +02:00
Mathijs Kwik
86693f1c5c linux-3.5: upgrade to 3.5.7 2012-10-13 12:22:47 +02:00
Mathijs Kwik
12ad270d2a linux-3.6: upgrade to 3.6.2 2012-10-13 12:22:47 +02:00
Mathijs Kwik
5711282fd8 linux kernels: mark kernels that can disable the conntrack-helper 2012-10-13 12:22:47 +02:00
Mathijs Kwik
8ea8105071 linux kernels: mark kernels with rpfilter support 2012-10-13 12:22:47 +02:00
Mathijs Kwik
6b8e468e2d iptables: upgrade to 1.4.16.2 2012-10-13 12:22:47 +02:00
Peter Simons
f77a2f460a Merge branch 'master' into x-updates. 2012-10-12 15:24:24 +02:00
David Guibert
85140f590a zfs: fix udev rules
This patch fixes Nixos checking of udev rules:
Checking that all programs call by absolute paths in udev rules exist ... FAIL
/lib/udev/vdev_id is called in udev rules but not installed by udev
2012-10-12 08:38:38 +02:00
Jack Cummings
b70d41d309 - long descriptions 2012-10-11 13:50:28 -07:00
Jack Cummings
8a911c889b Merge branch 'master' into zfs 2012-10-11 13:16:41 -07:00
Eelco Dolstra
e117d037e3 iproute: Update to 3.6.0 2012-10-11 15:38:54 -04:00
Eelco Dolstra
bf5967e77e systemd: Add libgcrypt dependency
This is required for forward secure sealing of the journal.
2012-10-11 12:33:47 -04:00
Eelco Dolstra
2fa1b38853 systemd: Properly handle device aliases used as dependencies
http://lists.freedesktop.org/archives/systemd-devel/2012-October/006872.html
2012-10-11 12:33:28 -04:00
Michael Raskin
b481647941 Merge pull request #143 from falsifian/master
upgrade firmware-linux-nonfree to 0.36
2012-10-10 21:38:07 -07:00
Eelco Dolstra
ebd2b0e1ab linux: Update to 3.2.31 2012-10-10 21:51:36 -04:00
Peter Simons
6ff829f19d Merge branch 'master' into x-updates 2012-10-10 18:46:48 +02:00
James Cook
abf60bdb08 Upgrade firmware-linux-nonfree to 0.36, because the last version disappeared from the Debian mirrors. 2012-10-09 23:18:50 -07:00
Mathijs Kwik
8f480e3035 linux-3.6: upgrade to 3.6.1
- enable aufs3 patch
- check other patches needing upgrade/enable
2012-10-09 16:05:24 +02:00
Mathijs Kwik
2f39ec92e3 linux-3.5: upgrade to 3.5.6 2012-10-09 16:05:23 +02:00
Mathijs Kwik
76aa428ac6 linux-3.4: upgrade to 3.4.13 2012-10-09 16:05:23 +02:00
Mathijs Kwik
332c6de736 linux-3.0: upgrade to 3.0.45 2012-10-09 16:05:23 +02:00
Eelco Dolstra
41e9f7cfed Merge remote-tracking branch 'origin/master' into x-updates 2012-10-08 13:48:30 -04:00
Cillian de Róiste
aaebab484b Disable the debug option for FFADO
The debug option is enabled by default and causes performance and stability issues
2012-10-07 22:33:50 +02:00
Marc Weber
2e7847cd12 making ati dirvers compile again
See comments on the nixos patch
2012-10-07 18:03:06 +02:00
Eelco Dolstra
c1719a5835 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-05 17:57:45 -04:00
Eelco Dolstra
a4cd5afd03 Fix "Failed to add path to set" error during nixos-rebuild 2012-10-05 16:58:36 -04:00
Jack Cummings
e23bda977d - removing old spl/zfs versions 2012-10-05 09:40:26 -07:00
Jack Cummings
e7f3ff803e - zfs 0.6.0-rc11, spl 0.6.0-rc11 2012-10-05 09:11:25 -07:00
Jack Cummings
ccad09d3b9 Revert " - zfs-0.6.0-rc11, and spl-0.6.0-rc11"
This reverts commit 8eb9491a22.
2012-10-05 09:07:33 -07:00
Jack Cummings
8043344266 Revert " - remove old versions"
This reverts commit 65d3ef369e.
2012-10-05 09:07:11 -07:00
Jack Cummings
65d3ef369e - remove old versions 2012-10-05 00:12:15 -07:00
Jack Cummings
8eb9491a22 - zfs-0.6.0-rc11, and spl-0.6.0-rc11 2012-10-05 00:09:49 -07:00
Eelco Dolstra
3240b48f74 systemd: Update to 194 2012-10-04 11:24:07 -04:00
Michael Raskin
396de23762 Enable V4L2 modules 2012-10-04 15:35:21 +04:00
Michael Raskin
8e38efac32 Update/fix MuPDF 2012-10-04 10:37:54 +04:00
Michael Raskin
0013b8faa5 Add reptyr, tool to change controlling terminal of a process under Linux 2012-10-04 09:17:09 +04:00
Eelco Dolstra
31f89ba349 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-03 14:43:10 -04:00
Eelco Dolstra
3c572df900 alsa-utils: Fix the path to alsactl in the udev rule 2012-10-02 11:09:28 -04:00
Rickard Nilsson
cf230cddda sysfsutils: Use SourceForge mirror instead of static URL. 2012-10-02 08:50:42 +02:00
aszlig
5908f6c28f
linuxconsoletools: New package, version 1.4.3.
This is a small set of tools useful for testing and calibrating joysticks,
gamepads and various other input devices.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:41 +02:00
Eelco Dolstra
b78256fbd7 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-01 11:43:43 -04:00
Shea Levy
359355e150 Linux 3.6 2012-10-01 07:01:31 -04:00
Cillian de Róiste
564cc7d12c Upgrade ffado (FireWire audio drivers) to the recently released 2.1.0 2012-09-30 21:23:28 +02:00
Eelco Dolstra
f2ccebcae4 usbutils: Update to 006 2012-09-28 23:20:59 -04:00
Eelco Dolstra
7f053d6157 Remove HAL
It's obsolete.  There was only one package still using it (nut) but it
builds fine without it.
2012-09-28 12:15:12 -04:00
Eelco Dolstra
c958552828 systemd: Update to 193 2012-09-28 11:48:30 -04:00
Peter Simons
bed0328879 systemd: add myself as a maintainer 2012-09-27 10:54:44 +02:00
Peter Simons
0a2f397ce0 systemd: fix build on Linux/i686 2012-09-27 10:53:25 +02:00
Eelco Dolstra
d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Eelco Dolstra
b7b45c60df Update Linux headers to 3.5 2012-09-26 14:29:56 -04:00
Eelco Dolstra
ab53df106f Get the 3.3.5 kernel headers to build in the stdenv bootstrap
We don't have xz early in the bootstrap, so use the bz2 tarball.  Also
add SHELL=bash to get it to build.
2012-09-26 14:14:07 -04:00
Eelco Dolstra
e710915ffc systemd: Update to 192 2012-09-26 10:04:19 -04:00
Eelco Dolstra
2a8e532e0a qemu-kvm: Update to 1.2.0
This time it will work for sure!
2012-09-25 17:30:43 -04:00
Peter Simons
ca6b9bdf17 alsa-utils: choose yet another mirror again 2012-09-24 15:53:57 +02:00
Peter Simons
436d8ce1f6 alsa-utils: update to version 1.0.26
ftp://ftp.alsa-project.org/ appears to be offline. We download from a mirror
until that issue has been resolved.
2012-09-24 14:54:48 +02:00
Peter Simons
1fd867426d systemd: fix build on 32 bit machines 2012-09-24 12:01:39 +02:00
Lluís Batlle i Rossell
762c6b1b76 cryptodev: fixing build problems
Some paths/vars were wrong.
2012-09-23 21:41:24 +02:00
Lluís Batlle i Rossell
57b578189b Adding cryptodev-linux, and made openssl use it optionally.
I'm trying to get the CESA of the sheevaplug available to openssl.
2012-09-23 20:51:15 +02:00
Lluis Batlle
22e050f8c6 linux: In case of an ARM kernel build, add extra include directories
They are required in order to build some modules, like that of
cryptodev.
2012-09-23 19:59:37 +02:00
Eelco Dolstra
fae03557fb systemd: Update to 191 2012-09-21 22:46:35 -04:00
Eelco Dolstra
beb5b65e9c systemd: Make "systemctl daemon-reexec" do the right thing on NixOS 2012-09-21 14:57:12 -04:00
Eelco Dolstra
0874615fcc Remove User Mode Linux
It hasn't built in a long time and it's obsolete IMHO.
2012-09-21 13:32:37 -04:00
Eelco Dolstra
7057acb322 systemd: Update to 190 2012-09-21 13:30:00 -04:00
Eelco Dolstra
50aac3247a linux: Update to 3.2.30 2012-09-21 13:30:00 -04:00
Eelco Dolstra
5d859baf59 pam: Update to 1.1.6 2012-09-21 10:20:26 -04:00
Rob Vermaas
265a0563fa Apply patch to shadow which allows dots (.) in user names. 2012-09-18 23:56:51 +02:00
Lluís Batlle i Rossell
6a63479899 amd-ucode: updating to 2012-09-10 2012-09-16 22:36:43 +02:00
Mathijs Kwik
ce3e42df72 linux aufs3: upgrade patch and utils to 20120827 for all 3.x kernels 2012-09-16 13:05:52 +02:00
Mathijs Kwik
7b92af45f8 linux-3.4: upgrade to 3.4.11 2012-09-16 13:05:52 +02:00
Mathijs Kwik
c9b24ba210 linux-3.0: upgrade to 3.0.43 2012-09-16 13:05:52 +02:00
Lluís Batlle i Rossell
95fa07e183 linux-3.5: Updating to 3.5.4 2012-09-15 21:57:05 +02:00
Peter Simons
40fe4cf682 pmtools: add version 20071116 2012-09-13 20:00:17 +02:00
Eelco Dolstra
c843abc1bc nvidia-x11: Update to 304.43 2012-09-13 11:36:34 -04:00
Eelco Dolstra
696206c405 Rename spiceProtocol -> spice_protocol 2012-09-13 11:36:34 -04:00
Eelco Dolstra
080c0a5c20 linux: Update to 3.2.29 2012-09-13 10:10:26 -04:00
Eelco Dolstra
fcd30ecfc1 systemd: Add to channel 2012-09-11 13:47:34 -04:00
Peter Simons
d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02:00
aszlig
109fdfe34f
conky: Enable weather plugins.
Those plugins do not require additional dependencis or at least no dependencies
we don't actually use, so let's build them aswell. And after all, If you work in
your hermetically sealed environment, you surely want to know what's going on
outside.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:54:00 +02:00
aszlig
2b7e88e9f5
conky: Re-enable support for ncurses.
Build breakage with enabled ncurses is fixed in 1.9.0 now, so we can safely
re-enable it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:54:00 +02:00
aszlig
b0ace9fa11
conky: Add license attribute to meta.
As the GPL license is more restrictive than the BSD license of the original
(torsmo) of the fork, I'm adding GPL as the license here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:54:00 +02:00
aszlig
3b7dd3c930
conky: Patch to #include <stdbool.h> in conky.c.
In current upstream master, they converted conky.c to C++ already, so it's not
an issue there anymore. But until then we need to patch it on our own to fix the
build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:53:59 +02:00
aszlig
b2b67c055b
conky: Remove curl/types.h patch.
This patch is no longer needed, as it is fixed upstream now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:53:59 +02:00
aszlig
3692a2e83d
conky: Update to version 1.9.0.
Version 1.8.1 seems to be quite dated, in addition I'd like to use the weather
plugin, which isn't available in 1.8.1 as well. If you work in your hermetically
sealed environment, you surely want to know what's going on outside.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:53:59 +02:00
Mathijs Kwik
3de1a56a73 hostapd: upgrade to 1.0 2012-09-09 13:04:14 +02:00
Mathijs Kwik
d9aac705bb wpa_supplicant: upgrade to 1.0 2012-09-09 13:04:13 +02:00
Mathijs Kwik
3ab9e5a38a powertop: upgrade to 2.1 2012-09-09 13:04:13 +02:00
Mathijs Kwik
09c3613d4a libnl: upgrade to 3.2.13 2012-09-09 13:04:13 +02:00
Russell O'Connor
b881bee48b Merge branch 'master' of https://github.com/NixOS/nixpkgs 2012-09-04 12:39:56 -04:00
Russell O'Connor
314af2262c 2030 Images – for Intel Centrino Wireless-N 2230 2012-09-04 12:39:40 -04:00
Mathijs Kwik
7672f20121 gogoclient: fix url and lower default metric
this allows other routes to take precedence over gogonet
2012-09-02 11:57:49 +02:00
Mathijs Kwik
d37b642769 newer kernels need cifs-utils to mount CIFS filesystems
the kernel itself (and busybox's cifs mount code) are no longer able
to do this in some/most cases and will error out saying:
"CIFS VFS: connecting to DFS root not implemented yet""

Nixos' qemu-vm target is hurt by this, as it wants to mount /nix/store
via cifs very early in the boot process.

this commit just marks the problematic kernels.
An associated commit in nixos will use this info to fix the problem.
2012-08-30 18:25:49 +02:00
Mathijs Kwik
50dca38b26 cifs-utils: upgrade to 5.6 2012-08-30 18:25:49 +02:00
Mathijs Kwik
6fabe047c6 linux-3.4: upgrade to 3.4.10 2012-08-30 18:25:49 +02:00
Mathijs Kwik
8f1a34e228 linux-3.5: upgrade to 3.5.3 2012-08-30 18:25:49 +02:00
Mathijs Kwik
fadaad6f89 qemu-kvm: add (optional) spice support 2012-08-29 22:27:39 +02:00
Yury G. Kudryashov
40078e2f90 xf86-input-wacom-0.16.0 2012-08-26 22:38:15 +04:00
Michael Raskin
2ab1594512 Atop: add package (atop is one more load monitor) 2012-08-25 21:24:17 +04:00
Lluís Batlle i Rossell
9b1c34f8f2 qemu-kvm: Revert the qemu update to 1.1.1
This reverts commit 607c28ea38
and c43f385e67.

Some builds hang, as they did with 1.1.0.
http://hydra.nixos.org/build/2963125
2012-08-23 00:07:51 +02:00
Lluís Batlle i Rossell
607c28ea38 qemu-kvm: I missed a change present in a previous reverted update
Eelco pointed it out.
2012-08-22 23:27:58 +02:00
Lluís Batlle i Rossell
c43f385e67 qemu-kvm: update to 1.1.1 2012-08-22 23:20:57 +02:00
Eelco Dolstra
22b545c325 nvidia-x11: Update to 304.37 2012-08-22 15:59:26 -04:00
Eelco Dolstra
ab3788b382 upower: Update to 0.9.18 and enable systemd support 2012-08-21 08:42:44 -04:00
Eelco Dolstra
6121046a1c systemd: Set the path to pkttyagent
This allows commands like "systemctl reboot" to ask for authentication
when run by mere mortals.
2012-08-21 08:42:44 -04:00
Mathijs Kwik
192b29181b linux-3.4: upgrade to 3.4.9
- aufs patch: upgrade to latest stable 3.4
2012-08-21 10:27:13 +02:00
Mathijs Kwik
6e9a6a5924 linux-3.3: upgrade to 3.3.8
- aufs patch: upgrade to latest stable 3.3
2012-08-21 10:26:44 +02:00
Eelco Dolstra
e91a4fb1e4 linux: Update to 3.2.28 2012-08-20 09:56:39 -04:00
Lluís Batlle i Rossell
3694b0f892 glibc: setting --enable-kernel=2.6.35
It was taking 2.4.0 as default, therefore, not using syscalls over 2.4.0
We may see performance improvements (openat, ...)
2012-08-19 13:25:40 +02:00
Arie Middelkoop
4c3c452e7f provides a better download url for the intel-microcode2ucode sources. 2012-08-17 19:25:05 +02:00
Eelco Dolstra
b06cb3578d systemd: Drop dependency on cryptsetup for now
This is necessary to prevent a cyclic dependency.
2012-08-16 15:46:20 -04:00
Eelco Dolstra
548365b95c lvm2: Update to 2.02.97 2012-08-16 15:37:36 -04:00
Mathijs Kwik
03228d60fe linux-3.5: upgrade aufs3 patch to latest stable 2012-08-16 12:00:25 +02:00
Mathijs Kwik
05ed13dc49 linux-3.5: upgrade to 3.5.2 2012-08-16 12:00:04 +02:00
Rob Vermaas
a19a68e93b Use /var/log/sa for statedir of sysstat, in stead of $out/var/lib/sa. This path cannot be overriden at runtime, so choosing a 'sane' default. 2012-08-14 14:14:55 +02:00
Eelco Dolstra
503b4fd5bf busybox: Update to 1.20.2 2012-08-13 15:56:09 -04:00
Shea Levy
839c58f5b1 linux/manual-config: Cleanup 2012-08-11 21:21:06 -04:00
Shea Levy
9ac776ab22 linux/manual-config.nix: Set sourceRoot directly to the pre-unpacked source rather than using a symlink 2012-08-11 21:07:37 -04:00
Shea Levy
0c18551c93 linux/manual-config: Do source unpacking/patching in a separate derivation.
Since we keep the source in the kernel build anyway, no space is wasted by having a separate store path for the unpacked source. The upside is that the same source can be used to build the kernel multiple times, or generate configurations for later kernel builds, without going through the (fairly long) unpack and patch process multiple times.
2012-08-11 21:02:30 -04:00
Lluís Batlle i Rossell
88f3b097ee Adding linux iw. 2012-08-11 20:22:45 +02:00
Shea Levy
3b78bd796d microcodeIntel: Bump version 2012-08-11 14:10:06 -04:00
Lluís Batlle i Rossell
2c0b930149 Removing rt73fw. The url was broken, and ralink_fw contains it.
ralink_fw attribute contains the rt73 firmware, among others from ralink.
2012-08-11 14:47:15 +02:00
Eelco Dolstra
e69a6c57bc linux: Update to 3.2.27 2012-08-10 18:54:10 -04:00
Eelco Dolstra
36e604ed1a cryptsetup: Update to 1.5.0 2012-08-10 18:54:10 -04:00
Eelco Dolstra
b4aa7cd475 systemd: Drop bogus dependency on udev 2012-08-10 18:54:10 -04:00
Eelco Dolstra
1966010ec7 systemd: Update to 188 2012-08-10 18:54:09 -04:00
Lluís Batlle i Rossell
691d069af9 perf: make it take the linux patches
Otherwise the previous patch I added does not get used for perf.
2012-08-10 10:03:53 +02:00
Lluís Batlle i Rossell
734bb84f09 linux-3.5: fix perf build with a patch from the perf mailing list 2012-08-10 09:41:43 +02:00
Mathijs Kwik
cbb2c3abf2 linux-3.5: upgrade to 3.5.1 2012-08-10 08:27:09 +02:00
Shea Levy
21a200d6b2 linux/manual-config: Fix depmod step, remove false comment 2012-08-07 06:36:50 -04:00
Eelco Dolstra
d6cc420fd7 linux: Update to 3.2.26 2012-08-06 09:57:21 -04:00
Mathijs Kwik
e8afe3c1c8 add package dstat 2012-08-05 15:10:26 +02:00
Mathijs Kwik
aed4ee4025 sysstat: upgrade to 10.1.1 2012-08-05 15:10:25 +02:00
Mathijs Kwik
fb99c24d7c kernel-3.5: add aufs3 patch 2012-08-05 01:55:31 +02:00
Michael Raskin
b244629571 acpi-call: force example script to be executable 2012-08-03 16:49:57 +04:00
Shea Levy
1935f7e5b8 linux/manual-config: Add informative comment 2012-08-03 08:33:31 -04:00
Michael Raskin
f82c864a4b acpi-call: update and fix kernel version handling 2012-08-03 16:20:24 +04:00
Shea Levy
1b7264d349 linux/manual-config.nix: When stripping, use xargs -r in case CONFIG_MODULES=y but no modules are actually installed 2012-08-01 23:32:02 -04:00
Shea Levy
4aba2bb3f5 linux/manual-config: Use kernelPatches like generic.nix, not a plain patches list 2012-08-01 23:02:17 -04:00
Shea Levy
fd330e9315 linux/manual-config: Install the kernel with the name given in stdenv.platform.kernelTarget 2012-08-01 15:39:49 -04:00
Shea Levy
ad49d92899 linux/manual-config: When installing firmware, create the firmware directory prior to make *_install.
It is probably a kernel build system bug that this is necessary, but it's not really a big deal either.
2012-08-01 11:56:12 -04:00
Shea Levy
3f4fd55c63 linux/manual-config: Remove unnecessary quotation 2012-08-01 11:26:30 -04:00
Shea Levy
443b9bc936 linux/kernel/manual-config: use isDisabled instead of isNo in case FIRMWARE_IN_KERNEL is left unspecified 2012-08-01 11:21:32 -04:00
Shea Levy
3dbfca0d7f linux/manual-config: Change from 'features' to 'config' and fix build when firmware is installed.
Instead of manually adding which 'features' a kernel has based on its config here, just generate a nixexpr representation of the whole config and let places that need it (e.g. NixOS modules) decide how to map config options to features.

Note that if your kernel requires firmware whose hex file sits directly in ${src}/firmware rather than in a subdirectory thereof, you may need this patch for now: https://lkml.org/lkml/2012/7/31/724
2012-08-01 06:18:03 -04:00
Mathijs Kwik
b5d4e8a17a linux-3.4: upgrade to 3.4.7 2012-07-31 10:26:18 +02:00
Eelco Dolstra
5d4916871c libcgroup: Update to 0.38 2012-07-30 13:48:19 -04:00
Shea Levy
da4c64026a linux/kernel/manual-config: Greatly simplify config parser 2012-07-29 15:54:31 -04:00
Shea Levy
298b5ccdab linux/kernel/manual-config: Only import from derivation when explicitly asked to 2012-07-29 13:26:39 -04:00
Shea Levy
f0694a3151 linux/kernel/manual-config: Do all of the config file parsing in the imported-from derivation 2012-07-29 13:24:05 -04:00
Shea Levy
6585646d41 linux/kernel/manual-config: Add meta 2012-07-29 04:59:38 -04:00
Shea Levy
46fa5ab105 linux/kernel/manual-config: Relink the symlink from the build directory to the source directory after the source directory is moved 2012-07-29 04:56:56 -04:00
Shea Levy
f7b6f01da1 linux/kernel/manual-config: Cleanup 2012-07-29 04:52:34 -04:00
Shea Levy
98341e0bda linux/kernel/manual-config: Use the kernel's make install 2012-07-29 04:48:50 -04:00
Shea Levy
a9a7085684 linux/kernel/manual-config: Allow manually specifying features, cleanup 2012-07-29 04:31:40 -04:00
Shea Levy
6bb20c7ba2 linux/kernel/manual-config: Strip modules after install 2012-07-29 04:23:28 -04:00
Shea Levy
6b18ab5365 linux/kernel/manual-config: Remove useless INSTALL_MOD_STRIP variable 2012-07-29 04:07:43 -04:00
Shea Levy
6e3b17feec linux/kernel/manual-config: Run depmod after build 2012-07-29 04:01:40 -04:00
Shea Levy
4f713d27f7 kmod: Bump to version 9 2012-07-29 03:57:50 -04:00
Shea Levy
48b5e8eee7 linux/kernel/manual-config: Build in a separate directory and move the build and source trees into $out 2012-07-29 03:49:52 -04:00
Shea Levy
e42a6c5f46 linux/kernel/manual-config: Move the build directory to $out instead of symlinking it 2012-07-29 03:27:09 -04:00
Shea Levy
a36456ca25 linux/kernel-manual-config: Simplify the lines.nix runCommand now that I know how to escape properly 2012-07-29 03:09:44 -04:00
Shea Levy
5a9d9f4f45 linux/kernel/manual-config: Properly escape makeFlagsArray and installFlagsArray 2012-07-29 02:57:58 -04:00
Shea Levy
471b4bc9bb MODLIB needs to be passed directly to make 2012-07-29 02:49:31 -04:00
Shea Levy
aa40e0ff59 linux/kernel/manual-config: The default 'make install' tries to do something with LILO, so install the kernel manually 2012-07-29 01:57:59 -04:00
Shea Levy
dfa750732d linux/kernel/manual-config: Properly set env vars referencing $out 2012-07-29 01:34:27 -04:00
Shea Levy
ff728a6365 The kernel build needs hostname and perl 2012-07-29 01:29:56 -04:00
Shea Levy
bf7467cbb1 Add first attempt at linux/kernel/manual-config.
The goal of this function is to make it possible to build a kernel with a user provided .config.
As a secondary goal, it will extract NixOS-relevant features from the config automatically.
As a tertiary goal, the build will aim to be simpler than the current generic kernel builder.sh.

Unfortunately, that simplicity is offset by the complexity of the feature extraction, especially since nix segfaults when trying to split the file into lines (so an import from a derivation is used)
2012-07-29 01:23:51 -04:00
Eelco Dolstra
84b4a086dd nvidia-x11: Update to 304.22
Now with glorious Xrandr 1.2/1.3 support! No more need to
nvidia-settings!
2012-07-26 18:59:33 -04:00
Lluís Batlle i Rossell
02e6a689be nvidia-legacy-173: Updating to 173.14.35
I also add gdk_pixbuf; otherwise nvidia-settings does not start.
2012-07-26 23:02:29 +02:00
Eelco Dolstra
1b0abce6de linux: Update to 3.2.24 2012-07-26 11:32:53 -04:00
Eelco Dolstra
b044cac2fc sysvinit: Don't install mountpoint and wall
These are already provided by util-linux.
2012-07-25 23:18:40 -04:00
Eelco Dolstra
60a63886f0 shadow: Don't install ‘groups’
Coreutils already provides this command.
2012-07-25 23:18:40 -04:00
Eelco Dolstra
732ea6382a shadow: Update to 4.1.5.1
Fixes CVE-2005-4890 and CVE-2011-0721.
2012-07-25 23:18:40 -04:00
Eelco Dolstra
830aa1a2f0 ipw2100-fw: Drop runtime dependency on binutils etc. 2012-07-25 14:31:58 -04:00
Eelco Dolstra
0d5f1fd833 upower: Update to 0.9.17 2012-07-24 22:45:26 -04:00
Eelco Dolstra
ddb5bd38bb kbd: Update to 1.15.3 2012-07-24 22:33:39 -04:00
Eelco Dolstra
99413d3e3c kbd: Hard-code the path to gzip/bzip2
This is necessary for systemd-vconsole-setup.service in systemd.
2012-07-24 22:33:39 -04:00
Shea Levy
8c9bef04a6 linux-3.5: Enable XEN_DOM0 support 2012-07-24 02:26:04 +00:00
Shea Levy
053f641d16 Add linux-3.5 2012-07-22 11:33:00 -04:00
Eelco Dolstra
2547e0e96a systemd: Use an interface version, just like we have for Upstart 2012-07-22 01:18:01 -04:00
Eelco Dolstra
44cf3d5808 systemd: Update to 187 2012-07-20 10:44:19 -04:00
Mathijs Kwik
f3b43a268d linux-3.4: update to 3.4.6 2012-07-20 13:37:46 +02:00
Eelco Dolstra
bfc2de46d1 sysklogd: Support systemd socket-based activation
Syslogd cannot open /dev/log directly but must receive syslog messages
from systemd (http://www.freedesktop.org/wiki/Software/systemd/syslog).
The patch adds support for that.
2012-07-19 12:46:39 -04:00
Eelco Dolstra
28a76a96be libcap: Update to 2.22
Systemd requires the recent CAP_SYSLOG capability.
2012-07-19 10:26:44 -04:00
Vladimír Čunát
196f5cb265 Fix broadcom_sta for linux-3.4 and clean nix source.
Idea from Kevin Quick, implementation from Gentoo. Also cleaned and
added a minor license patch from Gentoo. Builds for many x86_64 kernels.
2012-07-19 11:42:40 +02:00
Shea Levy
4497344e49 Merge branch 'master' into x-updates 2012-07-18 23:24:10 -04:00
Cillian de Róiste
70298ba42c Fix style: The meta.description field should be capitalised (niksnut) 2012-07-18 23:35:20 +02:00
Cillian de Róiste
933205acaf Add the sha256 for xf86-video-nested 2012-07-18 23:04:00 +02:00
Cillian de Róiste
8ebb309320 Pin xf86-video-nested to a revision that works with Xorg 7.6 2012-07-18 22:52:43 +02:00
Cillian de Róiste
6efd9b24d3 Add xf86-video-nested
This does not yet compile. I had a working version from an obsolete github repo, but then found the upstream repo. Perhaps it needs a newer Xorg.
2012-07-18 22:52:16 +02:00
Eelco Dolstra
26fa2425c6 Fix dmraid build
http://hydra.nixos.org/build/2842473
2012-07-18 09:25:58 -04:00
Shea Levy
d04cbc85cf linux-3.4: Update to 3.4.5 2012-07-16 20:26:27 -04:00