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

..

languages-frameworks

Merge branch 'master' into staging

2018-03-10 20:38:13 +00:00

old

doc/old/cross.txt: md5 -> sha256

2017-01-24 16:26:05 +00:00

coding-conventions.xml

Merge pull request #31668 from rycee/doc/naming

2017-12-23 17:12:29 +03:00

configuration.xml

nixpkgs manual: unfree packages are untested

2017-11-01 22:34:56 +01:00

contributing.xml

doc: make it clear the Contributing section is for the docs

2015-06-30 12:25:55 +02:00

cross-compilation.xml

doc: Cross chapter: Add note on why use example platforms

2018-01-26 12:38:34 -05:00

default.nix

mkShell: add builder (#30975)

2017-12-20 23:42:07 +00:00

functions.xml

dockerTools: document image spec v1.2 compatibility

2017-08-03 11:52:03 +02:00

introduction.md

nixpkgs manual: remove reference to now defunct nixpkgs monitor

2017-10-17 16:04:29 +01:00

manual.xml

docs: add section on common darwin issues

2017-11-01 18:08:19 +01:00

meta.xml

lib, treewide: Add missing MIPS arches, and fix existing usage

2018-02-23 20:43:42 -05:00

multiple-output.xml

stdenv: Move devhelp books to outputDevdoc

2017-11-24 02:09:44 +01:00

overlays.xml

Overlays: allow overlays to be specified in a file

2017-08-17 22:13:39 +00:00

package-notes.xml

Merge pull request #31312 from binarin/emacs-package-set-overrides

2018-02-06 21:22:23 +00:00

platform-notes.xml

docs: add section on common darwin issues

2017-11-01 18:08:19 +01:00

quick-start.xml

Point to the new mailing list by replacing the old link

2017-07-18 13:44:10 +02:00

release-notes.xml

Fix trivial spelling mistake in docs

2014-06-13 11:11:27 +01:00

reviewing-contributions.xml

doc: system.environmentPackages -> environment.systemPackages

2017-12-20 02:19:43 +00:00

shell.md

doc: fix typo

2017-12-24 00:40:01 +00:00

stdenv.xml

setup-hooks: Add autoPatchelfHook

2018-02-10 00:27:24 +05:30

style.css

* Sync CSS with the Nix manual.

2012-05-11 21:42:00 +00:00

submitting-changes.xml

doc/submitting-changes.xml: suggest "nixos/<module>" prefix for NixOS changes

2017-09-13 14:10:25 +02:00