3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

983 commits

Author SHA1 Message Date
Brian McKenna 7c3e0fccc3 hipchat: 4.0.1641 -> 4.26.0.1655 2016-08-23 14:19:12 +10:00
Tuomas Tynkkynen fffd8f192e treewide: Fix output references to xorg.libX11 2016-08-23 04:53:33 +03:00
Tuomas Tynkkynen cdfa83498e treewide: Fix output references to gtk2 2016-08-23 04:53:09 +03:00
Tuomas Tynkkynen 5ae4471fb5 treewide: Fix output references to gtk 2016-08-23 04:53:05 +03:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Nikolay Amiantov 3c6beea1a7 gajim: use wrapPython 2016-08-20 00:43:45 +03:00
Frederik Rietdijk 5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov 86f3595cfe tdesktop: 0.9.56 -> 0.10.1 2016-08-14 22:37:07 +03:00
Frederik Rietdijk 6842a24b21 Remove top-level pyqt4
See #11567.
2016-08-14 12:38:01 +02:00
Frederik Rietdijk 11d1fdfd8b Remove top-level cython and cython3
See #11567.
2016-08-14 12:01:09 +02:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
zimbatm c2302f2f45 Merge pull request #17677 from kamilchm/no-go-libs-json
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Michael Raskin 4fd2adb604 baresip: 0.4.19 -> 0.4.20 2016-08-11 17:57:35 +02:00
Matthew 473a656426 vacuum-im: add -lz to NIX_LDFLAGS
This should be fixed upstream, but it's broken regardless.

http://hydra.nixos.org/build/38322959/nixlog/1
2016-08-09 21:09:28 +00:00
cmfwyp 071b57ba79
pidgin-skypeweb: 2015-10-02 -> 1.2.1
The source can be fetched with tags now that there are stable
releases of pidgin-skypeweb.
2016-08-08 15:48:49 -04:00
lukasepple cd1ebc64d3 teamspeak_client: 3.0.19.3 -> 3.0.19.4 2016-08-07 11:03:39 +02:00
Hector A. Escobedo 594256c3a8 purple-matrix: init at 2016-07-11 2016-08-03 15:46:28 -04:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Luca Bruno 2cce7a064e telepathy_salut: fix build, add myself as maintainer 2016-08-02 22:00:24 +02:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Nikolay Amiantov cce1e9f2f4 tdesktop: use parseDrvName to get Qt release version
Closes #16559
2016-07-23 09:41:25 +03:00
Robin Gloster 1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
edanaher 5682279d14 pidgin-osd: init at 0.1.0 (#16792)
* pidgin-osd: init at 0.1.0

A straightforward pidgin plugin; kind of ancient, but still works fine.

* Use autoreconf, which minor hackery around ChangeLog.
2016-07-21 01:12:31 +02:00
Graham Christensen 5bc522913b Merge pull request #17032 from Ralith/purple-hangouts
purple-hangouts-hg: init at 2016-07-17
2016-07-20 14:38:26 +00:00
Benjamin Saunders 54b037720d purple-hangouts-hg: init at 2016-07-17 2016-07-19 21:45:48 -07:00
Robin Gloster 203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Joachim F 23e27413b3 Merge pull request #17029 from nathanielbaxter/dev/teamspeak_client
teamspeak_client: 3.0.19.1 -> 3.0.19.3
2016-07-17 11:29:01 +02:00
Nathaniel Baxter 3c9788e1ce teamspeak_client: 3.0.19.1 -> 3.0.19.3 2016-07-17 17:06:44 +10:00
Joachim Fasting ec4ae7c8b6
teamspeak_client: specify a custom, nonfree license
The licensing terms depend on use [1], but the software is clearly nonfree.
Previously, the package would happily build even with allowUnfree = false.

[1]: http://sales.teamspeakusa.com/licensing.php
2016-07-17 04:52:22 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Alexey Lebedeff 52ed165c91 viber: 4.2.2.6 -> 6.0.1.5
- Use Qt provided by viber itself -> no longer broken
- Remove notes about obsolete bugs
2016-07-14 15:36:29 +03:00
Renzo Carbonara 103ae01173 zoom-us: init at 2.0.52458.0531 (#15607) 2016-07-12 13:37:11 +02:00
Tim Steinbach 72221e71d5 slack: 2.0.3 -> 2.1.0 2016-07-07 08:44:05 -04:00
Kranium Gikos Mendoza a89eee9da8 utox: 0.9.0 -> 0.9.4 2016-07-03 20:54:45 +08:00
Nikolay Amiantov f990abb801 tdesktop: 0.9.49 -> 0.9.56 2016-06-27 22:03:29 +03:00
Marius Bakke 4a7d31a392 treewide: remove double quotes from wrappers
Close #14753; see that for context.
2016-06-22 11:12:27 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Thomas Tuegel e6fdc9f7f0 Merge pull request #16092 from abbradar/qt561
Qt: 5.6.0 -> 5.6.1
2016-06-09 14:32:53 -05:00
Nikolay Amiantov 7b84294bd9 tdesktop: fix with new Qt 2016-06-09 21:37:24 +03:00
Rushmore Mushambi 83c40ada7e Merge pull request #16017 from kamilchm/rework-go
Rework goPackages
2016-06-09 17:09:13 +02:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Vladimír Čunát cc174b3d55 pidgin: simplify using the wrapped version
Now only the `pidgin` attribute is exposed and it's wrapped based on
whether the `plugins` parameter is overridden.

Discussion: https://github.com/NixOS/nixpkgs/issues/8999#issuecomment-224851642
2016-06-09 12:21:36 +02:00
Kamil Chmielewski 03feac7937 pond: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski 5017469197 xmpp-client: extracted from goPackages 2016-06-09 11:22:02 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Emery Hemingway c544cbca42 qtox: 1.3.0 -> 1.4.1 2016-06-02 14:58:01 +02:00
Thomas Tuegel a1facf3362 qtox: run pre- and post-install hooks
Fixes #15744.
2016-05-30 16:31:58 -05:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Arseniy Seroka 8479e0ad84
purple-telegram: fix hash 2016-05-26 22:51:23 +03:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Jascha Geerds c815844df9 hipchat: 4.0.1637 -> 4.0.1641 2016-05-26 08:10:02 +02:00
Rok Garbas bf2aaeb0f6 tdesktop: 0.9.48 -> 0.9.49 2016-05-25 17:59:08 +02:00
Michael Raskin 910744de98 baresip: 0.4.18 -> 0.4.19 2016-05-25 15:36:59 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
ldesgoui 85789b5f2b discord: 0.0.3 -> 0.0.8 2016-05-21 18:33:57 +02:00
Tobias Geerinckx-Rice 5940056af6
utox: 0.7.0 -> 0.9.0
Upstream is weird.
2016-05-21 13:50:52 +02:00
Nikolay Amiantov 131eb8406e tdesktop: 0.9.44 -> 0.9.48
This package requires a ridiculous amount of time to maintain, with
their build system changing from one completely ad-hoc way to
another. More hacks for the throne of hacks...
2016-05-20 03:47:42 +03:00
Tuomas Tynkkynen 5152e01e87 treewide: Make explicit that 'dev' output of pango is used 2016-05-19 10:02:27 +02:00
Tuomas Tynkkynen 2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen 5eb01cd0ad treewide: Make explicit that 'dev' output of openldap is used 2016-05-19 10:00:50 +02:00
Tuomas Tynkkynen 99acb412ab treewide: Make explicit that 'dev' output of ncurses is used 2016-05-19 10:00:49 +02:00
Tuomas Tynkkynen be00816cab treewide: Make explicit that 'dev' output of libjpeg is used 2016-05-19 10:00:42 +02:00
Tuomas Tynkkynen d1937cf11a treewide: Make explicit that 'dev' output of gtk2 is used 2016-05-19 10:00:38 +02:00
Tuomas Tynkkynen f81af4e6f0 treewide: Make explicit that 'dev' output of glib is used 2016-05-19 10:00:35 +02:00
Tuomas Tynkkynen a11b717ce4 treewide: Make explicit that 'dev' output of gdk_pixbuf is used 2016-05-19 10:00:35 +02:00
Tuomas Tynkkynen bb5a922c78 treewide: Make explicit that 'dev' output of ffmpeg is used 2016-05-19 10:00:31 +02:00
Tuomas Tynkkynen 4e0307dcfc treewide: Make explicit that 'dev' output of cyrus_sasl is used 2016-05-19 10:00:30 +02:00
Tuomas Tynkkynen 5e5c5382f6 treewide: Make explicit that 'dev' output of cairo is used 2016-05-19 10:00:28 +02:00
Tuomas Tynkkynen 85a51074dc treewide: Make explicit that 'dev' output of atk is used 2016-05-19 10:00:25 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Jascha Geerds 31253b0c1b hipchat: 4.0.1631 -> 4.0.1637 2016-05-18 15:56:53 +02:00
Jascha Geerds 02d6680b5a hipchat: Add xdg_utils to rpath
This makes it possible to open links with a single click in your
preferrred browser via xdg-open.
2016-05-18 15:28:45 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Vladimír Čunát 3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Arseniy Seroka fd12b1149e Merge pull request #15398 from Shados/maintain-opensteamworks
Allow plugins to work for Finch (CLI Pidgin)
2016-05-12 15:00:37 +03:00
Alexei Robyn b874447eef teamspeak-server: 3.0.10.3 -> 3.0.12.4, also
tsdnsserver binary now in output
2016-05-12 15:46:45 +10:00
Alexei Robyn 9d9a20e98b pidgin-opensteamworks: Change install location to work with Finch as well as Pidgin. 2016-05-12 10:22:52 +10:00
Alexei Robyn e634488cc3 pidgin-with-plugins: Add plugin support for Finch, the CLI version of Pidgin. 2016-05-12 10:22:52 +10:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Joachim Fasting cac498b522 Merge pull request #15282 from nathanielbaxter/dev/teamspeak
teamspeak_client: 3.0.18.2 -> 3.0.19.1
2016-05-07 18:51:28 +02:00
Nathaniel Baxter 24ffbfde1d teamspeak_client: 3.0.18.2 -> 3.0.19.1 2016-05-07 09:52:49 +10:00
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Nikolay Amiantov 87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Nikolay Amiantov c4ab28e38e tdesktop: 0.9.33 -> 0.9.44 2016-04-30 03:12:32 +03:00
Nikolay Amiantov 938d64f1f3 quote URLs in my packages to ease opening them from urxvt 2016-04-30 03:12:32 +03:00
Tuomas Tynkkynen b465dc202f boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Nikolay Amiantov 1f89dbd46b pidgin-with-plugins: use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov 618c75de7b tdesktop: fix build 2016-04-25 20:47:29 +03:00
ldesgoui 1c08aa2704 discord: 0.0.1 -> 0.0.3 2016-04-24 16:45:09 +02:00
Vladimír Čunát e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Alexander V. Nikolaev 2ddc17b930 skype: fix rpath broken by closure-size merge 2016-04-20 22:42:52 +03:00
Nikolay Amiantov 837c573f27 vacuum: move to qmake4Hook 2016-04-20 18:55:46 +03:00
Nikolay Amiantov a6af80b421 telegram-qml: move to qmakeHook
This reverts commit c275fc610e.
2016-04-20 18:55:46 +03:00
Nikolay Amiantov 82bf15393d tdesktop: move to qmakeHook 2016-04-20 18:55:45 +03:00
Nikolay Amiantov 56b63b91b4 libqtelegram-aseman-edition: move to qmakeHook
This reverts commit 080b54d766.
2016-04-20 18:55:45 +03:00
Nikolay Amiantov 5faed29fa8 cutegram: move to qmakeHook
This reverts commit 7f4ab1cb72.
2016-04-20 18:55:45 +03:00
Nikolay Amiantov 46cf871c3d ricochet: move to qmakeHook 2016-04-20 18:55:45 +03:00
Nikolay Amiantov 87397b770c qtox: move to qmakeHook 2016-04-20 18:55:45 +03:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
aszlig 7f4ab1cb72
cutegram: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of cutegram
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of cutegram and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig c275fc610e
telegram-qml: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of telegram-qml
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of telegram-qml and it now successfully compiles on
my machine.

Built it using the following command, because it wasn't exposed via the
top-level packages attribute:

nix-build -E '
  with import ./. {};
  qt55.callPackage pkgs/applications/networking/instant-messengers/telegram/telegram-qml {
    libqtelegram-aseman-edition = qt55.callPackage pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition {};
  }
'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig 080b54d766
libqtelegram-aseman-edition: Add pre/postConfigure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of
libqtelegram-aseman-edition override the whole configurePhase, so this
hook isn't run at all.

This fixes the build of libqtelegram-aseman-edition and it now
successfully compiles on my machine.

Built it using the following command, because it wasn't exposed via the
top-level packages attribute:

nix-build -E '
  with import ./. {};
  qt55.callPackage pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition {}
'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
zimbatm 7081325518 slack: fixes
* Fixes missing stdlib rpath
* Removes unused share/lintian
* Fixes slack.desktop paths
2016-04-14 15:50:55 +01:00
Nikolay Amiantov 755e4633c7 mass-replace glib and gtk lib/*/include paths 2016-04-14 04:13:54 +03:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Michael Raskin 58d2649f70 baresip: 0.4.17 -> 0.4.18 2016-04-13 14:47:04 +02:00
Nikolay Amiantov a951fba574 discord: fix evaluation 2016-04-13 14:01:17 +03:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Tim Steinbach b6c80ee36c slack: Fix 2.0.3 2016-04-12 10:50:43 -04:00
Pascal Wittmann a2aec04abc Merge pull request #14601 from NeQuissimus/slack203
slack: 2.0.1 -> 2.0.3
2016-04-11 18:25:29 +02:00
Tim Steinbach 0dfcc687be slack: 2.0.1 -> 2.0.3 2016-04-11 11:12:50 -04:00
Nicolas Petton a65c6f4932 skype: Use a larger icon for the .desktop file (#14591) 2016-04-11 13:35:55 +01:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Vladimír Čunát d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Arseniy Seroka f059af932a Merge pull request #14491 from nico202/telegram-cli
telegram-cli: 2015-07-30 -> 2016-03-23
2016-04-06 11:41:35 +03:00
= cfad82119b telegram-cli: 2015-07-30 -> 2016-03-23 2016-04-06 09:43:25 +02:00
ldesgoui f2a88f89c6 discord: init at 0.0.1 2016-04-05 13:17:43 +02:00
Brian McKenna b39fd4f97b hipchat: fix links being broken 2016-04-05 10:02:46 +10:00
Robin Gloster bbbaccfa68 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-04 15:24:52 +00:00
Silvio Frischknecht 4087e99886 psi: fix remove psimedia and spellchecker
spellchecker (aspell -> enchant)
2016-04-03 14:10:37 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Franz Pletz 2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Nikolay Amiantov 1d24a7b6f8 tdesktop: init at 0.9.33 2016-03-30 22:22:51 +03:00
Robin Gloster a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
Pascal Wittmann 51135d803a bitlbee: 3.4.1 -> 3.4.2 2016-03-29 21:17:30 +02:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Frederik Rietdijk 2636fcf7cd fix license 2016-03-28 14:24:06 +02:00
Frederik Rietdijk 2b10296637 Merge pull request #13858 from leenaars/blinkqt
python-sipsimple: 2.6.0 -> 3.0.0 (with all dependencies)
2016-03-28 14:18:33 +02:00
Nikolay Amiantov 5e985c42d6 cutegram: fix playing media files 2016-03-27 21:36:39 +03:00
Nikolay Amiantov 78b75b8ecd cutegram: fix meta information and parallel building 2016-03-27 18:53:54 +03:00
Nikolay Amiantov 3819384395 skype: small cleanup 2016-03-27 11:57:46 +03:00
Arseniy Seroka 61fc93b432 telegram-purple: init at 2016-03-17 2016-03-23 19:22:58 +03:00
Graham Christensen aba56e7f59 vacuum: port to mkDerivation, add zlib for hydra failure 2016-03-23 09:24:55 -05:00
Greyson Fischer 7fe888e521 slack: init at 2.0.1 2016-03-23 11:29:18 +03:00
joachifm 4f0324f766 Merge pull request #14116 from otwieracz/utox
utox: 0.5.0 -> 0.7.0, libtoxcore: 20160131 -> 20160319
2016-03-22 13:01:43 +00:00
Slawomir Gonet eddb7a55f8 utox: 0.5.0 -> 0.7.0, libtoxcore: 20160131 -> 20160319 2016-03-22 08:42:07 +01:00
Pascal Wittmann e5343cd9e6 bitlbee: write pid file to /var/lib/bitlbee/bitlbee.pid
Previously it was written to /var/lib/bitlbee.pid but on
NixOS the user bitlbee has no write access to /var/lib/.
2016-03-20 21:23:53 +01:00
leenaars d8cae4d0cb blink: added icon and updated license 2016-03-20 15:36:03 +01:00
Brian McKenna 411b4a1df1 hipchat: 2.2.1388 -> 4.0.1631 2016-03-18 10:47:03 +11:00
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Edward Tjörnhammar 7da494b8ae qtox: 1.2.4 -> 1.3.0 2016-03-13 21:36:30 +01:00
Michiel Leenaars 6db4b907b8 blinkqt: 1.4.1 -> 2.0.0 2016-03-12 22:33:00 +01:00
Graham Christensen b87ebf2b62 pidgin-otr: 4.0.1 -> 4.0.2 for CVE-2016-2851 2016-03-09 17:20:36 -06:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
joachifm 046e5011b4 Merge pull request #13691 from AndersonTorres/cutegram
Cutegram: add qtimageformats (for sticker support)
2016-03-07 14:10:08 +00:00
Christoph Hrdinka d3e3b135ea pidgin: fix gstreamer plugin path
Closes #13722, fixes #13719 and maybe #10556.
2016-03-07 07:03:49 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
AndersonTorres af85404412 Cutegram: add qtimageformats (for sticker support)
This commit adds preliminary sticker support for Cutegram.
2016-03-05 11:41:39 -03:00
Robin Gloster fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
Arseniy Seroka dfbf0b27a4 Merge pull request #13497 from AndersonTorres/cutegram
cutegram: 2.7.0 -> 2.7.1
2016-03-03 09:04:17 +03:00
AndersonTorres 14aa382f03 cutegram: 2.7.0 -> 2.7.1
And some minor changes
2016-03-03 02:21:31 -03:00
AndersonTorres f70ba914ef telegram-qml: 0.9.1 -> 0.9.2 2016-03-03 02:19:07 -03:00
AndersonTorres bd71f511e5 libqtelegram-aseman-edition: 6.0 -> 6.1 2016-03-03 02:18:07 -03:00
Pascal Wittmann 369ede9235 mcabber: 1.0.1 -> 1.0.2 2016-03-02 22:37:14 +01:00
Robin Gloster 3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
zimbatm 69ce5cb656 use the sourceforge mirrors everywhere
find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
2016-02-28 12:07:42 +00:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm fa46b448d7 Merge pull request #13019 from tg-x/qtox
qtox: 20151221 -> 1.2.4, libtoxcore-dev: 20160105 -> 20160131
2016-02-23 22:52:09 +00:00
Frederik Rietdijk 40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Franz Pletz 82ac1d952e Revert "gajim: Add python-axolotl for OMEMO plugin"
This reverts commit c3c5622817.
2016-02-23 00:36:43 +01:00
Robin Gloster 95325aa96f vacuum: use mkDerivation and turn off format hardening 2016-02-22 08:57:20 +00:00
Franz Pletz c3c5622817 gajim: Add python-axolotl for OMEMO plugin 2016-02-22 04:56:15 +01:00
Robin Gloster bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Robin Gloster 8483edcda0 silc-client: turn off format hardening 2016-02-19 21:15:59 +00:00
Arseniy Seroka 24a536f77d Merge pull request #13126 from zimbatm/ricochet-1.1.2
ricochet: 1.1.1 -> 1.1.2
2016-02-19 22:53:42 +03:00
zimbatm 883b788ab0 ricochet: 1.1.1 -> 1.1.2 2016-02-19 14:18:48 +00:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
tg(x) d03c73a228 utox: 7e290747 -> 0.5.0 2016-02-17 15:43:53 +01:00
Vladimír Čunát e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
tg(x) 7b91d708af qtox: 20151221 -> 1.2.4, libtoxcore-dev: 20160105 -> 20160131 2016-02-15 01:15:41 +01:00
Michael Raskin 874721defa baresip: 0.4.16 -> 0.4.17 2016-02-14 21:17:07 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Eelco Dolstra aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Vladimír Čunát a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Guillaume Maudoux 9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Robin Gloster ecc580f379 carrier: deleted pidgin fork
not updated in >5 years and broken build
2016-01-30 20:31:03 +00:00
Franz Pletz 562a41e696 Merge pull request #12584 from nathanielbaxter/dev/teamspeak
teamspeak client: bump 3.0.18.1 -> 3.0.18.2
2016-01-30 17:10:16 +01:00
Pascal Wittmann 13e13c38cd mcabber: 1.0.0 -> 1.0.1 2016-01-29 22:33:47 +01:00
Tuomas Tynkkynen d91c7347d1 treewide: Mass replace 'openssl}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Nathaniel Baxter e800e5bb11 teamspeak client: bump 3.0.18.1 -> 3.0.18.2 2016-01-24 13:11:27 +11:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Vladimír Čunát 0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
Tobias Geerinckx-Rice 8871de95f5 fuze: remove dead package
Last maintained in 2013. Building fails due to vanished sources.
Upstream has the following to say:

  “As of February 11th 2015, Fuze will no longer support a native
   Linux-based client. This means that any customers attempting to
   install or use our previous Linux client will be unable to do
   so. There are currently no plans to create an updated version
   of the Linux client for Fuze. For Linux based customers that
   still wish to use Fuze, we recommend that you try our browser
   client.” -- https://support.fuze.com/hc/en-us/articles/201527877-Does-Fuze-Support-Linux-

Never marked as broken, but has been so for quite some time.
2016-01-19 21:36:23 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Franz Pletz 501f9166b1 Merge pull request #12407 from jgillich/chats
xmpp-client, ricochet
2016-01-18 15:15:59 +01:00
Robin Gloster 53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Nikolay Amiantov 00eeae1179 gajim: add extraPythonPackages option
For exampole, this allows to add python-axolotl to PYTHONPATH,
which is needed for OMEMO OTR messaging plugin.
2016-01-17 22:24:14 +03:00
Jakob Gillich 6a24c20744 ricochet: add desktop file, cleanups
closes #11979, #11974
2016-01-16 08:23:59 +01:00
codsl 79cc97c637 ricochet: init at 1.1.1 2016-01-14 16:55:25 +01:00
Mark Laws e7ba7fba01 gale: init at 1.1happy 2016-01-13 12:00:50 -08:00
Slawomir Gonet efeffdbdc0 qTox updated due to bug with A/V subsystem 2016-01-12 21:44:38 +01:00
Slawomir Gonet 8b7d28251a qtsvg dependency added for qtox 2016-01-12 21:44:38 +01:00
Slawomir Gonet 0d02182843 utox, libutoxcore and filter_audio version bump 2016-01-12 21:44:38 +01:00
Jakob Gillich a8f526432c pybitmessage: init at 0.4.4 2016-01-12 02:43:00 +01:00
Michael Raskin a2f76a89bb gajim: 0.16.4 -> 0.16.5 2016-01-01 12:30:17 +03:00
Michael Raskin a2ddd89932 baresip: 0.4.15 -> 0.4.16 2016-01-01 12:30:17 +03:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Emery b604318ad8 ratox: fix src hash mismatch 2015-12-29 11:44:07 +01:00
leenaars 767f145a60 blink: 1.4.1 -> 1.4.2 2015-12-24 14:41:23 +01:00
Thomas Tuegel 54bcdcc0a7 teamspeak_client: Qt 5 infrastructure update 2015-12-20 07:56:54 -06:00
Thomas Tuegel 1cd5505a9f telegram-qml: Qt 5 infrastructure update 2015-12-20 07:56:53 -06:00
Thomas Tuegel 126188be5c cutegram: Qt 5 infrastructure updates 2015-12-20 07:56:52 -06:00
Thomas Tuegel de5898a495 qtox: Qt 5 infrastructure update 2015-12-20 07:56:49 -06:00
Thomas Tuegel 8cf6b39833 Merge pull request #11769 from Profpatsch/cutegram
cutegram: fix version in name
2015-12-16 17:41:30 -06:00
Profpatsch 5f709b8974 cutegram: fix version in name 2015-12-17 00:05:48 +01:00
Eelco Dolstra 98151e0691 ratox: Fix broken URL
However, the URL still gives a hash mismatch. @ehmry
2015-12-16 12:07:08 +01:00
Profpatsch 9c5cd49903 cutegram: init at 2.7.0-stable 2015-12-16 02:08:49 +01:00
Profpatsch 7b407414a4 telegram: create explicit folder
Will be used for other tools coming soon™.
2015-12-12 13:27:03 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Emery Hemingway 2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
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.
2015-11-20 14:32:58 +01:00
lassulus 4803b2f31a bitlbee-steam: init at 2015-09-10 2015-11-13 14:37:41 +01:00
Vladimír Čunát 31d9263159 some evaluation fixes
Not all multiple-output fixups were properly tested.
2015-10-28 10:15:52 +01:00
Vladimír Čunát dd915f82e7 expat: split dev output 2015-10-28 10:09:34 +01:00
Vladimír Čunát 783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát ba9b80c7e0 nspr,nss: split into multiple outputs
Hopefully most references are OK.
2015-10-13 20:18:44 +02:00
Michael Raskin 5c32df44c1 gajim: 0.16.3 -> 0.16.4 2015-10-13 19:30:01 +03:00
Michael Raskin e8d82e08cf baresip: 0.4.14 -> 0.4.15 2015-10-13 19:29:43 +03:00
Nathaniel Baxter 102f70bfb2 teamspeak_client: Fixed qt and quazip lib references. 2015-10-13 22:12:41 +11:00
Nikolay Amiantov 0aaadc2b9e gajim: drop LaTeX support
It's in a separate plugin now.
2015-10-12 20:06:12 +03:00
Matthias Beyer 99d7a7d83e teamspeak_client: 3.0.16 -> 3.0.18.1 (Added missing SHA update) 2015-10-11 17:09:52 +02:00
Matthias Beyer 5bf207541d teamspeak_client: 3.0.16 -> 3.18.1 2015-10-11 14:31:41 +02:00
Jascha Geerds 470e71abbd pidgin-skypeweb: init at 2015-10-02 2015-10-05 13:40:54 +02:00
Vladimír Čunát 328eafa885 gnutls: split into multiple outputs
Fixed all 'gnutls}' references, too.
2015-10-05 11:07:54 +02:00
Vladimír Čunát 68530a4fb7 dbus-glib: split into multiple outputs
Fixed all 'dbus_glib}' references too.
2015-10-05 10:51:22 +02:00
Thomas Tuegel 2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
viric 46c18a47e1 Merge pull request #10063 from akaWolf/qtox
qTox: update & fix git revision.
2015-09-25 19:23:47 +02:00
Artjom Vejsel 1bfa084cdc qtox: 20150821 -> 20150925 2015-09-25 19:47:51 +03:00
Artjom Vejsel 0c95190fff qtox: fix git hash revision 2015-09-25 19:36:23 +03:00
Vladimír Čunát 68bd8e4a9d jitsi: fix meta.license and refactor meta
/cc maintainer @khumba.
2015-09-23 13:42:47 +02:00
Vladimír Čunát 0a836bb5c0 jitsi: rename xlibs -> xorg 2015-09-23 13:36:23 +02:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
devhell eace7b6f9c profanity: 0.4.6 -> 0.4.7
Built and run successfully on local.

From the Changelog:
```
- GNU Readline
- OpenPGP support
- Message Carbons (xep-0280)
- Message Delivery Receipts (xep-0184)
- MUC Mediated Invitation support
- Configurable time formatting
- Option to show JIDs in roster
- Option to hide empty groups in roster
- Generate UUID for unnamed new MUC rooms
- Themable UI preference to indicate OTR and PGP messages
- Reformatted help
- devel: Added functional tests using libexpect and libstabber
```
2015-09-20 19:38:03 +01:00
Bryan Gardiner c8ea6c07c6 jitsi: fix the system tray icon
Java's desktop integration on Linux relies on dlopen'ing some libraries (gtk2 or
gnome).  This commit makes Java able to find gtk2, fixing the problem of Jitsi's
system tray icon not appearing.

Part of bug #4014.
2015-09-18 20:11:29 +02:00
Edward Tjörnhammar 697ef465cd jitsi: kill the elves of solaris 2015-09-18 20:11:29 +02:00
Vladimír Čunát 80b26e4079 jitsi: fix tarball on darwin 2015-09-17 22:04:39 +02:00
Bryan Gardiner 37cd8fc16f jitsi: fix when installed via systemPackages
Close #9754.
Otherwise, the wrong directory is changed into, and trying to start Jitsi gives:

$ jitsi
Error: Could not find or load main class net.java.sip.communicator.launcher.SIPCommunicator
2015-09-17 21:19:47 +02:00
Jascha Geerds d8b6defaae hipchat: 2.2.1373 -> 2.2.1388 2015-09-17 11:06:24 +02:00
Edward Tjörnhammar c6cadd11db Merge pull request #9785 from khumba/jitsi-rpath-fix
jitsi: patch RPATHs for missing libraries
2015-09-16 16:10:04 +02:00
Bjørn Forsman 0af5fccf2a pidgin-sipe: 1.18.1 -> 1.20.0
Build and run tested (on release-15.09 branch).
2015-09-16 15:47:16 +02:00
Bryan Gardiner 476f2e3e2d
jitsi: add myself as maintainer 2015-09-16 06:42:26 -07:00
Bryan Gardiner e422c2398c
jitsi: make a path patch for java slightly safer 2015-09-16 06:42:26 -07:00
Bryan Gardiner 8ef6197be5
jitsi: patch RPATHs of bundled .so files
Possibly helps with bug #3482.
2015-09-16 06:42:25 -07:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Arseniy Seroka 90a7bb69d0 Merge pull request #9711 from anderspapitto/bitlbee
plugin support for bitlbee, and facebook plugin
2015-09-09 03:03:53 +03:00
Anders Papitto 78f7a09e3a bitlbee service: enable plugins 2015-09-08 14:24:50 -07:00
Anders Papitto 207f74eee9 bitlbee-facebook: init at 2015-08-27 2015-09-08 14:24:25 -07:00
Anders Papitto 7bcf564587 bitlbee: patch to allow plugindir configuration 2015-09-08 12:05:48 -07:00
Rok Garbas 7dc9dfae88 blink: 1.4.0 -> 1.4.1 2015-09-05 15:01:06 +02:00
Alexei Robyn 4028f88786 pidgin-opensteamworks: 1.5.1 -> 1.6.1, fixes #9489
Also, changed source url to (new) official github repo
2015-09-03 13:09:54 +02:00
rnhmjoj 721dc51640 telegram-cli: keep arguments passed to the wrapper
Also break long lines
2015-08-30 22:57:08 +00:00
Luca Bruno c91d360cec pidginsipe: add nss and nspr (ZHF) 2015-08-27 12:29:45 +02:00
ts468 b1db014f40 Merge pull request #9462 from ts468/upstream.linphone
linphone: update linphone with dependencies
2015-08-26 22:33:56 +02:00
Thomas Strobel 63a1d2a364 linphone: wrap to find plugins 2015-08-26 22:17:41 +02:00
Thomas Strobel 7160a32001 linphone: 3.8.1 -> 3.8.5 2015-08-26 17:08:27 +02:00
Artjom Vejsel c9ca9db213 qtox: 20150624 -> 20150821 2015-08-22 09:59:49 +03:00
Artjom Vejsel 7f1efceff8 qtox: add wrapper for set runtime qt5.svg plugin 2015-08-22 09:59:33 +03:00
Pascal Wittmann 6364245475 telegram-cli: make maintainers a list 2015-08-14 22:38:38 +02:00
Alexei Robyn 417dd5528e pidgin-opensteamworks: init at v1.5.1
Adds pidgin-opensteamworks, a Pidgin plugin to add support for the
Steam Friends/Steam IM service
2015-08-10 13:27:27 +10:00
Michael Raskin e346b417d3 gajim: 0.16.1 -> 0.16.3 2015-08-08 21:01:31 +03:00
Michael Raskin 081dff71be baresip: 0.4.13 -> 0.4.14 2015-08-08 21:01:31 +03:00
Arseniy Seroka d649a1d88f telegram-cli: 2014-03-04 -> 2015-07-30 & add maintainer 2015-08-04 17:11:36 +03:00
Eelco Dolstra 55932c1bec Don't statically depend on cacert for certificates
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
2015-07-31 01:34:58 +02:00
Artjom Vejsel 5b527968bd pidgin-mra: init at 54b2992 (close #8996)
@vcunat made pkgconfig dependency explicit.
2015-07-26 13:45:27 +02:00
Artjom Vejsel 9ca034f277 purple-vk-plugin: init at 40ddb6d (close #8996)
@vcunat simplified preConfigure.
2015-07-26 12:08:07 +02:00
lethalman 90b19534e5 Merge pull request #8972 from nathanielbaxter/dev/teamspeak_client
teamspeak_client: create .desktop file
2015-07-24 10:14:51 +02:00
Nathaniel Baxter aae3bdab03 teamspeak_client: create .desktop file 2015-07-24 14:32:56 +10:00
Luca Bruno cbf935f90e ekiga: fid build failure, use adwaita-icon-theme instead of gnome-icon-theme (ZHF) 2015-07-21 13:20:22 +02:00
William A. Kennington III 333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Pascal Wittmann 2c31cb1c36 blink: update from 1.3.0 to 1.4.0 2015-07-10 18:53:27 +02:00
William A. Kennington III ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
Pascal Wittmann a4f69f5a39 bitlbee: update from 3.4 to 3.4.1 2015-07-06 18:16:49 +02:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin 807fbc4b57 baresip: update 0.4.12 -> 0.4.13 2015-07-05 00:32:53 +03:00
Pascal Wittmann d5275c70c3 mcabber: update from 0.10.3 to 1.0.0 2015-07-03 10:18:48 +02:00
William A. Kennington III 7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Artjom Vejsel 25ee65de97 qtox: 20150128 -> 20150624 2015-07-01 14:39:04 +03:00
Eelco Dolstra 4a57b07653 Merge remote-tracking branch 'origin/master' into staging 2015-06-11 00:18:24 +02:00
Pascal Wittmann 24a218b1cc mcabber: enable tests 2015-06-10 10:17:03 +02:00
William A. Kennington III 9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
Arseniy Seroka 70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
lethalman 997022bea9 Merge pull request #8148 from ts468/jitsi
Update version: jitsi: 2.4.4997 -> 2.8.5426
2015-06-03 10:57:37 +02:00
Thomas Strobel ac355ac095 Update version: jitsi: 2.4.4997 -> 2.8.5426 2015-06-03 07:49:01 +02:00