7 commits

Author	SHA1	Message	Date
Vladimír Čunát	26af997d41	Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix	2013-03-02 10:41:53 +01:00
Rickard Nilsson	ad1e7be58a	Revert "libsoup: Update to 2.40.3" ... For some reason, the update to 2.40.3 seems to cause troubles for surf and vimprobable2. This reverts commit 9642adef32.	2013-02-25 23:37:16 +01:00
Eelco Dolstra	2aa6f262cb	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
Rickard Nilsson	9642adef32	libsoup: Update to 2.40.3	2013-02-13 15:57:41 +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
Shea Levy	4fd1a24af4	libsoup: Update to 2.38.1	2012-07-15 23:39:55 -04:00
Yury G. Kudryashov	d96524476d	Move libsoup to development/libraries ... It is used in many packages outside of gnome2 set. svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33197	2012-03-17 16:45:37 +00:00