nixpkgs/pkgs
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
..
applications Merge pull request #54713 from dywedir/fff 2019-01-27 18:28:14 +00:00
build-support all-packages: move fetch* to pkgs/build-support/ 2019-01-26 22:47:54 -05:00
common-updater
data Merge pull request #54619 from Mic92/remove-wkennington 2019-01-26 23:37:27 +00:00
desktops libglade: fix on darwin 2019-01-22 11:33:30 -05:00
development Merge pull request #52848 from mightybyte/callHackage-variant 2019-01-27 17:13:40 -05:00
games EmptyEpsilon: 2018.11.16 -> 2019.01.19 2019-01-26 00:28:42 +01:00
misc Merge pull request #54670 from r-ryantm/auto-update/seafile-client 2019-01-27 13:40:39 +01:00
os-specific linux: ability to merge structured configs 2019-01-28 09:06:33 +09:00
servers unifi, nixos/unifi: add erictapen as maintainer 2019-01-27 17:28:15 +01:00
shells Merge pull request #54552 from NixOS/update-zsh-5.7 2019-01-26 16:51:58 +01:00
stdenv stdenv/make-derivation: don't hide broken packages 2019-01-27 17:02:17 -05:00
test
tools moreutils: 0.62 -> 0.63 2019-01-27 21:16:22 +01:00
top-level Merge pull request #54008 from palfrey/libnetfilter_acct 2019-01-27 20:28:04 +01:00