Yury G. Kudryashov
2bca92e32d
Merge trunk
...
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Florian Friesdorf
9e050a9226
iwlwifi-5150-ucode: add Intel 5150 wireless firmware package
...
Author: Sergey Mironov <ierton@gmail.com>
svn path=/nixpkgs/trunk/; revision=31232
2012-01-03 14:14:58 +00:00
Yury G. Kudryashov
08761e83fc
Merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Lluís Batlle i Rossell
076977b462
Making procps crossbuild.
...
svn path=/nixpkgs/trunk/; revision=31190
2012-01-01 20:01:02 +00:00
Florian Friesdorf
d5709cfb64
cryptsetup-1.4.1
...
Thanks to Mathijs Kwik and Peter Simons for preparing this.
Make sure you have nixos r31132.
svn path=/nixpkgs/trunk/; revision=31134
2011-12-28 21:48:58 +00:00
Michael Raskin
0efe938292
A newer rc
...
svn path=/nixpkgs/trunk/; revision=31081
2011-12-26 04:20:15 +00:00
Yury G. Kudryashov
f77741e018
merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Michael Raskin
435c32b5b6
A fresher Linux rc
...
svn path=/nixpkgs/trunk/; revision=31048
2011-12-23 04:26:36 +00:00
Lluís Batlle i Rossell
6db6983bc2
Updating nvidia legacy 96.x, so it builds with the linux 3.1 kernel.
...
svn path=/nixpkgs/trunk/; revision=31047
2011-12-22 22:35:57 +00:00
Eelco Dolstra
e1a96b2b88
* Add cpufrequtils to the channel.
...
svn path=/nixpkgs/trunk/; revision=31017
2011-12-21 16:24:40 +00:00
Eelco Dolstra
9eecf0e076
* lm_sensors -> lm-sensors.
...
svn path=/nixpkgs/trunk/; revision=30997
2011-12-21 10:28:51 +00:00
Eelco Dolstra
5f0536dc27
* lm-sensors updated to 3.3.1. Also fixed the name to match upstream.
...
svn path=/nixpkgs/trunk/; revision=30996
2011-12-21 10:28:09 +00:00
Eelco Dolstra
c3a52c32a4
* Fix the upower build in the case where /var/lib/upower doesn't exist
...
already (http://hydra.nixos.org/build/1646705 ).
svn path=/nixpkgs/trunk/; revision=30994
2011-12-20 23:10:06 +00:00
Eelco Dolstra
a9a3aed0c2
* udisks updated to 1.0.4.
...
svn path=/nixpkgs/trunk/; revision=30993
2011-12-20 23:04:07 +00:00
Eelco Dolstra
32a88887c6
* upower updated to 0.9.15.
...
svn path=/nixpkgs/trunk/; revision=30992
2011-12-20 22:47:57 +00:00
Yury G. Kudryashov
b077940b3b
svn merge https://nixos.org/repos/nix/nixpkgs/trunk
...
No conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Eelco Dolstra
cfde88976b
* Streamline the stdenv bootstrap and resulting closure by removing
...
some redundant builds (e.g., GMP was built three times).
* Updated GMP to 5.0.2.
* Updated PPL to 0.11.2.
* Remove ad hoc flags to build GCC's dependencies statically.
Instead, use the ‘makeStaticLibraries’ stdenv adapter.
* Build GMP with C++ support by default.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30891
2011-12-14 14:31:56 +00:00
Peter Simons
8d2d9449f7
Revert cryptsetup update to version 1.4.1.
...
The patch committed in revision 30839 causes nixos-rebuild to fail:
| building Nix...
| building the system configuration...
| these derivations will be built:
| /nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv
| /nix/store/csagx61sw5mzd4hb9lajx65ds5212331-udev-initrd.conf.drv
| /nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv
| /nix/store/k40r1l30amnbxqidbdl480xq46rqr0pa-udev-rules.drv
| /nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv
| /nix/store/wqhdw86v24z0x7fhp8xrqvw6g12lphij-extra-utils.drv
| building path(s) `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils'
| [pbuilding /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils
| `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/ld-linux-x86-64.so.2'
| `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/libc.so.6'
| [...]
| `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sh' -> `bash'
| `/nix/store/pmsabjn87gxlmkqlnj3hj502l687hw0f-module-init-tools-3.16/sbin/modprobe' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real'
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ata_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/basename...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/bash...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/blkid...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cat...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cdrom_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chmod...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chroot...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cryptsetup...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/dmsetup...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/e2fsck...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/edd_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/fsck...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/input_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ln...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/lvm...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mdadm...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mkdir...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mknod...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mount...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/path_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/reiserfsck...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/scsi_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sleep...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/switch_root...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/tune2fs...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevadm...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevd...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/umount...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/usb_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/v4l_id...
| testing patched programs...
| GNU bash, version 4.1.2(1)-release (x86_64-unknown-linux-gnu)
| mount from util-linux-ng 2.18 (with libblkid support)
| umount (util-linux-ng 2.18)
| e2fsck 1.41.14 (22-Dec-2010)
| tune2fs 1.41.14 (22-Dec-2010)
| 173
| blkid from util-linux-ng 2.18 (libblkid 2.18.0, 30-Jun-2010)
| Library version: 1.02.66 (2011-08-12)
| LVM version: 2.02.87(2) (2011-08-12)
| reiserfsck 3.6.21 (2009 www.namesys.com)
|
| mdadm - v3.1.2 - 10th March 2010
| basename (GNU coreutils) 8.7
| Copyright (C) 2010 Free Software Foundation, Inc.
| License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html >.
| This is free software: you are free to change and redistribute it.
| There is NO WARRANTY, to the extent permitted by law.
|
| Written by David MacKenzie.
| module-init-tools version 3.16
| [qoutput is not allowed to refer to path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1'
| cannot build derivation `/nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv': 1 dependencies couldn't be built
| cannot build derivation `/nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv': 1 dependencies couldn't be built
| cannot build derivation `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv': 1 dependencies couldn't be built
| error: build of `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv' failed
svn path=/nixpkgs/trunk/; revision=30885
2011-12-14 10:42:49 +00:00
Michael Raskin
0e3d2e236e
Update Linux kernel to 3.1
...
svn path=/nixpkgs/trunk/; revision=30876
2011-12-14 07:27:58 +00:00
Eelco Dolstra
c044d7f56f
* Forgot a few utillinuxng references.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30866
2011-12-13 12:57:32 +00:00
Eelco Dolstra
da3eea5c9e
* util-linux 2.20.1.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30860
2011-12-12 19:56:17 +00:00
Eelco Dolstra
f5fd808b51
* ‘linuxHeaders’ shouldn't use the kernel sources from
...
‘linuxPackages.kernel’, because then every minor kernel upgrade will
cause a rebuild of everything. So fix it at 2.6.35.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30857
2011-12-12 18:51:11 +00:00
Eelco Dolstra
eda3fd1730
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Peter Simons
ba935dcbc0
upgraded cryptsetup
...
svn path=/nixpkgs/trunk/; revision=30839
2011-12-11 19:39:12 +00:00
Shea Levy
766396a57b
bluez: Wrap the test-input program
...
Apparently this is useful for bluetooth mice and other HID. Patch submitted by mornfall
svn path=/nixpkgs/trunk/; revision=30721
2011-12-03 22:23:57 +00:00
Peter Simons
d7cac3194e
bridge-utils: updated to version 1.5
...
svn path=/nixpkgs/trunk/; revision=30643
2011-12-01 11:26:49 +00:00
Shea Levy
f3b7b7d69e
Linux 3.1.4
...
svn path=/nixpkgs/trunk/; revision=30625
2011-11-29 16:47:28 +00:00
Eelco Dolstra
752203c3ca
* Remove broken tux-on-ice kernels.
...
svn path=/nixpkgs/trunk/; revision=30619
2011-11-29 14:49:32 +00:00
Eelco Dolstra
25f6c6ca6e
* Re-enable the CFQ scheduler as a builtin module (as was the case in
...
2.6.32).
svn path=/nixpkgs/trunk/; revision=30617
2011-11-29 14:19:35 +00:00
Eelco Dolstra
0d124624e8
* NVIDIA driver updated to 290.10.
...
svn path=/nixpkgs/trunk/; revision=30550
2011-11-24 18:14:28 +00:00
Eelco Dolstra
ab017a58c5
* Enable PROC_EVENTS, since it's required by libcgroup's cgrulesengd
...
to monitor process creation.
svn path=/nixpkgs/trunk/; revision=30549
2011-11-24 17:54:55 +00:00
Eelco Dolstra
b9214d9c8c
* Move libcgroup from libcg/ to libcgroup/.
...
svn path=/nixpkgs/trunk/; revision=30547
2011-11-24 13:48:16 +00:00
Shea Levy
df05356c05
Linux 3.1.2
...
svn path=/nixpkgs/trunk/; revision=30529
2011-11-22 17:05:18 +00:00
Eelco Dolstra
cf4a0bdce9
svn path=/nixpkgs/trunk/; revision=30506
2011-11-21 14:05:26 +00:00
Eelco Dolstra
7c5f627645
* Sigh. Nixpkgs broken again...
...
svn path=/nixpkgs/trunk/; revision=30505
2011-11-21 13:58:46 +00:00
Ludovic Courtès
9b2bd7479f
Shadow: Make Linux-PAM optional; allow cross-compilation.
...
svn path=/nixpkgs/trunk/; revision=30482
2011-11-19 18:28:16 +00:00
Shea Levy
9a9df48782
Linux 3.0.9 and 3.1.1
...
svn path=/nixpkgs/trunk/; revision=30427
2011-11-14 16:55:50 +00:00
Evgeny Egorochkin
33ebbc07dd
udev: fix for bluetooth devices according to https://bugs.archlinux.org/task/25356
...
svn path=/nixpkgs/trunk/; revision=30351
2011-11-09 12:58:17 +00:00
Shea Levy
fe5dd801b7
The rtl8192c firmware is back on the realtek site at a new location
...
svn path=/nixpkgs/trunk/; revision=30350
2011-11-09 00:03:58 +00:00
Shea Levy
d800dcc26c
Linux 3.2-rc1
...
svn path=/nixpkgs/trunk/; revision=30336
2011-11-08 16:58:20 +00:00
Shea Levy
7868432b2e
I no longer wish to maintain older aufs versions
...
svn path=/nixpkgs/trunk/; revision=30330
2011-11-08 16:04:14 +00:00
Shea Levy
c65ff0d37d
Update aufs3.0, add aufs3.1
...
svn path=/nixpkgs/trunk/; revision=30329
2011-11-08 16:00:19 +00:00
Eelco Dolstra
172c52f9e9
* Per the coding guidelines, put different AUFS versions in the same
...
directory.
svn path=/nixpkgs/trunk/; revision=30324
2011-11-08 15:15:07 +00:00
Eelco Dolstra
b26931a480
* Refactoring: let linuxPackages.aufs and linuxPackages.aufs_util
...
evaluate to right AUFS for the kernel in question.
svn path=/nixpkgs/trunk/; revision=30322
2011-11-08 15:05:54 +00:00
Eelco Dolstra
756df1fb12
* Remove AUFS1, it's obsolete and we don't use it anymore.
...
svn path=/nixpkgs/trunk/; revision=30321
2011-11-08 14:54:46 +00:00
Peter Simons
368ac01473
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Michael Raskin
3b3c1670d1
Obviously, iproute needs host flex
...
svn path=/nixpkgs/trunk/; revision=30285
2011-11-06 21:38:02 +00:00
Shea Levy
5e5dd16842
Remove the efi stub patch
...
svn path=/nixpkgs/trunk/; revision=30264
2011-11-06 17:38:51 +00:00
Michael Raskin
16b52399c7
Oops, set include dir
...
svn path=/nixpkgs/trunk/; revision=30240
2011-11-04 21:53:47 +00:00
Michael Raskin
f9596a8145
Make cross-buildable. I wonder if it will work...
...
svn path=/nixpkgs/trunk/; revision=30239
2011-11-04 21:35:35 +00:00