Eelco Dolstra
5391395e68
cryptsetup: Update to 1.5.1
2013-01-08 17:06:08 +01:00
Rickard Nilsson
eda055ded2
nvidia-x11: Install missing libs.
...
Several libs from the Nvidia distribution was not
copied to the nix store during installation. Therefore,
OpenCL was not working, for example.
The various nvidia-legacy packages are probably also
missing libs, this commit does not touch them, though.
2013-01-08 09:29:19 +01:00
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
Lluís Batlle i Rossell
11eb687e57
Fixing nettools with headers >=3.6 (no more strip)
...
I remove the strip (Metricom radio) support
2013-01-05 21:52:44 +00:00
Peter Simons
9e9cd7b529
Merge branch 'master' into stdenv-updates.
2013-01-04 21:00:53 +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
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