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

15299 Commits

Author SHA1 Message Date
Thomas Tuegel
8e83bb4220
spotify: 1.0.37.152 -> 1.0.38.171 2016-09-27 13:35:54 -05:00
Franz Pletz
77779323c5
gitlab: 8.11.2 -> 8.12.1 2016-09-27 18:41:02 +02:00
Joachim F
19d3b1aa5f Merge pull request #19004 from nico202/fix-gazebo-cmake 
gazebo7: Fix gazebo-config.cmake output file
 2016-09-27 16:32:32 +02:00
Joachim F
3050350791 Merge pull request #18999 from jonafato/corebird-1.3.2 
corebird: 1.3.1 -> 1.3.2
 2016-09-27 13:49:12 +02:00
Graham Christensen
c992ac8584 Merge pull request #18921 from grahamc/spice 
Spice: Upgrade all the spice packages
 2016-09-27 07:42:51 -04:00
=
efb56cec43
gazebo7: Fix gazebo-config.cmake output file 2016-09-27 10:30:27 +02:00
Jon Banafato
39b0c0c230 corebird: 1.3.1 -> 1.3.2 
Upgrade corebird to the latest release to address new Twitter character
limit rules.
 2016-09-26 23:37:47 -04:00
Joachim F
a5580c9951 Merge pull request #18765 from aske/ocaml-move 
Reorganize ocaml packages
 2016-09-26 23:17:53 +02:00
Thomas Tuegel
240552cba1
dropbox: 10.4.26 -> 11.4.20 2016-09-26 15:34:00 -05:00
Eelco Dolstra
81447b6a59 subversion: Remove openssl.dev from the runtime closure 2016-09-26 19:58:57 +02:00
Frederik Rietdijk
d5fd65df4e Merge pull request #18982 from aneeshusa/pin-packages-to-python2-part2 
Pin packages to python2 part2
 2016-09-26 18:33:26 +02:00
Aneesh Agrawal
e6897a3fb4 mercurial: Pin to Python 2 2016-09-26 11:41:54 -04:00
Franz Pletz
fa184ee6fd
mupdf: fix build, add security patch 
Broken due to 42b08b743c.

PIC is enabled by default by our hardening flags.
 2016-09-26 15:56:27 +02:00
Robin Gloster
2d0c1c6a7c
linuxPackages.virtualboxGuestAdditions: fix with grsecurity 2016-09-26 14:52:49 +02:00
Graham Christensen
0d20194889
spice-vdagent: 0.16.0 -> 0.17.0 2016-09-26 08:20:04 -04:00
Frederik Rietdijk
9c5610d759 bazaar: use buildPythonApplication 2016-09-26 14:16:18 +02:00
Graham Christensen
fe98e664fd Merge pull request #18967 from grahamc/mplayer 
mplayer: 1.1.1 -> 1.3.0
 2016-09-26 08:15:58 -04:00
zimbatm
fb8e541da2 Merge pull request #18948 from kevincox/mumble-ice 
Fix building mumble without ice.
 2016-09-26 12:39:10 +01:00
zimbatm
0d05b32ec0 Merge pull request #18964 from guaraqe/update/buku 
buku: 1.9 -> 2.4
 2016-09-26 12:20:23 +01:00
Frederik Rietdijk
3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication 
but instead use the one in pythonPackages.
 2016-09-26 11:10:51 +02:00
Frederik Rietdijk
804de7d820 zim: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Frederik Rietdijk
f84bc4e505 uzbl: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Frederik Rietdijk
debfe4f124 terminator: do not use top-level python packages 
and refactor to use buildPythonApplication. cc @bjornfor
 2016-09-26 11:10:50 +02:00
Frederik Rietdijk
451f1921f1 liferea: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Frederik Rietdijk
0ccf17590b mypaint: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Frederik Rietdijk
76ef3ef0e1 linuxband: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Peter Hoeg
0230d923f1 syncthing: 0.14.6 -> 0.14.7 2016-09-26 16:07:14 +08:00
Eelco Dolstra
cc99017c9f Merge pull request #18959 from grahamc/qemu 
qemu: 2.6.1 -> 2.7.0 for CVEs
 2016-09-26 08:18:07 +02:00
Graham Christensen
f5057d6ba9
mplayer: 1.1.1 -> 1.3.0 2016-09-25 21:50:08 -04:00
guaraqe
571d51387c buku: 1.9 -> 2.4 2016-09-26 03:16:58 +02:00
Kirill Boltaev
2bc87d48f1 scilab: mark as broken 2016-09-26 02:36:49 +03:00
Kirill Boltaev
06ecea00e5 glsurf: mark as broken 2016-09-26 02:36:49 +03:00
Kirill Boltaev
e61663a233 treewide: move to ocaml-ng system 2016-09-26 02:36:49 +03:00
Emery Hemingway
94d059d1d9 baresip: enable G.711 codec 2016-09-26 00:29:39 +02:00
Frederik Rietdijk
107e8ccb6b key-mon: do not use top-level python packages 2016-09-25 23:59:21 +02:00
Frederik Rietdijk
aa23f61120 keepnote: do not use top-level python packages 2016-09-25 23:53:57 +02:00
Frederik Rietdijk
9f8916e519 jbrout: do not use top-level python packages 2016-09-25 23:52:22 +02:00
Frederik Rietdijk
1ec5db7f2e gnumeric: do not use top-level python packages 2016-09-25 23:40:02 +02:00
Frederik Rietdijk
0721cd2f7d gimp: do not use top-level python packages 2016-09-25 23:19:01 +02:00
Frederik Rietdijk
24314edbc8 diffuse: do not use top-level python packages 2016-09-25 23:12:26 +02:00
Frederik Rietdijk
39b819d7ad electrum-dash: do not use top-level python packages 2016-09-25 23:12:05 +02:00
Frederik Rietdijk
f2e0a3c43a cinepaint: do not use top-level python packages 2016-09-25 22:56:40 +02:00
Frederik Rietdijk
7470f4d761 freecad: do not use top-level Python packages 2016-09-25 22:32:20 +02:00
Frederik Rietdijk
7ff1544981 inkscape: use python.withPackages instead of wrappers 2016-09-25 22:31:25 +02:00
Graham Christensen
5e25995295
qemu: 2.6.1 -> 2.7.0 2016-09-25 15:40:47 -04:00
aszlig
0c2683cc11
chromium: Fix wrong/missing hash for beta channel 
The hash provided in commit 072917ea5d is
faulty, either because the upstream tarball has changed or because it
was wrong in the first place, no matter what happened we can't really
verify if we don't have the tarball with the old hash.

To double-check I've verified the hash against the one from Gentoo[1],
which has the following SHA256:

b46c26a9e773b2c620acd2f96d69408f14a279aefaedfefed002ecf898a1ecf2

After being converted into base 32 the hash does match with ours.

Note that I haven't tested building all Chromium channels (yet), but we
can fix upcoming issues later because right now it doesn't build anyway
because of the failing hash check.

[1]: https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/Manifest?id=2de0f5e4ffeb46a478c589b21d5bbcfd5736e57b

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-09-25 20:58:03 +02:00
Thomas Tuegel
41e0146136
dropbox: 10.4.25 -> 10.4.26 2016-09-25 10:42:38 -05:00
Kevin Cox
180366aa14 Fix building mumble without ice. 2016-09-25 10:38:02 +01:00
2chilled
68a38d6c0f rawtherapee: 4.2 -> 4.2.1025 (#18368) 2016-09-25 08:01:27 +02:00
andjscott
2e2542b389 keepasshttp: init at 1.8.4.1 (#18439) 2016-09-25 07:54:24 +02:00
Pascal Bach
40b77eeea3 openshift: 1.0.1 -> 1.3.0 (#18937) 2016-09-25 01:57:35 +02:00
Arseniy Seroka
98b2411fe3 Merge pull request #18677 from RamKromberg/fix/mlterm 
mlterm: fix cairo and multiple other features
 2016-09-25 01:19:29 +04:00
Arseniy Seroka
4400b60cd9 Merge pull request #18787 from romildo/upd.subtitleeditor 
subtitleeditor: 0.52.1 -> 0.53.0
 2016-09-25 01:09:24 +04:00
Arseniy Seroka
3324c19a84 Merge pull request #18899 from grahamc/ikiwiki 
ikiwiki: 3.20150614 -> 3.20160905
 2016-09-25 01:05:59 +04:00
Franz Pletz
072917ea5d
chromium: update to latest channel releases (security) 
Fixes at least:

  - CVE-2016-1667
  - CVE-2016-1668
  - CVE-2016-1669
  - CVE-2016-1670
  - CVE-2016-5170
  - CVE-2016-5171
  - CVE-2016-5172
  - CVE-2016-5173
  - CVE-2016-5174
  - CVE-2016-5175
  - CVE-2016-7395

cc #18856
 2016-09-24 21:55:24 +02:00
Thomas Tuegel
1e741cf603 Merge pull request #18926 from PierreR/master 
vcsh: 1.20141026-1 -> 1.20151229-1
 2016-09-24 10:10:24 -05:00
Franz Pletz
fa6c6dae76
imagemagick: 6.9.5-2 -> 6.9.5-10 
Fixes lots of CVEs, including the recent:

  * CVE-2016-4562, CVE-2016-4563, CVE-2016-4564
  * CVE-2016-5687
  * CVE-2016-5010
  * CVE-2016-5688
  * CVE-2016-5689, CVE-2016-5690, CVE-2016-5691
  * CVE-2016-5841 and CVE-2016-5842
  * CVE-2016-6491
  * CVE-2016-6520

cc #18856
 2016-09-24 16:57:00 +02:00
Pierre Radermecker
e9bac709e2 vcsh: 1.20141026-1 -> 1.20151229-1 2016-09-24 16:50:08 +02:00
Joachim F
cbc9670832 Merge pull request #18758 from yorickvP/upd.i3lock 
i3lock-color: 2.7_rev63a4c23 -> 2.7_revc8e1aec
 2016-09-24 15:58:16 +02:00
zimbatm
f65f6a7668 sublimetext3: 3124 -> 3126 2016-09-24 14:53:42 +01:00
Joachim F
3e0dcb3955 Merge pull request #18866 from acowley/redprl 
redprl: init at 2016-09-22
 2016-09-24 15:51:54 +02:00
Nikolay Amiantov
0d7f5117fb Merge pull request #18871 from romildo/fix.mkvtoolnix 
mkvtoolnix: qt5 development tools are not found
 2016-09-24 13:31:05 +04:00
Anthony Cowley
a3c26fec32 redprl: init at 2016-09-22 2016-09-23 20:37:20 -04:00
Joachim F
468b2d9c00 Merge pull request #18862 from cmfwyp/calibre-2.68.0 
calibre: 2.66.0 -> 2.68.0
 2016-09-24 01:34:08 +02:00
Thomas Tuegel
564b12656e
firefox-bin: update hashes 2016-09-23 17:28:47 -05:00
José Romildo Malaquias
40c4e80935 vivaldi: 1.3 -> 1.4 (#18886) 2016-09-24 00:27:36 +02:00
Graham Christensen
5e043ffa45
ikiwiki: 3.20150614 -> 3.20160905 2016-09-23 18:27:00 -04:00
Daiderd Jordan
fef18bdedc Merge pull request #18801 from winksaville/update-vim_configurable-to-vim.8.0005 
vim_configurable: 7.4.826 -> 8.0005
 2016-09-23 23:54:34 +02:00
Wink Saville
d81a6e6f9c Remove python_framework.patch 
In the [discussion](https://github.com/NixOS/nixpkgs/pull/18801) of this pull
request @LnL7 was unable to complete a darwin build because the
python_framework.patch does not apply and suggests it should be removed.
 2016-09-23 09:13:23 -07:00
Tim Steinbach
d965064280
tortoisehg: 3.8.1 -> 3.9.1 2016-09-23 11:51:54 -04:00
Tim Steinbach
18b5e607d9
mercurial: 3.8.2 -> 3.9.1 2016-09-23 11:50:14 -04:00
José Romildo Malaquias
d18a8f9cf2 mkvtoolnix: do not inline the result of optional in buildInputs because it returns a list and should be concatenated instead 2016-09-23 11:35:26 -03:00
Joachim F
5f0302b4a1 Merge pull request #18704 from Ralith/purple-hangouts 
purple-hangouts-hg: 2016-07-17 -> 2016-08-31
 2016-09-23 15:27:25 +02:00
Lancelot SIX
9b4a56e312 Merge pull request #18830 from paperdigits/darktable-206 
Updated darktable to version 2.0.6
 2016-09-23 12:43:09 +02:00
rushmorem
faf14cbcee rkt: 1.14.0 -> 1.15.0 2016-09-23 11:59:55 +02:00
Tuomas Tynkkynen
6bca04c57b retroshare06: Disable parallel build 
http://hydra.nixos.org/build/40998820/nixlog/1/raw
 2016-09-23 12:45:21 +03:00
cmfwyp
8212b2e0b5
calibre: 2.66.0 -> 2.68.0 2016-09-22 23:32:52 -04:00
Joachim F
cdec20ac58 Merge pull request #18790 from michalrus/xmind 
xmind: init at 7.5-update1
 2016-09-23 03:47:57 +02:00
Mica Semrick
9e661620ea darktable: 2.0.5 -> 2.0.6 2016-09-22 17:33:01 -07:00
Tuomas Tynkkynen
5dcc389afc Merge pull request #18834 from DamienCassou/hub-2.2.8 
hub: 2.2.5 -> 2.2.8
 2016-09-23 01:10:36 +03:00
Robert Helgesson
38f9d995ab
eclipse-plugin-testng: 6.9.11 -> 6.9.12 2016-09-22 22:13:37 +02:00
Robert Helgesson
47e210b846
gpsprune: 18.4 -> 18.5 2016-09-22 22:13:37 +02:00
zimbatm
0ccfe2e3a9 terraform: 0.7.2 -> 0.7.4 2016-09-22 20:37:05 +01:00
Joachim F
87ac2b108b Merge pull request #18799 from taku0/firefox-bin-49.0 
firefox-bin: 48.0.2 -> 49.0
 2016-09-22 14:41:08 +02:00
Joachim F
48ceedf1f4 Merge pull request #18642 from mjanczyk/update/keepass-keefox 
keepass-keefox: 1.5.4 -> 1.6.3
 2016-09-22 14:35:36 +02:00
Joachim F
775bb8791e Merge pull request #18641 from mjanczyk/update/keepass 
keepass: 2.33 -> 2.34
 2016-09-22 14:12:13 +02:00
Moritz Ulrich
b8a8575b1b rawtherapee-git; Init at 2016-09-21 2016-09-22 13:11:04 +02:00
zimbatm
70b02dcc11 sublime3: 3114 -> 3124 2016-09-22 10:59:53 +01:00
Damien Cassou
4d15b2cdb0
hub: 2.2.5 -> 2.2.8 2016-09-22 09:26:58 +02:00
Alexander V. Nikolaev
b3ada0bce9 irssi: 1.8.19 -> 1.8.20 (security) 
https://irssi.org/security/irssi_sa_2016.txt
  CVE-2016-7044
  CVE-2016-7045
 2016-09-22 03:42:50 +03:00
Periklis Tsirakidis
937b56f5db emacs-25-macport: init at 25.1-mac-6.0 (#18363) 2016-09-21 22:19:57 +02:00
Vincent Laporte
4aafe684d2 tagainijisho: set meta.platforms to linux only 2016-09-21 19:19:16 +02:00
Vincent Laporte
c78c2b98c4 ecm: set meta.platforms to linux only 2016-09-21 19:14:11 +02:00
Tuomas Tynkkynen
ca7808f696 streamlink: Fix longDescription 2016-09-21 19:34:01 +03:00
Tuomas Tynkkynen
5aee5b2100 streamlink: Init at 1.14.0-rc1 
A fork of livestreamer (which is no longer maintained) that actually
works with Twitch.
 2016-09-21 19:29:51 +03:00
Michael Raskin
7be4077832 libreoffice: fix symlinking of the tarballs. The tarballs' outputHash is now sha256, but LibreOffice build process expects them to be available by md5-prefixed names 2016-09-21 18:33:49 +02:00
José Romildo Malaquias
c212ad1630 subtitleeditor: 0.52.1 -> 0.53.0 2016-09-21 09:45:20 -03:00
Eelco Dolstra
5bfd092f07 firefox-esr: 45.3.0 -> 45.4.0 2016-09-21 13:28:37 +02:00
Eelco Dolstra
99138dc356 firefox: 48.0.2 -> 49.0 2016-09-21 13:28:37 +02:00
Domen Kožar
5d1db88a7c virtualboxGuestAdditions: mark as broken on grsecurity 
(cherry picked from commit 4821fa2d1971a54847d28dfb3e9039c5e5ae4ded)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-09-21 12:04:19 +02:00
Alexander Ried
9f3550e2ee weston: 1.11.0 -> 1.12.0 2016-09-21 11:16:32 +02:00
Chris Martin
356bae0aa9 libreoffice: md5 -> sha256 2016-09-21 01:14:17 -04:00
Wink Saville
08d7cfa420 Update vim_configurable to vim 8.0005 2016-09-20 16:56:31 -07:00
Eelco Dolstra
ddd41a509a virtualbox: Drop dontPatchELF hack 
However, this also requires ad8f31df7f
to get rid of gcc_multi.out in the closure.
 2016-09-20 18:02:19 +02:00
Gabriel Ebner
dd4a015aa8 eprover: 1.9 -> 1.9.1 2016-09-20 11:57:14 -04:00
Michal Rus
0e5674412f
xmind: init at 7.5-update1 2016-09-20 16:33:08 +02:00
Joachim F
e22dd2f6c5 Merge pull request #18740 from chris-martin/tulip-4-9 
Tulip: 4.1.0 -> 4.9.0
 2016-09-20 14:34:17 +02:00
Joachim F
f6ce8894dd Merge pull request #18753 from rnhmjoj/mutt 
mutt: 1.6.2 -> 1.7.0
 2016-09-20 14:33:22 +02:00
Michael Raskin
d9bb1bfeda Merge pull request #18755 from chris-martin/libreoffice-gen 
libreoffice: Convert generate-libreoffice-srcs from Bash to Python
 2016-09-20 09:47:30 +00:00
Franz Pletz
15935839b9 Merge pull request #18773 from romildo/upd.lxappearance 
lxappearance: 0.6.1 -> 0.6.2
 2016-09-20 10:34:14 +02:00
Nicolas Dudebout
fafff78d3d Emacs cleanup (#18730) 
emacs: Clean up derivation
 2016-09-20 10:13:01 +02:00
José Romildo Malaquias
18e696e97b lxappearance: move from pkgs/applications/misc/ to pkgs/desktops/lxde/core/ 2016-09-19 22:26:10 -03:00
taku0
25ff8637f4 firefox-bin: 48.0.2 -> 49.0 2016-09-20 09:12:07 +09:00
Eelco Dolstra
da3e6d6eda google-talk-plugin: Prevent a dependency on gcc 2016-09-19 20:02:07 +02:00
Yorick van Pelt
dccb882e45 i3lock-color: 2.7_rev63a4c23 -> 2.7-2016-09-17 2016-09-19 19:42:40 +02:00
Chris Martin
754836ab4c libreoffice: generate-libreoffice-srcs.{sh->py} 2016-09-19 12:01:30 -04:00
Frederik Rietdijk
0211fe0c65 Merge pull request #18748 from RamKromberg/fix/calc 
calc: remove redundant groff dependency
 2016-09-19 13:00:23 +02:00
Karn Kallio
07154a77e7 mysqlworkbench : fix build and update to latest version 6.3.7 2016-09-19 09:58:37 +02:00
rnhmjoj
5c0e73e860
mutt: 1.6.2 -> 1.7.0 2016-09-19 06:33:28 +02:00
Franz Pletz
01f8b65e48
freewheeling: cleanup 2016-09-19 00:58:55 +02:00
Franz Pletz
268d8dbf1b
blink: works with recent gnutls versions 2016-09-19 00:58:45 +02:00
Ram Kromberg
a729d6ee55 calc: remove redundant groff dependency 2016-09-19 01:37:45 +03:00
Franz Pletz
6e60359c74
errbot: the text interface needs pytest at runtime 2016-09-18 23:55:09 +02:00
Robin Gloster
f1f856ada7
errbot: use buildPythonApplication 2016-09-18 23:54:39 +02:00
Vladimír Čunát
f27a970f2d firefox*: fix notifications 
Fixes #18712. Now firefox uses the notification daemon, if available.

Unfortunately, the same approach didn't work for thunderbird; I don't
know why.
 2016-09-18 23:23:13 +02:00
Frederik Rietdijk
79995e91de Merge pull request #18719 from romildo/upd.mkvtoolnix 
mkvtoolnix: 9.4.0 -> 9.4.2
 2016-09-18 23:06:16 +02:00
Frederik Rietdijk
7a09eb7fbd Merge pull request #18276 from veprbl/rootpy 
rootpy: init at 0.8.3
 2016-09-18 22:49:47 +02:00
Chris Martin
08e5949235 tulip: 4.1.0 -> 4.9.0 2016-09-18 15:24:29 -04:00
Thomas Tuegel
3afe2061a2
Merge branch 'emacs-packages' 2016-09-18 12:55:06 -05:00
Thomas Tuegel
c31e3cf65b
orgPackages 2016-09-18 2016-09-18 12:52:29 -05:00
Thomas Tuegel
42f63a5402
melpaStablePackages 2016-09-18 2016-09-18 12:47:09 -05:00
Thomas Tuegel
93adad3ba4
melpaPackages 2016-09-18 2016-09-18 11:40:43 -05:00
Bjørn Forsman
32efdb7128 treewide: sshfsFuse -> sshfs-fuse 2016-09-18 17:44:30 +02:00
Moritz Ulrich
a115cd5dbf digikam5: Add tools for panorama/stacking to PATH 2016-09-18 17:29:27 +02:00
Thomas Tuegel
b01e7f26c7
elpaPackages 2016-09-18 2016-09-18 09:38:47 -05:00
Thomas Tuegel
8d3644d7b2 Merge pull request #18303 from the-kenny/digikam-51 
Digikam 5.1
 2016-09-18 09:28:38 -05:00
Joachim F
39405311b8 Merge pull request #18686 from RamKromberg/fix/vis 
vis: 2016-07-15 -> 2016-08-24
 2016-09-18 13:52:37 +02:00
Moritz Ulrich
01e44ac1f9 emacs: 24.5 -> 25.1 
This commit removes all references to emacs24 with the exception of
emacs24-macports. The two folders in `pkgs/applications/editors` named
`emacs-24` and `emacs-24` are consolidated to a new `emacs` folder.

Various parts in nixpkgs also referenced `emacs24Packages` (pinned to
`emacs24`) explicitly where `emacsPackages` (non-pinned) is more
appropriate. These references get fixed by this commit too.
 2016-09-18 13:38:21 +02:00
José Romildo Malaquias
88e15b19ef mkvtoolnix: 9.4.0 -> 9.4.2 2016-09-18 07:09:07 -03:00
Dmitry Kalinkin
7b9deaba81 root: add setup-hook 2016-09-18 04:45:18 -04:00
Thomas Tuegel
48999a953b Merge pull request #18656 from jokogr/u/sddm-0.14.0 
sddm: 0.13.0 -> 0.14.0
 2016-09-17 17:01:29 -05:00
Profpatsch
61462c94e6 lib/fetchers.nix: factor out impure proxy vars (#18702) 
Apparently everyone just copied those variables, instead of creating a
library constant for them. Some even removed the comment. -.-
 2016-09-17 21:50:01 +02:00
Benjamin Saunders
673798ea15 purple-hangouts-hg: 2016-07-17 -> 2016-08-31 2016-09-17 12:05:06 -07:00
Joachim F
54482712d5 Merge pull request #18305 from RamKromberg/init/deadpixi-sam 
deadpixi-sam: init at 2016-09-15
 2016-09-17 16:18:43 +02:00
Ram Kromberg
dd8335629d deadpixi-sam: init at 2016-09-15 2016-09-17 16:43:28 +03:00
Alexander Ried
3e20ba60a1
freerdp: work around pkgconfig limitation 
Fixes weston build against freerdp2

Closes https://github.com/NixOS/nixpkgs/pull/18556
 2016-09-17 13:54:36 +02:00
Alexey Shmalko
b88b5d9a0f
Merge pull request #18651 from jonafato/init-corebird-1.3.1 
corebird: init at 1.3.1
 2016-09-17 12:55:22 +03:00
Franz Pletz
2b9ca53975 Merge pull request #18666 from Profpatsch/xmpp-client 
xmpp-client: 20160110 -> 20160916
 2016-09-17 11:09:59 +02:00
Kranium Gikos Mendoza
d9a4d942ab antiword: move sed to prePatch. fixes #18627 
[Bjørn: change patchPhase -> prePatch (we must not override patchPhase).]
 2016-09-17 10:30:06 +02:00
Michael Raskin
ad2d4f583c Merge pull request #18682 from chris-martin/libreoffice-fetch 
libreoffice: add nix shells for source generation
 2016-09-17 05:19:53 +00:00