3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2463 commits

Author SHA1 Message Date
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