nixpkgs/pkgs
Pascal Wittmann f7be21f4c9
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus
2018-08-06 12:04:52 +02:00
..
applications Merge branch 'master' into add-missing-licenses 2018-08-06 12:04:52 +02:00
build-support Revert "Merge #44221: default for NIX_CXXSTDLIB_COMPILE" 2018-07-31 09:43:52 +02:00
common-updater
data tex-gyre: remove unused displayName argument 2018-08-05 12:59:01 -05:00
desktops gnome3.gnome-todo: init at 3.28.1 2018-08-04 11:58:05 +02:00
development Merge branch 'master' into add-missing-licenses 2018-08-06 12:04:52 +02:00
games Merge branch 'master' into add-missing-licenses 2018-08-06 12:04:52 +02:00
misc urbit: clean-up 2018-08-05 20:34:24 +02:00
os-specific Merge branch 'master' into add-missing-licenses 2018-08-06 12:04:52 +02:00
servers Merge branch 'master' into add-missing-licenses 2018-08-06 12:04:52 +02:00
shells antibody: 3.5.1 -> 3.6.1 (#44481) 2018-08-05 21:00:55 +02:00
stdenv Merge master into staging-next 2018-07-28 12:31:35 +02:00
test pkgs/tests: Add test for LD_LIBRARY_PATH 2018-08-01 19:02:21 +03:00
tools Merge branch 'master' into add-missing-licenses 2018-08-06 12:04:52 +02:00
top-level ddar: explicitly use python2 2018-08-06 09:28:20 +02:00