3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs
Vladimír Čunát cba6d9b11a qt48: I give up, switching off parallel building
I was unable to find a reliable fix for the problems.
I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload
or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload .
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch x-updates
# You are currently rebasing branch 'x-updates' on '81b7f5f'.
#   (all conflicts fixed: run "git rebase --continue")
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   pkgs/development/libraries/qt-4.x/4.8/default.nix
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	core
#	dev.diff
#	pkgs/applications/networking/browsers/firefox/cairo-test.patch
#	pkgs/applications/video/flowblade/
#	pkgs/desktops/gnome-3/core/dconf/
#	pkgs/desktops/gnome-3/core/eog/
#	pkgs/desktops/gnome-3/core/libsecret/
#	pkgs/development/libraries/ncurses/builder.sh
#	pkgs/servers/x11/xorg/download-cache/
#	pkgs/servers/x11/xorg/still-missing.txt
2013-06-17 10:06:23 +02:00
..
applications Merge 'master' and 'stdenv-fixes' into x-updates 2013-06-16 10:13:51 +02:00
build-support fetchsvn: Allow setting the name of the output 2013-05-26 11:58:01 -04:00
data Merge remote-tracking branch 'hydra/master' into x-updates 2013-06-08 15:41:39 +00:00
desktops kde410.kdepimlibs: add pkgconfig 2013-06-13 13:02:24 +02:00
development qt48: I give up, switching off parallel building 2013-06-17 10:06:23 +02:00
games ReRevert Merge x-updates into master 2013-05-29 23:25:02 +02:00
lib Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-13 17:12:43 +04:00
misc Merge 'master' and 'stdenv-fixes' into x-updates 2013-06-16 10:13:51 +02:00
os-specific Merge 'master' and 'stdenv-fixes' into x-updates 2013-06-16 10:13:51 +02:00
servers Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04: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 Merge 'master' and 'stdenv-fixes' into x-updates 2013-06-16 10:13:51 +02:00
top-level Merge 'master' and 'stdenv-fixes' into x-updates 2013-06-16 10:13:51 +02:00