Commit Graph

9830 Commits

Author SHA1 Message Date
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
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
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
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
Matthew Bauer
5f106e8aae darwin.xcode: update hashes 2019-01-25 16:37:37 -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
Silvan Mosberger
62580e9529
Merge pull request #54516 from matthewbauer/column
unixtools.utillinux: add column
2019-01-24 00:58:36 +01:00
Matthew Bauer
d9332f2a71 unixtools.utillinux: add column
requested on IRC
2019-01-23 16:35:11 -05: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
Matthew Bauer
2000d62a50
Merge pull request #53605 from matthewbauer/fix-53587
mingw: use current package set for headers
2019-01-13 20:12:44 -05: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