1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
nixpkgs/pkgs
Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00
..
applications Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00
build-support
common-updater
data stdman: 2017.04.02 -> 2018.03.11 2018-03-30 19:57:10 +01:00
desktops Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00
development Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00
games Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00
misc Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00
os-specific Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00
servers Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00
shells Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00
stdenv
test
tools Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00
top-level Merge remote-tracking branch 'upstream/master' into staging 2018-04-03 02:22:54 +03:00