Commit Graph

9 Commits

Author SHA1 Message Date
William A. Kennington III
cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
Vladimír Čunát
5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Luca Bruno
873832ab6d telepathy-gabble: build on hydra 2014-07-06 11:50:30 +02:00
Vladimír Čunát
87ef13ee80 telepathy-gabble: major update 0.17.2 -> 0.18.2
Also doCheck, enableParallelBuilding, and add meta attributes.
2014-06-19 23:44:50 +02:00
Rickard Nilsson
83ca1bec30 Fix references to ca-bundle.
Several packages referred to /etc/ca-bundle.crt, that
was removed in 9c616e3. I've changed those references to
/etc/ssl/certs/ca-bundle.crt instead.
2014-02-12 19:30:32 +01:00
Vladimír Čunát
c9d3702c97 telepathy-related: fix via update
Some updates were restricted by gstreamer being <1.0
2013-02-23 22:20:42 +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
316222e2e1 Mass telepathy update, add telepathy-haze
svn path=/nixpkgs/trunk/; revision=34494
2012-06-13 07:09:19 +00:00
Yury G. Kudryashov
4874ff1144 Move some IM clients to instant-messengers/
svn path=/nixpkgs/trunk/; revision=33065
2012-03-14 15:41:44 +00:00