nixpkgs/doc/languages-frameworks
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 Update BEAM docs 2017-06-22 11:32:46 +02:00
bower.xml nixpkgs manual: Add documentation for bower2nix 2016-03-28 08:25:45 +01:00
coq.xml coqPackages docs: fix typo (and thus manual build) 2017-12-19 11:34:54 +01:00
go.xml doc / go building: improve 2017-06-27 16:34:03 +02:00
haskell.md haskell: Recommend use of hoogle --local 2018-01-01 19:16:23 -05:00
index.xml doc: Add rust documentation (#23510) 2017-03-20 20:41:37 +01:00
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 Python docs: remove name attribute 2018-01-16 18:01:06 +01:00
qt.xml nixpkgs: remark about running Qt applications 2017-06-18 08:44:47 -05:00
ruby.xml ruby docs: improve example 2017-08-15 15:00:27 +02:00
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 doc/languages-frameworks/vim: add custom vimrc & packages 2017-06-22 13:25:03 +01:00