Commit graph

9213 commits

Author SHA1 Message Date
Jan Tojnar 65e6d80ecd
Merge pull request #53425 from dtzWill/update/fwupd-1.2.3
fwupd: 1.2.1 -> 1.2.3

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2019-01-31 23:22:38 +01:00
markuskowa c3065c55d4
Merge pull request #54879 from markuskowa/upd-rdma-core
rdma-core: 21 -> 22
2019-01-31 21:57:24 +01:00
Joachim F bc84a22989
Merge pull request #54977 from teto/kernel_fix
linux: (re)take into account extraConfig
2019-01-31 19:46:11 +00:00
Tim Steinbach 705207ec9b
linux: 4.20.5 -> 4.20.6 2019-01-31 07:19:07 -05:00
Tim Steinbach e4c1ce97c3
linux: 4.19.18 -> 4.19.19 2019-01-31 07:18:36 -05:00
Tim Steinbach f623daca21
linux: 4.14.96 -> 4.14.97 2019-01-31 07:18:23 -05:00
Tim Steinbach 468b6cea72
linux: 4.9.153 -> 4.9.154 2019-01-31 07:17:38 -05:00
Matthieu Coudron a5a796222b linux: (re)take into account extraConfig
PR #42838 wrongly started to ignore extraConfig. This fixes that.
2019-01-31 13:34:42 +09:00
Jörg Thalheim 73fda89c7c
Merge pull request #54258 from aij/zfs
zfsUnstable: 0.8.0-rc2 -> 0.8.0-rc3
2019-01-30 15:07:25 +00:00
Vladimír Čunát 79a7cd6c55
syslinux: fix build with new binutils
Also fix the URL of the other patch.
2019-01-29 22:18:49 +01:00
Silvan Mosberger 96c9575b3e
Merge pull request #54769 from tadeokondrak/update-libratbag
libratbag: 0.9.903 -> 0.9.904
2019-01-29 21:53:49 +01:00
Will Dietz d5c660c9dd iwd: don't use '/usr' prefix, prefer placeholder over quote-and-pray 2019-01-28 21:41:23 -06:00
Tadeo Kondrak db60e251b7
piper: 0.2.902 -> 0.2.903 2019-01-28 16:18:49 -07:00
Markus Kowalewski ef729e46d0
rdma-core: 21 -> 22 2019-01-28 16:05:10 +01:00
Silvan Mosberger 51d2eed83b
Merge pull request #42838 from teto/kernel_autoconf
[RFC] add ability to merge structured configs
2019-01-28 10:38:00 +01:00
Tadeo Kondrak d80651d5d9
libratbag: 0.9.903 -> 0.9.904 2019-01-28 01:04:03 -07:00
Tim Steinbach e1ddb90ca8
linux: 4.20-rc4 -> 4.20-rc5 2019-01-27 20:56:23 -05:00
Edmund Wu da0fbf4dd7
linux_testing_bcachefs: 4.18.2018.10.12 -> 4.20.2019.01.23 2019-01-27 20:46:55 -05:00
Matthieu Coudron 7aacbdb898 linux: convert hardened-config to a structured one 2019-01-28 09:07:24 +09:00
Matthieu Coudron 3bb7b3f02e linux: ability to merge structured configs
This should make the composability of kernel configurations more straigthforward.

- now distinguish freeform options from tristate ones
- will look for a structured config in kernelPatches too
one can now access the structuredConfig from a kernel via linux_test.configfile.structuredConfig
in order to reinject it into another kernel, no need to rewrite the config from scratch

The following merge strategies are used in case of conflict:
-- freeform items must be equal or they conflict (mergeEqualOption)
-- for tristate (y/m/n) entries, I use the mergeAnswer strategy which takes the best available value, "best" being defined by the user (by default "y" > "m" > "n", e.g. if one entry is both marked "y" and "n", "y" wins)
-- if one item is both marked optional/mandatory, mandatory wins (mergeFalseByDefault)
2019-01-28 09:06:33 +09:00
Jan Tojnar dd06999e32
fwupd: fix installed tests 2019-01-28 00:15:00 +01:00
Tim Steinbach 39fdfd0eb1
linux: 4.20.4 -> 4.20.5 2019-01-27 16:12:13 -05:00
Tim Steinbach 4ab5604c85
linux: 4.19.17 -> 4.19.18 2019-01-27 16:12:13 -05:00
Tim Steinbach 19505bb8d1
linux: 4.14.95 -> 4.14.96 2019-01-27 16:12:12 -05:00
Tim Steinbach 4606793349
linux: 4.9.152 -> 4.9.153 2019-01-27 16:12:12 -05:00
Tim Steinbach 6df6bb42b5
linux: 4.4.171 -> 4.4.172 2019-01-27 16:12:12 -05:00
Will Dietz 7dd30dd64b
fwupd: put plugins in "out", restore "lib" output w/o cycle 2019-01-27 21:26:43 +01:00
Will Dietz 55fa570046
fwupd: blacklist test plugin by default
Don't add the testing "webcam" device,
which is unexpected to see when querying
what devices fwupd believes exist :).

Won't change behavior for anyone defining
the blacklistPlugin option already,
but doesn't seem worth making more complicated.
2019-01-27 21:26:42 +01:00
Will Dietz 461699607e
fwupd: 1.2.2 -> 1.2.3
Drop lib output to avoid cycle.
2019-01-27 21:26:42 +01:00
Will Dietz 022c0165c2
Merge pull request #53907 from dtzWill/update/bcc-0.8.0
bcc: 0.7.0 -> 0.8.0
2019-01-27 13:36:03 -06:00
Will Dietz f34e604cac
Merge pull request #54059 from dtzWill/update/fwts-19.01.00
fwts: 18.12.00 -> 19.01.00
2019-01-27 13:33:51 -06:00
Matthew Bauer 92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Tim Steinbach 43c6a83041
conky: journal support 2019-01-26 22:14:10 -05:00
Jörg Thalheim ba34ffc665
Merge pull request #54619 from Mic92/remove-wkennington
treewide: remove wkennington as maintainer
2019-01-26 23:37:27 +00:00
Vladimír Čunát 2c226107cb
systemd-cryptsetup-generator: fixup linkage
It got broken by 74a64a8a6 #53483.
But IMO it's *this* expression that was written in a too fragile way.
2019-01-26 14:16:56 +01:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Tim Steinbach 3da56c7844
conky: 1.11.1 -> 1.11.2 2019-01-25 22:57:53 -05:00
Joachim F f6414428ed
Merge pull request #53511 from joachifm/kernel-32bit-emu-feature-flag
linux: flag to indicate 32bit emulation support
2019-01-25 14:13:45 +00:00
Will Dietz 68d09065ef
Merge pull request #54440 from dtzWill/update/musl-1.1.21
musl: 1.1.20 -> 1.1.21
2019-01-24 07:56:12 -06:00
Tim Steinbach 8ee43e01fa
linux: 4.9.151 -> 4.9.152 2019-01-23 07:10:45 -05:00
Tim Steinbach 6da5e2d45f
linux: 4.20.3 -> 4.20.4 2019-01-23 07:10:35 -05:00
Tim Steinbach 1b8beae40b
linux: 4.19.16 -> 4.19.17 2019-01-23 07:10:27 -05:00
Tim Steinbach 5f0a4ee69f
linux: 4.14.94 -> 4.14.95 2019-01-23 07:10:18 -05:00
Cray Elliott 9b055427f5 alsaLib: 1.1.7 -> 1.1.8
also remove a patch that is now obsolete
2019-01-22 13:00:17 -08:00
Vladimír Čunát 3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Will Dietz 0450d28a1e musl: 1.1.20 -> 1.1.21
https://www.openwall.com/lists/musl/2019/01/21/8

\o/
2019-01-21 16:10:36 -06:00
Tim Steinbach 538ce21fe8
linux: 5.0-rc2 -> 5.0-rc3 2019-01-21 08:14:14 -05:00
Tim Steinbach 8f1b27401c
kernelHeaders: 4.18.3 -> 4.19.16 2019-01-20 14:21:25 -05:00
Frederik Rietdijk ca2edf79f7 Merge master into staging-next 2019-01-20 18:22:17 +01:00
markuskowa eebeb363da
Merge pull request #54250 from r-ryantm/auto-update/alsa-utils
alsaUtils: 1.1.7 -> 1.1.8
2019-01-20 16:03:48 +01:00
Vladimír Čunát 3fa77297b5
linux: avoid memory hotplug support on most platforms
It broke i686 build, and it's probably not worth it on others, too.
/cc #54095 e63414078a.
2019-01-19 19:22:02 +01:00
Vladimír Čunát 23eb5e846d
Merge #54095: linux: enable memory hotplug support 2019-01-19 16:26:01 +01:00
Frederik Rietdijk d531da6f8a
Merge pull request #54094 from rnhmjoj/shell
treewide: use ${stdenv.shell} instead of /bin/sh where possible
2019-01-19 14:15:51 +01:00
Ivan Jager 1f2a3fe040 zfsUnstable: Fetch source by tag and patch by hash. 2019-01-19 06:22:24 -06:00
Frederik Rietdijk f8b45e2d84 Merge staging-next into staging 2019-01-19 09:24:01 +01:00
Edmund Wu aaff01ecbf nvidia_x11: 415.25 -> 415.27 2019-01-19 09:22:10 +01:00
Matthew Bauer 1c02863317
busybox: give priority of 10
Lots of packages provide this. Usually we don't want the busybox version.
2019-01-18 18:16:37 -05:00
Jörg Thalheim a73ad4615a
android-udev-rules: 20181031 -> 20190114 2019-01-18 13:27:38 +00:00
Aaron Andersen e63414078a Enable memory hotplug support 2019-01-18 13:17:33 +00:00
Jörg Thalheim f1d7cc678b
zfs: mark as broken on 4.20 2019-01-18 08:53:43 +00:00
R. RyanTM d04a50da7c atop: 2.3.0 -> 2.4.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/atop/versions
2019-01-17 20:35:46 -08:00
Ivan Jager d1e838ed23 zfsUnstable: 0.8.0-rc2 -> 0.8.0-rc3 2019-01-17 22:08:15 -06:00
R. RyanTM 0e1a60bef4 alsaUtils: 1.1.7 -> 1.1.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/alsa-utils/versions
2019-01-17 19:52:35 -08:00
Jan Tojnar af3758e0b5
Merge branch 'master' into staging 2019-01-17 21:49:16 +01:00
Danylo Hlynskyi 23a13b562c
kernel config: add support for CONFIG_SQUASHFS_ZSTD (#52967)
Also, allow override `make-squashfs.nix` compression parameters.
2019-01-17 15:24:44 +02:00
Tim Steinbach bae1a0f825
linux: 4.20.2 -> 4.20.3 2019-01-17 06:56:20 -05:00
Tim Steinbach b4ab6ffb7f
linux: 4.19.15 -> 4.19.16 2019-01-17 06:56:08 -05:00
Tim Steinbach 6ad56550e4
linux: 4.14.93 -> 4.14.94 2019-01-17 06:55:59 -05:00
Tim Steinbach 1e62588421
linux: 4.9.150 -> 4.9.151 2019-01-17 06:55:42 -05:00
Tim Steinbach 2833865206
linux: 4.4.170 -> 4.4.171 2019-01-17 06:55:31 -05:00
Frederik Rietdijk 9cfae76fc5 Merge staging-next into staging 2019-01-17 09:21:29 +01:00
Will Dietz 8238e19c2f iwd: 0.12 -> 0.14
https://git.kernel.org/pub/scm/network/wireless/iwd.git/diff/ChangeLog?h=0.13
https://git.kernel.org/pub/scm/network/wireless/iwd.git/diff/ChangeLog?h=0.14
2019-01-16 17:16:42 -06:00
Jörg Thalheim bd3957ddc9
Merge pull request #53902 from dtzWill/update/cpupower-fix-for-kernel-5
cpupower: fix w/linux 5, rework a bit
2019-01-16 20:40:08 +00:00
rnhmjoj bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Will Dietz b147fa1cbc fwts: 18.12.00 -> 19.01.00
https://wiki.ubuntu.com/FirmwareTestSuite/ReleaseNotes/19.01.00
2019-01-16 08:55:36 -06:00
Frederik Rietdijk 42d276c6b8 Merge staging-next into staging 2019-01-15 16:59:03 +01:00
Tim Steinbach 429166fea2
linux: 5.0-rc1 -> 5.0-rc2 2019-01-14 09:24:39 -05:00
Frederik Rietdijk c92eccf629 nvidia_x11: fixup name of stable_415 2019-01-14 09:57:29 +01:00
Will Dietz 91f2eb73ae bcc: 0.7.0 -> 0.8.0 2019-01-13 17:35:44 -06:00
Will Dietz f094f1d07a
Merge pull request #53704 from dtzWill/update/utillinux-2.33.1
utillinux; 2.33 -> 2.33.1
2019-01-13 17:21:37 -06:00
Will Dietz 24777fd502 cpupower: push 'dir' suffix into generation func
bit silly for the odd-man-out "bash_completion_dir"
but IMO easier to read.
2019-01-13 17:12:21 -06:00
Will Dietz f4a765d4b3 cpupower: fix w/5.0-rc1 (completion dir), rework a bit 2019-01-13 17:12:19 -06:00
Tim Steinbach bddaa4bc16
linux: 4.20.1 -> 4.20.2 2019-01-13 15:50:00 -05:00
Tim Steinbach bbc1f0c452
linux: 4.19.14 -> 4.19.15 2019-01-13 15:50:00 -05:00
Tim Steinbach 0a8b109e81
linux: 4.14.92 -> 4.14.93 2019-01-13 15:49:59 -05:00
Tim Steinbach 887fd04623
linux: 4.9.149 -> 4.9.150 2019-01-13 15:49:59 -05:00
Tim Steinbach c88c0538ea
linux: 4.4.169 -> 4.4.170 2019-01-13 15:49:59 -05:00
Frederik Rietdijk bb9581cd88 Merge staging-next into staging 2019-01-13 14:46:43 +01:00
Edmund Wu ee32fa9b0d nvidia_x11: 410.78 -> 415.25 2019-01-13 09:37:06 +01:00
Vladimír Čunát bde8efe792
Merge branch 'master' into staging-next
A couple thousand rebuilds have accumulated on master.
2019-01-12 12:19:34 +01:00
Silvan Mosberger 084e008a2a
Merge pull request #53743 from baracoder/add-nvidia-maintainer
linuxPackages.nvidia_x11*: Add maintainer: baracoder
2019-01-11 19:09:40 +01:00
Pierre Bourdon b26c824da3
Revert "Revert "Revert "linux-hardened: Disable GCC_PLUGIN_RANDSTRUCT"""
The issue with out-of-tree modules has been addressed and the feature
should now be good to re-enable again.

This reverts commit 865f7a14b4.
2019-01-11 12:35:16 +01:00
Pierre Bourdon 1b9bf8fa75
kernel: make the RANDSTRUCT seed deterministic 2019-01-11 12:35:16 +01:00
Michael Weiss 9b17ee61b8
nvme-cli: 1.6 -> 1.7 2019-01-11 12:23:49 +01:00
Herman Fries ca1f092fe9 linuxPackages.nvidia_x11*: Add maintainer: baracoder
I bought some recent nVidia hardware, so I am stuck with it for a couple
of years and because of this, I have an interest in a working nVidia driver.
2019-01-11 11:36:34 +01:00
Jörg Thalheim 5ef8b40d4d
sysdig: enable 4.20 2019-01-11 10:34:34 +00:00
Franz Pletz a246144a01
Merge pull request #53485 from dtzWill/update/powertop-2.10
powertop: 2.9 -> 2.10
2019-01-11 02:35:36 +00:00
Cray Elliott 40ce44f675 alsaLib: add upstream pcm interval patch
fixes audio for Audacious, Old School Runescape (yet to be packaged),
and a few other packages, see the following issues

https://bugs.archlinux.org/task/60591?project=1&string=alsa-lib

https://bugzilla.redhat.com/show_bug.cgi?id=1640602

http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=b420056604f06117c967b65d43d01536c5ffcbc9
2019-01-10 12:41:34 -08:00
Franz Pletz 74a64a8a61
systemd: 239 -> 239.20190110
Fixes CVE-2018-16864 & CVE-2018-16865 (journald stack clash). Fixes #53755.

Also updates the debian patches to fix CVE-2018-15686. Fixes #52250.
2019-01-10 20:54:12 +01:00
Franz Pletz 237deba4e7
Merge remote-tracking branch 'origin/master' into staging 2019-01-10 16:00:34 +01:00
Vladimír Čunát 287144e342
Merge branch 'master' into staging-next 2019-01-10 13:07:21 +01:00
markuskowa eadb304a5f
Merge pull request #53604 from r-ryantm/auto-update/nmon
nmon: 16g -> 16h
2019-01-09 22:50:56 +01:00
Tim Steinbach 20f9b5d10a
linux: 4.19.13 -> 4.19.14 2019-01-09 12:10:11 -05:00
Will Dietz b836b43078 utillinux; 2.33 -> 2.33.1
https://www.kernel.org/pub/linux/utils/util-linux/v2.33/v2.33.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.33/v2.33.1-ChangeLog
2019-01-09 11:02:18 -06:00
Tim Steinbach 39173bff87
linux: 4.20 -> 4.20.1 2019-01-09 11:59:35 -05:00
Jörg Thalheim 2479e9ea0e
Merge pull request #53699 from makefu/pkgs/exfat-nofuse/update
exfat-nofuse: fix build for 4.18
2019-01-09 16:33:40 +00:00
Tim Steinbach d55b3c9bf0
linux: 4.14.91 -> 4.14.92 2019-01-09 11:24:45 -05:00
Tim Steinbach ec3e81beaf
linux: 4.9.148 -> 4.9.149 2019-01-09 11:03:10 -05:00
makefu 3034023976
exfat-nofuse: fix build for 4.18
additionally we use the PR 137 instead of the patch files from AUR.
This avoids changes in source files and pins the patch to exactly what we want
It also removes one fetchpatch call
2019-01-09 15:13:54 +01:00
Jörg Thalheim e6ca0fb71b
Merge pull request #53696 from makefu/pkgs/exfat-nofuse/update
exfat-nofuse: unbreak for 4.18 and 4.20
2019-01-09 12:01:24 +00:00
makefu eac6725843
exfat-nofuse: unbreak for 4.18 and 4.20 2019-01-09 11:37:20 +01:00
Bastian Köcher a90fc6d3ef linux: Adds patch for fixing wifi on raspberry pi 2019-01-09 11:18:09 +01:00
R. RyanTM 1db3185eea lxc: 3.0.3 -> 3.1.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lxc/versions
2019-01-07 16:19:26 -08:00
R. RyanTM 1dcc1f250b nmon: 16g -> 16h
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nmon/versions
2019-01-07 13:48:55 -08:00
Michael Weiss ca91a80084
iproute: 4.19.0 -> 4.20.0
"Update to iproute2 utility to support new features in Linux 4.20.
This release is mostly small fixes but there are several changes
related to ip neigh support for offloaded entries." [0]

File changes:
+share/man/man8/tc-taprio.8.gz

nix path-info -S:
4.19.0 42681224
4.20.0 42714224

[0]: https://www.spinics.net/lists/netdev/msg543288.html
2019-01-07 22:45:14 +01:00
Joachim Fasting 865f7a14b4
Revert "Revert "linux-hardened: Disable GCC_PLUGIN_RANDSTRUCT""
This reverts commit c68e8b05f0.

RANDSTRUCT currently fails to work with out-of-tree modules, as
evinced by
c68e8b05f0 (commitcomment-31850284)
and https://github.com/NixOS/nixpkgs/issues/53522.

Specifically, loading out-of-tree modules results in modsym version
mismatches, as in
   spl: version magic '4.20.0 SMP mod_unload modversions RANDSTRUCT_PLUGIN
from the issue above.

A working hypothesis is that the randstruct seed is not carried over when
building out-of-tree modules but more investigation is needed here.

Closes https://github.com/NixOS/nixpkgs/issues/53522
2019-01-07 19:50:12 +01:00
Tim Steinbach 97aba92bcd
linux: 4.20-rc7 -> 5.0-rc1 2019-01-07 07:57:38 -05:00
Joachim Fasting 6eea9ac868
linux: add feature flag to indicate support for 32bit emulation
Motivated by the need to warn users trying to build configurations that depend
on being able to run 32bit apps on 64bit kernels.
2019-01-06 19:52:03 +01:00
Vladimír Čunát 9ee8cf5177
linuxPackages.nvidia_x11*: unmaintain
I now no longer use an nvidia card commonly, so it would be harder for
me to test at least a bit.  And I'm overcommited anyway.
Hopefully someone else can be found.
2019-01-06 14:59:03 +01:00
Vladimír Čunát 10a12194e3
Merge #53490: fix treewide linking errors after #51770
Issue #53001.  This might not be all of them, but let's not wait.
2019-01-06 12:14:52 +01:00
Vladimír Čunát 68c3097b96
rtkit: link with librt explicitly 2019-01-06 12:12:49 +01:00
Will Dietz 7200eff868 powertop: 2.9 -> 2.10
musl patch still needed :)
2019-01-06 02:58:57 -06:00
Frederik Rietdijk a4250d1478 Merge staging-next into staging 2019-01-06 09:48:31 +01:00
Frederik Rietdijk e5381cdece Merge master into staging-next 2019-01-06 09:36:23 +01:00
Will Dietz 2d79465173
Merge pull request #51700 from dtzWill/update/i2c-tools-4.1
i2c-tools: 4.0 -> 4.1
2019-01-05 13:46:26 -06:00
Vladimír Čunát d84a33d85b
Merge branch 'master' into staging-next
A few more rebuilds (~1k on x86_64-linux).
2019-01-05 15:02:04 +01:00
R. RyanTM df834ee56d sysstat: 12.1.1 -> 12.1.2 (#52675)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sysstat/versions
2019-01-05 14:47:25 +01:00
Joachim Fasting d62086e6fc
hardened-config: allow slub/slab free poisoning 2019-01-05 14:07:36 +01:00
Joachim Fasting 11840f5c70
hardened-config: explain HARDENED_USERCOPY_FALLBACK n 2019-01-05 14:07:36 +01:00
Joachim Fasting dfd77a046d
hardened-config: ensure STRICT_KERNEL_RWX
This is y in the default config, but enable it explicitly here to catch
situations where it has been disabled (explicitly or implicitly).
2019-01-05 14:07:35 +01:00
Joachim Fasting 1801aad7b8
hardened-config: clarify MODIFY_LDT_SYSCALL
This likely never worked; MODIFY_LDT_SYSCALL depends on EXPERT; enabling
EXPERT however seems to introduce quite a few changes that would need to be
properly vetted.

The version guard is unnecessary, however, as this config has been supported
since 4.3.
2019-01-05 14:07:34 +01:00
Joachim Fasting abc8ed3fca
hardened-config: clarify readonly LSM hooks config
SECURITY_WRITABLE_HOOKS is implicitly controlled by SECURITY_SELINUX_DISABLE;
explicitly unsetting results in an error because the configfile builder fails
to detect that it has in fact been unset (reporting it as an unused option).
For now, leave WRITABLE_HOOKS as an "optional" config for documentation
purposes.
2019-01-05 14:07:33 +01:00
Joachim Fasting c68e8b05f0
Revert "linux-hardened: Disable GCC_PLUGIN_RANDSTRUCT"
This reverts commit 5dda1324be.

Presumably this was done to work around build errors or something but it
works fine now.
2019-01-05 14:07:21 +01:00
Frederik Rietdijk 60a3973a55 Merge staging-next into staging 2019-01-05 10:15:00 +01:00
Michael Weiss e7e18206dd
fuse: 2.9.8 -> 2.9.9 2019-01-05 02:26:02 +01:00
Joachim F 893c51bda8
Merge pull request #53369 from delroth/kernel-hardening
Re-add security features based on GCC plugins in 4.18+ hardened kernels
2019-01-04 21:49:53 +00:00
Pierre Bourdon 0f7ca26a48
kernel/hardened-config.nix: add STACKLEAK plugin on 4.20+ 2019-01-04 22:24:50 +01:00
Pierre Bourdon 9dc0d94896
kernel/hardened-config.nix: re-enable GCC plugins 2019-01-04 22:24:50 +01:00
Pierre Bourdon c789f642f0
kernel/generic.nix: provide required dependencies for GCC plugins builds 2019-01-04 22:24:50 +01:00
Frederik Rietdijk 9618abe87c Merge master into staging-next 2019-01-04 21:13:19 +01:00
Lengyel Balazs f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Dominik Xaver Hörl b7967e9dc4 dbus-broker: 13 -> 17 2019-01-04 14:36:30 +01:00
Benno Fünfstück 7817aa3641
linux-rpi: set correct hydraPlatforms (#53325) 2019-01-03 22:42:14 +01:00
Jörg Thalheim 31682848cb
android-udev-rules: 20180112 -> 20181031 2019-01-03 20:56:39 +01:00
Frederik Rietdijk 092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
Joachim F 88c516dd55
Merge pull request #52606 from lopsided98/linux-hardkernel-update
linux_hardkernel_4_14: 4.14.85-152 -> 4.14.87-153
2019-01-02 18:16:47 +00:00
Vladimír Čunát 70bff06140
Merge branch 'master' into staging 2019-01-02 17:19:23 +01:00
David Guibert d8e907ba18 conky: 1.11.0 -> 1.11.1 (#53157)
This fixes #52797.
2019-01-02 09:54:22 +01:00
Jan Tojnar b2b921bdca
Merge pull request #53149 from jtojnar/qrencode-cleanup
qrencode: merge with libqrencode
2019-01-02 02:18:22 +01:00
R. RyanTM 46e7ce0526 lxc: 3.0.2 -> 3.0.3 (#52239)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lxc/versions
2019-01-01 20:35:37 +01:00