cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
107149 commits 1 branch 0 tags 3.7 GiB
Commit graph

462 commits

Author SHA1 Message Date
Benno Fünfstück
2c7b5ac8a9 notmuch-mutt: drop unused fetchurl parameter 2016-08-02 11:45:42 +02:00
Benno Fünfstück
58afc252e4 notmuch-mutt: remove unused parameter 2016-08-02 11:39:50 +02:00
Peter Hoeg
8c04c3c899 notmuch-mutt: init at 0.22 2016-08-02 11:39:50 +02:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Christian L
f51169366b neomutt: 20160611 -> 20160723 (#17268) 
For information about what has changes, please refer to
http://www.neomutt.org/2016/07/23/release.
 2016-07-27 18:55:48 +02:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
J Phani Mahesh
9a4d0d8e44 alpine:configure: allow using passfile 2016-07-17 17:28:10 +05:30
Joachim Fasting
a317a15b30
mutt: fetch {sidebar,trash}.patch from AUR 2016-07-16 14:01:29 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
rnhmjoj
8745e47909
mutt: 1.6.0 -> 1.6.2 2016-07-09 05:16:51 +02:00
Vladimír Čunát
ac0ba89d1e Merge #16661: thunderbird: 45.1.1 -> 45.2.0 2016-07-02 17:04:49 +02:00
mimadrid
0dfaa1e8bd
thunderbird: 45.1.1 -> 45.2.0 2016-07-02 12:23:58 +02:00
taku0
4774abecb6 thunderbird-bin: 45.1.1 -> 45.2.0 (#16659) 2016-07-02 09:50:02 +02:00
Christian Lask
39812a3531 neomutt: 20160530 -> 20160611 2016-07-01 10:01:33 +02:00
Thomas Tuegel
6a61621cb4 Merge pull request #16396 from FRidh/trojita 
trojita: init at 0.7
 2016-06-21 10:53:41 -05:00
Frederik Rietdijk
bb8bd4b5cf trojita: init at 0.7 2016-06-21 14:24:45 +02:00
zimbatm
f29ce0fecc Merge pull request #16341 from mimadrid/update/thunderbird-45.1.1 
thunderbird: 45.1.0 -> 45.1.1
 2016-06-19 22:22:14 +01:00
mimadrid
96539866a6
thunderbird: 45.1.0 -> 45.1.1 2016-06-19 17:09:55 +02:00
Rahul Gopinath
65b3ddec31 neomutt: 20160502 -> 20160530 
Adds keywords, compress, nntp to patches.
 2016-06-10 13:55:21 -07:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Christian Lask
5ff90d1518 neomutt: 20160416 -> 20160502 2016-06-03 12:22:42 +02:00
taku0
b835f3e262 thunderbird-bin: 45.1.0 -> 45.1.1 (#15860) 2016-06-01 11:34:44 +02: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
81039713fa Merge branch 'master' into staging 
... to get the systemd update (rebuilding ~7k jobs).
 2016-05-26 16:50:22 +02:00
Eelco Dolstra
fa1b9ec1e6 thunderbird: 45.0 -> 45.1.0 2016-05-25 18:04:26 +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
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +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
21747ef768 Merge pull request #15407 from taku0/thunderbird-bin-45.1.0 
thunderbird-bin: 45.0 -> 45.1.0
 2016-05-13 01:27:13 +03:00
taku0
eb4e6b821b thunderbird-bin: 45.0 -> 45.1.0 2016-05-12 21:42:54 +09:00
Domen Kožar
323cd39016 thunderbird: set requiredSystemFeatures to big-parallel 2016-05-12 10:11:03 +01:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
namore
13c2bd4d7c thunderbird: fix out-of-date hash (#15390) 2016-05-11 20:34:23 +01:00
Eelco Dolstra
cb37ab146b Add mirror://mozilla scheme 2016-05-09 19:37:22 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Vladimír Čunát
ee2fbda77a Merge #15218: thunderbird: 38.7.1 -> 45.0 2016-05-05 17:14:06 +02:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Tobias Geerinckx-Rice
2dc8975bc4
thunderbird: 38.7.1 -> 45.0 
Changes: https://www.mozilla.org/en-US/thunderbird/45.0/releasenotes/
 2016-05-05 02:14:19 +02:00
Rok Garbas
2eac1070ad Merge pull request #15229 from DamienCassou/notmuch-0.22 
notmuch: 0.21 -> 0.22
 2016-05-05 00:16:04 +02:00
Damien Cassou
d122556a2f notmuch: 0.21 -> 0.22 2016-05-04 21:49:08 +02: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
Tobias Geerinckx-Rice
75b01594c8
sylpheed: 3.4.1 -> 3.5.0 2016-04-29 04:38:54 +02:00
Nikolay Amiantov
ab0a0c004e makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Christian Lask
3053080335 neomutt: init at 20160416 
With various tweaks by @cstrahan.

closes #14747
 2016-04-15 23:52:29 -04:00
joachifm
3d5e2c5569 Merge pull request #14688 from taku0/thunderbird-bin-45.0 
thunderbird-bin: 38.7.2 -> 45.0
 2016-04-14 14:43:31 +02:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
taku0
eb5c4fdadf thunderbird-bin: 38.7.2 -> 45.0 2016-04-14 03:48:44 +09: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
taku0
8be8b6c713 thunderbird-bin: 38.7.1 -> 38.7.2 2016-04-06 23:37:50 +09:00
Louis Taylor
81e23c5ab1 mutt: update sidebar patch 2016-04-05 16:33:35 +02:00
Louis Taylor
14cb8a7a58 mutt: 1.5.24 -> 1.6.0 2016-04-05 16:33:35 +02:00
Graham Christensen
2ec1d2c738 sup: 0.20.0 -> 0.22.1 2016-04-04 07:42:38 -05: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
Eelco Dolstra
ca983ec20c thunderbird: 38.7.0 -> 38.7.1 2016-03-30 11:32:40 +02:00
Robin Gloster
a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
taku0
dc73280d19 thunderbird-bin: 38.6.0 -> 38.7.1 2016-03-29 09:19:34 +09:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Eelco Dolstra
aa6ab92d93 thunderbird: 38.6.0 -> 38.7.0 
Lots of security fixes: https://www.mozilla.org/en-US/security/known-vulnerabilities/thunderbird/#thunderbird38.7
 2016-03-17 13:24:39 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Eelco Dolstra
d25135ff6e thunderbird: Fix hash 
Commit 4a54794d18 upgraded Thunderbird's
version to 38.6.0 (accidentally?), but didn't change the hash. This
wasn't caught due to tarballs.nixos.org being keyed on hash only.
 2016-03-11 13:47:37 +01:00
Eelco Dolstra
4f5d48abf5 thunderbird: Fix build on gcc 5 
It was barfing due to --enable-stdcxx-compat. Not clear if/why we
still need this, so let's disable it. If necessary a fix is available
at https://bugzilla.mozilla.org/show_bug.cgi?id=1153109.
 2016-03-11 13:46:27 +01: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
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
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Graham Christensen
4a54794d18 xara: broken due to patch-tracker.debian.org being missing. 2016-02-27 16:13:47 -06:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +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
Robin Gloster
bb2639aafc Merge branch 'curl-7.15-fixup' of https://github.com/zimbatm/nixpkgs into hardened-stdenv 2016-02-22 01:14:22 +00:00
taku0
ce763e2d66 thunderbird-bin: 38.5.1 -> 38.6.0 2016-02-21 22:16:26 +09:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster
9f8dc7d0fe realpine: turn off format hardening 2016-02-09 23:07:13 +00:00
Robin Gloster
37cdc16780 alpine: turn off fortify/format hardening 2016-02-09 10:29:15 +00:00
Tuomas Tynkkynen
13b3f3f246 treewide: Mass replace 'openssl}/bin' to refer the 'bin' output 2016-02-01 20:46:16 +02:00
Franz Pletz
ead58a86ba clawsMail: 3.13.1 -> 3.13.2 (security fix) 2016-01-30 21:16:22 +01:00
Oliver Charles
c311b228fc Merge pull request #12275 from mogorman/notmuch-addrlookup 
notmuch-addrlookup: init at 7
 2016-01-12 15:39:29 +00:00
Matthew O'Gorman
800f513c50
notmuch-addrlookup: init at 7 2016-01-09 17:08:17 -05:00
taku0
4e9729298e thunderbird-bin: 38.5.0 -> 38.5.1 2016-01-09 15:08:30 +09:00
Mateusz Kowalczyk
265f2b6e76 imapfilter: update from 2.5.7 to 2.6.3 2016-01-03 20:51:14 +00:00
taku0
66cddef221 thunderbird-bin: 38.4.0 -> 38.5.0 2015-12-25 00:21:01 +09:00
Franz Pletz
cbada77b0b clawsMail: 3.13.0 -> 3.13.1 (CVE-2015-8614) 
Fixes a remotely triggerable buffer overflow.
http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=3557
Close #11910.
 2015-12-23 18:48:38 +01:00
Pascal Wittmann
76eae695c7 Merge pull request #11319 from taku0/thunderbird-bin-38.4.0 
thunderbird-bin: 38.3.0 -> 38.4.0
 2015-12-18 08:50:59 +01:00
Aristid Breitkreuz
f217579ca6 Merge pull request #11680 from mayflower/fix/claws-mail-fancy 
claws-mail: Fix fancy plugin
 2015-12-13 22:52:23 +01:00
Franz Pletz
cabd3effda claws-mail: Remove extra GIO_EXTRA_MODULES wrapping 2015-12-13 17:09:15 +01:00
Franz Pletz
65d8af5af2 claws-mail: Fix fancy plugin, fixes #10421 
This fixes the fancy plugin displaying HTML mails as text as suggested
by @wedens.
 2015-12-13 17:02:36 +01:00
Robin Gloster
2251af754e claws-mail: enable PGP plugin by default 2015-12-12 12:49:49 +00:00
Burke Libbey
eeb2935ac5 Fix notmuch for darwin, fixes #11410 
platforms can be unix; this works on darwin at *least*, after we fix the
libtalloc references.
 2015-12-03 09:03:29 +01:00
taku0
50a842fb37 thunderbird-bin: 38.3.0 -> 38.4.0 2015-11-28 12:00:44 +09:00
Franz Pletz
bba0521fdd clawsMail: 3.12.0 -> 3.13.0 2015-11-27 03:15:32 +01:00
Domen Kožar
704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Bryan Gardiner
f2afad2349
claws-mail: add glib_networking for fancy to load HTTPS content (#10421) 2015-11-16 20:23:12 -08:00
Damien Cassou
c6f01358ed notmuch: 0.20.2 → 0.21 2015-11-07 12:29:56 +01:00
Vladimír Čunát
e0ebb928e1 claws-mail: use a better-maintainable URL 
/cc maintainer @khumba.
 2015-10-03 12:43:39 +02:00
Bryan Gardiner
a0de3cd969
claws-mail: 3.11.1 -> 3.12.0, remove priority workaround 2015-10-02 18:43:21 -07:00
Eelco Dolstra
562851a068 thunderbird: Update to 38.3.0 2015-10-01 13:54:00 +02:00
taku0
57155e04a7 firefox-bin: 41.0 -> 41.0.1, thunderbird-bin: 38.2.0 -> 38.3.0 2015-10-01 20:44:37 +09:00
Bryan Gardiner
4eb5068a13 claws-mail: fix conflict with shared_mime_info link 
Fixes #10156. Close #10157.
 2015-09-30 19:43:29 +02:00
Bryan Gardiner
c39a557095 claws-mail: add hicolor_icon_theme dependency 
We want the hicolor_icon_theme hook to strip Claws's icon-theme.cache.
 2015-09-30 19:42:52 +02:00
Moritz Ulrich
47c92a87c8 mutt: 1.5.23 -> 1.5.24 
This change uses a different patchset for mutt-with-sidebar.
 2015-09-29 00:23:55 +02:00
Eelco Dolstra
422e3736d5 thunderbird: Update to 38.2.0 2015-09-28 15:44:37 +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
Bryan Gardiner
268b4d5cfe
claws-mail: fix attachment MIME type detection 
Adds support for shared-mime-info to Claws, to fix attachments in
outgoing messages always having MIME type application/octet-stream
because Claws doesn't know where to look, instead complaining:

/nix/store/...-claws-mail-3.11.1/etc/mime.types: fopen: No such file or directory

Moreover, Claws relies on incoming MIME types for knowing when e.g. to
display an attached image, so sending application/octet-stream
unnecessarily is bad.

Tested against release-15.09.
 2015-09-18 04:52:44 -07:00
Bryan Gardiner
5e3eb6741f
claws-mail: enable parallel building 2015-09-18 04:32:35 -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
Bryan Gardiner
ab206a0e9a
claws-mail: install the .desktop file 2015-09-11 23:23:30 -07:00
Bryan Gardiner
7d7e983393
claws-mail: add myself as maintainer 2015-09-11 23:23:26 -07:00
taku0
dffb7373a5 firefox-bin: 39.0.3 -> 40.0.2, thunderbird-bin: 38.1.0 -> 38.2.0 2015-08-18 20:35:10 +09:00
taku0
f059656ef2 thunderbird: 31.7.0 -> 38.1.0 2015-08-08 23:25:24 +09:00
Jan Malakhovski
9966ec4e54 notmuch: fix gpg path in notmuch-config.c 
Fixes errors when attempting to decrypt an encrypted message.
I'm not sure that `crypto.c` needs to be patched after this, since this setting
should propagate there, but let's play it safe.
 2015-08-06 22:11:29 +02:00
Null is Too Long
804f0098ef thunderbird-bin: fix icon path 2015-08-04 12:23:28 -04:00
Franz Pletz
6d257267ae mutt-kz: 1.5.23.1-rc1 -> 1.5.23.1 2015-07-22 23:14:52 +02:00
taku0
7064dd1f88 thunderbird-bin: 38.0.1 -> 38.1.0 2015-07-12 11:39:09 +09:00
Moritz Ulrich
25c7e5fafe notmuch: 0.19 -> 0.20.2 2015-07-06 17:37:15 +02:00
Eelco Dolstra
d8c9fa5043 Remove meta.license hack 2015-06-19 14:14:52 +02:00
taku0
4e78d76c18 thunderbird-bin: update to version 38.0.1, closes #8357 2015-06-18 11:40:13 +02:00
Jascha Geerds
8ae4d0b1e1 Add mailnag package 2015-06-14 18:31:48 +02:00
taku0
5f890ceca1 firefox-bin, thunderbird-bin: update patchelf arguments 2015-06-06 19:05:57 +09:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Eelco Dolstra
99e9710348 thunderbird: Update to 31.7.0 
Also enable parallel building, as it seems to work reliably for
Firefox.
 2015-05-22 11:46:18 +02:00
taku0
3705c62266 thunderbird-bin: update to version 31.7.0 2015-05-20 09:33:30 +09:00
Eelco Dolstra
748be0b5d0 thunderbird: Update to 31.6.0 
Fixes various critical vulnerabilities.
 2015-05-11 11:46:57 +02:00
William A. Kennington III
ed22d756af pine: Use the passthru version of tcl 2015-04-26 21:20:15 -07:00
Bjørn Forsman
6e0d0636a1 mutt: use "sendmail" instead of "/usr/bin/sendmail" 
That way sending mail with mutt works on NixOS too, without having to
manually change mutt's config on your system. sendmail will be found in
$PATH at runtime, and thus the setuid wrapper will be used, if
available.
 2015-04-12 10:48:30 +02:00
Arseniy Seroka
e7dc8c3f27 Merge pull request #7195 from KoviRobi/mailcheck 
Added mailcheck, simple utility to check for mail.
 2015-04-06 00:41:53 +03:00
Kovacsics Robert (NixOS-SSD2)
9558523821 Added mailcheck, simple utility to check for mail. 2015-04-05 19:50:43 +01:00
taku0
ce7481e129 firefox-bin: update to version 37.0; thunderbird-bin: update to version 31.6.0 2015-04-02 23:16:50 +09:00
Jan Malakhovski
d711528c8b pythonPackages: notmuch: revert 6258728, move sourceRoot setting to top-level notmuch 
Looks like this is the only way to do what 6258728318
was expected to do that doesn't break things and doesn't look like a complete hack.

The problem is that different `fetch`ers generate very different results (from
archive files to plain source trees) and allowing overriding `src` in top-level
derivation when there is a derived python package is no trivial matter.
 2015-03-31 05:36:28 +00:00
Jan Malakhovski
6ac68a4c59 sylpheed: cleanup 2015-03-29 23:21:04 +00:00
Bart Brouns
bd3e18d60f rebase mutt-kz on master, as requested in: 
https://github.com/NixOS/nixpkgs/pull/6836
 2015-03-25 13:37:19 +01:00
taku0
2e8f2d6477 firefox-bin: update to version 36.0; thunderbird-bin: update to version 31.5.0 2015-02-25 22:42:05 +09:00
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging 
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-01-31 19:34:57 +01:00
Charles Strahan
034488ec80 ruby: fixup mpdcron 2015-01-21 22:38:29 -05:00
Charles Strahan
317d78d145 consule: use new bundlerEnv 2015-01-21 20:33:19 -05:00
Charles Strahan
f52c32fcfc ruby: rewrite sup package 2015-01-21 18:23:35 -05:00
Charles Strahan
dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
 2015-01-20 20:21:03 -05:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
taku0
9d2cf54c6a firefox-bin: update to version 35.0; thunderbird-bin: update to version 31.4.0 2015-01-15 09:43:10 +09:00
Vladimír Čunát
07966befee thunderbird: update, and refactor the expression 
- use mach for building (the way Mozilla devs use),
- use --disable-debug-symbols to reduce build-time resource consumption
 2015-01-13 22:10:39 +01:00
Jan Malakhovski
8cc5279b70 sylpheed: actually enable gpg support 2015-01-07 11:08:58 +00:00