JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,431 Commits 2 Branches 0 Tags 13 GiB
17ac9070b4
Commit Graph

9112 Commits

Author SHA1 Message Date
Will Dietz
17ac9070b4 iw: 5.0 -> 5.0.1 2019-02-04 22:20:13 -06:00
Will Dietz
a2d07bc725 iw: 4.14 -> 5.0 2019-02-03 22:08:11 -06: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
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
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
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