Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Lluís Batlle i Rossell
4970ec637e
Adding psmouse-alps, a touchpad kernel driver.
...
Some laptops use these new touchpads, and this driver is
supposed to provide proper support for them.
2013-06-12 22:55:58 +02:00
Michael Raskin
1a45886454
Merge branch 'master' into x-updates
2013-06-11 15:46:10 +04:00
Mathijs Kwik
fc5946ac4b
linux-3.9: upgrade to 3.9.5
2013-06-10 08:36:04 +02:00
Vladimír Čunát
7db886fdb9
Merge remote-tracking branch 'hydra/master' into x-updates
...
Conflicts (taken from @7c6f434c):
pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Domen Kozar
b6f7f05b35
adding unfree-redistributable-firmware
2013-06-05 22:44:17 +02:00
Vladimír Čunát
7af694700c
Merge branch 'master' into x-updates
...
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Eelco Dolstra
930c958771
iputils: Don't depend on both GNU TLS and OpenSSL
2013-06-04 14:57:37 +02:00
Eelco Dolstra
cb5b198b51
linux: Update to 3.2.46
2013-06-04 11:00:19 +02:00
Mathijs Kwik
91cf1716f4
linux-3.9: upgrade to 3.9.4
2013-06-04 07:50:59 +02:00
Mathijs Kwik
d7911372a8
linux-3.4: upgrade to 3.4.47
2013-06-04 07:50:59 +02:00
Mathijs Kwik
39e0eb9420
linux-3.0: upgrade to 3.0.80
2013-06-04 07:50:59 +02:00
Peter Simons
34a4d5f3f0
os-specific/linux/microcode/converter.nix: update download location for intel-microcode2ucode.c
2013-06-03 10:15:34 +02:00
Lluís Batlle i Rossell
ed4f1c947f
iw: update to 3.10.
...
The newer, the better.
2013-06-02 14:32:23 +02:00
Vladimír Čunát
25471803e4
Merge master into x-updates
2013-05-29 23:25:26 +02:00
Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0
.
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell
e1cb325f82
Adding batctl, control for batman
2013-05-28 23:02:22 +02:00
Lluís Batlle i Rossell
bf0d1f58dc
Adding batman-adv.
2013-05-28 22:58:25 +02:00
Domen Kozar
8ac0a0ac46
firmware-linux-nonfree: set platform as linux
2013-05-23 21:00:18 +02:00
Domen Kozar
d8d6fd7412
pam_ssh_agent_auth: fix nix eval
2013-05-23 15:24:15 +02:00
Eelco Dolstra
dad18680e5
pam_ssh_agent_auth: Update to 0.9.5
2013-05-22 11:33:01 -04:00
Eelco Dolstra
2767a01042
pam_ssh_agent_auth: Add to channel
2013-05-22 11:29:16 -04:00
Michael Raskin
da24027c25
Linux kernel: update to 3.9.3
2013-05-20 23:36:49 +04:00
Lluís Batlle i Rossell
c6df92a414
Making the linux rpi kernel not attempted to build by hydra
2013-05-20 17:43:26 +02:00
Lluís Batlle i Rossell
8b79a00c44
Adding netatop module, for atop
2013-05-20 10:13:07 +02:00
Lluís Batlle i Rossell
e459464ec1
nss_ldap: fixing crash with glibc >= 2.16
...
I update it to the latest version, 265. Then I use some patches:
The nss_ldap-265-glibc-2.16.patch is the one that fixes the crash.
The crashes.patch is another one that I took from RH that said to fixes somes
crashes, but it didn't fix the crash I was seeing. But I guess it fixes
something.
2013-05-17 10:23:37 +02:00
Vladimír Čunát
70882b980c
WARNING: history from now is going to change (mesa+llvm)
...
Current WIP, only tested nouveau (3D works very well).
2013-05-16 17:16:02 +02:00
Domen Kožar
378d975b88
Merge pull request #505 from MarcWeber/submit/linux-3.8-dvb-support
...
without these two settings my USB dvb-t stick doesn't work
2013-05-16 03:16:23 -07:00
Domen Kozar
7bbe5823e8
let hydra mirror unfree firmware
2013-05-15 15:22:50 +02:00
Domen Kožar
d63523c769
Merge pull request #527 from qknight/firmware-linux-0.36-to-0.38
...
updated firmware-linux from 0.36-to-0.38
2013-05-15 06:17:45 -07:00
Eelco Dolstra
501833cf55
linux: Re-enable the memory resource controller
...
We accidentally lost this in Linux >= 3.5 because the kernel options
were renamed. (Probably an argument for not using "?" in the kernel
config...)
2013-05-15 14:53:15 +02:00
Rob Vermaas
000fddd10e
Fix hash for linux 3.2.45
2013-05-15 08:37:33 +00:00
David Guibert
880a386c57
update linux 3.2.45
2013-05-14 21:33:14 +02:00
Eelco Dolstra
07d4f26be1
nvidia-x11: Update to 319.17
2013-05-14 13:47:30 +02:00
Eelco Dolstra
a1a725d20d
linux: Set AUDIT_LOGINUID_IMMUTABLE
...
This prevents faking the loginuid even by root.
2013-05-13 11:53:00 +02:00
David Guibert
0e98cd4a65
update linux versions
2013-05-12 20:28:45 +02:00
Mathijs Kwik
e18f4eb50f
apparmor patch: should have a name, broke nixpkgs tarball
2013-05-12 13:11:49 +02:00
Evgeny Egorochkin
1ee86005b9
Apparmor: minor cleanup
2013-05-11 21:14:35 +03:00
Joachim Schiele
f6e15f0d69
updated firmware-linux from 0.36-to-0.38
2013-05-11 16:56:28 +00:00
Evgeny Egorochkin
8d7e1a79cc
AppArmor: add a sample patched kernel.
2013-05-11 08:50:34 +03:00
Evgeny Egorochkin
a9459797e2
AppArmor: fix silent build breakage.
2013-05-11 08:50:33 +03:00
Evgeny Egorochkin
0ef509b1e0
Apparmor: update to 2.8.1
2013-05-10 16:36:11 +03:00
Eelco Dolstra
e083d32d22
sysklogd: Don't remove /dev/log when syslogd exits
...
This messes up systemd-journald.
2013-05-09 16:28:36 +02:00
Vladimír Čunát
369defb7c1
sysvtools: fix symlink when withoutInitTools = false
2013-05-09 15:15:04 +02:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Mathijs Kwik
1264fafe98
linux-3.4: upgrade to 3.4.44
2013-05-08 22:33:05 +02:00
Mathijs Kwik
7d2f148c53
linux-3.0: upgrade to 3.0.77
2013-05-08 22:33:05 +02:00
Vladimír Čunát
1278859d31
Merge branch 'master' into x-updates
...
Conflicts (just splitting version from name):
pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Michael Raskin
14d87f3a9e
Update Linux versions
2013-05-08 10:52:46 +04:00
Eelco Dolstra
2e77679b0b
systemd: Start ctrl-alt-del.target irreversibly
...
This fixes hangs during EC2 reboots (which are implemented by sending
a ctrl-alt-del to the instance).
2013-05-07 14:34:48 +02:00
Eelco Dolstra
0dfb9ecc35
systemd: Update to 203
2013-05-07 14:34:48 +02:00
Marc Weber
b5e6e1b78c
without these two settings my USB dvb-t stick doesn't work
2013-05-06 05:15:34 +02:00
Phreedom
c3f34e54a1
Merge pull request #381 from ierton/bluez5
...
bluez5: add experimental expression for bluez5
2013-05-03 10:54:39 -07:00
Vladimír Čunát
8fc5fb6ecc
Merge branch 'master' into x-updates
2013-05-01 08:14:15 +02:00
Mathijs Kwik
d8489d37ed
linux-3.9: upgrade to 3.9.0
2013-04-30 09:27:02 +02:00
Mathijs Kwik
b18c7b5891
linux-3.8: upgrade to 3.8.10
2013-04-30 09:27:02 +02:00
David Guibert
008bb6935c
update kernels 3.0, 3.2, 3.4, 3.8 and 3.9-rc
2013-04-26 09:12:35 +02:00
Bjørn Forsman
7894a6fa27
systemd: patch hardcoded "/bin/cat" in systemd-cat
...
Without this patch, systemd-cat doesn't work here:
$ echo "hello world" | systemd-cat
Failed to execute process: No such file or directory
2013-04-24 23:46:09 +02:00
Vladimír Čunát
fe1bd1a73c
tarball: move assertion in systemd
...
Now the assertion doesn't trigger on systemd.headers
which is needed for dbus.libs.
This should fix the tarball job (I don't have enough RAM to test it).
2013-04-24 09:03:30 +00:00
Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Eelco Dolstra
cddad771c5
Revert "experimental/shadow"
...
This reverts commit 788e760b51
. NixOS
doesn't even have an /etc/skel. And if we had, 1) NixOS has the
ability to create regular files rather than symlinks in /etc
(environment.etc.<file>.mode = ...), so files in /etc/skel that should
be copied as regular files can be supported; and 2) we may actually
*want* to copy a symlink.
Also, typos in file names. Bleh.
2013-04-23 13:04:17 +02:00
Michael Raskin
0aad0af30a
Merge pull request #459 from MarcWeber/submit/shadow
...
make useradd -m create ~/.bashrc as file, not as symlink pointing to the store
2013-04-22 22:33:20 -07:00
cillianderoiste
96e8703be0
Merge pull request #460 from cillianderoiste/plymouth
...
It works enough to display bootsplash animations in an xorg session and a VT.
I haven't figured out how to run it successfully from the initrd yet and I'm also not happy with the postInstall mess, but I'd rather merge it now than let it get lost. It seems like it should be possible for a user to activate it by using boot.initrd.extraUtilsCommands and boot.initrd.postMountCommands
2013-04-20 08:07:30 -07:00
David Guibert
81b78fe31a
Merge pull request #451 from jcumming/zfs.130328
...
zfs-0.6.1. spl-0.6.1
2013-04-20 06:27:19 -07:00
Vladimír Čunát
e8823c9e5e
Merge pull request #441 from ierton/udisks2-xfce
...
udisks2 for xfce
2013-04-20 01:37:14 -07:00
Mathijs Kwik
61b65080d9
linux-3.0: upgrade to 3.0.74
2013-04-19 14:53:00 +02:00
Mathijs Kwik
384de84023
linux-3.4: upgrade to 3.4.41
2013-04-19 14:53:00 +02:00
Michael Raskin
181fb52b14
Update Linux 3.8
2013-04-18 19:22:54 +04:00
Michael Raskin
873fa411b0
Update Linux 3.9rc
2013-04-18 19:22:54 +04:00
Vladimír Čunát
ec736312d4
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/development/compilers/vala/default.nix (it's different version)
pkgs/development/libraries/cairo/default.nix (trivial)
2013-04-17 18:26:28 +02:00
Cillian de Róiste
34b7ddafa8
Plymouth: works quite well with the X11 renderer and from a VT
...
I haven't figured out how to get it into the initrd correctly yet.
2013-04-15 20:15:47 +02:00
Peter Simons
8fee4ad060
lxc: update to version 0.9.0
2013-04-15 11:15:55 +02:00
Mathijs Kwik
56afb97e87
linux-3.8: upgrade to 3.8.7
2013-04-14 00:35:39 +02:00
Mathijs Kwik
e20d9d0a97
linux-3.4: upgrade to 3.4.40
2013-04-14 00:35:39 +02:00
Mathijs Kwik
407f07e7e6
linux-3.0: upgrade to 3.0.73
2013-04-14 00:35:39 +02:00
Vladimír Čunát
17ae1617dc
Merge branch 'master' into x-updates
...
Conflicts (systemd version is split on x-updates):
pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Eelco Dolstra
4adad458e7
Remove the "proprietary" license
...
We already had "unfree".
2013-04-12 14:37:50 +02:00
Eelco Dolstra
4a429f5276
systemd: Update to 201
...
Fixes NixOS/nixos#135 and NixOS/nixos#126 .
2013-04-12 14:33:41 +02:00
Mathijs Kwik
7ab70b3a41
linux-3.2: upgrade to 3.2.43
2013-04-12 11:40:33 +02:00
Cillian de Róiste
562cb3f460
Add Plymouth: WIP
2013-04-12 01:58:38 +02:00
Vladimír Čunát
8249695b61
Merge branch 'master' into x-updates
...
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Vladimír Čunát
774afb7ff2
qemu_kvm: disable tests that meddle with system time
2013-04-11 18:58:46 +02:00
Marc Weber
788e760b51
experimental/shadow
...
For /etc/skel/* files put file contents into user directories rather than
"symlinks". This way users can edit their .bashrc files.
This small patch works fine with the multi-shell-support topic branch found on
my github page which rewrites .bashrc and similar files to source /etc/ files.
Thus users can opt-out or set options - still following system updates.
Signed-off-by: Marc Weber <marco-oweber@gmx.de>
2013-04-11 16:24:11 +02:00
Peter Simons
9608d80c73
iproute: don't compile with -Werror
...
lnstat.c:169:30: error: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess]
memset(th.hdr[i], 0, sizeof(th.hdr[i]));
^
cc1: all warnings being treated as errors
make[1]: *** [lnstat.o] Error 1
2013-04-07 23:33:20 +02:00
Mathijs Kwik
a99ea7a0ee
linux-3.0: update to 3.0.72
2013-04-06 20:45:30 +02:00
Mathijs Kwik
4eff34e602
linux-3.4: upgrade to 3.4.39
2013-04-06 20:45:29 +02:00
Mathijs Kwik
8092bc2dd7
linux-3.8: upgrade to 3.8.6
2013-04-06 20:39:36 +02:00
Jack Cummings
4c37edd6f3
Don't need NIX_CFLAGS_COMPILE in spl build anymore, consolodate zfs patches.
2013-04-06 00:06:27 -07:00
Jack Cummings
d1cb67a629
spl-0.6.1, zfs-0.6.1
2013-04-06 00:01:02 -07:00
Cillian de Róiste
c7be8b8afb
Update Radeon Firmware
...
It was changed on 04.02
2013-04-05 16:50:23 +02:00
Lluís Batlle i Rossell
410d1a073e
qemu-kvm: fix USB passthrough with a patch
...
I saw the same symptoms as https://bugs.launchpad.net/qemu/+bug/1033727 ,
and the patch there proposed fixes my case.
2013-04-05 10:45:04 +02:00
Mathijs Kwik
4154fbfabd
linux-3.9: upgrade to 3.9-rc4
2013-04-04 22:18:07 +02:00
Mathijs Kwik
6ef9c6b1fc
linux-3.8: upgrade to 3.8.5
2013-04-04 22:18:07 +02:00
Mathijs Kwik
d0c6308da7
linux-3.4: upgrade to 3.4.38
2013-04-04 22:18:07 +02:00
Mathijs Kwik
37de48e43d
linux-3.0: upgrade to 3.0.71
2013-04-04 22:18:06 +02:00
Vladimír Čunát
dec718acb6
systemd: minor update, changes for dbus split
...
New version with upstreamed changes from @edolstra :-)
2013-04-04 22:00:58 +02:00
Vladimír Čunát
eb2e46aab2
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Vladimír Čunát
07bee4ac0a
nvidia_x11: update to short-lived, with security update
2013-04-04 14:31:47 +02:00
Sergey Mironov
b1386e4a09
fix udisks2 paths
2013-04-04 12:02:53 +04:00
Vladimír Čunát
7ce97cc443
udisks: split to udisks1 (stays default) and udisks2
2013-04-04 12:02:53 +04:00
Eelco Dolstra
e657e1b57e
systemd: Update to 200
2013-03-31 16:16:07 +02:00
Lluís Batlle i Rossell
bee99995d9
linux: update to 3.8.5
2013-03-31 09:27:40 +02:00
Lluís Batlle i Rossell
13d40ae54d
otpw: fixing the entropy source (PATH variables)
...
I don't know why it set some hardcoded PATH.
2013-03-30 21:06:06 +01:00
Lluís Batlle i Rossell
c908d2130f
Adding 'google-authenticator'
2013-03-30 21:06:06 +01:00
Lluís Batlle i Rossell
690d5a346d
otpw: fixing typo in url
2013-03-30 21:06:05 +01:00
Lluís Batlle i Rossell
c7cf2b1690
Adding otpw (a one-time password system)
2013-03-30 21:06:05 +01:00
Ludovic Courtès
ea304762fe
pthread-win32: don't propagate `mingw_headers'
2013-03-29 21:46:38 +01:00
Michael Raskin
30420115a4
Fix Linux 3.9-rc modDir
2013-03-29 09:30:07 +04:00
Michael Raskin
406954c12d
Next rc for 3.9
2013-03-29 09:30:03 +04:00
Lluís Batlle i Rossell
e48bbe4c39
wpa_supplicant: Making a remote patch local.
...
upstream is down
2013-03-28 18:35:19 +01:00
Eelco Dolstra
df92d96871
linux: Update to 3.2.42
2013-03-28 13:10:38 +01:00
Eelco Dolstra
2ef559c513
systemd: Enable the firmware loader in udev
...
It's needed in kernels < 3.8.
2013-03-27 23:00:03 +01:00
Eelco Dolstra
f0d45e2e25
Linux kernel: Enable CONFIG_FHANDLE
...
This enables the open_by_handle_at(2) and name_to_handle_at(2)
syscalls. Systemd kind of requires this.
2013-03-27 23:00:02 +01:00
Eelco Dolstra
916c1adb84
Delete all kernels older than 2.6.39
...
Systemd doesn't support those kernels, so there is no point in keeping
them around.
2013-03-27 23:00:02 +01:00
Eelco Dolstra
3300479c74
systemd: Update to 199
...
This incorporates some changes from
eb64a2f562
.
2013-03-27 23:00:02 +01:00
Eelco Dolstra
db572bc3ec
iproute2: Update to 3.8.0
2013-03-26 15:31:41 +01:00
Lluis Batlle
70dc369314
Updating the assertion to cpufrequtils: linux pc only.
...
The armv5tel-linux and mips64el-linux fail to build this too.
2013-03-25 22:04:14 +01:00
Peter Simons
438e23b45b
htop: update to version 1.0.2
2013-03-25 00:01:56 +01:00
Peter Simons
41020224ad
nvidia-x11: use the brand-new 'unfree-redistributable' license for this package
2013-03-24 22:47:12 +01:00
Marc Weber
259f76d24c
wacom driver updates required for intuos 5 wacom tablet.\
...
Note I had to disable some recognized "pens" by using xinput disable.
So maybe 2 drivers are active?
However tilt/preasure works nicely inside gimp, inkscape, mypaint
2013-03-24 18:55:43 +01:00
Shea Levy
4fa4ab3a6e
Partially revert my recent kernelPackages changes
...
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)
Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)
The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 07:45:00 -04:00
Peter Simons
c0e0604c4d
nvidia-x11: change meta.license from "unfree" to "proprietary"
...
I'm not entirely sure what the appropriate license attribute for this
package is. The license [1] says:
| 2.1.2 Linux/FreeBSD Exception. Notwithstanding the foregoing terms of
| Section 2.1.1, SOFTWARE designed exclusively for use on the Linux or
| FreeBSD operating systems, or other operating systems derived from
| the source code to these operating systems, may be copied and
| redistributed, provided that the binary files thereof are not
| modified in any way (except for unzipping of compressed files).
It sounds to me like this gives NixOS the right to re-distribute the
files (because we don't modify them). The 'proprietary' license sort-of
fits that. On the other hand, we seem to assume that proprietary
software cannot be redistributed, which doesn't apply here.
[1] http://www.nvidia.com/content/DriverDownload-March2009/licence.php?lang=us
2013-03-23 15:58:15 +01:00
Evgeny Egorochkin
48a871ffb7
Update nvidia legacy 304 driver so that it compiles with new kernels
2013-03-22 17:01:32 +02:00
Michael Raskin
3a157d2c6c
Fix references to ifconfig and route
2013-03-22 09:41:38 +04:00
Mathijs Kwik
011fc66a7c
bbswitch: upgrade to 0.6
2013-03-22 00:00:05 +01:00
Mathijs Kwik
1f43786616
linux-3.0: upgrade to 3.0.70
2013-03-22 00:00:05 +01:00
Mathijs Kwik
7560812cfa
linux-3.2: upgrade to 3.2.41
2013-03-22 00:00:05 +01:00
Mathijs Kwik
b7bb81bc1f
linux-3.4: upgrade to 3.4.37
2013-03-22 00:00:05 +01:00
Mathijs Kwik
42d29c2afb
linux-3.8: upgrade to 3.8.4
2013-03-22 00:00:04 +01:00
Michael Raskin
afe7609e25
Update Linux 3.9-rc to rc3
2013-03-21 11:59:53 +04:00
Michael Raskin
2d2123b8d7
Update Linux 3.9-rc to rc3
2013-03-19 13:34:57 +04:00
Michael Raskin
c306d2f899
Fix references to ifconfig and route
2013-03-19 13:21:04 +04:00
Lluís Batlle i Rossell
0236cc5d88
iputils: build and install the manpages
2013-03-18 15:07:20 +01:00
Lluís Batlle i Rossell
1e1b6ee733
iputils: update 20101006 to 20121221
...
Still without manpages! I don't know where to get SGML tools.
2013-03-18 12:21:47 +01:00
Michael Raskin
6922ec9258
Linux-3.9-rc2
2013-03-16 16:27:19 +04:00
Michael Raskin
b5b4a4a5cf
Linux 3.8: update to 3.8.3
2013-03-16 10:51:03 +04:00
Sergey Mironov
dc5c6e1607
bluez5: add experimental expression for bluez5
...
bluez5 has many changes relative to bluez4. Most notable are dependency on
linux-3.4 and new dbus API.
2013-03-14 17:58:31 +04:00
Jack Cummings
3ac299934d
enable 802.11n by default.
2013-03-11 02:31:51 -07:00
Shea Levy
5e434ef318
Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs
...
This branch adds libcap-ng and updates SELinux. It doesn't seem like
anyone is actually using SELinux from nixpkgs, but everything compiles
and looks right.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:00:16 -05:00
Jack Cummings
7fcfcb2614
linux-firmware.git moved, and so did the intel wireless firmware urls.
2013-03-08 07:40:47 -08:00
Eelco Dolstra
262c21ed46
Enable __ignoreNulls globally
2013-03-07 19:42:01 +01:00
Eelco Dolstra
f5052a8679
Fix extraBuildNativeInputs reference
2013-03-07 19:41:40 +01:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Michael Raskin
3d28751740
Linux 3.9-rc1: set correct modDirVersion
2013-03-07 09:12:49 +04:00
Michael Raskin
b72134dc11
Linux: Add 3.9-rc1 as lowPrio (it has a regression fix 3.8.2 lacks)
2013-03-06 23:59:49 +04:00
Peter Simons
ad31fcad52
cifs-utils: revert back to version 5.6
...
The updated version 5.9 couldn't mount any of my shares:
Status code returned 0xc000006d NT_STATUS_LOGON_FAILURE
CIFS VFS: Send error in SessSetup = -13
CIFS VFS: cifs_mount failed w/return code = -13
Apparently, this is a known problem in Windows Vista that needs to be
fixed on the server side. :-(
2013-03-05 12:14:00 +01:00
Peter Simons
7e99044638
cifs-utils: hard-code path '/run/current-system/sw/bin/systemd-ask-password' to fix issue #353 some more
...
It turns out that mount.cifs is run in a shell environment that doesn't have
$PATH. To find that program, we must commit to some location. The path I used will
work fine on NixOS, but of course it won't work on other Linux distributions. I'm
not sure whether that's an important issue or not.
2013-03-05 11:46:01 +01:00
Peter Simons
8437673c91
cifs-utils: update to version 5.9
2013-03-05 11:26:09 +01:00
Peter Simons
599cc3ec0a
cifs-utils: remove hard-coded path to 'systemd-ask-password' to close issue #353
2013-03-05 11:25:53 +01:00
Mathijs Kwik
6338743942
bbswitch: upgrade to 0.5 - add linux 3.8 compatibility patch
2013-03-04 22:40:33 +01:00
Mathijs Kwik
060ba43e8f
linux-3.8: upgrade to 3.8.2
2013-03-04 22:40:33 +01:00
Mathijs Kwik
c7c6592f6f
linux-3.7: upgrade to 3.7.10
2013-03-04 22:40:23 +01:00
Mathijs Kwik
01c5d2d702
linux-3.4: upgrade to 3.4.35
2013-03-04 22:40:23 +01:00
Mathijs Kwik
04e883e496
linux-3.0: upgrade to 3.0.68
2013-03-04 22:40:22 +01:00
Mathijs Kwik
91c327fb28
qemu-kvm: string concatenation fix
2013-03-04 22:40:22 +01:00
Cillian de Róiste
bcc9c80b85
Tidy up: use the web interface for the git repo as the homepage
...
There have been no important updates to this driver, but it should be
included in X11R7.8
2013-03-03 19:40:17 +01:00
Vladimír Čunát
d7abc31f5a
fix the last master merge, sorry for the problems
...
Now I carefully re-merged all the conflicts and tested some builds.
Hopefully it's all OK now.
2013-03-02 22:34:37 +01:00
Michael Raskin
3b5b1be3cf
Linux 3.8.1
2013-03-02 20:16:08 +04:00
Shea Levy
0bdd926a32
linux/manual-config: put build and source trees into a separate 'dev' output.
...
This makes it possible to still build out-of-tree modules without making a system using this kernel depend on the full source and build tree at runtime.
Note that references to the source tree are removed from kernel modules after build.
Ideally, this would be accomplished by modifying the Makefile that puts the reference there in the first place, but I haven't tracked that down yet.
2013-03-02 09:54:08 -05:00
Shea Levy
b90b62e33b
linux/manual-config: Move configfile symlinking to configurePhase.
...
It makes more semantic sense there than in unpackPhase, as that symlink is _how_ we configure the kernel
2013-03-02 07:55:07 -05:00
Shea Levy
8ce1295ad3
linux/manual-config: ignore nulls.
...
There's no need to set the postFixup env var at all if we're not modular.
2013-03-02 07:51:12 -05:00
Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
aszlig
94fe64b3eb
manual-kernel: Add bc to buildNativeInputs.
...
As timeconst.pl was replaced by a bc script in the merge window for kernel 3.9,
we also need bc during build time, for more information about the reasons,
please have a look at the following commit:
torvalds/linux@70730bca13
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 18:57:03 +01:00
aszlig
d5f85c20f2
xf86-input-wacom: Update to new version 0.19.0.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
Eelco Dolstra
bf8f39ff9b
linux: Update to 3.2.39
...
CVE-2013-0228
2013-02-27 14:47:40 +01:00
Peter Simons
b6d0d176f2
qemu-kvm: enable regression test suite
2013-02-27 14:34:49 +01:00
Peter Simons
2d375c3f5f
qemu-kvm: provide a proper path to the python interpreter
2013-02-27 14:34:49 +01:00
Peter Simons
97a2eb24d4
qemu-kvm: re-use 'patchShebangs' function to fix script paths
2013-02-27 14:34:49 +01:00
Peter Simons
d336909d9f
qemu-kvm: enable documentation build
...
... and rename the 'postPatch' hook to 'patchPhase'.
2013-02-27 14:34:48 +01:00
Peter Simons
5f32207dfc
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-24 19:27:08 +01:00
Vladimír Čunát
de70e3739d
SELinux fixes and updates to 2012-09-24
2013-02-24 13:25:53 +01:00
Lluís Batlle i Rossell
17d289498f
linux: Typo: CFG80211_WEXT
2013-02-24 12:07:14 +01:00
Vladimír Čunát
f6b28fad73
add libcap_ng
2013-02-24 11:19:35 +01:00
Lluís Batlle i Rossell
0961084afb
linux 3.7, 3.8: Enabling CFG80211_WEXT (for ipw2200)
...
My computer with a ipw2200 nic needs that, to have the
ipw2200 driver.
2013-02-23 15:40:20 +01:00
Vladimír Čunát
bc4e786187
alsa-lib: fix a stdint.h problem
2013-02-23 12:59:28 +01:00
Shea Levy
afe3758b1b
Remove myself from kernel maintainers.
...
I use manual config now.
2013-02-21 12:39:25 -05:00
Shea Levy
6a1c64a469
Unmaintain v86d.
...
I don't use it any more, and don't even remember what it was for
2013-02-21 12:39:25 -05:00
Shea Levy
30e1158101
kmod: Update to kmod-12
2013-02-21 11:28:52 -05:00
Shea Levy
acd4299e75
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/top-level/all-packages.nix
Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
David Guibert
059c30bf9d
add kernel 3.8
2013-02-21 08:53:16 +01:00
Shea Levy
aacca1902c
Merge branch 'upstream-master' into stdenv-updates
2013-02-19 10:09:39 -05:00
Shea Levy
a4d5e4a9e2
Linux 3.7.9
2013-02-18 11:35:22 -05:00
Shea Levy
0e4c3a1fc9
Linux 3.4.32
2013-02-18 11:34:42 -05:00
Shea Levy
f4a51bbdd6
Linux 3.0.65
2013-02-18 11:34:19 -05:00
Shea Levy
c42d77aa35
Merge remote-tracking branch 'upstream/master' into stdenv-updates
2013-02-17 08:19:40 -05:00
Vladimír Čunát
8493b51da1
x86info: fix
2013-02-16 21:29:55 +01:00
Cillian de Róiste
baf4e9309a
iwlwifi-4965 fix download url
2013-02-16 19:30:56 +01:00
Shea Levy
0489661dd1
qemu-kvm/fix-librt-check.patch: Replace with fix from upstream qemu.git
2013-02-15 11:33:59 -05:00
Shea Levy
8d245dc3d9
qemu-kvm: Fix check for librt
2013-02-15 11:07:27 -05:00
Eelco Dolstra
a25b27a7f8
buildNativeInputs -> nativeBuildInputs
2013-02-15 13:38:07 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Vladimír Čunát
290aa4ea44
Merge pull request #307 from maggesi/blcr-updates
...
BLCR to version 0.8.5
2013-02-14 12:44:15 -08:00
Shea Levy
af26af6fc7
Remove EOL'd Linux 3.6
2013-02-14 14:33:42 -05:00
Shea Levy
0ad870eb5e
Remove EOL'd Linux 3.5
2013-02-14 14:32:44 -05:00
Shea Levy
c23084906b
Remove EOL'd Linux 3.3
2013-02-14 14:30:31 -05:00
Shea Levy
0178a3b7b1
Remove EOL'd Linux 3.1
2013-02-14 14:28:53 -05:00
Shea Levy
ca59489e2b
Linux 3.7.8
2013-02-14 14:25:19 -05:00
Shea Levy
e531913aca
Linux 3.4.31
2013-02-14 14:25:11 -05:00
Shea Levy
2d23eb3a19
Linux 3.0.64
2013-02-14 14:24:57 -05:00
Lluís Batlle i Rossell
00251af191
SUNRPC_DEBUG doesn't work on linux 3.3
...
It's as if the option isn't there.
http://hydra.nixos.org/build/4015233
2013-02-14 20:08:08 +01:00
Shea Levy
3a8631201e
Linux 3.4.30
2013-02-11 12:57:40 -05:00
Shea Levy
45e877f706
Linux 3.0.63
2013-02-11 12:53:43 -05:00
Shea Levy
170b0c9e2e
Linux 3.7.7
2013-02-11 12:34:14 -05:00
Eelco Dolstra
76a5e89a1c
linux: Update to 3.2.38
2013-02-11 15:34:30 +01:00
Marco Maggesi
03bf520849
Update BLCR to version 0.8.5
2013-02-08 12:42:31 +01:00
Lluís Batlle i Rossell
c4216ed1a0
linux kernel: enabling SUNRPC_DEBUG
...
Much easier debugging of nfs issues.
If I understand correctly, it was enabled in 3.2 and below; I enable it for
next kernels.
2013-02-07 16:21:03 +01:00
Karn Kallio
f921baec94
nvidia-x11: fix build with the latest Linux kernel
2013-02-06 10:46:25 +01:00
David Guibert
bb03e66785
Merge pull request #294 from jcumming/zfs.130201
...
zfs-0.6.0-rc14. spl-0.6.0-rc14
2013-02-05 14:00:11 -08:00
Eelco Dolstra
1c23150eb0
Port my nss_myhostname patches to systemd
2013-02-04 15:49:20 +01:00
Shea Levy
5336c82882
Linux 3.7.6
2013-02-04 06:58:19 -05:00
Shea Levy
249b3ea5ef
Linux 3.4.29
2013-02-04 06:58:07 -05:00
Shea Levy
c32435381e
Linux 3.0.62
2013-02-04 06:57:46 -05:00
Marc Weber
5784fa5f79
for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work
2013-02-04 12:07:37 +01:00
Eelco Dolstra
9670631c75
nvidia-x11: Update to 310.32
2013-02-04 12:06:56 +01:00
Vladimír Čunát
db63a24ac0
powertop: fix and update
2013-02-02 11:07:14 +01:00
Jack Cummings
c6d9e073b0
zfs-0.6.0-rc14, spl-0.6.0-rc14
2013-02-01 19:52:57 -08:00
Lluís Batlle i Rossell
86839c4a6d
iwlwifi-2030-ucode: url change
2013-01-31 17:01:13 +01:00
Eelco Dolstra
bc4064af73
wpa_supplicant: Fix config generation
...
‘echo ${extraConfig}’ doesn't do the right thing if extraConfig
contains newlines. This broke NixOS because CONFIG_DEBUG_SYSLOG=y
wasn't processed.
2013-01-30 15:17:38 +01:00
Peter Simons
e5b51648b1
Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy.
2013-01-30 14:53:04 +01:00
Peter Simons
e4d79d21aa
Merge pull request #290 from vcunat/vlada/wpa-notg
...
wpa_supplicant: refactor settings, readline support (on by default)
2013-01-30 02:27:46 -08:00
Lluís Batlle i Rossell
45de66b2b1
Update the raspberry pi kernel to one newer.
2013-01-29 20:17:32 +01:00
Vladimír Čunát
0072c44255
wpa_supplicant: refactor settings, readline support (on by default)
2013-01-29 17:37:20 +01:00
Eelco Dolstra
97c5ab3a6d
linux-2.6.32-xen: Remove
...
Hasn't built in a long time and is obsolete anyway.
2013-01-29 12:43:53 +01:00
Eelco Dolstra
8cc94dc652
ov511: Remove
...
This is very obsolete (last updated for Linux 2.6.0-test4).
2013-01-28 18:31:18 +01:00
Eelco Dolstra
24420373f4
modutils: Remove
...
This package is long obsolete.
2013-01-28 18:31:18 +01:00
Eelco Dolstra
e0afec2edc
pwdutils: Remove
...
This package no longer builds and is obsolete (use ‘shadow’ instead).
2013-01-28 17:58:43 +01:00
Eelco Dolstra
c8aed4202d
eject: Remove
...
This command is part of util-linux now.
2013-01-28 17:25:59 +01:00
Eelco Dolstra
ce83f79a65
util-linux: Update to 2.22.2
...
This update is essential because coreutils no longer provides ‘su’.
Also enable ‘last’ and some other commands so that we can get rid of
sysvtools.
2013-01-28 17:19:03 +01:00
Eelco Dolstra
5200c92aa0
libxcrypt: Remove
2013-01-28 17:19:03 +01:00
Eelco Dolstra
25a875195d
syslinux: Update to 4.06 and fix build
...
http://hydra.nixos.org/build/3890519
2013-01-28 17:19:02 +01:00
Eelco Dolstra
b40ca97f00
pam_unix2: Remove
...
It no longer builds and NixOS doesn't use it anymore.
2013-01-28 17:19:02 +01:00
Eelco Dolstra
67de843bce
ebtables: Update to 2.0.10-4 and fix build
...
http://hydra.nixos.org/build/3891670
2013-01-28 17:19:01 +01:00
Shea Levy
2afdaf0e82
Linux 3.7.5
2013-01-28 00:12:35 -05:00
Shea Levy
4bf80b462d
Linux 3.4.28
2013-01-28 00:12:24 -05:00
Aristid Breitkreuz
4534699938
add alsa oss emulation
2013-01-28 02:49:49 +01:00
viric
111a6c23f8
Merge pull request #245 from maggesi/blcr-update
...
Update BLCR to version 0.8.5 Beta 3.
2013-01-27 12:40:54 -08:00
viric
39fa2f72ab
Merge pull request #253 from rickynils/fscache
...
linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE
2013-01-27 12:39:25 -08:00
Lluís Batlle i Rossell
a87fba9619
Adding the firmware files for raspberrypi
2013-01-27 17:49:02 +00:00
Lluís Batlle i Rossell
3b26ba7019
Merge remote-tracking branch 'central/master' into stdenv-updates
...
Conflicts:
pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Lluís Batlle i Rossell
8319a5599d
alsautils: Adding libsamplerate, to be able to use alsaloop
2013-01-25 09:18:50 +01:00
Eelco Dolstra
337d2f43d0
pm-utils: Set meta.platforms
2013-01-24 12:52:00 +01:00
Eelco Dolstra
ed0fde7eb5
pm-utils: Remove some powersave hooks
...
In particular, this should unbreak nix.readOnlyStore.
2013-01-24 12:51:59 +01:00
Eelco Dolstra
7db0642961
upower: Update to 0.9.19
2013-01-24 12:51:59 +01:00
Eelco Dolstra
5ebaaeb7f3
procps-ng: Add
...
This will replace procps eventually.
2013-01-23 17:12:20 +01:00
Eelco Dolstra
0a47a28f1d
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-22 23:23:53 +01:00
Lluis Batlle
b8b7268029
systemd: porting patches for arm for udev.
...
Related to our glibc version, probably fixed in newer glibcs like
in stdenv-updates.
2013-01-22 23:17:31 +01:00
Eelco Dolstra
331e7ac221
Merge remote-tracking branch 'origin/master' into systemd
2013-01-21 13:01:00 +01:00
Lluís Batlle i Rossell
9c2bc27eb2
Fixing mcelog, so it puts the proper files in share/doc
...
It was running "cp mce.pdf $out/share/doc", which created the file 'doc'.
Then buildEnv complained that 'share/doc' exists.
2013-01-20 18:52:58 +01:00
Rickard Nilsson
1886d1db6a
Merge remote-tracking branch 'upstream/master' into stdenv-updates
2013-01-20 16:53:21 +01:00
Peter Simons
ced57493ee
v4l-utils: update to version 0.9.3
...
This update fixes the build of the SANE back and front-ends.
2013-01-20 16:23:28 +01:00
Rickard Nilsson
4b9df608e2
v4l: Fix building of ir-keytable
2013-01-20 00:39:13 +01:00
Eelco Dolstra
9da086c08d
Merge remote-tracking branch 'origin/master' into systemd
2013-01-19 00:05:50 +01:00
David Guibert
bc8a6e6c19
new download host for zfsonlinux.org: spl/zfs
2013-01-18 08:31:25 +01:00
David Guibert
d54c8c4b83
update kernels: 3.0.59, 3.4.26 and 3.7.3
2013-01-18 08:31:25 +01:00
Eelco Dolstra
d8e722985b
Add config option ‘allowUnfree’
...
If set to false, mkDerivation will throw an exception if a package has
an unfree license. ‘release-lib.nix’ uses this to enforce that we
don't build unfree packages as part of the Nixpkgs channel. Since
this is set through Nixpkgs' ‘config’ argument, it's more finegrained
than $HYDRA_DISALLOW_UNFREE.
2013-01-17 23:41:37 +01:00
Eelco Dolstra
9248dc1a14
Remove unfree ATI drivers package from the channel
...
Urghhhhh...
2013-01-17 22:05:59 +01:00
Eelco Dolstra
8faee15126
linux: Update to 3.2.37
2013-01-17 17:21:31 +01:00
Eelco Dolstra
5bb548d2e4
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-17 14:19:14 +01:00
Eelco Dolstra
1d174fb974
linux-pam: Fix URL
2013-01-15 18:53:13 +01:00
Eelco Dolstra
7cf3713187
cpufrequtils: Fix URL
2013-01-15 18:53:12 +01:00
Eelco Dolstra
634aa5020d
module-init-tools: Fix URL
2013-01-15 18:53:12 +01:00
Eelco Dolstra
45b0bcbc69
v86d: Fix URL
2013-01-15 18:53:12 +01:00
Eelco Dolstra
eeda226b02
Merge branch 'master' into systemd
2013-01-15 12:11:07 +01:00
Eelco Dolstra
f286cc65b1
Fix bad URLs lacking a scheme
2013-01-14 18:26:46 +01:00
Eelco Dolstra
7fd42a8380
Get rid of the "sf" alias for "sourceforge"
2013-01-14 12:00:32 +01:00
Vladimír Čunát
e2521650b4
Update acpi, fix homepage, download from sourceforge.
2013-01-14 11:38:40 +01:00
David Guibert
0f2874dd08
nvidia96: update to support new X ABI
2013-01-13 17:38:56 +01:00
Evgeny Egorochkin
4dc4d10123
nvidia-legacy304: fix build
2013-01-13 16:18:27 +02:00
Mathijs Kwik
2d56a2cc15
linux-3.7: upgrade to 3.7.2
2013-01-13 14:30:55 +01:00
Mathijs Kwik
91d4d56703
linux-3.4: upgrade to 3.4.25
2013-01-13 14:30:55 +01:00
Mathijs Kwik
cf546347e5
linux-3.0: upgrade to 3.0.58
2013-01-13 14:30:55 +01:00
Cillian de Róiste
778540797d
iwlwifi: fix URL: firmware has moved from http://intellinuxwireless.org to http://wireless.kernel.org
...
I've only updated the firmware URLs for the firmware I could install without changing the sha256
2013-01-13 12:15:27 +01:00
Peter Simons
4ca4f1564f
Merge pull request #254 from jcumming/x86info.130109
...
X86info.130109
2013-01-12 06:09:32 -08:00
Jack Cummings
0cfd455a67
Update x86info description. Add Homepage.
2013-01-11 09:25:32 -08:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Peter Simons
abd6be85e1
lxc: update to version 0.8.0
2013-01-11 15:02:21 +01:00
Jack Cummings
42859e49ed
Merge remote-tracking branch 'upstream/master' into x86info.130109
2013-01-10 21:35:13 -08:00
aszlig
86f293a1e5
xf86-video-nouveau: Add pixman to buildInputs.
...
Well, either this build is only broken on my system or noone actually uses
nouveau? Even when looking into the source tree it seems to require pixman, so I
suppose it didn't work for anyone prior to this commit.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:29:44 +01:00
Jack Cummings
2fd4313f6c
x86info-1.30
2013-01-09 11:49:41 -08:00
Rickard Nilsson
97d6292deb
linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE
...
NFS_FSCACHE and CIFS_FSCACHE are required to enable the local cache support for
NFS and CIFS (the 'fsc' mount option). The reasoning for enabling it from 3.2
and forward is that at least Ubuntu 12.04 (linux 3.2) has it turned on. Could
probably be enabled for earlier kernels too.
2013-01-09 18:14:54 +01:00
Marco Maggesi
4c1e931cd4
Update BLCR to version 0.8.5 Beta 3.
...
This version extends support to kernels up to version 3.7.1.
According to the authors, despite the "beta" in the version name, this
version should be considered "stable" on non exotic architecture.
2013-01-09 14:56:58 +01:00
Eelco Dolstra
3a51aec945
Merge remote-tracking branch 'origin/master' into systemd
2013-01-08 18:47:23 +01:00
Eelco Dolstra
5a79974c81
systemd: Remove some plymouth calls
2013-01-08 18:41:21 +01:00
Eelco Dolstra
cdb2f64a35
systemd: Get rescue.service and emergency.service to work
2013-01-08 18:11:56 +01:00
Eelco Dolstra
1909f9547d
Merge remote-tracking branch 'origin/master' into systemd
2013-01-08 17:06:43 +01:00
Eelco Dolstra
30201193ea
systemd: Generate patches from my systemd Git repo
2013-01-08 17:06:08 +01:00
Eelco Dolstra
d906239fe3
systemd: Update to 197
2013-01-08 17:06:08 +01:00
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