William A. Kennington III
5cfe893cc4
Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
...
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
William A. Kennington III
40396584eb
kernel: 4.2 -> 4.2.1
2015-09-23 12:29:59 -07:00
William A. Kennington III
d5c7b265f7
kernel: 4.1.7 -> 4.1.8
2015-09-23 12:29:59 -07:00
William A. Kennington III
97200b7808
kernel: 3.14.52 -> 3.14.53
2015-09-23 12:29:59 -07:00
William A. Kennington III
397f806453
kernel: 3.12.47 -> 3.12.48
2015-09-23 12:29:59 -07:00
William A. Kennington III
284ea9295e
kernel: 3.10.88 -> 3.10.89
2015-09-23 12:29:59 -07:00
Arseniy Seroka
c405f22266
Merge pull request #10016 from cleverca22/master
...
open-iscsi: 2.0-871 -> 2.0-873
2015-09-23 19:56:31 +03:00
michael bishop
efa5b92bfc
open-iscsi: 2.0-871 -> 2.0-873
...
remove the kernel patch, since the package no longer builds the module, its already in the kernel
move it from the kernel function to the main all-packages list
2015-09-23 12:31:41 -03:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
William A. Kennington III
b3075b3087
pam_u2f: 0.0.1 -> 1.0.1
2015-09-22 23:25:55 -07:00
William A. Kennington III
9fbbbd5b68
linux-testing: Update to 4.3.0-rc2
2015-09-21 14:38:49 -07:00
William A. Kennington III
3fcbd5a829
Merge branch 'master.upstream' into staging.upstream
2015-09-20 14:54:53 -07:00
Jude Taylor
8a1b8a5b0a
alias libtool to darwin.cctools on darwin
2015-09-20 13:08:38 -07:00
Charles Strahan
f08fb6e6c7
broadcom-sta: fix build on kernel >= 4.2 ( close #9953 )
...
Also cherry-pick a licensing fix from torvalds/linux@7d3e2eb178
necessary for building broadcom-sta on kernel 4.2.
For more details, see:
https://github.com/longsleep/bcmwl-ubuntu/issues/6
Fixes #9948 .
2015-09-20 08:01:37 +02:00
William A. Kennington III
d9fd037e88
zfs + zfs_git: 0.6.5 -> 0.6.5.1
2015-09-19 15:02:59 -07:00
William A. Kennington III
6e09223627
Merge branch 'master.upstream' into staging.upstream
2015-09-18 17:16:27 -07:00
William A. Kennington III
4a672c87cd
zfs: Add a patch to fix discard data corruption
2015-09-18 14:55:36 -07:00
William A. Kennington III
ee867799b0
cgmanager: 0.37 -> 0.39
2015-09-18 14:52:51 -07:00
William A. Kennington III
24dabdfb98
iproute: 4.1.1 -> 4.2.0
2015-09-18 14:52:50 -07:00
Tobias Geerinckx-Rice
1e593edbf1
autofs: 5.0.8 -> 5.1.1
2015-09-18 05:02:02 +02:00
Jude Taylor
d78936131a
preparation for being able to build xquartz
2015-09-17 16:11:18 -07:00
William A. Kennington III
2d5dd06fbb
audit: 2.4.2 -> 2.4.4
2015-09-17 14:12:38 -07:00
William A. Kennington III
dec8e299f5
nftables: 0.4 -> 0.5
2015-09-17 14:12:38 -07:00
Vladimír Čunát
f2d03ee0d0
Merge #8897 : AppArmor updates
2015-09-17 21:21:44 +02:00
Vladimír Čunát
a418096d6a
Merge branch 'master' into staging
2015-09-17 20:07:20 +02:00
aszlig
389e654e03
systemd: Backport fix for detecting VirtualBox.
...
This is a backport of systemd/systemd@e32886e .
As noted by @ts468 in #9876 , systemd-detect-virt will report KVM if
we're running inside VirtualBox 5.x. Instead of just disabling the
check, this essentially fixes systemd to be able to detect VirtualBox
again.
Tested this against nixos/tests/simple.nix (just to make sure systemd is
still working) and nixos/tests/virtualbox.nix (all tests succeed).
Thanks a lot to @ts468 for catching this and also to @domenkozar for
testing various things concerning that bug.
Fixes #9876 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 16:02:43 +02:00
William A. Kennington III
84505bd36a
grsecurity: Update patches
2015-09-16 13:35:41 -07:00
William A. Kennington III
871baf2278
kernel: 4.1.6 -> 4.1.7
2015-09-16 12:55:36 -07:00
William A. Kennington III
5975687f98
kernel: 3.14.51 -> 3.14.52
2015-09-16 12:55:36 -07:00
William A. Kennington III
72d22e3f4d
kernel: 3.10.87 -> 3.10.88
2015-09-16 12:55:36 -07:00
William A. Kennington III
773b4deb7c
Merge commit 'a6f6c0e' into master.upstream
...
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
William A. Kennington III
8dc7073546
Merge branch 'master.upstream' into staging.upstream
2015-09-15 12:04:41 -07:00
Vladimír Čunát
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a
x11: replace its usage by xlibsWrapper directly
...
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Tobias Geerinckx-Rice
193319ce03
"Parallel Tools" -> Parallels Tools
2015-09-15 08:51:02 +02:00
Mathnerd314
eb7404d97a
all-packages: Use callPackage where possible
2015-09-14 22:27:19 -06:00
Jude Taylor
9be2c355be
remove 3 more outdated impure-deps
2015-09-14 17:54:15 -07:00
Tobias Geerinckx-Rice
133a31f71f
mcelog: 125 -> 126
...
Adds --is-cpu-supported command line option.
2015-09-15 00:17:18 +02:00
Tobias Geerinckx-Rice
cb363c1033
dstat: add python-wifi dependency for --wifi
...
This is limited to kernels with the (legacy) Wireless Extensions,
and supported wireless cards. Also add myself as a maintainer.
CC maintainer @jgeerds
2015-09-14 23:53:21 +02:00
Tomasz Kontusz
135fc6a769
lttng-modules: 2.6.2-1-g7a88f8b -> 2.6.3
...
This also drops the assertion about kernel.version - we don't have
anything older than 3.4 in nixpkgs anyway.
2015-09-14 21:45:37 +02:00
William A. Kennington III
70b6b6a735
dmidecode: 2.12 -> 3.0
2015-09-13 15:55:49 -07:00
Mathnerd314
87012187b2
kmod-debian-aliases: init at 21-1
2015-09-13 10:55:44 +02:00
Jude Taylor
b3b2928ca6
Revert "libsecurity_generic: add El Capitan impure-deps"
...
This reverts commit 557fa59042
2015-09-12 11:59:08 -07:00
Jude Taylor
f7cb16ff9b
Revert "apple-sdk: add El Capitan impure-deps"
...
This reverts commit 3bf5d87f9e
2015-09-12 11:58:59 -07:00
Domen Kožar
54e430a689
blcr: drop support for kernel 3.12
2015-09-12 13:17:01 +02:00
William A. Kennington III
6727f76739
zfs: Update to 0.6.5
2015-09-11 17:45:38 -07:00
William A. Kennington III
9cb93e7966
spl: Update to 0.6.5
2015-09-11 17:45:38 -07:00
Tobias Geerinckx-Rice
5d50acceeb
htop: also touch headers in subdirectories
2015-09-11 05:12:06 +02:00
Tobias Geerinckx-Rice
eb6b290ab3
conntrack_tools: 1.4.2 -> 1.4.3; maintain
2015-09-10 23:01:30 +02:00
Tobias Geerinckx-Rice
c5bd6fff36
mcelog: 124 -> 125
2015-09-10 00:59:07 +02:00
