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
..
aliases.nix	Merge pull request #35844 from adisbladis/jquery-mv	2018-03-06 15:34:34 +08:00
all-packages.nix	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
beam-packages.nix	Elixir: 1.6-rc -> 1.6	2018-01-17 14:22:48 -05:00
coq-packages.nix	coq: 8.7.1 -> 8.7.2	2018-02-15 23:12:43 -08:00
darwin-packages.nix	Update darwin-packages.nix	2018-02-06 00:41:35 +08:00
default.nix	Add setFunctionArgs lib function.	2018-01-31 14:02:19 -05:00
dotnet-packages.nix	dotnetPackages.Nuget: fix binary casing issue	2018-03-08 21:09:02 +00:00
emacs-packages.nix	Merge pull request #31312 from binarin/emacs-package-set-overrides	2018-02-06 21:22:23 +00:00
emscripten-packages.nix
haskell-packages.nix	Drop broken Haskell compilers.	2018-01-26 13:01:11 +01:00
haxe-packages.nix
impure.nix
java-packages.nix
lua-packages.nix	luaPackages.bit32: init at 5.3.0	2018-03-09 19:32:28 +00:00
make-tarball.nix
metrics.nix
ocaml-packages.nix	wyrd: fix build	2018-03-08 14:48:23 -06:00
perl-packages.nix	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
php-packages.nix	phpPackages.php-cs-fixer: 2.10.3 → 2.10.4	2018-03-09 05:07:29 +01:00
pure-packages.nix
python-packages.nix	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
release-cross.nix	prebuilt android tools: Init using SDK	2018-02-27 14:15:39 -05:00
release-lib.nix	nixos/release.nix: Move forAllSystems to release-lib	2018-01-16 18:56:41 +02:00
release-python.nix
release-small.nix	treewide: Remove gnat support.	2018-03-08 13:56:36 -05:00
release.nix	clang-6 test variants	2018-03-07 19:03:08 -06:00
splice.nix	top-level: Splice in more package sets for new types of deps	2017-12-30 22:04:20 -05:00
stage.nix	top-level: Duplicate overlaying unless stdenvOverrides comes last	2018-01-31 00:16:27 -05:00