JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99b88cfb53
nixpkgs/pkgs
History
Eelco Dolstra 99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02:00
..
applications Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-09 00:41:27 +02:00
build-support Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-09 00:41:27 +02:00
data Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
desktops KDE 4.10: update to 4.10.4 2013-06-05 19:41:28 +03:00
development Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-09 00:41:27 +02:00
games uqm: Include optional support for 3DO videos. 2013-05-16 21:03:07 +02:00
lib adding unfree-redistributable-firmware 2013-06-05 22:44:17 +02:00
misc Update Wine 2013-06-07 10:23:48 +04:00
os-specific Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-09 00:41:27 +02:00
servers Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-09 00:41:27 +02:00
shells fish: Add fish 2.0.0 2013-06-04 10:20:30 +01:00
stdenv mkDerivation: Allow direct access to passthru 2013-05-03 09:07:42 -04:00
test
tools Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
top-level Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-09 00:41:27 +02:00