1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 19:15:39 +00:00
Commit graph

9996 commits

Author SHA1 Message Date
Tim Steinbach dec53994eb
linux: 4.4.175 -> 4.4.176 2019-02-24 11:38:40 -05:00
Frederik Rietdijk c2eac6741b Merge master into staging-next 2019-02-24 09:19:12 +01:00
R. RyanTM 2b7f40ad32 pscircle: 1.1.0 -> 1.3.0 (#52129)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pscircle/versions
2019-02-24 00:59:15 +01:00
Pierre Bourdon 3f0a59314c wpa_supplicant: 2.6 -> 2.7 (#55926) 2019-02-24 00:47:11 +01:00
Ryan Mulligan 8c4ce1a106
Merge pull request #55741 from asymmetric/ledger
nixos/ledger: init
2019-02-22 11:10:32 -08:00
Austin Seipp 3a1f39e1de
kernel: enable pressure stall information on 4.20+
Closes #56207.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-02-22 12:47:37 -06:00
Lorenzo Manacorda 04cb60bc86 ledger-udev-rules: init at unstable-2019-02-13 2019-02-22 19:26:47 +01:00
Edmund Wu 48e66e5184
nvidia_x11: 415.27 -> 418.43 2019-02-22 13:00:19 -05:00
Edmund Wu 9629324536
nvidia_x11_legacy390: 390.87 -> 390.116 2019-02-22 12:58:22 -05:00
Vladimír Čunát 71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Florian Friesdorf fbef5ab82f Remove myself as maintainer from packages
I'm currently not maintaining any packages.
2019-02-22 16:14:13 +01:00
Vladimír Čunát 65c085e8a9
Merge #56010: busybox: 1.29.3 -> 1.30.1
There's a CVE fix inside, so let's not wait for long.
2019-02-22 10:25:24 +01:00
Vladimír Čunát 983890481b
Merge branch 'staging-next'
Just a systemd security patch.
2019-02-22 06:43:10 +01:00
Franz Pletz bd3fdc99e3
Merge pull request #56147 from callahad/linux-kernel-sed
linux: Enable support for Self-Encrypting Drives
2019-02-21 14:02:01 +00:00
Dan Callahan 0ea8c6e3de
linux: Enable support for Self-Encrypting Drives
To quote block/Kconfig:

> Builds Logic for interfacing with Opal enabled controllers.
> Enabling this option enables users to setup/unlock/lock
> Locking ranges for SED devices using the Opal protocol.

Without `BLK_SED_OPAL`, it is impossible to resume from sleep when using
a locked self-encrypting drive.

This configuration option appeared in earlier kernels, but only reached
maturity in 4.14 according to discussion at:

- https://github.com/Drive-Trust-Alliance/sedutil/issues/90 and
- https://github.com/Drive-Trust-Alliance/sedutil/pull/190

This kernel option is enabled in the default kernels shipped with
Fedora, Debian, and other mainstream Linux distributions.
2019-02-21 12:14:47 +00:00
Michael Raskin a059fc7420
Merge pull request #56067 from oxij/tree/fetchurl-boot
treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl`
2019-02-21 09:43:11 +00:00
Cray Elliott da4484c9a6 mwprocapture: 1.2.3950 -> 1.2.4054 2019-02-21 01:11:09 -08:00
Frederik Rietdijk e2cd07b997 Merge staging-next into staging 2019-02-21 07:54:33 +01:00
Frederik Rietdijk c9d8f5235b Merge master into staging-next 2019-02-21 07:53:19 +01:00
Tor Hedin Brønner bba6de611a
Merge pull request #56046 from callahad/bolt
Add and enable Bolt to support Thunderbolt 3 settings in GNOME
2019-02-20 21:43:02 +01:00
Tim Steinbach c627201820
linux: 4.20.10 -> 4.20.11 2019-02-20 09:11:35 -05:00
Tim Steinbach a1cf586d72
linux: 4.19.23 -> 4.19.24 2019-02-20 09:11:25 -05:00
Tim Steinbach 70643f0882
linux: 4.14.101 -> 4.14.102 2019-02-20 09:11:15 -05:00
Tim Steinbach 85733d1f9c
linux: 4.9.158 -> 4.9.159 2019-02-20 09:11:01 -05:00
Tim Steinbach 9deab03a27
linux: 4.4.174 -> 4.4.175 2019-02-20 09:10:48 -05:00
Clemens Fruhwirth 3e7af59243 hostapd: 2.6 -> 2.7 2019-02-20 10:48:00 +01:00
Franz Pletz e94914560b
systemd: 239.20190110 -> 239.20190219
Fix CVE-2019-6454.
2019-02-19 23:22:34 +01:00
Jan Malakhovski a1fec8667d treewide: assemble all fetchurlBoot uses in overrides to fetchurl itself
The only outside-curl uses of `fetchurlBoot` left are `stdenv`
and `apple-source-releases`. The latter one can probably be removed
too, but I can't test it.

Pros:

- Aggregates all behind-the-scenes insanity in a single place.

Cons:

- At the cost of 10 more derivations (but 0 new outpaths).
2019-02-19 20:55:59 +00:00
Dan Callahan c2a1d01a4b
bolt: init at 0.7 2019-02-19 20:54:37 +00:00
Matthew Bauer e3ca9d954e
Merge pull request #56029 from matthewbauer/revert-cctools-bump
Revert cctools bump
2019-02-19 11:44:17 -05:00
Linus Heckemann 688ca701b2
Merge pull request #56043 from mayflower/ossemul
linux: enable SND_OSSEMUL
2019-02-19 17:12:26 +01:00
Vladimír Čunát 024407bf9a
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1505754
2019-02-19 12:11:04 +01:00
Vladimír Čunát bce12effa7
syslinux: fix build with new binutils
Also fix the URL of the other patch.
2019-02-19 12:05:51 +01:00
Vladimír Čunát 555912067f
Revert "syslinux: 2015-11-09 -> 2019-02-07"
This reverts commit 0b49d5dd68 #55500.
I'm sorry, I'm unable to fix the build quickly in other way than
atop the older version.  Certainly feel free to improve the approach.
2019-02-19 12:04:43 +01:00
Vladimír Čunát 424efc7e71
Merge branch 'staging-next' into staging 2019-02-19 11:08:32 +01:00
Vladimír Čunát c721be4008
Merge #55845: linux-hardkernel: 4.14.87-153 -> 4.14.94-155 2019-02-19 09:16:01 +01:00
Tim Steinbach d607715ab3
linux: 5.0-rc6 -> 5.0-rc7
Also remove interpreter truncation patch, no longer needed in package tree.
2019-02-18 21:11:21 -05:00
Matthew Bauer 5464dbe40a cctools: add myself as maintainer 2019-02-18 20:45:35 -05:00
Matthew Bauer 0e78f2bd10 Revert "cctools: bump to latest commit"
This reverts commit ac682e362c.

This broke iOS building on master. Even Xcode 8.2 comes with TAPI
librarises. We need these patches to support those .tbd files.
Eventually we will move to using libtapi directly, but I have not
finished work on this right now.

Unfortunately, this will not have my changes for building cctools with
manpages. We will have to do this update at some later time.
2019-02-18 20:44:19 -05:00
Matthew Bauer b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Will Dietz 8019d4a1c7 busybox: 1.29.3 -> 1.30.1
For changes see https://busybox.net
(most of which are part of 1.30.0).
2019-02-18 13:17:10 -06:00
Linus Heckemann be38a70184 linux: enable SND_OSSEMUL
Fixes #54074
2019-02-18 17:11:37 +01:00
Frederik Rietdijk 815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Jörg Thalheim fdc9cbb793
Merge pull request #51312 from geistesk/usbutils-lsusbpy
usbutils: patch hashbang of lsusb.py
2019-02-17 23:16:40 +00:00
Daiderd Jordan 97c05bda52
darwin.architecture: fix sandbox build
Re-applies bad2db31b7.

This reverts commit f84aef11a4.
2019-02-17 10:11:25 +01:00
Daiderd Jordan cbb03f5564
Merge branch 'master' into staging-next 2019-02-17 10:09:12 +01:00
Daiderd Jordan f84aef11a4
Revert "darwin.architecture: fix sandbox build"
Moving changes to staging, this is a mass-rebuild.

This reverts commit e79278e4cd.
2019-02-17 10:03:26 +01:00
Vladimír Čunát f7f1a2f54e
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
2019-02-17 08:05:24 +01:00
Will Dietz a808baa5e5
Merge pull request #55164 from dtzWill/update/iw-5
iw: 4.14 -> 5.0.1
2019-02-17 00:12:36 -06:00
geistesk 4893aeae7a usbutils: usbutilsFull with Python3 for lsusb.py 2019-02-16 20:53:33 +00:00
Daniel Peebles cc8545fa5e
Merge pull request #55784 from LnL7/darwin-architecture
darwin.architecture: fix sandbox build
2019-02-16 14:47:18 -05:00
Frederik Rietdijk fd48a94b62 Merge staging-next into staging 2019-02-16 09:30:46 +01:00
Frederik Rietdijk 6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
qoli ed76b12e3a linux-hardkernel: 4.14.87-153 -> 4.14.94-155 2019-02-15 10:36:38 -08:00
Tim Steinbach 93e9b53b96
linux: 4.20.8 -> 4.20.10 2019-02-15 10:01:36 -05:00
Tim Steinbach 8c14948343
linux: 4.19.21 -> 4.19.23 2019-02-15 10:01:36 -05:00
Tim Steinbach 7954ec0ffd
linux: 4.14.99 -> 4.14.101 2019-02-15 10:01:36 -05:00
Tim Steinbach 50f518c93f
linux: 4.9.156 -> 4.9.158 2019-02-15 10:01:36 -05:00
Edmund Wu f0b8a113dd linux: allow for interpreter to be truncated
via https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cb5b020a8d38f77209d0472a0fea755299a8ec78
see https://github.com/NixOS/nixpkgs/issues/53672
2019-02-14 21:01:00 -05:00
Edmund Wu 13d1ba3439 Revert "Revert "linux: 4.14.98 -> 4.14.99""
This reverts commit 01d8894c4d.
2019-02-14 21:01:00 -05:00
Daiderd Jordan e79278e4cd
darwin.architecture: fix sandbox build 2019-02-14 21:36:04 +01:00
Graham Christensen ccb3fdbfa3
Merge pull request #55500 from samueldr/update/syslinux
syslinux: 2015-11-09 -> 2019-02-07
2019-02-14 14:36:48 -05:00
Jörg Thalheim 0ac83f0857
Merge pull request #55499 from eadwu/bcachefs/20190209
linux_testing_bcachefs,bcachefs-tools: 20190209
2019-02-14 16:18:05 +00:00
Frederik Rietdijk a25d48cd4f Merge master into staging 2019-02-14 11:35:50 +01:00
Jan Tojnar 606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
Vladimír Čunát 01d8894c4d
Revert "linux: 4.14.98 -> 4.14.99"
This reverts commit 0e1eb30a1d.
It broke the installer tests, e.g. https://hydra.nixos.org/build/88704861
2019-02-13 22:55:36 +01:00
Frederik Rietdijk 8b05b829be Merge staging-next into staging 2019-02-13 13:27:42 +01:00
Frederik Rietdijk 7257dedd7c Merge master into staging-next 2019-02-13 12:33:29 +01:00
markuskowa ac0fd7c426
Merge pull request #55630 from markuskowa/rdma-core
rdma-core: 22 -> 22.1
2019-02-13 10:26:40 +01:00
Tim Steinbach 117eb5725a
linux-libre: 15814 -> 15951 2019-02-12 19:00:16 -05:00
Tim Steinbach d174713a12
linux: 4.20.7 -> 4.20.8 2019-02-12 18:45:31 -05:00
Tim Steinbach c7e17fa49c
linux: 4.19.20 -> 4.19.21 2019-02-12 18:44:55 -05:00
Tim Steinbach 0e1eb30a1d
linux: 4.14.98 -> 4.14.99 2019-02-12 18:44:35 -05:00
Tim Steinbach a629651af2
linux: 4.9.155 -> 4.9.156 2019-02-12 18:44:12 -05:00
Markus Kowalewski 4ce75af3ee
rdma-core: 22 -> 22.1 2019-02-12 10:46:03 +01:00
Samuel Dionne-Riel 8568f68e61
Merge pull request #55141 from hhm0/rtl8821ce
rtl8821ce: init at 5.2.5_1.26055.20180108
2019-02-11 21:50:07 -05:00
Daiderd Jordan 051fcba987
swift-corefoundation: fix sandboxed build 2019-02-12 00:29:28 +01:00
Tim Steinbach f11e1c1135
linux: 5.0-rc5 -> 5.0-rc6 2019-02-11 16:23:06 -05:00
Jörg Thalheim 4ec7a5279a
Merge pull request #54125 from dtzWill/update/iwd-0.14
iwd: 0.12 -> 0.14
2019-02-10 21:49:05 +00:00
Vladimír Čunát c40f211499
Merge branch 'staging-next'
It's not completely without regressions, but ATM it seems to bring more
upsides than downsides and the iteration is too long already.
2019-02-10 14:20:49 +01:00
Michael Raskin ff343f35b8
Merge pull request #55322 from r-ryantm/auto-update/firejail
firejail: 0.9.56 -> 0.9.58
2019-02-10 12:25:17 +00:00
Samuel Dionne-Riel 0b49d5dd68 syslinux: 2015-11-09 -> 2019-02-07 2019-02-09 23:21:14 -05:00
Samuel Dionne-Riel 13b0c17932 syslinux: Adds @samueldr as maintainer 2019-02-09 23:21:14 -05:00
Edmund Wu 14a5c27743
linux_testing_bcachefs: 4.20.2019.01.23 -> 4.20.2019.02.09 2019-02-09 21:11:12 -05:00
Matthew Bauer 5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Vladimír Čunát 7f9e3b8206
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
Tim Steinbach 0f6571bae8
linux: 4.4.173 -> 4.4.174 2019-02-08 08:19:23 -05:00
Jörg Thalheim b2d9782d23
Merge pull request #53611 from r-ryantm/auto-update/lxc
lxc: 3.0.3 -> 3.1.0
2019-02-08 07:03:35 +00:00
Graham Christensen 1bcbbe08e4
keyutils: patch out unreproducibility 2019-02-06 22:20:16 -05:00
Tim Steinbach c7191de7db
linux: 4.4.172 -> 4.4.173 2019-02-06 14:40:38 -05:00
Tim Steinbach 7b0bf31a74
linux: 4.20.6 -> 4.20.7 2019-02-06 13:23:47 -05:00
Tim Steinbach 7870ada549
linux: 4.19.19 -> 4.19.20 2019-02-06 13:23:37 -05:00
Tim Steinbach bd7e5b51b5
linux: 4.14.97 -> 4.14.98 2019-02-06 13:23:24 -05:00
Tim Steinbach 117551ce2a
linux: 4.9.154 -> 4.9.155 2019-02-06 13:23:03 -05:00
Vladimír Čunát ff101946a8
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
2019-02-06 14:24:46 +01:00
Jörg Thalheim 22334ae168
Merge pull request #55313 from r-ryantm/auto-update/guvcview
guvcview: 2.0.5 -> 2.0.6
2019-02-06 10:40:14 +00:00
R. RyanTM 0e28f3c318 firejail: 0.9.56 -> 0.9.58
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/firejail/versions
2019-02-06 01:55:03 -08:00
R. RyanTM 08a54aac01 guvcview: 2.0.5 -> 2.0.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/guvcview/versions
2019-02-05 23:52:43 -08:00
Profpatsch a0a203eb5c sdnotify-wrapper: init at unversioned 2019-02-05 14:23:13 +01:00
Will Dietz 17ac9070b4 iw: 5.0 -> 5.0.1 2019-02-04 22:20:13 -06:00
hhm f2f1180c22 B"H fix error 2019-02-04 19:35:44 -05:00
Vladyslav M 8626808c72
Merge pull request #54752 from eadwu/bcachefs/20190123
linux_testing_bcachefs,bcachefs-tools: 20190123
2019-02-04 22:53:38 +02:00
Will Dietz a2d07bc725 iw: 4.14 -> 5.0 2019-02-03 22:08:11 -06:00
Tim Steinbach c77728de7b
linux: 5.0-rc4 -> 5.0-rc5 2019-02-03 19:31:25 -05:00
hhm 4e891a47e6 rtl8821ce: init at 5.2.5_1.26055.20180108 2019-02-03 17:02:25 -05:00
Jan Malakhovski dd5bcb34c9 lxcfs: move defaults to package file 2019-02-03 15:33:22 +00:00
Jan Malakhovski 23cfa1d290 guvcview: move defaults to package file 2019-02-03 15:33:17 +00:00
Jan Malakhovski 0f4eb7f977 conky: move defaults to package file 2019-02-03 15:33:12 +00:00
Vladimír Čunát 32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Matthew Bauer 7e78ddbf03
Merge pull request #55950 from LnL7/darwin-ubiquity
darwin: remove references to Ubiquity.framework
2019-02-19 22:43:20 -05:00
Florian Klink aaa0228240
Merge pull request #56068 from andir/linux-firmware-nonfree
firmwareLinuxNonfree: 2018-12-13 -> 2019-02-13
2019-02-20 01:59:37 +01:00
Andreas Rammhold b9ac4c1dd3
firmwareLinuxNonfree: 2018-12-13 -> 2019-02-13 2019-02-19 22:59:35 +01:00
Michael Raskin 446520bb9b
Merge pull request #56026 from oxij/tree/move-defaults-to-package-files-half-cuda
all-packages.nix: move defaults to package files continues^2
2019-02-19 21:54:02 +00:00
Daiderd Jordan b4ea47749a
darwin: remove references to Ubiquity.framework
It was removed on recent versions of macOS and these entries break
sandboxing if they don't exist.

	Aborted: while setting up the build environment: getting attributes of path '/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity': No such file or directory
2019-02-17 15:30:30 +01:00
Jan Malakhovski 40cde4d5d7 pcmciaUtils: move defaults to package file 2019-02-03 15:32:20 +00:00
Franz Pletz 36682692a0
batman-adv: 2018.4 -> 2019.0 2019-02-03 08:59:32 +01:00
Samuel Dionne-Riel 09af2fb9e0 linux: Removes the previously removed raspberry pi patch
There seems to have been an oopsie with the rebase.
2019-02-02 14:29:01 -05:00
Samuel Dionne-Riel 196af4b359 Revert "linuxPackages_4_{19,20}: works around bug with overlayfs."
This reverts commit de86af48fa.

(Manual revert due to conflicts.)

See #54509

The patch is causing overlayfs to misbehave.
2019-02-02 12:18:16 -05:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
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
Matthew Bauer ab118f3847
Merge pull request #54801 from matthewbauer/fix-trace-pos
make-derivation: fix position in trace
2019-01-31 10:44:21 -05: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
Matthew Bauer febda2b127 Revert "mingw: use current package set for headers"
This reverts commit 0307203693.
2019-01-28 10:42:04 -05: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