Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
beam.xml	…
bower.xml	…
coq.xml	…
go.xml	…
haskell.md	…
index.xml	…
java.xml	…
lua.xml	…
perl.xml	perlPackages.DBI: Stub out dbd_postamble for cross-compilation.	2018-02-28 15:01:32 -05:00
python.md	…
qt.xml	…
ruby.xml	…
rust.md	BuildRustCrate: more general overrides, and handling the "dylib" crate type (#35171)	2018-02-20 08:55:04 +01:00
texlive.xml	A note about scheme-* in texlive.combine	2018-03-07 22:25:01 +01:00
vim.md	…