Commit Graph

580 Commits

Author SHA1 Message Date
Robin Gloster
15f6dcb668
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-06-20 11:24:39 +02:00
Thomas Tuegel
c816bbc8a8
qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Vladimír Čunát
791f072384
Merge #26601: thunderbird*: 52.1.1 -> 52.2.0 (security) 2017-06-15 20:29:01 +02:00
Peter Hoeg
7eadf66244 neomutt: 20170428 -> 20170602 2017-06-02 21:41:27 +08:00
Robin Gloster
c1359ce04b
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-06-02 15:39:25 +02:00
John Ramsden
580f7b47a3 Update version to 2.0.32-fec7941 and apply proposed changes. 2017-06-01 00:06:20 -07:00
Matthias Beyer
9357927a4d mutt: 1.8.2 -> 1.8.3
From the Release-Mail:

    This is a bug-fix release.  Of note to Gmail users is a potential
    crash fix when copy/moving messages to its Trash folder.
2017-05-31 10:05:21 +02:00
Volth
b7ccf27229 rename webkitgtk24x -> webkitgtk24x-gtk3; webkitgtk2 -> webkitgtk24x-gtk2 2017-05-26 13:43:25 +00:00
Robin Gloster
cb00af4a2c
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-05-23 11:50:02 +02:00
Frederik Rietdijk
997b6ae752 Merge pull request #25803 from vdemeester/astroid-0-9-1
astroid: 0.8 -> 0.9.1
2017-05-22 11:14:42 +02:00
Robin Gloster
da9adb8fab
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-05-20 14:55:44 +02:00
taku0
4b9c089295 thunderbird: 52.1.0 -> 52.1.1 2017-05-17 16:10:28 +02:00
taku0
d745dc2177 thunderbird-bin: 52.1.0 -> 52.1.1 2017-05-17 16:10:28 +02:00
Vincent Demeester
fae70a8421
astroid: 0.8 -> 0.9.1
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-15 15:37:38 +02:00
John Ramsden
1f10c1112a Fixed spelling in description and added info on keyring. 2017-05-10 20:13:50 -07:00
John Ramsden
1be1ba5421 Add longDescription with note about keyring. 2017-05-10 19:47:40 -07:00
John Ramsden
14f4b21fe5 Added self as maintainer. 2017-05-10 17:17:33 -07:00
John Ramsden
42ff593555 nylas-mail: 2.0.31
Added new email client Nylas-Mail.
2017-05-07 16:05:53 -07:00
Peter Hoeg
7e9ca80490 neomutt: 2017-03-06 -> 2017-04-28 2017-05-07 10:40:49 +08:00
Vladimír Čunát
4e8aea4339
thunderbird: fix missing icons
It's just a fallback in case the user has no icon theme on path.
2017-05-04 22:54:30 +02:00
taku0
ef430f0298 thunderbird: 52.0.1 -> 52.1.0 2017-05-01 08:57:55 +09:00
taku0
aab5e51ed0 thunderbird-bin: 52.0.1 -> 52.1.0 2017-05-01 03:12:54 +09:00
Franz Pletz
07cc3eb0d0
claws-mail: 3.14.1 -> 3.15.0 2017-04-24 21:06:53 +02:00
Daiderd Jordan
80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors
Add Darwin as platform to various "broken" packages that actually build
2017-04-24 08:14:21 +02:00
Matthew Bauer
68b5c5e9a9
sylpheed: supports darwin 2017-04-23 18:08:53 -05:00
Nikolay Amiantov
9f6baaa89a Merge pull request #24961 from layus/thunderbird-default-mail-client
Thunderbird: Fix default mail client detection
2017-04-23 15:54:56 +03:00
Matthias Beyer
2052ff856f mutt: 1.8.1 -> 1.8.2 2017-04-19 11:26:25 +02:00
Guillaume Maudoux
eb8f604456 thunderbird: fix default mail client detection 2017-04-17 22:03:09 +02:00
Guillaume Maudoux
f5fa05677d thunderbird: (re)add features lost in refactoring
The refactoring in b023370f37 ported
changes from firefox-unwrpped, but dropped features in firefox's
wrapper.

Add the desktop item and remove useless dev files.
2017-04-17 00:07:26 +02:00
taku0
692ea2b6e9 thunderbird: 52.0 -> 52.0.1 2017-04-15 22:09:15 +09:00
taku0
dac0ad26c9 thunderbird-bin: 52.0 -> 52.0.1 2017-04-15 21:44:56 +09:00
Matthias Beyer
77e71c2f99 mutt: 1.8.0 -> 1.8.1
From the announce email:

    This is a bug fix release.  In particular, it has fixes for setenv,
    sidebar_whitelist, some refresh issues, and a potential segfault.
    Details can be seen in the ChangeLog file.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2017-04-14 11:34:13 +02:00
Eelco Dolstra
75f1a55fbe Merge pull request #24851 from laMudri/thunderbird-calendar
thunderbird: add option to enable calendar
2017-04-12 20:30:05 +02:00
laMudri
f94e0a0dc7 thunderbird: add option to enable calendar 2017-04-12 19:12:37 +01:00
Lorenzo Manacorda
5108c4c7b2 notmuch: fix homepage and notmuch-mutt license (#24777)
* notmuch: fix homepage and notmuch-mutt license

notmuch-mutt's license is GPLv3. might have been changed when it was upstreamed.

* fix scheme

* fix typo in url

* fix field alignment

* use with to make statements shorter
2017-04-10 16:00:25 +02:00
Nikolay Amiantov
b023370f37 thunderbird: port changes from firefox
Fix random crashes.
Add optional GTK3 support.
2017-04-10 02:20:59 +03:00
taku0
55ff94b396 thunderbird: 45.8.0 -> 52.0 2017-04-10 02:20:29 +03:00
taku0
77f0ad5a37 thunderbird-bin: 45.8.0 -> 52.0 2017-04-10 02:20:26 +03:00
Lorenzo Manacorda
da4fd5ef41 mutt: actually make imap optional (#24776) 2017-04-09 20:55:27 +01:00
Brandon Dimcheff
aac3f9a8cb astroid: 0.7 -> 0.8
Upgraded astroid to 0.8 and uses the upstream changes to properly
propagate environment without a patch.  Note that this still uses an
unsupported version of webkitgtk and thus will fail to build, but if
allow webkitgtk to install, astroid will run.
2017-04-02 23:37:24 -04:00
ndowens
da16238077 sylpheed: 3.5.0 -> 3.5.1 2017-03-29 19:07:54 -05:00
William Casarin
f9f5bec507 muchsync: fix on macOS 2017-03-28 19:22:21 +01:00
Bart Brouns
42c2bac8c0 neomutt: 20170128 -> 20170306 2017-03-11 16:26:37 +01:00
taku0
d398217d63 thunderbird, thunderbird-bin: 45.7.1 -> 45.8.0 2017-03-09 21:40:53 +09:00
Graham Christensen
85b47bbd5e
mailpile: mark as insecure, pending removal 2017-03-06 18:02:55 -05:00
Bjørn Forsman
3d104ab2b3 gst-plugins-base: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Matthias Beyer
77064ceb35 mutt: 1.7.2 -> 1.8.0
From the Changelog:

The keys used are:
  !: modified feature, -: deleted feature, +: new feature

1.8.0 (2017-02-24):

  - $locale has been removed.  Mutt now respects the LC_TIME setting
    instead.  See also $attribution_locale.
  + $attribution_locale can be used to override the date formatting in
    attribution strings.  When unset, Mutt will use the locale
    environment, but note the default value of $date_format has a
    leading '!' which says to use the C-locale.
  ! Message-id and mail-followup-to headers are now preserved for recalled
    messages.
  + <unsidebar_whitelist> added to complement <sidebar_whitelist>.
  ! The pager position is reset to the top when toggling header-weed.
  ! IMAP messages moved to $trash via server-side copy are marked as read.
  + <root-message> jumps to the root message of a thread.
  ! Piped text attachments are charset converted.
  + Added %F to $attach_format, to show the content-disposition filename.
    %d will fall back to %F which will fall back to %f.
  + <rename-attachment> allows an attachment name to be changed, without
    modifying the underlying file's name.
  ! Mutt will look for the user's muttrc additionally in
    $XDG_CONFIG_HOME/mutt/.
  + Compressed mbox and mmdf files are now supported via open-hook,
    close-hook, and append-hook.  See contrib/sample.muttrc-compress
    for suggested settings.  Note this is a compile-time option:
    --enable-compressed.
  + When $flag_safe is set, flagged messages cannot be deleted.
  + The '@' pattern modifier can be used to limit matches to known aliases.
  + <mark-message> creates a hotkey binding to a specific message.  The hotkey
    prefix is specified via $mark_macro_prefix.
  + <setenv> and <unsetenv> can be used to add/remove environment variables
    passed to children.
  ! Mutt will now use the built-in OpenSSL SSL_set_verify() callback
    to verify certificates.  This allows better support for verifying
    chains, including alternative chain support.
  + $uncollapse_new controls whether a thread will be uncollapsed when a new
    message arrives.
  ! $to_chars and $status_chars now accept multibyte characters.
  + <subjectrx> allows replacing matching subjects with something else.
    This can be used to declutter subject lines in the index.
  + <edit-label> can be used to add, change, or delete a message's X-Label.
  ! Pattern expressions with ~y support label tab completion.
  + The header cache now also supports Kyoto Cabinet and LMDB as
    backend databases.
2017-02-25 20:30:00 +01:00
Tuomas Tynkkynen
e5e1bdca53 firefox, thunderbird: Use common-updater/update-source-version script
Replace the custom patching code with the common script.

Also use callPackage and makeBinPath
2017-02-19 16:51:17 +02:00
Vladimír Čunát
432dba859e
Merge branch 'staging'
A security update of libxml2 is within.
2017-02-18 08:59:29 +01:00
Orivej Desh
47ded42788 lumail: init at 2.9 2017-02-17 12:14:20 +01:00
Robin Gloster
9d39e8b974
imapfilter: 2.6.3 -> 2.6.10 2017-02-17 00:11:22 +01:00
Thomas Tuegel
d43738ae93
notmuch: don't double-compress man pages 2017-02-14 08:54:10 -06:00
Franz Pletz
92d2d74c40
astroid: 0.6 -> 0.7, use wrapGAppsHook
cc @bdimcheff #22559
2017-02-09 14:44:04 +01:00
Brandon Dimcheff
c517e54328 astroid: fix crash due to missing icons
Astroid was unable to run in a pure environment because it couldn't find
the necessary icons.  This fixes that issue, and was tested with
`nix-shell --pure`
2017-02-09 14:42:17 +01:00
taku0
764b1d19f9 thunderbird-bin: 45.7.0 -> 45.7.1 2017-02-08 09:35:07 +09:00
Vladimír Čunát
a2c867fd39
Merge branch 'staging' 2017-02-04 21:02:46 +01:00
Ollie Charles
3c05174f07 muchsync: Add meta attributes 2017-02-03 18:01:37 +00:00
Ollie Charles
7d00b5faed muchsync: init at 2 2017-02-03 17:57:53 +00:00
Vladimír Čunát
adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
Robin Gloster
bd3ac6938b
claws-mail: 3.14.0 -> 3.14.1 2017-02-02 19:19:28 +01:00
Vladimír Čunát
9cd2dbc569
Merge branch 'master' into staging
Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
2017-01-30 18:39:36 +01:00
Franz Pletz
0adf664210
neomutt: 20161126 -> 20170128 2017-01-30 01:16:18 +01:00
Franz Pletz
eadb9ce15f
notmuch: 0.23.4 -> 0.23.5 2017-01-30 01:16:15 +01:00
Tuomas Tynkkynen
424cfe7686 Merge remote-tracking branch 'upstream/master' into staging 2017-01-29 02:16:29 +02:00
taku0
403cb72d9a thunderbird, thunderbird-bin: 45.6.0 -> 45.7.0 2017-01-27 22:26:45 +09:00
Robin Gloster
6d3f23d045
thunderbird: add patch to fix build with gcc6 2017-01-25 20:12:39 +01:00
Robin Gloster
53a2bbd552
thunderbird: add patch to fix build with gcc6 2017-01-20 16:39:28 +01:00
Moritz Ulrich
efe05f9d42
notmuch: 0.23.2 -> 0.23.4. 2017-01-08 20:14:34 +01:00
Vladimír Čunát
789b811e7d
thunderbird: fixup build after updating sed 2017-01-05 22:40:30 +01:00
Brandon Dimcheff
0890ce6f09
astroid: init at 0.6 2017-01-01 22:38:12 +01:00
Graham Christensen
31c14bc58e Merge pull request #21512 from Mic92/neomutt
neomutt: 20161104 -> 20161126
2016-12-30 15:13:05 -05:00
Jörg Thalheim
1cc599307f
neomutt: 20161104 -> 20161126 2016-12-30 04:04:24 +01:00
taku0
93d917fa22 firefox, thunderbird: add updateScript 2016-12-29 11:19:50 +01:00
Graham Christensen
0e400de967 Merge pull request #21488 from taku0/thunderbird-45.6.0
thunderbird: 45.5.1 -> 45.6.0 [Critical security fix]
2016-12-28 21:34:45 -05:00
taku0
a1f595c870 thunderbird: 45.5.1 -> 45.6.0 2016-12-29 11:07:10 +09:00
taku0
373fb99e98 thunderbird-bin: 45.5.1 -> 45.6.0 2016-12-29 10:59:37 +09:00
Rok Garbas
a66b703f94 firefox-bin/thunderbird-bin: reuse the same updateScript for both 2016-12-18 16:45:33 +01:00
Bart Brouns
3fc60ec351
remove mutt-kz: deprecated in favor of neomutt
Removed reference in all-packages.nix. Fixes #20952.
2016-12-16 12:16:39 +01:00
Matthias Beyer
10b16b2327 mutt: 1.7.1 -> 1.7.2 2016-12-05 08:48:14 +01:00
Eelco Dolstra
f4aab5b211
thunderbird: 45.5.0 -> 45.5.1 2016-12-01 13:06:41 +01:00
taku0
5f4b3cd34b thunderbird-bin: 45.5.0 -> 45.5.1
Critical security fix.

https://www.mozilla.org/en-US/thunderbird/45.5.1/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2016-92/
2016-12-01 09:11:50 +09:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk
8fb430ca86 thunderbird: use python2
and remove pysqlite since its part of the standard library.
2016-11-24 22:28:04 +01:00
Frederik Rietdijk
eb926468e9 mailpile: use python2 2016-11-24 22:28:04 +01:00
Rok Garbas
61f38b9e83 notmuch: disable tests on darwin 2016-11-24 09:17:08 +01:00
Rok Garbas
aecc5ba80e notmuch-addrlookup: added myself (garbas) as maintainer 2016-11-24 09:17:08 +01:00
Rok Garbas
58771c0fe6 notmuch: 0.22 -> 0.23.2
* enabled tests (except 3 which are still failing)
2016-11-24 09:17:08 +01:00
Vladimír Čunát
d045f8b486
thunderbird: maintenance 45.4.0 -> 45.5.0 2016-11-19 20:15:04 +01:00
taku0
2540608f43 thunderbird-bin: 45.4.0 -> 45.5.0 2016-11-19 03:12:09 +09:00
Felix Richter
f1ebae152d mutt: fix smime_keys hard-coded openssl path (#20275)
smime_keys uses hard-coded path to openssl, use path in /nix/store for openssl
2016-11-10 01:42:18 +01:00
Erik Rybakken
897a1ba8ff neomutt: 20160910 -> 20161104 (#20221) 2016-11-07 06:56:15 +01:00
Christian Lask
2d524a37f8 Remove myself as maintainer. 2016-11-03 11:54:54 +01:00
Eelco Dolstra
9db03c1cf1 thunderbird: 45.3.0 -> 45.4.0 2016-10-26 15:32:39 +02:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Frederik Rietdijk
760a36372e mailnag: use python2 2016-10-18 23:16:08 +02:00
Joachim Fasting
16a917d5e2
thunderbird: disable PaX mprotect() hardening
Otherwise, thunderbird crashes at startup due to a PaX mprotect()
violation.

Fixes https://github.com/NixOS/nixpkgs/issues/19403
2016-10-14 23:48:14 +02:00
Frederik Rietdijk
104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Matthias Beyer
c4c1ec9a5b mutt: 1.7.0 -> 1.7.1 2016-10-09 13:19:17 +02:00
taku0
2fa0ffc25a thunderbird-bin: 45.3.0 -> 45.4.0 2016-10-01 11:45:13 +09:00
rnhmjoj
5c0e73e860
mutt: 1.6.2 -> 1.7.0 2016-09-19 06:33:28 +02:00
Nikolay Amiantov
4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Erik Rybakken
a65e1c560c neomutt: 20160827 -> 20160910 (#18485) 2016-09-13 07:29:57 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Eelco Dolstra
25c9f2729e thunderbird: 45.2.0 -> 45.3.0 2016-08-31 14:00:44 +02:00
taku0
816e86cba3 thunderbird-bin: 45.2.0 -> 45.3.0 2016-08-30 09:12:11 +09:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Erik Rybakken
5212eb3882 neomutt: 20160723 -> 20160827 2016-08-27 10:37:53 +02:00
J Phani Mahesh
d228789e58 add cross-referencing notes to alpine and realpine 2016-08-25 11:58:45 +05:30
J Phani Mahesh
cd3d8eee85 realpine:configure: allow using passfile 2016-08-25 11:55:31 +05:30
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01: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
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
Bryan Gardiner
a510c5046f claws-mail: 3.13.2 -> 3.14.0 (#17734) 2016-08-14 22:54:07 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00: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
1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
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