mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Code Issues Wiki Activity
nixpkgs/pkgs
History
Vladimír Čunát d4e9fd2a90 Merge recent master into staging 
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
..
applications Merge recent master into staging 2014-08-21 15:09:31 +02:00
build-support Merge recent master into staging 2014-08-21 15:09:31 +02:00
data man-pages: Update to 3.70 2014-08-19 11:46:08 +02:00
desktops Merge recent master into staging 2014-08-21 15:09:31 +02:00
development Merge recent master into staging 2014-08-21 15:09:31 +02:00
games update minecraft-server to 1.7.10 2014-08-18 18:51:51 -07:00
misc Vim-plugins: add vim-pathogen 2014-08-15 19:45:32 +02:00
os-specific Merge recent master into staging 2014-08-21 15:09:31 +02:00
servers diod: Update from 1.0.21 to 1.0.22 2014-08-20 16:10:20 +02:00
shells
stdenv Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
test
tools Merge recent master into staging 2014-08-21 15:09:31 +02:00
top-level rhash: new package 2014-08-21 00:46:35 +02:00