JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,181 Commits 2 Branches 0 Tags 13 GiB
1ba32c5403
Commit Graph

740 Commits

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