JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,708 Commits 2 Branches 0 Tags 13 GiB
0cf1a5c5e1
Commit Graph

4077 Commits

Author SHA1 Message Date
Kranium Gikos Mendoza
6f634e3c3a Add kbdlight package and setuid wrapper 
update nixos/modules/programs/kbdlight.nix to use mkEnableOption
 2015-05-11 13:23:01 +08:00
William A. Kennington III
142b48688c edac-utils: Add derivation 2015-05-10 18:18:31 -07:00
Ricardo M. Correia
aa75bb25d8 grsecurity: Update stable and test patches 
stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test:   3.1-4.0.2-201505072057   -> 3.1-4.0.2-201505101122
 2015-05-11 02:45:38 +02:00
Michael Raskin
ebadf1ff3f Update firejail 2015-05-10 13:46:30 +02:00
Tobias Geerinckx-Rice
9870b076f5 phc-intel: don't try to build on _grsec kernels 
It will fail.
 2015-05-10 13:46:00 +02:00
Tobias Geerinckx-Rice
b9b8fec6ae Add phc-intel: undervolt Intel CPUs under Linux 2015-05-10 13:45:59 +02:00
Michael Alan Dorman
27d4e762a0 Add wpa_supplicant p2p patch. 
wpa_supplicant 2.4 appears to have a serious bug that makes impossible
to use wifi for some number of people.

(See https://bbs.archlinux.org/viewtopic.php?id=196584 for an example)

It was resolved in a patch for the to-be-released 2.5 which it seemed
worth it to cherry-pick here.
 2015-05-10 13:45:59 +02:00
Michael Raskin
c25495bcff Update firejail 2015-05-10 13:36:44 +03:00
Lluís Batlle i Rossell
d8a2bb86c0 Raspberry Pi 2 changes to make it boot. 
It boots, but some things still don't work:
1) Installation of DTBs
2) Boot of initrd

Booting still needs a proper config.txt in /boot, which could probably be
managed by NixOS.
 2015-05-09 17:05:24 +00:00
Tobias Geerinckx-Rice
8c39547fc2 phc-intel: don't try to build on _grsec kernels 
It will fail.
 2015-05-09 02:49:41 +02:00
Tobias Geerinckx-Rice
1f6c2a97ef Add phc-intel: undervolt Intel CPUs under Linux 2015-05-09 01:25:58 +02:00
Michael Alan Dorman
d3e0850989 Add wpa_supplicant p2p patch. 
wpa_supplicant 2.4 appears to have a serious bug that makes impossible
to use wifi for some number of people.

(See https://bbs.archlinux.org/viewtopic.php?id=196584 for an example)

It was resolved in a patch for the to-be-released 2.5 which it seemed
worth it to cherry-pick here.
 2015-05-08 11:02:01 -04:00
William A. Kennington III
c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
William A. Kennington III
a5312e581f kernel: Remove obsolete btrfs patch 2015-05-08 05:27:55 -07:00
William A. Kennington III
61be2ceb27 kernel: Move grsecurity update warning 2015-05-07 20:45:48 -07:00
William A. Kennington III
8209d3f78b kernel: 3.14.40 -> 3.14.41 2015-05-07 20:34:26 -07:00
William A. Kennington III
0e4057b167 kernel: 4.0.1 -> 4.0.2 2015-05-07 20:32:24 -07:00
William A. Kennington III
5b4cd639dd kernel: 3.19.6 -> 3.19.7 2015-05-07 20:32:23 -07:00
William A. Kennington III
b4a8eaaf87 kernel: 3.18.12 -> 3.18.13 2015-05-07 20:32:23 -07:00
William A. Kennington III
185d7c062b kernel: 3.12.40 -> 3.12.42 2015-05-07 19:26:48 -07:00
William A. Kennington III
f4a016081a kernel: 3.10.76 -> 3.10.77 2015-05-07 19:26:20 -07:00
viric
1b982918f5 Merge pull request #7740 from dezgeg/arm 
ARM changes for the Jetson TK1 (and other multiplatform boards)
 2015-05-07 20:53:07 +02:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Tuomas Tynkkynen
9fc72c8ab8 kernel: Install DTBs into a subdirectory 
This avoids the pollution of the top-level kernel output directory and
also simplifies the boot entry generator script I will be using on ARM.
 2015-05-07 06:04:10 +03:00
Lluís Batlle i Rossell
0c5be7164c sheevaplug: fix kernel build. 
I added platform.kernelMakeFlags. This allows setting the required
parameter to make the required kernel uImage for the sheevaplug,
since it became a platform with devicetree (3.10).

I have tried it with linux 3.18 and it built fine.
 2015-05-06 09:50:51 +02:00
William A. Kennington III
874fa4d8a3 busybox: 1.22.1 -> 1.23.2 
Also use musl as libc since it is just as small as uclibc, usually more
performant, and regularly makes releases.
 2015-05-06 00:15:16 -07:00
Charles Strahan
398a23d94f Merge pull request #7710 from cstrahan/broadcom-sta-patches 
broadcom-sta: fixes for kernel version >= 3.18
 2015-05-05 17:21:29 -04:00
Charles Strahan
4d3be75ae2 broadcom-sta: fixes for kernel version >= 3.18 
This replaces our patches with those from Arch's package [1]. Further
discussion can be found on the Arch forum [2].

This patch set is a superset of the previous set, and resolves the
immediate and consistent kernel panics I've seen on my MacBook Pro
Retina since switching from version 3.16 to 3.18 of the Linux kernel.

Fixes #5315
Fixes #7710

1: https://aur.archlinux.org/packages/broadcom-wl/
2: https://bbs.archlinux.org/viewtopic.php?id=192287
 2015-05-05 16:34:59 -04:00
Philip Potter
2216728979 add support for pam_u2f to nixos pam module 
This adds support for authenticating using a U2F device such as a
yubikey neo.
 2015-05-03 19:22:00 +01:00
William A. Kennington III
8de4be096f ffado: Refactor and cleanup 2015-05-02 15:54:42 -07:00
William A. Kennington III
a71f78acf7 libgcrypt: Massive cleanup and make 1.6 the default 2015-05-01 17:41:42 -07:00
Ricardo M. Correia
8119b8a0e4 zfs: Update from 0.6.4 -> 0.6.4.1 2015-05-02 01:05:54 +02:00
Ricardo M. Correia
a46066219c spl: Update from 0.6.4 -> 0.6.4.1 2015-05-02 01:05:08 +02:00
Ricardo M. Correia
b95fa1c852 grsecurity: Update stable and test patches 
stable: 3.1-3.14.40-201504290821 -> 3.1-3.14.40-201504302118
test:   3.1-3.19.6-201504290821  -> 3.1-3.19.6-201504302119
 2015-05-02 01:03:05 +02:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
William A. Kennington III
bc4347bfd7 iproute: 3.19.0 -> 4.0.0 2015-04-30 18:51:27 -07:00
Charles Strahan
53ab1f7d3c mbpfan: new package 
Daemon that uses input from coretemp module and sets the fan speed using
the applesmc module
 2015-04-30 21:21:15 -04:00
Joachim Fasting
bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Tobias Geerinckx-Rice
2a29cf9eaa mcelog 116 -> 117 
That was quick.
 2015-04-30 13:11:31 +02:00
Tobias Geerinckx-Rice
dbbc1b3379 fatrace: fix power-usage-report 2015-04-30 13:11:31 +02:00
Tobias Geerinckx-Rice
8ce7626dc7 fatrace 0.9 -> 0.10 2015-04-30 13:11:30 +02:00
William A. Kennington III
084d1143e6 kernel: 3.14.39 -> 3.14.40 2015-04-29 14:34:11 -07:00
William A. Kennington III
dfd7b26e3a kernel: 3.19.5 -> 3.19.6 2015-04-29 14:33:23 -07:00
William A. Kennington III
0414465137 kernel: 4.0 -> 4.0.1 2015-04-29 14:33:23 -07:00
William A. Kennington III
6a34c8fbac kernel: 3.10.75 -> 3.10.76 2015-04-29 14:31:33 -07:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Tobias Geerinckx-Rice
cdeb2e5886 mcelog 115 -> 116 
Added Knights Landing (Xeon Phi) support.
 2015-04-28 21:32:22 +02:00
Edward Tjörnhammar
74742ad584 Merge pull request #7606 from dezgeg/pr-kmod-blacklist 
kmod-blacklist-ubuntu: Fix source package URL returning 404
 2015-04-28 10:18:30 +02:00
Tuomas Tynkkynen
c323c87565 kmod-blacklist-ubuntu: Fix source package URL returning 404 
The original URL http://archive.ubuntu.com/ubuntu/pool/main/k/kmod/kmod_9-3ubuntu1.debian.tar.gz
is dead.
 2015-04-28 11:15:54 +03:00
William A. Kennington III
00230c9240 fusionio: Correct binary testing code 2015-04-27 17:38:08 -07:00
William A. Kennington III
9258e8a4bf fusionio: Refactor and add utils 2015-04-27 17:24:43 -07:00
William A. Kennington III
47e67a80b9 fusionio: Add iomemory-vsl driver 2015-04-27 16:00:17 -07:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
William A. Kennington III
d96535ba41 ffado: Add maintainer 2015-04-26 10:24:48 -07:00
Edward Tjörnhammar
a682c2eb4e Merge pull request #7572 from dezgeg/pr-trinity 
trinity: New package
 2015-04-26 10:13:57 +02:00
William A. Kennington III
954b8a4cdb Merge pull request #7574 from codyopel/v86d 
v86d: refactor
 2015-04-25 23:35:15 -07:00
William A. Kennington III
3cb1669249 alsa-plugins: 1.0.28 -> 1.0.29 2015-04-25 21:43:37 -07:00
William A. Kennington III
60a39dec54 ffado: Refactor 2015-04-25 21:27:54 -07:00
William A. Kennington III
bdf2329262 bluez5: 5.29 -> 5.30 2015-04-25 21:27:53 -07:00
William A. Kennington III
95a49c18b5 alsaLib: 1.0.28 -> 1.0.29 2015-04-25 21:27:53 -07:00
codyopel
2421b139bc v86d: refactor 2015-04-25 17:36:56 -04:00
Tuomas Tynkkynen
7453f378ea trinity: init at version 1.5 2015-04-26 00:03:01 +03:00
Jaka Hudoklin
f2ec6964db openvswitch: export and fix ovs-monitor-ipsec script 2015-04-25 15:33:08 +02:00
Edward Tjörnhammar
9604dcc42f Merge pull request #7493 from malyn/hal-flash 
Add hal-flash package
 2015-04-25 12:14:15 +02:00
William A. Kennington III
076dff2f58 hostapd: Refactoring 2015-04-24 15:12:55 -07:00
William A. Kennington III
4ae59b199a wpa_supplicant: 2.3 -> 2.4 2015-04-24 15:02:25 -07:00
Arseniy Seroka
e5b2ecd9b4 Merge pull request #7535 from joachifm/apparmor-2_9_2 
apparmor: 2.9.1 -> 2.9.2
 2015-04-24 16:42:47 +03:00
Joachim Fasting
029514b513 apparmor: 2.9.1 -> 2.9.2 
Bugfixes & minor improvements
 2015-04-24 12:42:58 +02:00
Michael Alyn Miller
48c8092f6d Add hal-flash package 2015-04-23 19:56:51 -07:00
Edward Tjörnhammar
e92c84402d Merge pull request #7519 from dezgeg/pr-trace-cmd-build-fix 
trace-cmd: Fix build by adding docbook_xsl dependency
 2015-04-23 20:52:24 +02:00
Joachim Schiele
e3e8aebdc1 wpa-supplicant: CVE-2015-1863 (close #7526) 
http://w1.fi/security/2015-1/
 2015-04-23 20:23:47 +02:00
Tuomas Tynkkynen
663c972385 trace-cmd: Fix build by adding docbook_xsl dependency 
Gets rid of this build error:

make -C /tmp/nix-build-trace-cmd-2.5.3.drv-0/trace-cmd/Documentation all
      ASCIIDOC            trace-cmd-hist.1.xsl
*********************************
** No docbook.xsl is installed **
** Can't make man pages        **
*********************************
Makefile:59: recipe for target '/tmp/nix-build-trace-cmd-2.5.3.drv-0/trace-cmd/Documentation/trace-cmd-hist.1' failed
 2015-04-23 06:32:54 +03:00
Tobias Geerinckx-Rice
fb235a871a mcelog 114 -> 115: major path fixes 
Both $out/bin/mcelog and $out/etc/mcelog/mcelog.conf now point to
the correct $out/etc/mcelog.
 2015-04-23 01:52:18 +02:00
Tobias Geerinckx-Rice
07b9356023 b43-firmware: add new version 6.30.163.46 2015-04-23 01:52:18 +02:00
William A. Kennington III
37ab5f0ad0 kernel: 3.18.11 -> 3.18.12 2015-04-22 14:49:43 -07:00
Nikolay Amiantov
05dd67ce9f schedtool: add package 2015-04-22 17:50:41 +03:00
Tobias Geerinckx-Rice
e727aae8ca jfbview 0.4.2 -> 0.5.1 
Also adds two new tools to the package: jpdfcat (quick and dirty text
dumper) and jpdfgrep (PDF search tool with weird syntax).
 2015-04-22 12:34:15 +02:00
William A. Kennington III
7b34703b70 zfs: Fix pkgconfig 2015-04-21 20:57:58 -07:00
William A. Kennington III
c6d0acbda7 numactl: 1.0.2 -> 2.0.10 2015-04-21 20:57:58 -07:00
William A. Kennington III
dbaeb7c428 kernel: 3.14.38 -> 3.14.39 2015-04-20 22:41:47 -07:00
William A. Kennington III
2c35a4aa39 kernel: 3.19.4 -> 3.19.5 2015-04-20 22:40:31 -07:00
William A. Kennington III
d82fa84357 kernel: 3.10.74 -> 3.10.75 2015-04-20 22:37:40 -07:00
Jan Malakhovski
9f9959599f drbd: hash changed 2015-04-20 15:59:13 +00:00
Cillian de Róiste
001ea3b455 xf86_input_wacom: update from 0.28.0 to 0.29.0 2015-04-20 14:51:38 +02:00
Eelco Dolstra
e229dbdb4e systemd: Drop dependency on sysvtools 2015-04-20 11:34:00 +02:00
Eelco Dolstra
888c7b40fe Revert "systemd: Drop dependency on sysvtools" 
This reverts commit 51fe214218. It was
intended for the staging branch.
 2015-04-20 11:33:28 +02:00
Eelco Dolstra
51fe214218 systemd: Drop dependency on sysvtools 2015-04-20 11:32:28 +02:00
Tobias Geerinckx-Rice
63727ffcb2 kexec-tools 2.0.4 -> 2.0.9 2015-04-19 03:45:58 +02:00
Spencer Whitt
165456bba2 command-line-tools: Update broken URL and packages 
Close #7452.
 2015-04-18 22:55:43 +02:00
Austin Seipp
003f5a87b3 nixpkgs: add trace-cmd 2.5.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-18 14:45:47 -05:00
William A. Kennington III
c6234ad07b kernel: 3.4.106 -> 3.4.107 2015-04-17 16:55:14 -07:00
Jookia
98d77cd1a5 Fixed zImage installation when building Linux. 
When building kernels outputting a zImage, the zImage wasn't correctly copied in
to the installation. This broke the build process entirely, at least on my ARM
machine.
 2015-04-16 22:00:58 -04:00
Tobias Geerinckx-Rice
2123be342d mcelog 1.0pre-7fa9981 -> 114 2015-04-17 00:46:22 +02:00
Tobias Geerinckx-Rice
487b200ea1 util-linux: ddate was removed in 2.23 2015-04-16 06:29:11 +02:00
William A. Kennington III
b46dae268a grsec_path: Update patch 2015-04-15 16:22:42 -07:00
William A. Kennington III
0fd4774781 kernel: 3.14.37 -> 3.14.38 2015-04-15 16:22:42 -07:00
William A. Kennington III
2ded7833ed kernel: 3.19.3 -> 3.19.4 2015-04-15 16:22:42 -07:00
William A. Kennington III
44dcac2e2b kernel: 3.10.73 -> 3.10.74 2015-04-15 16:22:42 -07:00
Austin Seipp
2d8cfe76a9 Merge pull request #7186 from arno01/checksecfix 
checksec: use binutils instead of elfutils
 2015-04-13 17:12:41 -05:00
Shea Levy
114ffa0d6c Oops, forgot to update the hash 2015-04-12 19:23:35 -04:00
Shea Levy
e01c96d14c Add linux 4.0 
Untested yet, my build machine is too slow
 2015-04-12 19:17:53 -04:00
Austin Seipp
627da7cb22 nixpkgs: libcgroup adopt, bump 0.38 -> 0.41 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-11 15:22:52 -05:00
Arseniy Seroka
06a24b12b2 Merge pull request #7321 from AndersonTorres/alsaUtils 
AlsaUtils: 1.0.28 -> 1.0.29
 2015-04-11 23:02:40 +03:00
AndersonTorres
27e46441fa AlsaUtils: 1.0.28 -> 1.0.29 2015-04-11 15:10:35 -03:00
William A. Kennington III
c1f586e275 kernel: 3.12.39 -> 3.12.40 2015-04-10 23:23:53 -07:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
William A. Kennington III
ef03b0ffde zfs_git: 2015-04-03 -> 2015-04-08 2015-04-09 13:21:46 -07:00
William A. Kennington III
d8bf90c8a0 zfs: 0.6.3 -> 0.6.4 2015-04-09 13:21:46 -07:00
William A. Kennington III
983845d78a spl_git: 2015-04-03 -> 2015-04-08 2015-04-09 13:21:46 -07:00
William A. Kennington III
758c8e5c5d spl: 0.6.3 -> 0.6.4 2015-04-09 13:21:46 -07:00
Nikolay Amiantov
285d64d2f0 kernel: add patch to fix btrfs deadlocks to affected kernels 2015-04-08 20:49:12 +03:00
William A. Kennington III
6ffd44c4c3 nvidia: 346.47 -> 346.59 2015-04-07 13:24:55 -07:00
William A. Kennington III
487e4b13db kbd: Fix missing patch 2015-04-07 11:45:28 -07:00
William A. Kennington III
265ffd8b34 kbd: Fix file descriptor issue with the console 2015-04-07 11:44:33 -07:00
Domen Kožar
46f4e26154 Merge pull request #7233 from joachifm/apparmor-perl 
apparmor: perl support
 2015-04-07 11:54:49 +02:00
Joachim Fasting
d3ea6abf0e libapparmor: build perl bindings 
There are still a few utils which use Perl, though most have been ported to
Python. Note that SWIG v2 is required to avoid the `error: 'bool' undeclared`
build failure with Perl >=5.16 [1].

[1]: 4305a3cef9
 2015-04-07 11:05:54 +02:00
Joachim Fasting
38dc021b16 apparmor: use base32 digest 2015-04-07 10:21:40 +02:00
William A. Kennington III
22bb53dfe2 linux-testing: 4.0-rc6 -> 4.0-rc7 2015-04-06 20:12:08 -07:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Ricardo M. Correia
6566738b29 grsecurity: Update stable and test patches 
stable: 3.1-3.14.37-201503270048 -> 3.1-3.14.37-201504051405
test:   3.1-3.19.3-201503270049  -> 3.1-3.19.3-201504021826
 2015-04-06 18:26:05 +02:00
Tobias Geerinckx-Rice
8a2deb7abe linux: disable UEVENT_HELPER by default on versions >= 3.15 2015-04-06 14:00:03 +02:00
Michael Raskin
3ba3c1f25d libjpeg needs to be propagated build input of v4l 2015-04-06 08:27:23 +03:00
Nikolay Amiantov
7626674ae0 bbswitch: maintain, fix (transient?) hash failure 2015-04-06 02:58:30 +03:00
William A. Kennington III
181248b2a2 Merge pull request #7176 from codyopel/v4l 
v4l-util: refactor & 1.0.0 -> 1.6.2 (libv4l)
 2015-04-05 14:58:50 -07:00
codyopel
466cb22bcd v4l-util: refactor & 1.0.0 -> 1.6.2 (libv4l) 
+ added missing dependencies (alsa, libXll & qt5)
+ added fixes to make sure unnecessary features are disabled for libv4l
 2015-04-05 16:23:37 -04:00
Andrey Arapov
96063873e2 checksec: use binutils instead of elfutils 
readelf which makes most of checks should come from binutils package instead of elfutils

E.g. the PIE check from checksec, different readelf gives different result:
(elfutils)
$ /nix/store/rgrji20513g19ci0sa6jydm86gpf4j42-elfutils-0.158/bin/readelf -d /nix/store/q1sbn93v4k3166s091s9biygv9srv8qa-nginx-1.6.2/bin/nginx
2>/dev/null |grep -q '(DEBUG)' ; echo $?
1

(binutils)
$ /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/readelf -d /nix/store/q1sbn93v4k3166s091s9biygv9srv8qa-nginx-1.6.2/bin/nginx
2>/dev/null | grep -q '(DEBUG)' ; echo $?
0
 2015-04-05 21:13:26 +02:00
Michael Raskin
93bf2f8ba9 Update firejail 2015-04-05 20:27:25 +03:00
Nikolay Amiantov
8220246beb bbswitch: add patch to fix Lenovo t440p 2015-04-05 16:12:34 +03:00
William A. Kennington III
8c330acec8 zfs_git: 2015-03-25 -> 2015-04-03 2015-04-04 20:12:38 -07:00
William A. Kennington III
f64ddc181c spl_git: 2015-03-25 -> 2015-04-03 2015-04-04 20:11:08 -07:00
William A. Kennington III
bfe79e4b9a kernel: 3.18.10 -> 3.18.11 2015-04-04 19:47:21 -07:00
William A. Kennington III
c0cb4e1ef7 nixos/nvidia: Add a temporary hack to support kernel 4.0 2015-04-03 21:53:34 -07:00
William A. Kennington III
18c9619021 nvidia: Add beta driver 2015-04-03 21:53:12 -07:00
Austin Seipp
d61561e381 nixpkgs: pax-utils 1.0.2 -> 1.0.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-02 16:27:52 -05:00
Austin Seipp
1b338edc80 nixpkgs: musl 1.1.7 -> 1.1.8 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-02 16:27:52 -05:00
William A. Kennington III
04e39bdb5c kbd: 1.15.3 -> 2.0.2 2015-04-01 18:36:31 -07:00
William A. Kennington III
e05b68ed05 More cleanups of sw/sbin 2015-04-01 14:26:22 -07:00
William A. Kennington III
ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
aszlig
8664aea63d
Revert "mdadm: 3.3 -> 3.3.2". 
This reverts commit 7719f7f23b, again!

It prevents systems from booting, for two reasons:

  * The initrd size is going to explode, but I think this is not the
    REAL issue. We had that in 666cf99 already, which reverted this
    update already.
  * Another reason I don't yet know, which is the REAL issue. We need to
    investigate and fix that before attempting another update.

Because of that I've also added a small comment before the src attribute
to prevent further updates like this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-04-01 17:59:09 +02:00
William A. Kennington III
5bf407ada4 linux-testing: 4.0-rc4 -> 4.0-rc6 2015-03-31 14:28:42 -07:00
lethalman
fed2cf85ec Merge pull request #7065 from pmahoney/skarnet-2015-03-28 
update s6, execline, other skarnet.org
 2015-03-30 17:57:41 +02:00
Arseniy Seroka
c1d5eee053 Merge pull request #7071 from oxij/conky-options 
conky: add lua-imlib2 and lua-cairo support, add more options, change defaults
 2015-03-30 17:36:38 +03:00
William A. Kennington III
c9bbf2228f Merge pull request #7069 from taktoa/master 
Fixed grsecurity path patch for testing (3.19)
 2015-03-30 02:36:34 -07:00
Jan Malakhovski
8591b7b48c conky: add lua-imlib2 and lua-cairo support, add more options, rename old ones so that they would conform to a common standard, make the defaults for a "normal desktop user" 2015-03-29 23:23:29 +00:00
William A. Kennington III
fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Domen Kožar
c31f1d99a5 fix linux 3.2/3.4 builds 2015-03-29 21:41:05 +02:00
Remy Goldschmidt
d567e12eb7 Fix grsec-path.patch (2) 2015-03-29 14:26:11 -04:00
Remy Goldschmidt
d68e248418 Fixed grsec-path.patch 2015-03-29 14:26:00 -04:00
Nikolay Amiantov
fb8ed6efd4 ocz-toolbox: remove (obsoleted by SSD Guru) 2015-03-29 13:05:28 +03:00
Nikolay Amiantov
f0c54d671a android-udev-rules: update 2015-03-29 13:05:28 +03:00