nixpkgs/pkgs
Matthieu Coudron 2207378c9e linux: clearer origin for settings configuration
adds _file so that nix may have a chance to display what file the conflictings settings come
from.
2019-09-04 17:04:16 +09:00
..
applications Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
build-support Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
common-updater
data Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
desktops Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
development libgdata.tests: add installedTests 2019-09-03 16:51:47 +02:00
games Merge staging-next into staging 2019-08-31 18:07:33 +02:00
misc Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
os-specific linux: clearer origin for settings configuration 2019-09-04 17:04:16 +09:00
servers Merge pull request #66973 from dtzWill/update/xauth-1.1 2019-09-03 18:25:06 -05:00
shells treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
stdenv Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
test treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
tools Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
top-level Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00