Timo Kaufmann
3cec0b0c17
Merge pull request #50172 from r-ryantm/auto-update/aha
...
aha: 0.4.10.6 -> 0.5
2018-11-10 15:10:46 +01:00
Timo Kaufmann
bfa37c55d6
Merge pull request #50162 from r-ryantm/auto-update/acpica-tools
...
acpica-tools: 20180927 -> 20181031
2018-11-10 15:08:05 +01:00
R. RyanTM
ec49036267
btrfs-progs: 4.17.1 -> 4.19
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/btrfs-progs/versions
2018-11-10 06:05:16 -08:00
Daiderd Jordan
8d603be22d
Merge pull request #49880 from LnL7/darwin-cfprivate-fixes
...
darwin cf-private fixes
2018-11-10 15:03:21 +01:00
Jörg Thalheim
19c315c71d
Merge pull request #50122 from r-ryantm/auto-update/fio
...
fio: 3.11 -> 3.12
2018-11-10 13:51:43 +00:00
R. RyanTM
1ec2eb8b7b
aha: 0.4.10.6 -> 0.5
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/aha/versions
2018-11-10 05:51:28 -08:00
Jörg Thalheim
d7cdc480e1
Merge pull request #50084 from r-ryantm/auto-update/hyx
...
hyx: 0.1.4 -> 0.1.5
2018-11-10 13:50:49 +00:00
R. RyanTM
b5179c6d1a
lynis: 2.6.9 -> 2.7.0 ( #50045 )
...
* lynis: 2.6.9 -> 2.7.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lynis/versions
* lynis: remove perl and create plugins subdir
2018-11-10 14:48:26 +01:00
Silvan Mosberger
59f18fbf36
Merge pull request #50131 from r-ryantm/auto-update/facter
...
facter: 3.12.0 -> 3.12.1
2018-11-10 14:47:57 +01:00
Jörg Thalheim
5071475653
Merge pull request #50144 from r-ryantm/auto-update/disorderfs
...
disorderfs: 0.5.4 -> 0.5.5
2018-11-10 12:29:00 +00:00
Jörg Thalheim
0ed91fa4d5
Merge pull request #50155 from r-ryantm/auto-update/debootstrap
...
debootstrap: 1.0.109 -> 1.0.110
2018-11-10 12:18:23 +00:00
R. RyanTM
2e9aa64516
acpica-tools: 20180927 -> 20181031
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/acpica-tools/versions
2018-11-10 03:27:42 -08:00
Jörg Thalheim
9d3961ef17
Merge pull request #50158 from xaverdh/aft-v3.6
...
android-file-transfer: 3.5 -> 3.6
2018-11-10 11:18:12 +00:00
Robert Schütz
1afd25fb4a
getmail: 5.7 -> 5.8
2018-11-10 12:08:07 +01:00
Dominik Xaver Hörl
23e66b362d
android-file-transfer: 3.5 -> 3.6
2018-11-10 11:27:28 +01:00
R. RyanTM
3de237efb1
debootstrap: 1.0.109 -> 1.0.110
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/debootstrap/versions
2018-11-10 02:19:30 -08:00
Jörg Thalheim
810d3de243
Merge pull request #50143 from r-ryantm/auto-update/doitlive
...
doitlive: 4.0.1 -> 4.1.0
2018-11-10 10:15:05 +00:00
Jörg Thalheim
7ca7291f9a
Merge pull request #50110 from r-ryantm/auto-update/google-compute-engine
...
google-compute-engine: 20180905 -> 20181011
2018-11-10 10:14:21 +00:00
Jörg Thalheim
80318523af
hyx: limit to linux
...
clock_gettime is not available on macOS
2018-11-10 09:38:23 +00:00
Jörg Thalheim
1fadff893f
hyx: disable wall to fix darwin build
2018-11-10 09:34:56 +00:00
Peter Simons
bc3c2a46a6
Merge pull request #50138 from r-ryantm/auto-update/duplicity
...
duplicity: 0.7.18.1 -> 0.7.18.2
2018-11-10 09:18:11 +01:00
R. RyanTM
c6ddd51854
disorderfs: 0.5.4 -> 0.5.5
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/disorderfs/versions
2018-11-09 23:51:17 -08:00
R. RyanTM
aa7981c3a1
doitlive: 4.0.1 -> 4.1.0
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/doitlive/versions
2018-11-09 23:43:25 -08:00
R. RyanTM
a481218df3
duplicity: 0.7.18.1 -> 0.7.18.2
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/duplicity/versions
2018-11-09 23:20:49 -08:00
R. RyanTM
0a387d40e1
fwup: 1.2.5 -> 1.2.6
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fwup/versions
2018-11-09 22:33:13 -08:00
R. RyanTM
7c2caffc88
facter: 3.12.0 -> 3.12.1
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/facter/versions
2018-11-09 22:23:16 -08:00
R. RyanTM
4f3f9c1e25
fio: 3.11 -> 3.12
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fio/versions
2018-11-09 20:21:42 -08:00
Silvan Mosberger
38b2520b96
Merge pull request #37365 from proteansec/pkgs/bacula
...
bacula: 5.2.13 -> 9.2.1
2018-11-10 04:23:28 +01:00
Silvan Mosberger
c74e1769fa
Merge pull request #50082 from va1entin/youtube-dl_2018.11.07
...
youtube-dl: 2018.10.29 -> 2018.11.07
2018-11-10 04:07:19 +01:00
R. RyanTM
c5f42c7d35
google-compute-engine: 20180905 -> 20181011
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/google-compute-engine/versions
2018-11-09 19:03:58 -08:00
Maximilian Bosch
16c75025d6
Merge pull request #50090 from r-ryantm/auto-update/ibus-typing-booster
...
ibus-engines.typing-booster-unwrapped: 2.1.2 -> 2.1.3
2018-11-10 03:50:55 +01:00
Jörg Thalheim
0ede13cf1a
Merge pull request #50091 from r-ryantm/auto-update/httpie
...
httpie: 0.9.9 -> 1.0.0
2018-11-10 00:58:11 +00:00
R. RyanTM
14ee620738
hebcal: 4.14 -> 4.15
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hebcal/versions
2018-11-09 16:22:10 -08:00
R. RyanTM
76d07488d7
httpie: 0.9.9 -> 1.0.0
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/httpie/versions
2018-11-09 16:10:36 -08:00
R. RyanTM
c281799090
ibus-engines.typing-booster-unwrapped: 2.1.2 -> 2.1.3
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ibus-typing-booster/versions
2018-11-09 16:04:01 -08:00
Samuel Dionne-Riel
2f668e3248
Merge pull request #40043 from kierdavis/ckb-update-and-cleanup
...
ckb/ckb-next: 0.2.9 -> 0.3.2, and cleanup
2018-11-09 23:59:58 +00:00
R. RyanTM
9fdf71d28f
hyx: 0.1.4 -> 0.1.5
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hyx/versions
2018-11-09 14:58:11 -08:00
Valentin Heidelberger
ddc829348e
youtube-dl: 2018.10.29 -> 2018.11.07
2018-11-09 23:34:03 +01:00
R. RyanTM
28c4e861f2
libinput-gestures: 2.38 -> 2.39
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libinput-gestures/versions
2018-11-09 11:57:34 -08:00
Jörg Thalheim
2f97911566
Merge pull request #49817 from alyssais/rack_cve
...
rack: 1.6.* -> 1.6.11, 2.0.* -> 2.0.6 (CVE-2018-16470, CVE-2018-16471)
2018-11-09 19:30:43 +00:00
Jörg Thalheim
e15854e366
Merge pull request #49916 from r-ryantm/auto-update/xidlehook
...
xidlehook: 0.5.0 -> 0.6.0
2018-11-09 15:28:27 +00:00
Silvan Mosberger
1652c30c3b
Merge pull request #50017 from r-ryantm/auto-update/pdf2djvu
...
pdf2djvu: 0.9.10 -> 0.9.11
2018-11-09 16:21:53 +01:00
Renaud
e738c1084b
Merge pull request #49867 from marsam/feature/init-pgmetrics
...
pgmetrics: init at 1.5.0
2018-11-09 15:17:14 +01:00
Maximilian Bosch
0045ea5b10
up: init at 0.3.1
...
With this tool you can interactively write shell pipes with a previewed
intermediate result.
See https://github.com/akavel/up
2018-11-09 14:14:39 +01:00
R. RyanTM
b6dd810ba4
pdf2djvu: 0.9.10 -> 0.9.11
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pdf2djvu/versions
2018-11-09 04:38:09 -08:00
Renaud
d85c3a952c
Merge pull request #49914 from r-ryantm/auto-update/yank
...
yank: 1.0.0 -> 1.1.0
2018-11-09 10:06:32 +01:00
Renaud
f349be5b2e
Merge pull request #49917 from r-ryantm/auto-update/you-get
...
you-get: 0.4.1148 -> 0.4.1167
2018-11-09 10:04:37 +01:00
Jörg Thalheim
313de2a04d
Merge pull request #49951 from r-ryantm/auto-update/rsyslog
...
rsyslog: 8.38.0 -> 8.39.0
2018-11-09 00:13:46 +00:00
R. RyanTM
3866470845
rsyslog: 8.38.0 -> 8.39.0
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rsyslog/versions
2018-11-08 14:28:56 -08:00
Jörg Thalheim
92a065f23e
Merge pull request #49930 from r-ryantm/auto-update/spoofer
...
spoofer: 1.3.3 -> 1.4.0
2018-11-08 22:18:15 +00:00
Jörg Thalheim
e799f2a63b
Merge pull request #49938 from r-ryantm/auto-update/snapraid
...
snapraid: 11.2 -> 11.3
2018-11-08 21:27:35 +00:00
Jörg Thalheim
ffbe435e93
Merge pull request #49932 from r-ryantm/auto-update/tgt
...
tgt: 1.0.73 -> 1.0.74
2018-11-08 21:19:55 +00:00
Jörg Thalheim
b8589937ff
Merge pull request #49939 from r-ryantm/auto-update/tio
...
tio: 1.31 -> 1.32
2018-11-08 21:16:11 +00:00
markuskowa
5985d1adf4
Merge pull request #49941 from r-ryantm/auto-update/unshield
...
unshield: 1.4.2 -> 1.4.3
2018-11-08 21:58:12 +01:00
R. RyanTM
93a90a3416
unshield: 1.4.2 -> 1.4.3
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/unshield/versions
2018-11-08 12:38:39 -08:00
Jörg Thalheim
d8f4f61a66
Merge pull request #49936 from r-ryantm/auto-update/swaks
...
swaks: 20170101.0 -> 20181104.0
2018-11-08 20:26:57 +00:00
R. RyanTM
1bb7496d2e
tio: 1.31 -> 1.32
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tio/versions
2018-11-08 12:14:48 -08:00
R. RyanTM
20938b4264
snapraid: 11.2 -> 11.3
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/snapraid/versions
2018-11-08 12:11:50 -08:00
R. RyanTM
1749c8ff1c
swaks: 20170101.0 -> 20181104.0
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/swaks/versions
2018-11-08 12:02:55 -08:00
markuskowa
24cafb3aab
Merge pull request #49929 from r-ryantm/auto-update/snapper
...
snapper: 0.7.2 -> 0.8.0
2018-11-08 20:36:51 +01:00
Daiderd Jordan
a06e7c5b19
Merge pull request #49284 from LnL7/darwin-watchexec
...
watchexec: fix darwin build
2018-11-08 20:04:47 +01:00
R. RyanTM
814c68a503
tgt: 1.0.73 -> 1.0.74
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tgt/versions
2018-11-08 11:00:39 -08:00
R. RyanTM
e681d3a6da
spoofer: 1.3.3 -> 1.4.0
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/spoofer/versions
2018-11-08 10:52:13 -08:00
R. RyanTM
6e5e61123f
snapper: 0.7.2 -> 0.8.0
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/snapper/versions
2018-11-08 10:24:26 -08:00
Domen Kožar
068374c0ae
Add chrome-token-signing
2018-11-08 18:05:01 +00:00
R. RyanTM
ccfd36afba
you-get: 0.4.1148 -> 0.4.1167
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/you-get/versions
2018-11-08 08:46:44 -08:00
R. RyanTM
400a40b8c9
xidlehook: 0.5.0 -> 0.6.0
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xidlehook/versions
2018-11-08 08:19:04 -08:00
R. RyanTM
b25b579e04
yank: 1.0.0 -> 1.1.0
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yank/versions
2018-11-08 08:00:28 -08:00
Domen Kožar
e854a7a72f
qdigidoc: 3.13.6 -> 4.1.0
2018-11-08 11:42:01 +00:00
Domen Kožar
544778d231
qesteidutil: 3.12.10 -> 2018-08-21
2018-11-08 11:17:24 +00:00
Robert Hensing
cd80aee989
acsccid: init at 1.1.6
2018-11-08 10:44:50 +00:00
Michael Raskin
adf41ed942
Merge pull request #49864 from oxij/pkgs/tiny-things
...
trivial: tiny cleanups and fixes
2018-11-08 06:28:10 +00:00
Jan Malakhovski
67a5c0da41
tree-wide: fix all rev
s of fetchsvn
2018-11-08 05:29:47 +00:00
Daiderd Jordan
33104363af
noti: add cf-private on darwin
...
Undefined symbols for architecture x86_64:
"_OBJC_CLASS_$_NSDate", referenced from:
objc-class-ref in _x002.o
"_OBJC_CLASS_$_NSRunLoop", referenced from:
objc-class-ref in _x002.o
ld: symbol(s) not found for architecture x86_64
2018-11-07 23:47:25 +01:00
Daiderd Jordan
be9fc0d669
keybase: add cf-private on darwin
...
Undefined symbols for architecture x86_64:
"_OBJC_CLASS_$_NSData", referenced from:
objc-class-ref in _x002.o
"_OBJC_CLASS_$_NSDictionary", referenced from:
objc-class-ref in _x002.o
"_OBJC_CLASS_$_NSURL", referenced from:
objc-class-ref in _x002.o
ld: symbol(s) not found for architecture x86_64
2018-11-07 23:47:24 +01:00
R. RyanTM
51251b446c
pcsclite: 1.8.23 -> 1.8.24
...
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pcsclite/versions
(cherry picked from commit f174ae0f4f
)
Signed-off-by: Domen Kožar <domen@dev.si>
(cherry picked from commit 7cf572d87a
)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-07 18:46:21 +00:00
aszlig
1d0517ddb3
ip2unix: 1.1.0 -> 1.1.1
...
Upstream fixes:
* Don't unlink target socket path if connect is used after bind.
Signed-off-by: aszlig <aszlig@nix.build>
2018-11-07 18:21:07 +01:00
lewo
ea0b564c94
Merge pull request #49837 from knl/add-grpcurl
...
grpcurl: init at 1.0.0
2018-11-07 15:31:20 +01:00
Jörg Thalheim
7e2e6e1131
Merge pull request #49684 from Zimmi48/dune-package
...
buildDunePackage: add support function and use it in a few packages
2018-11-07 13:01:09 +00:00
Nikola Knežević
e7b61b791b
grpcurl: init at 1.0.0
2018-11-07 13:43:24 +01:00
Mario Rodas
780a3ffa12
pgmetrics: init at 1.5.0
2018-11-07 06:47:31 -05:00
Brayden Willenborg
e11c3a08b0
gucci: init at 0.1.0 ( #49813 )
...
* gucci: init at 0.1.0
* gucci: init at 0.1.0
2018-11-07 10:21:55 +01:00
Théo Zimmermann
794158fcd5
buildDunePackage: new support function; use it to refactor some OCaml derivations
2018-11-07 10:08:03 +01:00
aszlig
5fc73fd52e
ip2unix: 1.0.0 -> 1.1.0
...
Upstream fixes:
* Prevent closing file descriptors passed by systemd.
New upstream features:
* Allow to specify port ranges.
Signed-off-by: aszlig <aszlig@nix.build>
2018-11-07 09:42:17 +01:00
Matthew Bauer
147ff753f5
shadowsocks-libev: set install name correctly
...
This avoids having to invoke install_name_tool.
2018-11-06 19:58:20 -06:00
Daiderd Jordan
b6dcb9e641
Merge pull request #49768 from LnL7/darwin-no-cfprivate
...
darwin: don't include cf-private in framework dependencies
2018-11-06 20:15:27 +01:00
Alyssa Ross
652e59965a
asciidoctor: rack: 2.0.5 -> 2.0.6
...
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:28 +00:00
Alyssa Ross
df68cd5ea3
bcat: rack: 1.6.8 -> 1.6.11
...
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:27 +00:00
Alyssa Ross
e2d72ed954
metasploit: rack: 1.6.8 -> 1.6.11
...
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:26 +00:00
Alyssa Ross
b5931668c2
oxidized: rack: 1.6.9 -> 1.6.11
...
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:25 +00:00
Kier Davis
3b7984dd51
Merge branch 'master' into ckb-update-and-cleanup
2018-11-06 00:47:14 +00:00
Michael Weiss
7eaba9af5e
scdoc: Use $SOURCE_DATE_EPOCH to produce reproducible man pages
...
Use this patch until something like it is in the upstream repository.
Without it, the current date is used for the man pages, which makes them
non-reproducible.
2018-11-05 20:37:01 +01:00
Daiderd Jordan
86bf715c49
contacts: add cf-private
...
Undefined symbols for architecture x86_64:
"_OBJC_CLASS_$_NSArray", referenced from:
objc-class-ref in contacts.o
objc-class-ref in FormatHelper.o
"_OBJC_CLASS_$_NSMutableArray", referenced from:
objc-class-ref in FormatHelper.o
ld: symbol(s) not found for architecture x86_64
2018-11-05 20:35:06 +01:00
Daiderd Jordan
7fd359f2f9
pinentry_mac: add cf-private
...
Undefined symbols for architecture x86_64:
"_OBJC_CLASS_$_NSArray", referenced from:
objc-class-ref in GPGDefaults.o
"_OBJC_CLASS_$_NSDictionary", referenced from:
objc-class-ref in PinentryController.o
objc-class-ref in GPGDefaults.o
objc-class-ref in KeychainSupport.o
"_OBJC_CLASS_$_NSMutableDictionary", referenced from:
objc-class-ref in GPGDefaults.o
"_OBJC_CLASS_$_NSSet", referenced from:
objc-class-ref in GPGDefaults.o
"_OBJC_CLASS_$_NSUserDefaults", referenced from:
objc-class-ref in GPGDefaults.o
ld: symbol(s) not found for architecture x86_64
2018-11-05 19:57:12 +01:00
Daiderd Jordan
c8e480b4da
atomicparsley: include cf-private on darwin
...
Undefined symbols for architecture x86_64:
"_OBJC_CLASS_$_NSDictionary", referenced from:
objc-class-ref in nsfile.o
objc-class-ref in nsimage.o
ld: symbol(s) not found for architecture x86_64
2018-11-05 19:13:33 +01:00
aszlig
b162b40007
ip2unix: init at 1.0.0
...
This tool was initially built specifically for nixcloud to prevent a few
annoying programs from binding to IP sockets.
While initially only accepting a JSON file as input, the tool now has a
proper command line interface and it's also generally usable to turn IP
sockets of any program into Unix sockets.
Another thing that might be even useful for NixOS modules is the
possibility to bend programs into using systemd socket activation.
Signed-off-by: aszlig <aszlig@nix.build>
2018-11-05 16:39:42 +01:00
Robert Helgesson
69522a0acf
svtplay-dl: 1.9.11 -> 2.1
2018-11-05 00:21:08 +01:00
Jörg Thalheim
98063b86b1
Merge pull request #49664 from dtzWill/update/bup-0.29.2
...
bup: 0.29.1 -> 0.29.2
2018-11-04 19:20:23 +00:00
Jörg Thalheim
dc0af4d7b6
Merge pull request #49632 from enumatech/fastlane-2.107.0
...
fastlane: 2.105.2 -> 2.107.0
2018-11-04 18:37:17 +00:00
Sander Hollaar
76f803f44e
tmux: fix tmux sha256 hash ( #49327 )
...
* tmux: fix tmux sha256 hash
* pin to upstream commit
2018-11-04 18:35:17 +01:00