1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
nixpkgs/pkgs/misc
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
..
beep Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
cups Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
drivers Fix broken use of builtins.currentSystem 2014-07-28 11:28:35 +02:00
emulators Mednafen: update to 0.9.36.3 2014-08-14 11:20:25 -03:00
foldingathome Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
freestyle Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
ghostscript Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
gxemul
jackaudio Revert "Remove obsolete jackaudio version 1." 2014-07-31 12:52:29 +02:00
lilypond lilypond: unbreak build by adding t1utils to buildInputs 2014-06-11 21:17:50 +02:00
maven maven: update from 3.0.4 to 3.1.1, potentially fixes CVE-2013-0253 2014-07-04 21:45:30 +04:00
my-env my-env: Support for running command directly by load-env-xxx script 2014-07-16 23:09:49 +02:00
screensavers Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
seafile-shared seafile: update client, ccnet, libsearpc and shared 2014-05-24 03:36:10 +02:00
solfege gnome3 apps: correctly render icons 2014-02-28 01:40:21 +01:00
source-and-tags drop myhasktags, current hackage version has everything my version had 2014-01-23 14:44:21 +01:00
themes Merge pull request #2580 from ttuegel/qtcurve 2014-05-13 11:30:50 +02:00
uboot clean up git revision handling in several packages 2013-11-13 12:46:55 +02:00
vim-plugins Vim-plugins: add vim-pathogen 2014-08-15 19:45:32 +02:00
xosd
misc.nix