nixpkgs - Downstream nixpkgs tree for Spectrum

	Commit message (Collapse)	Author	Age
*	hplip : add openssl as buildInput	Théophane Hufschmitt	2016-04-18
\|
*	Merge pull request #14781 from ambrop72/wine-fix	Nikolay Amiantov	2016-04-18
\|\ \| \| \| \|	wine: Disable stripping to avoid breaking fakedlls.
\| *	wine: Disable stripping to avoid breaking fakedlls.	Ambroz Bizjak	2016-04-17
\| \|
* \|	cups: do not split doc output	Luca Bruno	2016-04-17
\|/ \| \| \| \| \| \| \|	The DocumentRoot is under doc/ which is looked up in .out. So for now let doc/ directory in .out. Not the right fix, but the easiest fix. cc @vcunat
*	wine: Fix RPATH for multiple-outputs	Alexander V. Nikolaev	2016-04-17
\|
*	Merge pull request #14736 from AndersonTorres/higan	Arseniy Seroka	2016-04-17
\|\ \| \| \| \|	higan: 096 -> 098
\| *	higan: 096 -> 098	AndersonTorres	2016-04-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now without some options, reflecting upstream development. In special, no GTK building (as it was obsoleted on 096) and no profile selecion, because it will be obsoleted on next release.
* \|	cups: add systemd to build inputs on linux	Joachim Fasting	2016-04-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise, cups will be built without systemd support. The upstream systemd service unit expects cups to have systemd support however. When cups is built without systemd support, the daemon will fork to the background. Consequently, systemd will think the service is done and enter inactive state. Along with 9de93be6cd448bdce64e7ef5cf80ff8d81592140 and 47330b1732b67e7d5fee283685b48fdcafdc91e6 this patch fixes the nixos printer test timing out in `waitForUnit("cups.service")`; see NixOS/nixpkgs#14748
* \|	brgenml1cupswrapper: fix regression and improvements	Raymond Gauthier	2016-04-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`cp`, `grep`, `chmod`, `sed` executables no longer found when upgrading from nixos 15.09 to 16.03. Fixed by use of wrapper script that brings these executables into `PATH`. Also fix lpd binaries on 64 bits machines by use of `callPackage_i686`.
* \|	vimPlugins: update 2016-04-16	Arseniy Seroka	2016-04-16
\|/
*	Merge pull request #14577 from hrdinka/fix/pcsx2	joachifm	2016-04-14
\|\ \| \| \| \|	pcsx2: disable advance SIMD instructions
\| *	pcsx2: disable advance SIMD instructions	Christoph Hrdinka	2016-04-10
\| \| \| \| \| \| \| \| \| \| \| \|	By setting `-DDISABLE_ADVANCE_SIMD=TRUE` pcsx2 will be compiled with predefined SIMD flags instead of `-march=native`. This makes the resulting binary more portable. Further this seems to be needed to make pcsx2 compile with gcc5.
* \|	mass-replace glib and gtk lib/*/include paths	Nikolay Amiantov	2016-04-14
\| \|
* \|	replace makeSearchPath tree-wise to take care of possible multiple outputs	Nikolay Amiantov	2016-04-13
\| \|
* \|	mgba: 0.3.1 -> git 20160325 (#14578)	Anderson Torres	2016-04-13
\| \| \| \| \| \| \| \| \| \|	I have made this release fromgit because 0.4.0 release doesn't compile (gcc complains with an error in Window.cpp: "isnan is not defined on this scope"). The error disappears on mgba git master.
* \|	Merge branch 'staging', containing closure-size #7701	Vladimír Čunát	2016-04-13
\|\ \
\| * \|	Merge branch 'master' into closure-size	Vladimír Čunát	2016-04-10
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
\| * \|	Merge branch 'master' into closure-size	Vladimír Čunát	2016-04-01
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
\| * \ \	Merge master into closure-size	Vladimír Čunát	2016-03-08
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
\| * \ \ \	Merge branch 'master' into closure-size	Vladimír Čunát	2016-02-14
\| \|\ \ \ \
\| * \ \ \ \	Merge recent 'staging' into closure-size	Vladimír Čunát	2016-02-03
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let's get rid of those merge conflicts.
\| * \| \| \| \| \|	treewide: Mass replace 'glibc}/lib' to refer the 'out' output	Tuomas Tynkkynen	2016-01-24
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'staging' into closure-size	Vladimír Čunát	2016-01-19
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' into closure-size	Vladimír Čunát	2015-12-31
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
\| * \ \ \ \ \ \ \	Merge branch 'master' into closure-size	Luca Bruno	2015-12-11
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into closure-size	Luca Bruno	2015-11-29
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into closure-size	Luca Bruno	2015-11-25
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge staging into closure-size	Vladimír Čunát	2015-11-20
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
\| * \| \| \| \| \| \| \| \| \| \| \|	dbus: split into multiple outputs and fix referrers	Vladimír Čunát	2015-10-13
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	just add comments about outputs (cups, gdk-pixbuf)	Vladimír Čunát	2015-10-13
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	SDL: split the dev output and fix referrers	Vladimír Čunát	2015-10-13
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	gtk3: split into multiple outputs	Vladimír Čunát	2015-10-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All references OK, hopefully. Seems surprisingly smooth.
\| * \| \| \| \| \| \| \| \| \| \| \|	libxml2,libxslt: split into multiple outputs	Vladimír Čunát	2015-10-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed all references, hopefully. libxml2Python is slightly hacky now, but it seems to work.
\| * \| \| \| \| \| \| \| \| \| \| \|	udev: complete rework	Vladimír Čunát	2015-10-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- systemd puts all into one output now (except for man), because I wasn't able to fix all systemd/udev refernces for NixOS to work well - libudev is now by default copied into another path, which is what most packages will use as build input :-) - pkgs.udev = [ libudev.out libudev.dev ]; because there are too many references that just put `udev` into build inputs (to rewrite them all), also this made "${udev}/foo" fail at evaluation time so it's easier to catch and change to something more specific
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge staging into closure-size	Vladimír Čunát	2015-10-03
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes gcc5 the default builder, etc.
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge commit staging+systemd into closure-size	Vladimír Čunát	2015-10-03
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many non-conflict problems weren't (fully) resolved in this commit yet.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	fix "libc}/lib" and similar references	Vladimír Čunát	2015-05-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Done mostly without any verification. I didn't bother with libc}/include, as the path is still correct.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	fix ${udev} references (and a few others)	Vladimír Čunát	2015-05-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge staging into closure-size	Vladimír Čunát	2015-05-05
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge 'staging' into closure-size	Vladimír Čunát	2015-04-18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'staging' into v/modular	Vladimír Čunát	2014-08-31
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge 'staging' into multiple-outputs	Vladimír Čunát	2014-08-23
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into multiple-outputs	Mathijs Kwik	2013-11-01
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'official/master' into multiple-outputs	Mathijs Kwik	2013-09-11
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/libpng/default.nix pkgs/development/libraries/pango/default.nix pkgs/tools/typesetting/tex/texlive/default.nix pkgs/top-level/all-packages.nix
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup	Eelco Dolstra	2013-08-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cups: keep versioning in all-packages.nix, as it is in master	Mathijs Kwik	2013-08-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Oops	Eelco Dolstra	2013-08-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into multiple-outputs	Eelco Dolstra	2013-08-21
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libsndfile/default.nix pkgs/misc/cups/default.nix pkgs/top-level/all-packages.nix
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into multiple-outputs	Eelco Dolstra	2013-06-25
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	openssl, cups: Fix stripping libraries	Eelco Dolstra	2013-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|