mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity
nixpkgs/pkgs
History
obadz 57ddc155fc Merge branch 'master' into staging 
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
..
applications Merge branch 'master' into staging 2016-08-28 12:20:59 +01:00
build-support Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-08-24 11:01:53 +02:00
data source-code-pro: 2.010 -> 2.030 2016-08-27 10:41:36 +02:00
desktops Merge branch 'master' into staging 2016-08-28 12:20:59 +01:00
development Merge branch 'master' into staging 2016-08-28 12:20:59 +01:00
games Merge branch 'master' into staging 2016-08-28 12:20:59 +01:00
misc Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
os-specific Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
servers Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
shells Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
stdenv Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
test
tools Merge branch 'master' into staging 2016-08-28 12:20:59 +01:00
top-level Merge branch 'master' into staging 2016-08-28 12:20:59 +01:00