Frederik Rietdijk
5b7ffb6207
Merge pull request #26635 from magnetophon/lv2bm
...
lv2bm: git-2015-04-10 -> git-2015-11-29
2017-06-16 14:47:50 +02:00
Frederik Rietdijk
65f8780119
Merge pull request #26638 from magnetophon/ntk
...
ntk: 2014-10-18 -> 2017-04-22
2017-06-16 14:47:07 +02:00
Frederik Rietdijk
bb1bdaa15f
Merge pull request #26639 from magnetophon/qjackctl
...
qjackctl: 0.4.4 -> 0.4.5
2017-06-16 14:45:03 +02:00
Frederik Rietdijk
6e38c9c583
Merge pull request #26640 from magnetophon/qmidinet
...
qmidinet: 0.4.2 -> 0.4.3
2017-06-16 14:44:29 +02:00
Frederik Rietdijk
c94491f959
Merge pull request #26642 from romildo/upd.tint2
...
tint2: 0.14.5 -> 0.14.6
2017-06-16 14:43:25 +02:00
Will Dietz
5e9edcfebe
hiawatha: Don't ask cmake to install w/setuid perms
2017-06-16 07:34:53 -05:00
Tim Steinbach
ef2f34d3d7
kotlin: 1.1.2 -> 1.1.2-5
2017-06-16 08:32:00 -04:00
Will Dietz
7eaa7adf4e
rssh: don't set special bits
2017-06-16 07:31:21 -05:00
Tim Steinbach
a4a0f30108
gradle: 3.5 -> 4.0
2017-06-16 08:29:08 -04:00
Will Dietz
bb1e0b51de
torque: Patch out attempts to set special bits
2017-06-16 07:27:23 -05:00
Will Dietz
b20b2af59f
unnethack: override GAMEPERM to not include special bits
2017-06-16 07:24:39 -05:00
Will Dietz
7270b9b425
rewritefs: Don't attempt to set special bits
2017-06-16 07:22:20 -05:00
Will Dietz
479d9f9cd3
xsokoban: Don't set special bits on install
2017-06-16 07:18:20 -05:00
romildo
38b3e42f54
tint2: 0.14.5 -> 0.14.6
2017-06-16 09:14:38 -03:00
Bart Brouns
37bd5d40f9
qmidinet: 0.4.2 -> 0.4.3
2017-06-16 14:14:22 +02:00
Will Dietz
8098e4048b
super: Don't set special perms, don't chown to root
2017-06-16 07:13:54 -05:00
Bart Brouns
b3f1f88175
qjackctl: 0.4.4 -> 0.4.5
2017-06-16 14:13:23 +02:00
Bart Brouns
6c3459772b
ntk: 2014-10-18 -> 2017-04-22
2017-06-16 14:11:21 +02:00
Will Dietz
5d0a8792a7
uucp: Don't chown to 'uucp' user, don't set special perms
2017-06-16 07:11:02 -05:00
Bart Brouns
94c6b321e9
sorcer: 1.1.1 -> 1.1.3
2017-06-16 14:10:35 +02:00
Tim Steinbach
d990d618c0
atom: 1.17.2 -> 1.18.0
2017-06-16 08:09:15 -04:00
Bart Brouns
65ce8aa992
lv2bm: git-2015-04-10 -> git-2015-11-29
2017-06-16 14:08:13 +02:00
Bart Brouns
d0e6dcca4e
jalv: 1.4.6 -> 1.6.0
2017-06-16 14:07:10 +02:00
Will Dietz
b6caf10989
xconq: don't set special perms on install
2017-06-16 07:04:54 -05:00
Jörg Thalheim
9f399c40e9
dino: 2017-05-31 -> 2017-06-13
2017-06-16 13:02:46 +01:00
Will Dietz
98b2e4816f
udevil: minor cleanup, fix setuid/setgid problems
2017-06-16 06:57:08 -05:00
Will Dietz
4d57153659
logkeys: Don't chmod u+s
2017-06-16 06:57:05 -05:00
Will Dietz
714cd37b21
logcheck: Don't set special permissions
2017-06-16 06:57:00 -05:00
Will Dietz
3d5409ac97
cron: don't set special permissions
2017-06-16 06:56:56 -05:00
Will Dietz
0d92084f75
at: Don't set fancy bits on install
2017-06-16 06:56:51 -05:00
Peter Simons
c3399e5934
haskell-hastache: don't install the internal mkReadme tool
2017-06-16 13:51:45 +02:00
Bart Brouns
082563fe9e
eq10q: 2.1 -> 2.2
2017-06-16 13:47:41 +02:00
Bart Brouns
33b0842305
artyFX: 2015-05-07 -> 1.3
2017-06-16 13:24:48 +02:00
Bart Brouns
075f43c8e6
zynaddsubfx: 2.5.4 -> 3.0.1
2017-06-16 13:21:24 +02:00
Bart Brouns
3ed9546312
x42-plugins: 20161230 -> 20170428
2017-06-16 13:20:10 +02:00
Bart Brouns
c002b886c0
faustCompressors: 1.1.1 -> 1.2
2017-06-16 13:18:19 +02:00
Guillaume Koenig
60183a1177
gtk3: install gtk-launch
2017-06-16 13:10:42 +02:00
Graham Christensen
72ff321f9c
rustc: re-enable static_in_const
...
We saw this error when building main.rs:error: this needs a 'static lifetime or the static_in_const feature, see #35897
2017-06-16 07:09:40 -04:00
Benno Fünfstück
11b113541d
rustRegistry: 2017-05-31 -> 2017-06-16
2017-06-16 11:54:23 +02:00
regnat
d036d88296
ocamlPackages.containers: 0.22 -> 1.2
2017-06-16 11:42:17 +02:00
Yann Hodique
3f97bcaf2d
hugo: 0.22.1 -> 0.23
...
This release includes a move to a new github organization.
2017-06-16 01:56:31 -07:00
Francois-Rene Rideau
2f45c37646
gerbil: 0.10 -> 0.11
2017-06-16 10:07:14 +02:00
Fatih Altinok
ca8eed1732
flow: 0.46.0 -> 0.48.0
2017-06-16 09:32:05 +02:00
Frederik Rietdijk
b127317e94
Merge pull request #26589 from georgewhewell/bump-defusedxml
...
pythonPackages.defusedxml: 0.4.1 -> 0.5.0
2017-06-16 09:23:42 +02:00
Alexey Shmalko
b521296a4c
Merge pull request #26575 from rnhmjoj/ddcutil
...
ddcutil: init at 0.8.2
2017-06-16 10:08:55 +03:00
Franz Pletz
fd0384b4c2
pythonPackages.glances: 2.9.1 -> 2.10
2017-06-16 06:17:51 +02:00
Franz Pletz
7272f8096e
nmap: 7.40 -> 7.50
2017-06-16 06:17:36 +02:00
Graham Christensen
ba9c71b999
rustc.bootstrap: 1.17.0 -> 1.16.0
...
bootstrapping rust requires the prior version of rust according to #rust-internals
they theorize this could be causing the build problems on i686
2017-06-15 19:57:00 -04:00
Jörg Thalheim
f5d98e8e18
ply: fix build
2017-06-15 21:11:35 +01:00
Shea Levy
517d65ec9b
Merge branch 'ghc821rc2' of git://github.com/k0001/nixpkgs
2017-06-15 16:10:07 -04:00
Jörg Thalheim
10d0213d3f
Merge pull request #26599 from Mic92/utop
...
ocamlPackages.utop: allow utop to locate topfile
2017-06-15 19:43:18 +01:00
Jörg Thalheim
9ffbebfeb0
ocamlPackages.camlidl: export c header and libs.
2017-06-15 19:39:49 +01:00
Vladimír Čunát
791f072384
Merge #26601 : thunderbird*: 52.1.1 -> 52.2.0 (security)
2017-06-15 20:29:01 +02:00
Renzo Carbonara
5f94d85e5e
ghc821: init at 8.2.1-rc2 (a.k.a., 8.2.0.20170507)
...
The approach taken to add this package was to port over the definitions
currently existing for HEAD, and making the necessesary changes to get
this building.
The Haskell package set associated with this compiler doesn't yet
guarantee that all or most of the packages successfully build with this
new compiler, but that will improve over time after this GHC 8.2.1
is officially released and the ecosystem catches up.
2017-06-15 19:59:38 +02:00
Volth
4a5c593e80
vivaldi: fix space in sha256
2017-06-15 17:48:49 +00:00
Frederik Rietdijk
2a24fdaee0
Merge pull request #26525 from jyp/boto-2.47
...
pythonPackages.gensim: init at 2.1.0
2017-06-15 18:57:27 +02:00
Jörg Thalheim
9698439767
Merge pull request #26597 from Zimmi48/update_ppx_tools_versioned
...
ocamlPackages.ppx_tools_versioned: 5.0alpha -> 5.0.1
2017-06-15 16:14:05 +01:00
Jörg Thalheim
8ac0e68809
ocamlPackages.utop: allow utop to locate topfile
...
fixes #16085
2017-06-15 15:17:00 +01:00
Shea Levy
9101fe8f6c
Merge branch 'zoom-us-fix' of git://github.com/danbst/nixpkgs
2017-06-15 10:10:25 -04:00
Robert Helgesson
19f8213a3e
perl-Perl-Critic: 1.126 -> 1.128
2017-06-15 15:50:19 +02:00
danbst
6d6d2fd324
zoom-us: fix webcam video
...
Webcam Logitech C270 showed black screen in zoom, but LD_PRELOADing
v4l1compat.so fixed this. I hope, this wouldn't break camera for people,
who were already able to see video, but I can't be 100% sure currently.
2017-06-15 16:01:43 +03:00
Tim Steinbach
b4576c5108
linux: 4.11.4 -> 4.11.5
2017-06-15 08:54:55 -04:00
danbst
8bc737d9d3
zoom-us: fix facebook and SSO login
...
Turns out, zoom couldn't launch QtWebEngineProcess because of wrong interpreter
Also, there was a need for some extra deps, which I found when
running debug version of zoom.
2017-06-15 15:53:41 +03:00
Tim Steinbach
a7efc9f0cd
linux: 4.9.31 -> 4.9.32
2017-06-15 08:53:35 -04:00
Théo Zimmermann
901069c577
ocamlPackages.ppx_tools_versioned: 5.0alpha -> 5.0.1
2017-06-15 14:53:15 +02:00
Tim Steinbach
07edb44d15
linux: 4.4.71 -> 4.4.72
2017-06-15 08:52:26 -04:00
Jörg Thalheim
a3539d0dbc
Merge pull request #26126 from pmahoney/ocaml-core_bench
...
ocamlPackages.core_bench: init at 113.33.03
2017-06-15 13:50:10 +01:00
Franz Pletz
72c36db003
bind: 9.10.5 -> 9.10.5-P1 for CVE-2017-3140
2017-06-15 13:43:09 +02:00
Franz Pletz
cb59381eee
gnutls: remove dependency on unbound
...
Unbound is used for DANE support but this requires the unbound trust
anchor in /etc/unbound/root.key which we don't create in any NixOS
module.
2017-06-15 13:43:01 +02:00
Franz Pletz
4ac68216bd
unbound: 1.6.2 -> 1.6.3
...
Also moves the header file into the lib output.
2017-06-15 13:42:27 +02:00
Domen Kožar
525c10ecbd
hackage2nix: purescript{,-bridge} compiles now
2017-06-15 13:35:52 +02:00
georgewhewell
79c24a04f1
pythonPackages.defusedxml: 0.4.1 -> 0.5.0
2017-06-15 11:31:53 +01:00
Will Dietz
5172e1afee
mendeley: 1.17.9 -> 1.17.10 ( #26574 )
2017-06-15 12:05:20 +02:00
Joachim F
97fcbd9a31
Merge pull request #26526 from lheckemann/ror-update
...
rigsofrods: 20160412 -> 0.4.7.0
2017-06-15 09:45:38 +01:00
Domen Kožar
72f530ba33
Fix #26441 second try: avoid infinite recursion
2017-06-15 10:22:25 +02:00
Domen Kožar
7c455b5b7e
Revert "Fix #26441 : avoid infinite recursion"
...
This reverts commit 9cad7076d1
.
See 9cad7076d1 (commitcomment-22548331)
2017-06-15 10:19:29 +02:00
Pascal Wittmann
fe041692e2
git-standup: init at 2.1.8
2017-06-15 10:08:21 +02:00
Vladimír Čunát
952bb9a445
Merge #26571 : firefox* updates (critical security)
2017-06-15 08:59:39 +02:00
Edward Tjörnhammar
0f9a2285b8
ezquake: init at 3.0.1
2017-06-15 08:37:24 +02:00
Vladimír Čunát
4ef8313bb6
aiccu: remove leftover from 3dcecf09fc
2017-06-15 07:54:50 +02:00
Edward Tjörnhammar
3dcecf09fc
Remove aiccu package and service due to sunsetting.
...
https://www.sixxs.net/main/
2017-06-15 06:58:08 +02:00
Susan Potter
fdef885d97
ply: init at v1-beta1(9e810b1)
2017-06-14 17:41:42 -05:00
rnhmjoj
7ef9a9ffc1
ddcutil: init at 0.8.2
2017-06-15 00:32:26 +02:00
Domen Kožar
8198cc10f0
Merge pull request #26550 from cleverca22/purescript
...
purescript: fix closure size on OSX
2017-06-15 00:20:46 +02:00
Joachim Fasting
4f909c4f3a
tor-browser-bundle-bin: 7.0 -> 7.0.1
2017-06-14 23:33:45 +02:00
Thomas Tuegel
98c38d51b9
dropbox: 27.4.22 -> 28.4.14
2017-06-14 15:14:06 -05:00
Peter Simons
f59104bc73
vcsh: patch broken parser for $GIT_VERSION_MINOR
2017-06-14 21:28:28 +02:00
Pascal Wittmann
fcf205024a
jasper: 2.0.12 -> 2.0.13, fixes CVE-2017-6850
2017-06-14 20:16:28 +02:00
Pascal Wittmann
3628ce4d67
intel-gpu-tools: 1.18 -> 1.19
2017-06-14 20:15:07 +02:00
Vincent Laporte
b7f4e04c18
ocamlPackages.mparser: 1.2.1 -> 1.2.3
2017-06-14 18:04:23 +00:00
michael bishop
24d313e203
justStaticExecutables: enable -dead_strip on mac to shrink closure
2017-06-14 14:23:53 -03:00
Lancelot SIX
3a9c7c6c18
pythonPackages.netcdf4: add missing cython dependency ( #26570 )
2017-06-14 17:50:48 +02:00
volth
13a8fa8801
nixos-artwork: do not leak nix hashes to filenames in /share/artwork/gnome/ ( #26566 )
...
* nixos-artwork: do not leak nix hashes to filenames /share/artwork/gnome/
* simplify
2017-06-14 17:46:13 +02:00
Will Dietz
b2660fe3cc
mplayer: Use system ffmpeg instead of vendored version. ( #26572 )
...
Fixes use of mplayer with https:// URL's.
2017-06-14 17:44:33 +02:00
taku0
930a00bc92
firefox-esr: 52.1.2esr -> 52.2.0esr
2017-06-14 22:46:23 +09:00
Michael Raskin
0032e55232
Merge pull request #26568 from taku0/flashplayer-26.0.0.126
...
flashplayer: 25.0.0.171 -> 26.0.0.126 [Critical security fixes]
2017-06-14 15:25:38 +02:00
taku0
04e95882c0
firefox: 53.0.3 -> 54.0
2017-06-14 21:50:02 +09:00
taku0
0ed1aead70
nss: 3.30 -> 3.31
2017-06-14 21:50:02 +09:00
taku0
ceb34c6d95
nspr: 4.13.1 -> 4.15
2017-06-14 21:50:01 +09:00
Ekaterina Vaartis
b707e8c78f
perlPackages: init packages needed for bugzilla ( #26569 )
...
perlPackages.EmailMIMEAttachmentStripper: init at 1.317
perlPackages.EmailReply: init at 1.204
perlPackages.PatchReader: init at 0.9.6
perlPackages.TemplateGD: init at 2.66
perlPackages.AuthenRadius: init at 0.26
perlPackages.Chart: init at 2.4.10
perlPackages.EmailMIMEModifier at 1.444
2017-06-14 14:18:56 +02:00
taku0
6cf6048285
firefox-bin: 53.0.3 -> 54.0
2017-06-14 21:10:49 +09:00
taku0
264ec9242f
flashplayer: 25.0.0.171 -> 26.0.0.126
2017-06-14 20:56:19 +09:00
Profpatsch
79dd4deda5
Ultrastar ( #26524 )
...
* ultrastardx-beta: init at 1.3.5
* libbass, libbass_fx: init at 24
* ultrastar-creator: init at 2017-04-12
* buildSupport/plugins.nix: add diffPlugins
Helper function to compare expected plugin lists to the found plugins.
* ultrastar-manager: init at 2017-05-24
The plugins are built in their own derivations, speeding up (re-)compilation.
The `diffPlugins` function from `beets` is reused to test for changes in the
plugin list on updates.
* beets: switch to diffPlugins
The function is basically just extracted for better reusability.
2017-06-14 11:29:31 +02:00
Lancelot SIX
f6fbbabcb7
pythonPackages.django: 1.11.1 -> 1.11.2 ( #26557 )
...
Bugfix release.
See https://docs.djangoproject.com/en/1.11/releases/1.11.2/
2017-06-14 11:26:39 +02:00
Maximilian Bosch
3803864ca6
thefuck: init at 3.18 ( #26529 )
2017-06-14 09:57:38 +01:00
Domen Kožar
9cad7076d1
Fix #26441 : avoid infinite recursion
2017-06-14 10:33:37 +02:00
Jörg Thalheim
537944ea77
gajim: 0.16.7 -> 0.16.8
2017-06-14 09:23:56 +01:00
Rok Garbas
cc0ce6b7a6
rofi-pass: 1.4.3 -> 1.5.0
2017-06-14 08:32:42 +02:00
Josef Kemetmueller
773cc7c03d
pythonPackages.hug: Disable on python2
...
Hug is only supported on python3.
2017-06-14 05:05:13 +02:00
romildo
89b1d4cbe2
greybird: 3.22.3 -> 3.22.4
2017-06-14 04:48:31 +02:00
Peter Hoeg
fd2976bb20
syncthing: 0.14.29 -> 0.14.30
2017-06-14 10:22:31 +08:00
Charles Strahan
3b1c4fce4f
psensor: init at 1.2.0
...
psensor is a graphical hardware monitoring application for Linux
2017-06-13 18:51:36 -04:00
Joachim F
631ec734eb
Merge pull request #26460 from romildo/fix.nixos-artwork
...
nixos-artwork: add more wallpapers
2017-06-13 23:20:52 +01:00
Bas van Dijk
2444eab485
ELK: update kibana and the elastic beats to 5.4 ( #26252 )
...
* Add kibana5 and logstash5
* Upgrade the elastic beats to 5.4
* Make sure all elastic products use the same version
(see elk5Version)
* Add a test for the ELK stack
2017-06-13 22:36:08 +02:00
Peter Simons
424dc0138d
parallel: fix broken shebangs to /usr/bin/perl
...
Adding perl to buildInputs accomplishes this for us automatically.
2017-06-13 22:28:58 +02:00
Gabriel Ebner
0edd78f7bc
calibre: fix missing gsettings schemas
2017-06-13 22:09:48 +02:00
Daiderd Jordan
30412f9930
rhash: fix darwin build
...
Fixes cmake update to 3.8.2, d74d871f52
2017-06-13 22:09:12 +02:00
Robin Stumm
9079f94df7
exa: 2017-04-02 -> 0.6.0
2017-06-13 22:05:27 +02:00
Will Dietz
b83609add3
psmisc: 22.21 -> 23.0
...
No longer need fuser patch, fixes musl compat.
2017-06-13 22:05:00 +02:00
Linus Heckemann
4fc077bfee
vdrift: fix build ( #26522 )
...
Had been broken since 7bf7f19765
2017-06-13 21:51:33 +02:00
Guillaume Koenig
8a06af1163
reno: 1.8.0 -> 2.3.2 ( #26516 )
...
thanks
2017-06-13 21:50:46 +02:00
David Guibert
f03ee24754
gfortran7: added by wrapping gcc7 ( #26535 )
...
thanks
2017-06-13 21:46:37 +02:00
Wei Tang
727ec216dc
go-ethereum-classic: init at 3.5.0 ( #26551 )
...
thanks
2017-06-13 21:43:33 +02:00
Yann Hodique
5c8192c7d6
hugo: 0.22 -> 0.22.1 ( #26558 )
...
thanks
2017-06-13 21:40:45 +02:00
Pascal Wittmann
a9b2de487b
rage: fix license for unstable
...
Beginning with the next development release (> 7.0.0.9)
Ragel is licensed under an MIT style license. Ragel 6
remains under GPL v2. Please see the file COPYING in the
source.
2017-06-13 21:37:54 +02:00
Pascal Wittmann
c9fcce368d
ragel: 6.9 -> 6.10
2017-06-13 21:37:52 +02:00
Pascal Wittmann
972fa2a219
instead: 3.0.0 -> 3.0.1
2017-06-13 21:37:50 +02:00
Urban Škudnik
053377e49f
google-play-music-desktop-player: 4.2.0 -> 4.3.0
2017-06-13 21:32:51 +02:00
Franz Pletz
58605e0ace
Merge pull request #26543 from jbedo/snpeff
...
snpeff: 4.3i -> 4.3p
2017-06-13 21:30:59 +02:00
Pascal Wittmann
50b3f8e051
fsql: 0.1.1 -> 0.2.1
2017-06-13 21:26:48 +02:00
Franz Pletz
3640c65be6
jenkins: 2.64 -> 2.65
2017-06-13 21:22:00 +02:00
Franz Pletz
44cb792077
powerdns: 4.0.2 -> 4.0.3
2017-06-13 21:21:59 +02:00
Franz Pletz
ec27fcdd6c
caddy: 0.9.5 -> 0.10.3
2017-06-13 21:21:58 +02:00
Peter Simons
14283b6a95
vcsh: update to latest Git head, enable test suite, install man page
2017-06-13 20:16:30 +02:00
Peter Simons
8d71c758a1
perl-Shell-Command: initial version 0.06
2017-06-13 20:16:30 +02:00
Tim Shaffer
e973c75d65
vim: update URL for vimrc
...
Previous URL was returning a 404. Adjusting the query parameters fixes
things.
2017-06-13 13:31:17 -04:00
Jörg Thalheim
32a7390055
Merge pull request #26553 from zx2c4/patch-4
...
wireguard: 0.0.20170531 -> 0.0.20170613
2017-06-13 18:02:41 +01:00
Vladimír Čunát
90cf4cfabe
rhash: extend meta.platforms
...
Now cmake evaluates on Darwin again. Let's be optimistic about building.
Discussion: https://github.com/NixOS/nixpkgs/commit/d74d871f52
2017-06-13 17:17:03 +02:00
Peter Simons
b7f71bd2ad
mr: update to version 1.20170129
2017-06-13 16:55:50 +02:00
Jason A. Donenfeld
9d4bf6b155
wireguard: 0.0.20170531 -> 0.0.20170613
...
Simple version bump. Release notes:
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-06-13 15:55:56 +02:00
Vladimír Čunát
5ad7d3106e
kde4.kdepimlibs: fixup build by using older cmake
...
I have no idea why, but apparently the last cmake update caused:
kdepimlibs-4.14.3/akonadi/tests/../pastehelper.cpp:343:27:
fatal error: pastehelper.moc: No such file or directory
2017-06-13 14:27:44 +02:00
Will Dietz
d645223306
elfkickers: fix typo in enableParallelBuilding.
...
Thanks @bjornfor for spotting this!
2017-06-13 07:01:17 -05:00
Linus Heckemann
db2849c8a2
rigsofrods: 20160412 -> 0.4.7.0
2017-06-13 10:52:38 +01:00
Vladimír Čunát
ed070354a9
Merge branch 'staging'
2017-06-13 11:22:56 +02:00
Vladimír Čunát
156a9afb2b
knot-resolver: 1.2.6 -> 1.3.0
2017-06-13 10:57:33 +02:00
Jean-Philippe Bernardy
cbbdc7d3eb
pythonPackages.gensim: init at 2.1.0
2017-06-13 09:35:18 +02:00
Jörg Thalheim
f866cae200
android-udev-rules: 20170305 -> 20170612
2017-06-13 08:07:04 +01:00
timor
d74f8351a5
kernel: enable audio jack reconfiguration
...
Change kernel config to allow for changing the functions of the audio
jacks at run-time as well as at boot time.
2017-06-13 08:50:34 +03:00
Justin Bedo
94ec54598c
snpeff: 4.3i -> 4.3p
2017-06-13 15:31:52 +10:00
Shea Levy
b349d4b899
haskellPackages.developPackage: Add overrides argument
2017-06-12 19:29:46 -04:00