Commit graph

9768 commits

Author SHA1 Message Date
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
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
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 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
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
Tim Steinbach c77728de7b
linux: 5.0-rc4 -> 5.0-rc5 2019-02-03 19:31:25 -05: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 de86af48faa03a824917ac90f4776481c7ce9e54.

(Manual revert due to conflicts.)

See #54509

The patch is causing overlayfs to misbehave.
2019-02-02 12:18:16 -05: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
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
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
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
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