mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 00:22:13 +00:00
Code Issues Wiki Activity
26264 commits 241 branches 124 tags 7.5 GiB
Commit graph

9 commits

Author SHA1 Message Date
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Vladimír Čunát 684f215b4f fix the problem of missing expat in a few packages 2013-02-11 18:34:40 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Yury G. Kudryashov c6f0449124 Let hydra build kdesvn and krusader. 
Also fix kdesvn build with qt-4.8.

svn path=/nixpkgs/trunk/; revision=32473
 2012-02-22 14:51:15 +00:00
Karn Kallio a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps. 
svn path=/nixpkgs/trunk/; revision=28217
 2011-08-07 01:45:26 +00:00
Lluís Batlle i Rossell 9ff0622848 Kdesvn fixed. At the end it was a wrong docbook type only in one of the docbook 
files there. The other was fine, and kept me confused for long.

svn path=/nixpkgs/trunk/; revision=24571
 2010-11-02 13:35:28 +00:00
Lluís Batlle i Rossell 5e5ce5a987 Updating kdesvn. It still does not build to some docbook problems I don't know how to solve, related to kde 4.5 I guess. 
It runs some /nix/store/wlbri8r6fzavvq554bm04666aphhkxxr-kdelibs-4.5.2/bin/meinproc4 --check --cache /tmp/nix-build-rjcm9mri08cpbvh7gcjcvra2iqzn20ch-kdesvn-1.5.5.drv-0/kdesvn-1.5.5/build/doc/nl/index.cache.bz2 /tmp/nix-build-rjcm9mri08cpbvh7gcjcvra2iqzn20ch-kdesvn-1.5.5.drv-0/kdesvn-1.5.5/doc/nl/index.docbook

and this fails.

svn path=/nixpkgs/trunk/; revision=24569
 2010-11-02 13:24:08 +00:00
Yury G. Kudryashov 673e66e3a3 Move most kde-extragear apps to top-level 
svn path=/nixpkgs/trunk/; revision=24092
 2010-10-05 17:44:33 +00:00