nixpkgs/pkgs
Maximilian Bosch 6b0cd9ad47
Merge branch 'staging' into glibc230
Conflicts:
	pkgs/applications/misc/vit/default.nix
2020-01-28 14:54:51 +01:00
..
applications Merge branch 'staging' into glibc230 2020-01-28 14:54:51 +01:00
build-support Merge master into staging-next 2020-01-28 10:46:13 +01:00
common-updater
data Merge pull request #78265 from Synthetica9/https-homepages 2020-01-27 15:00:53 +01:00
desktops Merge master into staging-next 2020-01-28 10:46:13 +01:00
development Merge branch 'staging' into glibc230 2020-01-28 14:54:51 +01:00
games Merge master into staging-next 2020-01-28 10:46:13 +01:00
misc Merge staging-next into staging 2020-01-28 10:48:36 +01:00
os-specific Merge branch 'staging' into glibc230 2020-01-28 14:54:51 +01:00
servers Merge branch 'staging' into glibc230 2020-01-28 14:54:51 +01:00
shells Merge master into staging-next 2020-01-28 10:46:13 +01:00
stdenv Merge branch 'staging' into glibc230 2020-01-23 11:31:13 +01:00
test Merge remote-tracking branch 'obsidiansystems/work-on-multi-shellFor' 2020-01-17 18:00:27 -05:00
tools Merge branch 'staging' into glibc230 2020-01-28 14:54:51 +01:00
top-level Merge staging-next into staging 2020-01-28 10:48:36 +01:00