nixpkgs/pkgs
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
..
applications Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
build-support Revert "buildRustPackage: allow patches to fix Cargo.lock" 2018-08-13 12:26:33 +02:00
common-updater
data Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
desktops Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
development Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
games Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
misc Merge branch 'master' into staging-next 2018-08-12 10:33:41 +02:00
os-specific Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
servers Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
shells powershell: 6.0.3 -> 6.0.4 2018-08-13 10:01:53 +07:00
stdenv Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs" 2018-08-09 12:57:38 +02:00
test pkgs/tests: Add test for LD_LIBRARY_PATH 2018-08-01 19:02:21 +03:00
tools Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
top-level Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00