JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96cec2a7bd
nixpkgs/pkgs
History
Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
..
applications Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
build-support Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
data man-pages: Update to 3.70 2014-08-19 11:46:08 +02:00
desktops kde4: security patch for CVE-2014-5033 2014-08-21 15:13:18 +02:00
development Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
games update minecraft-server to 1.7.10 2014-08-18 18:51:51 -07:00
misc Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
os-specific Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
servers Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
shells Merge 'staging' into master 2014-08-08 20:13:23 +02:00
stdenv Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
test
tools Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
top-level Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00