Commit Graph

660 Commits

Author SHA1 Message Date
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
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
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