Commit Graph

14517 Commits

Author SHA1 Message Date
Joachim F
70bf931498 Merge pull request #17410 from knedlsepp/motif-on-darwin
motif: Add support for darwin
2016-08-03 18:31:43 +02:00
Michael Raskin
ef46388c48 neovim-qt: 0pre -> 0.2.1, use libmsgpack 1.4 2016-08-03 17:58:22 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Robin Gloster
98473cdb15 x42-plugins: fix unpacking 2016-08-03 13:20:32 +00:00
Robin Gloster
54984049f6 Merge pull request #17477 from mimadrid/update/qutebrowser-0.8.2
qutebrowser: 0.8.1 -> 0.8.2
2016-08-03 11:54:59 +02:00
Robin Gloster
b1f2e02fd5 Merge pull request #17456 from chris-martin/truecrypt-fix-src
Truecrypt: fix source url
2016-08-03 11:54:24 +02:00
mimadrid
4a06ece723
qutebrowser: 0.8.1 -> 0.8.2 2016-08-03 11:02:02 +02:00
zimbatm
2f791c7444 terraform: 0.6.16 -> 0.7.0 2016-08-03 09:53:20 +01:00
Peter Hoeg
0afcb79f60 puddletag: init at 1.1.1 (#17443)
Thanks to @fridh for feedback.
2016-08-03 00:25:41 +02:00
Luca Bruno
2cce7a064e telepathy_salut: fix build, add myself as maintainer 2016-08-02 22:00:24 +02:00
Franz Pletz
cb0ddbadd9 seabios: 1.9.2 -> 1.9.3 2016-08-02 21:21:02 +02: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
Tuomas Tynkkynen
102ffa6be7 treewide: Wrap some really long package descriptions 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
63de40099f treewide: Move some meta sections to end-of-file
That seems to be the overwhelming convention.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Franz Pletz
b0d748e244 bitkeeper: disable fortify hardening 2016-08-02 17:49:08 +02:00
Robin Gloster
b9152cf5a0 yabar: disable format hardening 2016-08-02 15:40:37 +00:00
Robin Gloster
cbc8fc239a zgv: disable format hardening 2016-08-02 15:40:37 +00:00
Franz Pletz
15b8491af3 seabios: disable fortify hardening 2016-08-02 17:38:25 +02:00
taku0
47024938a2 firefox-bin: 47.0.1 -> 48.0 (#17452) 2016-08-02 16:55:55 +02:00
Franz Pletz
1005f464dd xpdf: disable format hardening 2016-08-02 14:08:01 +00:00
Franz Pletz
68a953cdc3 nedit: disable format hardening 2016-08-02 14:00:10 +00:00
Robin Gloster
1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Frederik Rietdijk
450c866730 Merge pull request #17446 from despairblue/update/atom
atom: 1.8.0 -> 1.9.0
2016-08-02 13:52:42 +02: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
Danny Arnold
9d85a87e73 atom: 1.8.0 -> 1.9.0 2016-08-02 11:38:58 +02:00
Frederik Rietdijk
f7a48fb80e Merge pull request #17435 from ttuegel/konsole-kpart
Add missing Konsole kpart to various KDE applications
2016-08-02 09:13:15 +02:00
Frederik Rietdijk
266fde80ca kde5.konversation: 1.6 -> 1.6.1 2016-08-02 09:00:03 +02:00
Frederik Rietdijk
65c109f887 kde5.konversation: use kdeWrapper 2016-08-02 08:49:12 +02:00
Frederik Rietdijk
2e538a0f55 kde5.yakuake: use kdeWrapper 2016-08-02 08:40:16 +02:00
Thomas Tuegel
39aff85b0e kde5.kile: add konsole kpart 2016-08-01 15:42:17 -05:00
Chris Martin
ade00b3c42 truecrypt: change checksum from sha1 to sha256 2016-08-01 13:32:11 -07:00
Chris Martin
9c4b23ba11 truecrypt: update source url 2016-08-01 13:31:44 -07:00
Jean-Pierre PRUNARET
26a2392594 qgis: 2.10.0 -> 2.16.1
Upgrade qgis with latest version
2016-08-01 21:26:01 +02:00
Robin Gloster
5341b8b1f8 moonlight-embedded: init at 2.2.1 (#17414) 2016-08-01 18:46:13 +02:00
Bjørn Forsman
93bac07b38 mopidy: fix zeroconf support (by depending on dbus)
Closure size increases by 1 MiB, from 480 to 481.
2016-08-01 17:23:16 +02:00
obadz
8d84e6a20f libreoffice: add compile flag -fpermissive due to libcurl upgrade
curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and
therefore requires the -fpermissive flag until this package gets updated
2016-08-01 13:23:30 +01:00
Robin Gloster
8c735c3aee Merge pull request #17388 from magnetophon/zam-plugins
zam-plugins: 3.6 -> 3.7
2016-07-31 23:50:54 +02:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Josef Kemetmueller
3a910eed61 nedit: Add darwin support 2016-07-31 20:57:14 +02:00
Josef Kemetmueller
3d3d607408 catclock: Add darwin support 2016-07-31 20:57:06 +02:00
Robert Helgesson
8878e8ec05 leo2: remove use of builderDefsPackage (#17398) 2016-07-31 13:57:29 +02:00
Langston Barrett
d3d0bab56e mopidy-musicbox-webclient: 2.2.0 -> 2.3.0 (#17391) 2016-07-31 13:51:27 +02:00
Gabriel Ebner
b714fdb574 khard: 0.9.0 -> 0.11.1 2016-07-31 10:14:13 +02:00
Bart Brouns
86cf45338a zam-plugins: 3.6 -> 3.7 2016-07-30 22:27:08 +02:00
Joachim F
255227780e Merge pull request #17383 from jokogr/new/syncthing-inotify
syncthing-inotify: init at 0.8.3
2016-07-30 21:59:19 +02:00
Joachim F
a5302f3c79 Merge pull request #17313 from vrthra/kakoune
kakoune: init at 2016-07-26
2016-07-30 19:31:11 +02:00
Ioannis Koutras
631edf7de8 syncthing-inotify: init at 0.8.3 2016-07-30 20:19:16 +03:00
Ram Kromberg
78d82f33ac alliance: 5.0 -> 5.1.1 (#17353) 2016-07-30 15:35:51 +01:00
Joachim F
29739ece1f Merge pull request #17376 from mimadrid/update/meld-3.16.2
meld: 3.16.1 -> 3.16.2
2016-07-30 14:00:29 +02:00
Joachim F
5915716f13 Merge pull request #17373 from peterhoeg/st_0143
syncthing: 0.14.2 -> 0.14.3
2016-07-30 12:26:30 +02:00
lucas8
849414f276
yadm: init at 1.04 2016-07-30 11:40:37 +02:00
Bart Brouns
dc6ec6a4c8 faust: remove double quotes around NIX_CFLAGS_COMPILE and NIX_LDFLAGS
fixes https://travis-ci.org/NixOS/nixpkgs/jobs/147556297#L2705
2016-07-30 11:21:02 +02:00
mimadrid
83251cdd60
meld: 3.16.1 -> 3.16.2 2016-07-30 11:06:22 +02:00
Peter Hoeg
10deae8a57 syncthing: 0.14.2 -> 0.14.3 2016-07-30 11:32:43 +08:00
Dmitry Kalinkin
4449ecb617 root: 6.04.16 -> 6.04.18 (#17265)
root: compile against external gsl

Revert "Revert "root: enable parallel building""

This reverts commit ee1a10ee6b.

ROOT has no problems with parallel build. The problems that caused the
original commit were not related to parallel building.
2016-07-30 01:41:37 +01:00
Kranium Gikos Mendoza
c9e5ddde0a monero: 0.8.8.4 -> 0.9.4 (#17371) 2016-07-30 01:37:49 +01:00
mimadrid
5fbe282abd
wireshark: 2.0.4 -> 2.0.5 2016-07-29 12:11:09 +02:00
mimadrid
59caf069a4
git: 2.9.1 -> 2.9.2 2016-07-29 11:28:31 +02:00
mimadrid
ca780df195
nano: 2.6.1 -> 2.6.2 2016-07-28 16:46:25 +02:00
Robin Gloster
154af9e67d Merge pull request #9499 from khumba/scilab-bin-5
scilab-bin: init at 5.5.2
2016-07-28 16:43:08 +02:00
Robin Gloster
bddec681fb Merge pull request #17334 from RamKromberg/init/catclock
catclock: init at 2015-10-04
2016-07-28 16:31:12 +02:00
Marco Maggesi
c28eb6c2ba Update HOL Light to version 2016-07-23. 2016-07-28 15:56:20 +02:00
Frederik Rietdijk
ace13888c7 Merge pull request #17282 from magnetophon/faust1git
faust1git: 2016-04-27 -> 2016-07-19
2016-07-28 15:11:07 +02:00
Frederik Rietdijk
e40f5e6658 Merge pull request #17338 from matthiasbeyer/update-rtv
Update rtv
2016-07-28 15:01:31 +02:00
Matthias Beyer
39cd6895c1 rtv: 1.9.0 -> 1.10.0 2016-07-28 14:00:37 +02:00
Damien Cassou
b9f7a65179 melpa-stable-packages: 2016-07-28 2016-07-28 13:44:44 +02:00
Ram Kromberg
4f94e026f4 catclock: init at 2015-10-04 2016-07-28 12:09:31 +03:00
Matthias Beyer
af5e45cf2e timewarrior: 0.9.5.alpha -> 1.0.0.beta1 2016-07-28 10:57:19 +02:00
Pascal Wittmann
cf114708fe Merge pull request #17153 from rasendubi/rhythmbox
rhythmbox: init at 3.2.1
2016-07-28 08:56:07 +02:00
Bryan Gardiner
ed071594e5
scilab-bin: init at 5.5.2
A built-from-source Scilab 5 package looks to be a lot more work, and some
dependencies are missing from Nixpkgs, but the binary version with bundled
dependencies works.
2016-07-27 21:30:12 -07:00
Matthias Beyer
c31cbe8f9c xterm: Make dec-locator support optional (#17238)
Enable it by default but allow disabling, which solves some issues one
might have with vim/nvim as reported and documented in

    #17158
    #17170
    #17234
    neovim/neovim#5015
2016-07-28 04:08:54 +02:00
Michele Guerini Rocco
cf8c16e3aa mkvtoolnix: 9.2.0 -> 9.3.1 (#17321) 2016-07-28 04:00:04 +02:00
Franz Pletz
996c9837fa Merge pull request #17322 from RamKromberg/init/motif
motif: init at 2.3.6 & nedit: 5.6 -> 5.6a
2016-07-28 03:53:38 +02:00
Thomas Tuegel
ea3e067106 Merge pull request #17324 from mdorman/emacs-updates
Emacs package updates
2016-07-27 20:53:08 -05:00
Michael Alan Dorman
475a8e0568 org-packages: 2016-07-27 2016-07-27 19:52:51 -04:00
Michael Alan Dorman
d5dfd4b82e melpa-stable-packages: 2016-07-27 2016-07-27 19:52:48 -04:00
Michael Alan Dorman
9237931cf0 melpa-packages: 2016-07-27
Also, the last time the version numbers should change capriciously.
2016-07-27 19:52:42 -04:00
Michael Alan Dorman
b391a3d47a elpa-packages: 2016-07-27 2016-07-27 19:52:37 -04:00
Ram Kromberg
c764437946 nedit: 5.6 -> 5.6a 2016-07-28 01:33:52 +03:00
Rahul Gopinath
1db375ebd9 kakoune: init at 2016-07-26 2016-07-27 15:14:06 -07:00
mimadrid
2ea77889ad filezilla: 3.19.0 -> 3.20.0 2016-07-27 22:48:43 +02: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
Bart Brouns
ef570f29b9 plugin-torture: 5 -> 2016-07-25 (#17272) 2016-07-27 18:50:36 +02:00
jokogr
54e870e3b1 syncthing: 0.14.0 -> 0.14.2 (#17274)
* Update syncthing from 0.14.0 to 0.14.2
* Use fetchFromGitHub instead of fetchgit
* Add joko to package maintainers
2016-07-27 18:49:43 +02:00
Miguel Madrid
94549d4fab qutebrowser: 0.8.0 -> 0.8.1 (#17302) 2016-07-27 15:50:29 +01:00
Robert Helgesson
893d0830ea
eclipse-plugin-jdt: 4.5.2 -> 4.6 2016-07-27 15:59:07 +02:00
Robert Helgesson
b36802d24e
eclipse-plugin-checkstyle: 6.19.0 -> 6.19.1 2016-07-27 15:59:07 +02:00
Damien Cassou
8a887fa1ba Merge pull request #17297 from DamienCassou/emacs25.1-rc1
emacs25pre: 25.0.95 -> 25.1-rc1
2016-07-27 15:37:39 +02:00
Damien Cassou
6a41c312eb emacs25pre: 25.0.95 -> 25.1-rc1 2016-07-27 14:24:17 +02:00
Michael Alan Dorman
967bb7e195 spaceline: melpa-stable no longer requires melpa powerline 2016-07-27 06:54:16 -04:00
Michael Alan Dorman
a6220b0757 crux: melpa-stable no longer broken 2016-07-27 06:54:16 -04:00
Robin Gloster
3882698004 Merge pull request #17294 from kamilchm/fix-mesos-fetcher-extract
mesos: FIX #16917 Failed to extract tgz
2016-07-27 12:23:07 +02:00
Gabriel Ebner
f970bc67c7 lean: 20160117 -> 2016-07-05
Fixes #17260.
2016-07-27 11:01:45 +02:00
Kamil Chmielewski
81efd0c82d mesos: FIX #16917 Failed to extract tgz 2016-07-27 10:11:33 +02:00
Bart Brouns
037fc40b6a faust1git: 2016-04-27 -> 2016-07-19 2016-07-26 20:40:44 +02:00
Ram Kromberg
3df0422083 lenmus: 5.4.1 -> 5.4.2 2016-07-26 20:14:06 +03:00
Bjørn Forsman
e7ef33c50a git: fix gitweb.cgi breakage due to missing CGI.pm
CGI.pm was removed from Perl core in v5.22, breaking the gitweb.cgi
script and thus NixOS' services.lighttpd.gitweb. Nixpkgs switched to
Perl 5.22 with a85ba820a4 ("perl: Make 5.22 the default").

Fix it by bringing in the Perl CGI module (and dependency HTMLParser).
The closure size of "nix-build -A git" increase by 1 MiB, to 201 MiB.
2016-07-26 15:20:24 +02:00
Gabriel Ebner
7fce7c5a07 qutebrowser: 0.7.0 -> 0.8.0 2016-07-26 14:53:59 +02:00
Kranium Gikos Mendoza
b98e4b3aa4 qtbitcointrader: add {pre,post}Configure to fix build (#17269) 2016-07-26 12:15:47 +02:00
Graham Christensen
3badad811c Merge pull request #17262 from jerith666/crashplan-47-r2
crashplan: 4.7.0-r1 -> 4.7.0-r2
2016-07-26 02:05:55 +00:00
Matt McHenry
0a0172fffb crashplan: 4.7.0-r1 -> 4.7.0-r2
follow up to f1c1c1be: also increment the rev number
2016-07-25 19:48:25 -04:00
Ram Kromberg
5685968ca6 midori: 0.5.8 -> 0.5.11 (#17142) 2016-07-25 21:25:42 +01:00
Kranium Gikos Mendoza
a5d1c8d471 bluejeans: 2.160.63.8 -> 2.160.66.8 (#17232) 2016-07-25 20:53:32 +01:00
Bart Brouns
5b48659519 CharacterCompressor 0.2 -> 0.3 (#17207) 2016-07-25 20:52:06 +01:00
Maximilian Güntner
1fa6fe72fd unison: 2.48.3 -> 2.48.4 (#17209)
Signed-off-by: Maximilian Güntner <code@maschinenpsychologe.de>
2016-07-25 20:50:09 +01:00
taku0
2ac2676a17 android-sdk: 24.4.1 -> 25.1.7 (#17193) 2016-07-25 20:47:39 +01:00
Florian Fackler
f1c1c1be6c crashplan: Fixed the checksum 2016-07-25 15:20:34 +02:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Rommel M. Martinez
48fdde173f emem: 0.2.22 -> 0.2.23 (#17245) 2016-07-25 06:13:49 +02:00
Bjørn Forsman
2451680603 pitivi: 0.95 -> 0.96 (fixes startup error) (#17228)
* pitivi: 0.95 -> 0.96 (fixes startup error)

The upgrade of gtk3 to v3.20 broke pitivi, causing it to segfault after
the user closes the Welcome dialog. This release fixes that.

New dependencies: gst-transcoder and dbus.
(pitivi imports dbus if it finds the GNOME_DESKTOP_SESSION_ID
environment variable. Without dbus there will be some ugly errors for
GNOME desktop users.)

* pitivi: use wrapGAppsHook instead of makeWrapper

Allows us to remove preFixup.

* pitivi: move meta section to the end

Like most Nix package files are written.
2016-07-25 06:05:55 +02:00
Rok Garbas
b8ab178e4c
obs-studio: libX11.so was missing at runtime 2016-07-25 04:20:49 +02:00
Rommel M. Martinez
68ac9bda91 emem: 0.2.20 -> 0.2.22 2016-07-24 22:00:40 +08:00
Gabriel Ebner
9082476478 cvc4: 1.4 -> 1.5pre-smtcomp2016 2016-07-24 13:11:17 +02:00
Joachim F
e064903a19 Merge pull request #17225 from ebzzry/emem-0.2.20
emem: 0.2.19 -> 0.2.20
2016-07-24 12:50:12 +02:00
Rommel M. Martinez
66d07f4dfe emem: 0.2.19 -> 0.2.20 2016-07-24 14:17:11 +08:00
Joachim F
06d1723c4e Merge pull request #17195 from womfoo/bump/pwsafe-0.99
pwsafe: fix build and 0.95 -> 0.99
2016-07-23 20:42:48 +02:00
Eric Sagnes
b56a379fb6 ponymix: 4 -> 5 (#17204) 2016-07-23 15:19:26 +02:00
Nikolay Amiantov
cce1e9f2f4 tdesktop: use parseDrvName to get Qt release version
Closes #16559
2016-07-23 09:41:25 +03:00
Kranium Gikos Mendoza
cf08d94d18 pwsafe: 0.95 -> 0.99 2016-07-23 12:37:10 +08:00
Stefan Junker
04b30b2397 rkt: fix default stage1 location 2016-07-22 18:18:29 -07:00
Stefan Junker
abc3faa294 rkt: 1.10.1 -> 1.11.0 2016-07-22 17:49:38 -07:00
Alexey Shmalko
c9c3118620
rhythmbox: init at 3.2.1 2016-07-23 03:28:35 +03:00
Peter Hoeg
9d53dc00c3 dropbox: 4.4.29 -> 6.4.14 (#17165) 2016-07-23 00:51:55 +02:00
Miguel Madrid
8816df20f3 shotwell: 0.23.2 -> 0.23.4 (#17190) 2016-07-23 00:32:23 +02:00
Joachim F
c4c378b613 Merge pull request #17156 from KoviRobi/wmii-hg-update
wmii-hg: refactor to fetchurl as fetchhg broke
2016-07-23 00:16:23 +02:00
Daiderd Jordan
3bacfede38 Merge pull request #17171 from RamKromberg/init/metamorphose2
metamorphose2: init at 0.9.0beta
2016-07-23 00:15:52 +02:00
Peter Simons
8593eb92e8 Merge pull request #17186 from rycee/fix-and-bump/stellarium
Fix and version bump Stellarium
2016-07-22 23:57:55 +02:00
Joachim F
46c924c4a2 Merge pull request #17178 from amiloradovsky/add-evilwm
evilwm: init at 1.1.1 (#17104)
2016-07-22 23:28:11 +02:00
Robert Helgesson
1012508356 stellarium: 0.14.2 -> 0.14.3 2016-07-22 23:13:35 +02:00
Robert Helgesson
1bedecb4f9 stellarium: wrap binary using wrapQtProgram
Fixes #13582 where Stellarium segfaults when starting.
2016-07-22 22:21:17 +02:00
Andrew Miloradovsky
17b127205d evilwm: init at 1.1.1 (#17104)
Minimalist window manager for the X Window System
2016-07-22 19:15:57 +00:00
Gabriel Ebner
575e0e27b1 jabref: 3.4 -> 3.5 2016-07-22 21:04:30 +02:00
Ram Kromberg
3e938ad7f1 metamorphose2: init at 0.9.0beta 2016-07-22 21:51:21 +03:00
Carl Sverre
51d9312e44 i3blocks-gaps: init at 1.4
Fork of i3blocks which supports adding borders to work with i3-gaps
2016-07-21 23:39:48 -07:00
Tuomas Tynkkynen
e5d048ad9a Merge pull request #17151 from juliendehos/exrtools
exrtools: init at 0.4
2016-07-22 09:37:35 +03:00
zimbatm
95cfa1a668 Merge pull request #17150 from ebzzry/emem-0.2.19
emem: 0.2.18 -> 0.2.19
2016-07-21 20:18:25 +01:00
Kovacsics Robert (NixOS)
a6df5b9f1d wmii-hg: refactor to fetchurl as fetchhg broke 2016-07-21 19:28:15 +01:00
Gabriel Ebner
82f087944b metis-prover: 2.3.20160102 -> 2.3.20160713 2016-07-21 18:41:26 +02:00
Michel Kuhlmann
fb4a53b1c1 saga: 2.2.2 -> 2.3.1 2016-07-21 16:47:29 +01:00
Julien Dehos
d6ff1ce2a0 exrtools: init at 0.4 2016-07-21 17:09:27 +02:00
Rommel M. Martinez
a584ca5791 emem: 0.2.18 -> 0.2.19 2016-07-21 23:00:59 +08:00
Peter Simons
641fc0e683 haskell: remove all but the latest LTS package sets (version 6.7)
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.

More details are at:

  http://permalink.gmane.org/gmane.linux.distributions.nixos/20505

Closes https://github.com/NixOS/nixpkgs/issues/14897.

Also relevant:

 - https://github.com/NixOS/nixpkgs/issues/16130
 - https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
Ram Kromberg
26008f28b8 lighthouse: 2016-01-26 -> 2016-07-20 (#17127) 2016-07-21 05:50:59 +02:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00