ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity
552fd3d599
nixpkgs/pkgs
History
Eelco Dolstra 552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
..
applications Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-25 18:42:56 +02:00
build-support Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-25 18:42:56 +02:00
data nixos.org/tarballs -> tarballs.nixos.org 2013-06-25 14:12:16 +02:00
desktops libgnomeprint: build on linux 2013-06-18 22:50:15 +02:00
development Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-25 18:42:56 +02:00
games nixos.org/tarballs -> tarballs.nixos.org 2013-06-25 14:12:16 +02:00
lib Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
misc Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-25 18:42:56 +02:00
os-specific Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-25 18:42:56 +02:00
servers Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-25 18:42:56 +02:00
shells fish: Add fish 2.0.0 2013-06-04 10:20:30 +01:00
stdenv Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-25 18:42:56 +02:00
test
tools nixos.org/tarballs -> tarballs.nixos.org 2013-06-25 14:12:16 +02:00
top-level Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-25 18:42:56 +02:00