ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-28 08:07:24 +03:00
Code Issues Projects Releases Wiki Activity
67,706 Commits 96 Branches 102 Tags 4.3 GiB
16a615a0f6
Commit Graph

4167 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
82d0acaf37 kernel-config: Explicitly enable NAMESPACES 
Namespace support is required by the `unshare` tool used in
`nixos-install`. It's enabled by the x86 defconfig, but not by
e.g. multi_v7_defconfig. So enable it here so that `nixos-install`
can work on ARM.
 2015-07-22 16:08:17 +03:00
Tuomas Tynkkynen
ec43c69b5d linux-rpi: Fix modDirVersion 
This causes build breakage on staging due to #7524.
 2015-07-22 16:08:17 +03:00
Eelco Dolstra
9a75bafcda systemd-timesyncd: Use NTP servers from our own ntp.org pool 
(cherry picked from commit 01dc343c2c)

Conflicts:
	pkgs/os-specific/linux/systemd/default.nix
 2015-07-22 12:27:50 +02:00
Eelco Dolstra
069b4a8a57 Remove Linux 3.2 and 3.4 
These are not supported by systemd so no reason to keep them around.

(cherry picked from commit ee10e165dc)

Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.4.nix
 2015-07-22 12:25:32 +02:00
Eelco Dolstra
bb5647ea0f Remove unused file 
(cherry picked from commit 58ef0eea0c)
 2015-07-22 12:25:11 +02:00
Eelco Dolstra
2c48ab4390 Remove ancient version of udev 
(cherry picked from commit ab91aaaeb8)
 2015-07-22 12:24:24 +02:00
Luca Bruno
6f5aa25e89 Revert "zfs_git: 2015-06-22 -> 2015-07-01" 
This reverts commit 54022375eb.

Revert "zfs_git: 2015-05-13 -> 2015-06-22"

This reverts commit 59faa759da.

Closes #8941
 2015-07-22 10:31:28 +02:00
Luca Bruno
f50e327510 gradm: fix download (ZHF) 2015-07-22 10:04:00 +02:00
Austin Seipp
d2986a9398 nixpkgs: remove linuxPackages.ktap 
It's been broken on the latest 3 major kernels, and it seems development
has stalled unfortunately, so this should be pulled.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-21 18:27:58 -05:00
Austin Seipp
a5e1b8db8f nixpkgs: pax-utils 1.0.4 -> 1.0.5 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-21 17:00:19 -05:00
Edward Tjörnhammar
bed11354e9 Merge pull request #8902 from dezgeg/pr-nfs 
nfs-utils, rpcbind: Update packages to fix nfs3 test
 2015-07-21 16:48:38 +02:00
Austin Seipp
b81c21428c nixpkgs: pax-utils 1.0.3 -> 1.0.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 13:52:34 -05:00
Austin Seipp
71d4b4baae nixpkgs: lockdep 3.19.1 -> 4.1.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 13:52:33 -05:00
Vladimír Čunát
e4fcddf177 statifier: fix meta.platforms syntax 2015-07-20 12:32:01 +02:00
Tuomas Tynkkynen
4f928f3550 nfs-utils: 1.2.5 -> 1.3.2, potentially fixes CVE-2013-1923 2015-07-20 12:20:42 +03:00
William A. Kennington III
70a1e7afd8 pam: 1.2.0 -> 1.2.1 
Fixes CVE-2015-3238
 2015-07-19 12:22:51 -07:00
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
William A. Kennington III
52b78864a8 firmware-linux-nonfree: 2015-06-30 -> 2015-07-12 2015-07-13 23:53:13 -07:00
aszlig
45135c0256
linux-testing: Update to version 4.2.0-rc2. 
Upstream diff of changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/diff/?id=v4.2-rc2&id2=v4.2-rc1&dt=2

Not tested on my machine right now (well, it's "testing" after all), but
verified the SHA256 from two different connections.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-07-14 07:31:18 +02:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Arseniy Seroka
c01539790b Merge pull request #8555 from fpletz/pkg/jool 
jool: init at 3.3.2
 2015-07-12 22:20:18 +03:00
Tuomas Tynkkynen
91cbd8a3b2 firejail: Fix source URL 
This particular sf.net mirror is down.
 2015-07-12 21:12:06 +02:00
Tuomas Tynkkynen
5fbd08968b can-utils: Source is now hosted at GitHub 
Gitorious doesn't exist any more.
 2015-07-12 21:01:57 +02:00
Franz Pletz
a21ead3d62 jool: init at 3.3.2 
Jool is a SIIT and a NAT64 implementation for Linux.
 2015-07-12 07:25:44 +02:00
William A. Kennington III
0245b28796 kernel: 3.14.47 -> 3.14.48 2015-07-11 20:15:05 -07:00
William A. Kennington III
3284b216a4 kernel: 4.0.7 -> 4.0.8 2015-07-11 20:15:05 -07:00
William A. Kennington III
75b7938ba2 kernel: 4.1.1 -> 4.1.2 2015-07-11 20:15:05 -07:00
William A. Kennington III
680e2ced04 kernel: 3.18.17 -> 3.18.18 2015-07-11 20:15:05 -07:00
William A. Kennington III
4529105271 kernel: 3.10.82 -> 3.10.84 2015-07-11 20:15:05 -07:00
William A. Kennington III
bf32753cd9 hdparm: 9.45 -> 9.48 2015-07-09 17:30:35 -07:00
William A. Kennington III
97a2fcdc24 bluez5: 5.31 -> 5.32 2015-07-09 17:30:35 -07:00
Eelco Dolstra
5c9f437d2f linux: 3.14.46 -> 3.14.47 
CVE-2014-7822
 2015-07-09 15:10:12 +02:00
Pascal Wittmann
b847dec4a0 eudev: disable install-exec-hook target (ZHF) 2015-07-09 12:28:24 +02:00
Tuomas Tynkkynen
88e43eb39b powertop: Patch out path to /sbin/modprobe (close #8702) 
The modprobe call is made via system(), so an absolute path is not
needed if modprobe is in PATH. Which it is by default at least in
NixOS and Arch.

Fixes #5424.
 2015-07-09 11:57:38 +02:00
William A. Kennington III
e587d3e155 Merge branch 'master.upstream' into staging.upstream 2015-07-07 00:31:00 -07:00
William A. Kennington III
3cfc6fa38a linux-firmware: 2015-05-13 -> 2015-06-30 
Use iwlwifi/linux-firmware temporarily since the firmware for kernel
4.1+ is not mainlined in firmware/linux-firmware.
 2015-07-06 18:31:13 -07:00
William A. Kennington III
310ad36a4d Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:49:35 -07:00
William A. Kennington III
06e146b2ce syslinux: Fix failed loading on gcc5 2015-07-06 17:49:07 -07:00
William A. Kennington III
ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
William A. Kennington III
2f28600f2b lvm2: 2.02.120 -> 2.02.124 2015-07-06 17:13:50 -07:00
William A. Kennington III
b363927556 linux-testing: 4.2-rc1 2015-07-06 13:45:03 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin
eafecd1fd2 perf-tools: update to a fresher git snapshot 2015-07-05 00:32:54 +03:00
Michael Raskin
2f5e534841 eudev: update 3.1.1 -> 3.1.2 2015-07-05 00:32:53 +03:00
Michael Raskin
e8f4be94e2 atop: update 2.1-1 -> 2.2-3 2015-07-05 00:32:53 +03:00
Thomas Strobel
5a5587ba6d pam_mount: fix PATH issue 2015-07-04 16:36:47 +02:00
Charles Strahan
44594e851c xsensors: init at 0.70 2015-07-03 22:55:10 -04:00
Edward Tjörnhammar
6257425dab linuxPackages.nvidia_x11_legacy340: fix cr4 references 
Patch was copied from here:
https://devtalk.nvidia.com/default/topic/813458/linux-4-0-rc1-346-47-build-error-_cr4-functions-fix/

Reference to kernel change, also noted in the forum post:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/x86/include/asm/paravirt.h?id=1e02ce4cccdcb9688386e5b8d2c9fa4660b45389
 2015-07-03 09:32:14 +02:00
Tobias Geerinckx-Rice
63041a7ecb kexec-tools: 2.0.9 -> 2.0.10 2015-07-03 04:28:43 +02:00
William A. Kennington III
7735b2e4c5 udisks: 2.1.4 -> 2.1.6 2015-07-02 09:05:15 -07:00
Thomas Strobel
31ba3ab30d pam_mount: version update: 2.14 -> 2.15 2015-07-02 16:49:35 +02:00
William A. Kennington III
54022375eb zfs_git: 2015-06-22 -> 2015-07-01 2015-07-01 22:52:09 -07:00
William A. Kennington III
f6f9b9574d zfs: 0.6.4.1 -> 0.6.4.2 2015-07-01 22:50:49 -07:00
William A. Kennington III
ca5c1e4187 spl_git: 2015-06-10 -> 2015-06-29 2015-07-01 22:49:36 -07:00
William A. Kennington III
4fc07740c6 spl: 0.6.4.1 -> 0.6.4.2 2015-07-01 22:48:21 -07:00
Tobias Geerinckx-Rice
1ea70323d6 mcelog: 120 -> 121 2015-07-02 03:35:35 +02:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
William A. Kennington III
d64b3c8a5c kernel: 3.14.45 -> 3.14.46 2015-06-30 11:28:59 -07:00
William A. Kennington III
43eda80b09 kernel: 3.18.16 -> 3.18.17 2015-06-30 11:20:41 -07:00
William A. Kennington III
b25930c4c8 kernel: 4.0.6 -> 4.0.7 2015-06-30 11:20:41 -07:00
William A. Kennington III
3f7d195762 kernel: 4.1 -> 4.1.1 2015-06-30 11:20:40 -07:00
William A. Kennington III
34cb1a202b kernel: 3.10.81 -> 3.10.82 2015-06-30 11:16:21 -07:00
Pascal Wittmann
512225ef81 Fixed some descriptions 2015-06-29 16:20:58 +02:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Domen Kožar
f895960e84 Merge pull request #8256 from dezgeg/pr-i686-kconfig 
kernel-config: Fix 4.0 build on 32-bit
 2015-06-26 13:23:35 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
William A. Kennington III
59faa759da zfs_git: 2015-05-13 -> 2015-06-22 2015-06-24 23:41:46 -07:00
William A. Kennington III
6af1fe3519 spl_git: 2015-04-24 -> 2015-06-10 2015-06-24 23:41:45 -07:00
William A. Kennington III
2a8cf39952 zfs: Fix kernel 4.1 compat 2015-06-24 23:33:28 -07:00
William A. Kennington III
b08d384da8 kernel: 3.14.44 -> 3.14.45 2015-06-24 18:12:20 -07:00
William A. Kennington III
2f255eafd9 kernel: 4.0.5 -> 4.0.6 2015-06-24 18:11:25 -07:00
William A. Kennington III
16e0a98483 kernel: 3.10.80 -> 3.10.81 2015-06-24 18:09:40 -07:00
Cillian de Róiste
df92d1c711 xf86_input_wacom: update from 0.29.0 to 0.30.0 2015-06-24 17:23:23 +02:00
Tobias Geerinckx-Rice
97ae36691e radeontop 2015-05-28 -> 2015-06-24 
New features:
- Make coloured output toggleable

Fixes:
- Release libpciaccess resources
- Make the check for quit case-insensitive
 2015-06-24 16:43:04 +02:00
William A. Kennington III
c6e512b80c Merge branch 'master.upstream' into staging.upstream 2015-06-22 12:43:12 -07:00
William A. Kennington III
bd9433c90d kernel: Add version 4.1 latest 2015-06-22 12:41:23 -07:00
William A. Kennington III
c48433d575 kernel: 3.4.107 -> 3.4.108 2015-06-22 12:35:56 -07:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Vladimír Čunát
783af9a960 wpa_supplicant: disable TLS-1.2 for now (fixes #8332) 2015-06-22 17:33:49 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Robin Gloster
45be5244a4 Wrap the python scripts in lxc 2015-06-19 14:34:09 +02:00
Eelco Dolstra
fef6141662 Revert "procps-ng: Refactor a bit" 
This reverts commit dceff137e1. It was
described as a "refactoring", but actually made procps depend on
systemd (which is a heavy dependency) and changed the name of the
package.
 2015-06-19 14:14:52 +02:00
William A. Kennington III
ad9081411c kmod: 20 -> 21 2015-06-18 23:51:12 -07:00
William A. Kennington III
fe4f8903b4 Merge branch 'master.upstream' into staging.upstream 2015-06-18 22:37:00 -07:00
William A. Kennington III
2f63137a44 lvm2: 2.02.118 -> 2.02.120 2015-06-18 21:50:53 -07:00
William A. Kennington III
af178cbc4e bluez: 5.30 -> 5.31 2015-06-18 21:50:39 -07:00
William A. Kennington III
1bb39e282d nvidia-x11: 346 -> 352.21 2015-06-18 21:45:51 -07:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
William A. Kennington III
8f63b5e89e Merge pull request #8359 from NixOS/fix-CVE-2015-4143 
wpa_supplicant: fix CVE-2015-4143
 2015-06-17 20:35:41 -07:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
William A. Kennington III
8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
Pascal Wittmann
7c4a0eaa53 wpa_supplicant: fix CVE-2015-4143 
see http://www.openwall.com/lists/oss-security/2015/05/09/6
 2015-06-16 17:28:35 +02:00
William A. Kennington III
046ba6b7db linux-testing: 4.1-rc7 -> 4.1-rc8 2015-06-15 11:37:05 -07:00
William A. Kennington III
2fd74f43b5 kernel: 3.18.14 -> 3.18.16 2015-06-15 11:32:46 -07:00
William A. Kennington III
b325c1556a kernel: 3.12.43 -> 3.12.44 2015-06-15 11:32:46 -07:00
Luca Bruno
aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Tuomas Tynkkynen
2c9b93b01c i2c-tools: New package at version 3.1.1 2015-06-15 17:49:35 +02:00
Tuomas Tynkkynen
7233ca0488 read-edid: New package at version 3.0.2 2015-06-15 17:49:35 +02:00
Michael Raskin
14e7d5440b Update Sysdig, adding new dependencies 2015-06-14 11:23:56 +03:00
Michael Raskin
59cbed7a02 Update eudev 2015-06-14 11:21:44 +03:00
William A. Kennington III
8f60f45eb6 mdadm: add gcc5 compat 2015-06-12 15:40:38 -07:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Tobias Geerinckx-Rice
cbbefbdabb mcelog -> 120 
Fix potential NULL reference while parsing kernel efi files
 2015-06-12 13:11:38 +02:00
Eelco Dolstra
4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging 
Conflicts:
	pkgs/development/libraries/wayland/default.nix
 2015-06-11 00:23:03 +02:00
Ricardo M. Correia
e26bfbe26f grsecurity: Update stable and test patches 
stable: 3.1-3.14.43-201506021902 -> 3.1-3.14.44-201506082249
test:   3.1-4.0.4-201506021902   -> 3.1-4.0.5-201506082251
 2015-06-10 18:33:28 +02:00
Tuomas Tynkkynen
62b75c64d4 kernel-config: Fix 4.0 build on 32-bit 
KVM_COMPAT apparently enables 32-bit compability syscalls for KVM, and
as such can be enabled only on a 64-bit system.

Resolves error http://hydra.nixos.org/build/23014132/nixlog/1/raw:
GOT: #
GOT: # configuration written to .config
GOT: #
GOT: make[1]: Leaving directory '/tmp/nix-build-linux-config-4.0.5.drv-0/build'
GOT: make: Leaving directory '/tmp/nix-build-linux-config-4.0.5.drv-0/linux-4.0.5'
unused option: KVM_COMPAT
builder for ‘/nix/store/7kskdvmzs116f1fm55ghm0crjniw9q0a-linux-config-4.0.5.drv’ failed with exit code 255
 2015-06-10 00:28:01 +03:00
Tobias Geerinckx-Rice
b229cfc894 mcelog -> 119 
- Fix clobbered status variable in server_ping
- Avoid prefilling memory database when DMI is disabled
 2015-06-09 20:22:26 +02:00
William A. Kennington III
6c00f2105a iw: 3.15 -> 4.1 2015-06-08 17:41:10 -07:00
aszlig
87b9cceefd
linux-testing: Update to new version 4.1-rc7. 
Includes fixes for DRM, MIPS, iSCSI, ALSA, USB, bna and wireless and
more. Full diff can be found here:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/diff/?id=v4.1-rc7&id2=v4.1-rc6

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-06-08 15:12:47 +02:00
Pascal Wittmann
c46889ea42 ipsec-tools: apply debians patch to fix CVE-2015-4047 2015-06-08 13:56:42 +02:00
Vladimír Čunát
9f7d7adb05 Revert "kmod-blacklist-ubuntu: update to Vivid" 
This reverts commit 0307c27219.

The only change was blacklisting bochs-drm, but that breaks our VM setup
and I don't see a good reason to do that on the Ubuntu issue
(just some PowerPC failure).

Defaulting to qxl driver might be better anyway, but I'm not venturing
such changes now.
 2015-06-08 12:34:24 +02:00
William A. Kennington III
514a9fdf87 Merge pull request #8173 from dezgeg/pr-kernel-config 
kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM
 2015-06-07 10:14:51 -07:00
William A. Kennington III
4991e62285 musl: 1.1.9 -> 1.1.10 2015-06-06 12:56:10 -07:00
William A. Kennington III
0a8e830196 kernel: 4.0.4 -> 4.0.5 2015-06-06 12:32:58 -07:00
William A. Kennington III
24042f3803 kernel: 3.14.43 -> 3.14.44 2015-06-06 12:32:58 -07:00
William A. Kennington III
1adef3db3d kernel: 3.10.79 -> 3.10.80 2015-06-06 12:32:58 -07:00
Arseniy Seroka
70b5e51456 Merge pull request #8178 from jagajaga/fix/versions 
fix: add missing versions
 2015-06-06 00:22:10 +03:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Ricardo M. Correia
3afae4037b zfs: Fix systemd warning 
The `zfs-share` service was trying to execute the `rm` binary, but it
was providing an invalid `/bin` path.

This should fix #8171.
 2015-06-04 17:35:39 +02:00
Eelco Dolstra
5b7c6d0440 audit: Update to 2.4.2 2015-06-04 14:54:53 +02:00
Eelco Dolstra
4c16c271f6 Revert "audit: 2.9.1 -> 2.9.2" 
This reverts commit 7e126ac83e.
 2015-06-04 14:54:50 +02:00
Eelco Dolstra
3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries" 
This reverts commit 25a148fa19.
 2015-06-04 14:54:48 +02:00
Tobias Geerinckx-Rice
ac5d849ff6 Merge pull request #8153 from nckx/update-libnl 
libnl 3.2.25 -> 3.2.26
 2015-06-04 13:11:16 +02:00
Eelco Dolstra
cdeb271101 zfs: Nuke references to linux.dev in *.ko files 
This prevents linux.dev being included in the installation CD.
 2015-06-04 11:06:44 +02:00
Tuomas Tynkkynen
6be70d17c0 kernel-config: Enable IKCONFIG so ARM gets /proc/config.gz 
IKCONFIG must be enabled so IKCONFIG_PROC can be set. On x86 IKCONFIG
gets implicitly enabled by kernelAutoModules in platforms.nix. But ARM
doesn't use kernelAutoModules, so IKCONFIG_PROC won't get enabled
without this patch.
 2015-06-04 11:28:35 +03:00
Tuomas Tynkkynen
9c2f2bc893 kernel-config: Enable FB_VESA and FRAMEBUFFER_CONSOLE 
Commit 159fed47bc (nixos/grub: Fix video display on efi) changed BIOS
systems to start in non-text mode as well. Enable FB_VESA to get a
framebuffer console on BIOS systems. Change FRAMEBUFFER_CONSOLE to 'y'
instead of the default 'm' to so the user doesn't need to manually load
the fbcon module anymore.

Other distros have similar defaults, at least on Arch:
    CONFIG_FB_VESA=y
    CONFIG_FRAMEBUFFER_CONSOLE=y
and on Ubuntu (12.04):
    CONFIG_FB_VESA=m
    CONFIG_FRAMEBUFFER_CONSOLE=y

Fixes #8139
 2015-06-04 11:26:20 +03:00
Tobias Geerinckx-Rice
33ad641be9 libnl 3.2.25 -> 3.2.26 
Changes (also in project hosting):
<http://lists.infradead.org/pipermail/libnl/2015-March/001865.html>
 2015-06-03 22:41:30 +02:00
Ricardo M. Correia
07c26ee680 grsecurity: Update stable and test patches 
stable: 3.1-3.14.43-201505272112 -> 3.1-3.14.43-201506021902
test:   3.1-4.0.4-201505272113   -> 3.1-4.0.4-201506021902
 2015-06-03 19:38:05 +02:00
Vladimír Čunát
0307c27219 kmod-blacklist-ubuntu: update to Vivid 2015-06-02 20:17:01 +02:00
William A. Kennington III
2f96621b6a linux-testing: 4.1-rc5 -> 4.1-rc6 2015-06-02 11:03:53 -07:00
Patrick Mahoney
9835f18fbd Add myself as maintainer for skarnet software 2015-06-01 15:20:56 -05:00
Tobias Geerinckx-Rice
217566ede4 mcelog 117 -> 118 
Changet to mcelog(8) to support new architectural extentions in
Intel CPUs.
 2015-06-01 21:13:34 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
 2015-06-01 20:08:43 +02:00
Domen Kožar
dc3316268e Merge branch 'master' into staging 2015-06-01 11:00:51 +02:00
codyopel
a9af62f38b v4l-utils: 1.6.2 -> 1.6.3 2015-05-31 19:54:03 -04:00
William A. Kennington III
18237ff377 musl: 1.1.8 -> 1.1.9 2015-05-31 14:17:19 -07:00
Tobias Geerinckx-Rice
3ca2bb3c03 radeontop v0.8-8-g2499679 -> 2015-05-28 (new format) 2015-05-30 21:09:26 +02:00
Pascal Wittmann
1d30557516 Fixed meta.license: s/licence/license 2015-05-30 15:19:05 +02:00
William A. Kennington III
7141d96bde pam: Factor out dependencies 2015-05-29 14:58:39 -07:00
Ricardo M. Correia
b59d52daf7 grsecurity: Update stable and test patches 
stable: 3.1-3.14.43-201505222221 -> 3.1-3.14.43-201505272112
test:   3.1-4.0.4-201505222222   -> 3.1-4.0.4-201505272113
 2015-05-29 19:49:46 +02:00
William A. Kennington III
7e126ac83e audit: 2.9.1 -> 2.9.2 2015-05-29 10:29:11 -07:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
William A. Kennington III
7a9e0a5ae4 util-linux: 2.26.1 -> 2.26.2 2015-05-28 02:20:08 -07:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Ricardo M. Correia
c0f09411e8 grsecurity: Update stable and test patches 
stable: 3.1-3.14.43-201505191737 -> 3.1-3.14.43-201505222221
test:   3.1-4.0.4-201505182014   -> 3.1-4.0.4-201505222222
 2015-05-27 20:27:43 +02:00
Mateusz Kowalczyk
1113efec5e Merge pull request #7559 from offlinehacker/openvswitch/ipsec 
openvswitch: ipsec support
 2015-05-26 11:26:02 +01:00
William A. Kennington III
988ede2c6b linux-testing: 4.1-rc4 -> 4.1-rc5 2015-05-26 01:36:35 -07:00
Tobias Geerinckx-Rice
8d98f626a1 statifier 1.6.15 -> 1.7.3 
Also switch to mkDerivation and fix build on amd64.
 2015-05-25 13:35:55 +02:00