ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 00:27:49 +03:00
Code Issues Projects Releases Wiki Activity
486e7736df
nixpkgs/pkgs
History
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
..
applications Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-10 00:25:54 +01:00
build-support Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
data shared_mime_info: update from 1.1 to 1.2 2013-12-04 06:53:44 +02:00
desktops KDE-4.10: Kopete: fix build against giflib5 2013-12-08 12:04:02 +02:00
development Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-10 00:25:54 +01:00
games Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-10 00:25:54 +01:00
misc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-10 00:25:54 +01:00
os-specific Linux 3.12.4 2013-12-09 12:01:37 -05:00
servers Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-10 00:25:54 +01:00
shells Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
stdenv stdenv/patchShebangs: fix shebang check 2013-12-07 21:13:06 +01:00
test
tools Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-10 00:25:54 +01:00
top-level Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-10 00:25:54 +01:00