Commit graph

2205 commits

Author SHA1 Message Date
Eelco Dolstra c6c1bc6b0f Merge branch 'master' into systemd 2013-01-07 00:34:25 +01:00
David Guibert c7f30ac377 update atop 2013-01-06 17:51:54 +01:00
Eelco Dolstra 99897218f4 linux: Update to 3.2.36 2013-01-04 14:19:00 +01:00
Rickard Nilsson db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd
Conflicts:
	pkgs/tools/networking/network-manager/default.nix
2013-01-03 13:44:47 +01:00
Rickard Nilsson 2278d43eab wpa_supplicant: Install systemd service files 2013-01-03 12:47:00 +01:00
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
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
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 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
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 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
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 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 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