JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,653 Commits 2 Branches 0 Tags 13 GiB
0925700688
Commit Graph

2527 Commits

Author SHA1 Message Date
Vladimír Čunát
c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Tobias Geerinckx-Rice
2a08ea9426
epiphany: remove unused libxml_depend.patch 2016-06-22 03:58:55 +02:00
Tobias Geerinckx-Rice
aa18ee6a73
geary 0.10: remove unused disable_valadoc.patch 2016-06-22 02:10:49 +02:00
Philip Potter
ea4738ff4f gnome-keyring: remove unused configure flag 
The --with-ca-certificates flag seems to have been removed in
[this commit][1] from March 2013.  The configure script now just warns
about an unknown option.

[1]: https://git.gnome.org/browse/gnome-keyring/commit/?id=7afaae43f205c059163c3670169af302f1ba6de3
 2016-06-21 07:56:09 +01:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
Vladimír Čunát
e757404555 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1279790
 2016-06-19 12:33:04 +02:00
Vladimír Čunát
97c484a10f treewide: fix #include errors after gcc-5.4 
They were mostly missing <cmath> or <math.h>.
 2016-06-19 10:18:30 +02:00
Bjørn Forsman
0b061e7f75 gnome-terminal: enable GNOME Shell search provider (for 3.20) 
[This is a re-re-application of the patch that was originally written
for GNOME 3.16. It was lost during the transition to GNOME 3.18 and
then to 3.20. Third time's a charm?]

Silly ./configure, it looks for dbus file from gnome-shell in the
installation tree of the package it is configuring. Fix by copying
needed file from gnome-shell before ./configure is run.

This change makes gnome-shell a build time dependency (not runtime).
 2016-06-18 14:17:27 +02:00
Thomas Tuegel
ed46b468b0 Fix Travis build failure caused by Qt/KDE documentation 
The comments in the Qt/KDE packages caused a spurious Travis build
failure because they appeared to refer to `<nixpkgs>`.
 2016-06-17 12:21:19 -05:00
Thomas Tuegel
592dcbc4bf Fix evaluation error in Qt/KDE packages 
For now, the source hashes will continue to be stored in the Nixpkgs
tree. The package update instructions are updated.
 2016-06-17 09:47:16 -05:00
Thomas Tuegel
cb302c7696 kde5.frameworks: store generated source hashes outside Nixpkgs tree 2016-06-16 15:16:49 -05:00
Thomas Tuegel
cc5adac6f6 kde5.plasma: 5.6.4 -> 5.6.5 
The generated source hashes are now stored outside the Nixpkgs tree.
 2016-06-16 15:16:49 -05:00
Thomas Tuegel
d975d5da8b kde5.khelpcenter: moved from Plasma 5.6.4 to Applications 16.04.2 2016-06-16 15:16:49 -05:00
Thomas Tuegel
f87c251c98 kde5.applications: 16.04.1 -> 16.04.2 
The generated source hashes are now stored outside the Nixpkgs tree.
 2016-06-16 15:16:49 -05:00
obadz
ecd3617d7a xfce.xfce4-power-manager: add withGtk3 version 1.6.0 
test passed: nix-build '<nixos/release.nix>' -A tests.xfce.x86_64-linux

Closes: #8595
 2016-06-16 15:32:07 +01:00
José Romildo Malaquias
e72d29020c libxfce4ui: add libICE and libSM as propagated build inputs 2016-06-14 11:53:11 -03:00
José Romildo Malaquias
370cc4f44f libxfce4ui: use nativeBuildInputs for dependencies not needed at runtime 2016-06-14 11:51:04 -03:00
Ronny Pfannschmidt
be7043e01a gnome-disk-utility: wrapGAppsHook 2016-06-12 21:55:20 +02:00
Ronny Pfannschmidt
ebda96638a gnome-keyring: wrapGAppsHook 2016-06-12 21:55:01 +02:00
Ronny Pfannschmidt
e6ba55dcf5 gnome-online-accounts: use wrapGAppsHook 2016-06-12 21:54:32 +02:00
José Romildo Malaquias
9573ef7e0d mate-themes: 3.18.1 -> 3.18.2, 3.20.8 2016-06-12 15:47:42 -03:00
José Romildo Malaquias
14e4e62ea4 mate-icon-theme-faenza: 1.14.1 -> 1.15.0 2016-06-12 14:36:58 -03:00
José Romildo Malaquias
bea663985a mate-icon-theme: 1.14.1 -> 1.15.0 2016-06-12 14:30:04 -03:00
José Romildo Malaquias
0edbfabe24 mate-common: 1.14.1 -> 1.15.0 2016-06-12 14:13:24 -03:00
Luca Bruno
beb4182cc8 gnome3.gdm: fix version 3.14 for being used with gnome-shell 3.20. Closes #16063 2016-06-11 16:47:14 +02:00
Thomas Tuegel
04ad2ebfb2 Merge branch 'kde-propagate' 2016-06-09 12:40:04 -05:00
Thomas Tuegel
98bb89b9d0 kde5.extra-cmake-modules: propagate build inputs correctly 2016-06-09 09:14:20 -05:00
Joachim Fasting
687fff86c1 Merge pull request #16087 from romildo/upd.enlightenment 
enlightenment: 0.20.8 -> 0.20.9
 2016-06-09 14:01:56 +02:00
obadz
31f4a9b559 xfce.thunar: patch to avoid error 
«the desktop file … is in an insecure location»
which pops up when invoking desktop files that are
symlinks to the /nix/store

this error was added by this commit:

1ec8ff89ec

«Only allow direct execution of desktop files in an
XDG directory and if they are executable.»
 2016-06-09 12:10:15 +01:00
José Romildo Malaquias
3b28b5673b enlightenment: 0.20.8 -> 0.20.9 2016-06-09 08:05:14 -03:00
Thomas Tuegel
8dae2eddcf kde5.kdeplasma-addons: add missing ksysguard dependency 2016-06-08 14:58:35 -05:00
Thomas Tuegel
b214c6b64f kde5.plasma-desktop: add missing ksysguard dependency 2016-06-08 13:51:25 -05:00
Thomas Tuegel
bcd6e295d7 kde5.plasma-workspace: add iso-codes dependency 
Fixes #16040. CMake finds the iso-codes dependency through pkgconfig.
 2016-06-08 10:26:24 -05:00
Luca Bruno
217feced47 gnome3_20.totem: fix build on i686 
See https://bugzilla.gnome.org/show_bug.cgi?id=767374
 2016-06-07 21:22:27 +02:00
Nikolay Amiantov
66077b9a36 gpaste: fix evaluation 2016-06-07 17:23:19 +03:00
Thomas Tuegel
dc7d5231d6 Merge branch 'plasma-5' 2016-06-07 08:47:19 -05:00
Thomas Tuegel
43a7d90e97 Revert "Revert "kde5.frameworks: 5.21 -> 5.22"" 
This reverts commit 9769952933.
 2016-06-07 06:21:09 -05:00
Thomas Tuegel
80b1cf6633 kde5.plasma-integration: init at 5.6.4 2016-06-06 16:08:33 -05:00
Damien Cassou
da62589d8e gnome3_20: Add GNOME 3.20 package set 2016-06-06 20:33:58 +02:00
Thomas Tuegel
9769952933 Revert "kde5.frameworks: 5.21 -> 5.22" 
This reverts commit 112d4c71b2.

This upgrade causes a serious Plasma performance degradation and causes
incorrect font rendering. Reverting until the cause is known.
 2016-06-05 14:56:27 -05:00
Vladimír Čunát
a03ff26080 Merge #15639: xorg-server 1.17.4 -> 1.18.3 
... and fglrxCompat to maintain compatibility.
 2016-06-05 00:52:06 +02:00
Thomas Tuegel
ddaebefb12 Revert "extra-cmake-modules: don't change the RPATH settings" 
This reverts commit 94fcfc9c41.
 2016-06-01 08:14:51 -05:00
Joachim Fasting
5134bfab0c Merge pull request #15872 from romildo/fix.mate 
mate-themes and mate-icon-theme: move to pkgs/desktops/mate/
 2016-06-01 02:49:26 +02:00
José Romildo Malaquias
f67c878241 mate-icon-theme: move to pkgs/desktops/mate/ 2016-05-31 15:08:51 -03:00
José Romildo Malaquias
e428c0346f mate-themes: move to pkgs/desktops/mate/ 2016-05-31 15:06:43 -03:00
Thomas Tuegel
94fcfc9c41 extra-cmake-modules: don't change the RPATH settings 
We don't need KDE upstream messing up our RPATH.
 2016-05-31 13:02:15 -05:00
Joachim Fasting
228331cc7d Merge pull request #15837 from romildo/new.mate-icon-theme-faenza 
mate-icon-theme-faenza: init at 1.14.1
 2016-05-31 15:41:31 +02:00
Tobias Geerinckx-Rice
b1dda910a3
gnome3.libcroco: 0.6.8 -> 0.6.11 2016-05-31 15:17:04 +02:00
José Romildo Malaquias
f5dff2cd14 mate-icon-theme-faenza: init at 1.14.1 2016-05-30 15:32:47 -03:00
José Romildo Malaquias
5c221d0b00 mate-common: init at 1.14.1 2016-05-30 15:32:36 -03:00
José Romildo Malaquias
69cbaebf27 elementary: 1.17.0 -> 1.17.1 2016-05-28 09:54:32 -03:00
José Romildo Malaquias
91a23ebcc6 efl: 1.17.0 -> 1.17.1 2016-05-28 09:54:23 -03:00
Vladimír Čunát
e4832c7541 Merge branch 'staging' 
Includes a security update of libxml2.
 2016-05-27 15:58:40 +02:00
Luca Bruno
ef8ea38fe8 gdm: fix build with systemd 230 2016-05-27 11:18:16 +02:00
obadz
1fb49e8089 Revert "gdm: apply substition to cope with systemd 229 -> 230 upgrade" 
This reverts commit 745c379f1b.

@lethalman will commit a better solution
 2016-05-27 10:17:11 +01:00
obadz
745c379f1b gdm: apply substition to cope with systemd 229 -> 230 upgrade 
Inspired from eee5bf72c9
 2016-05-27 10:13:14 +01:00
Damien Cassou
6ef9dec981 gpaste: 3.18.3 -> 3.18.4 2016-05-25 18:09:25 +02:00
Vladimír Čunát
69cc0a7bc5 xf86-input-evdev: split dev output 2016-05-23 13:02:55 +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
Bjørn Forsman
ca717d0d65 gnome-terminal: enable GNOME Shell search provider (for 3.18) 
[This is a re-application of the patch that was originally written for
GNOME 3.16. It was lost during the transition to GNOME 3.18.]

Silly ./configure, it looks for dbus file from gnome-shell in the
installation tree of the package it is configuring. Fix by copying the
needed file from gnome-shell before ./configure is run.

This change makes gnome-shell a build time dependency (not runtime).
 2016-05-19 13:59:16 +02:00
Tuomas Tynkkynen
1819181726 treewide: Make explicit that 'dev' output of xorgserver is used 2016-05-19 10:04:41 +02:00
Tuomas Tynkkynen
f7a0b0b9bc treewide: Make explicit that 'dev' output of libdrm is used 2016-05-19 10:00:39 +02:00
Tuomas Tynkkynen
e363b019cf treewide: Make explicit that 'dev' output of gnome3.libsoup is used 2016-05-19 10:00:37 +02:00
Tuomas Tynkkynen
ec8af05e1f treewide: Make explicit that 'dev' output of gnome3.glib is used 2016-05-19 10:00:36 +02:00
Tuomas Tynkkynen
f81af4e6f0 treewide: Make explicit that 'dev' output of glib is used 2016-05-19 10:00:35 +02:00
Michael Alan Dorman
7c1106d595 gitg: 3.18.0 -> 3.20.0 2016-05-18 08:19:52 -04:00
Michael Alan Dorman
bfe9fded9c libgit2-glib: 0.23.6 -> 0.24.0 2016-05-18 08:19:48 -04:00
Joachim Fasting
f3f16643a8 Merge pull request #15522 from romildo/upd.enlightenment 
enlightenment: 0.20.7 -> 0.20.8
 2016-05-18 03:21:30 +02:00
José Romildo Malaquias
f3dc37840d enlightenment: 0.20.7 -> 0.20.8 2016-05-17 11:27:30 -03:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Thomas Tuegel
f7ec37f3e8 Merge branch 'pr-15453' 2016-05-15 18:19:57 -05:00
Thomas Tuegel
112d4c71b2 kde5.frameworks: 5.21 -> 5.22 2016-05-15 18:19:12 -05:00
José Romildo Malaquias
1b5de9df06 xfce4: rename package xfce4screenshooter to xfce4-screenshooter 2016-05-14 23:27:09 -03:00
Frederik Rietdijk
9bb021898e KDE5 Plasma 5.6.3 -> 5.6.4 2016-05-14 14:26:23 +02:00
José Romildo Malaquias
1498dfd24a xfce4-screenshooter: 1.8.1 -> 1.8.2 2016-05-14 09:25:25 -03:00
José Romildo Malaquias
48c63cb6a6 xfce4-screenshooter: add dependency on hicolor_icon_theme 2016-05-14 09:15:06 -03:00
Frederik Rietdijk
7083611275 KDE5 Applications 16.04.0 -> 16.04.1 2016-05-14 11:14:08 +02:00
Thomas Tuegel
dd34c61097 kdewebkit: removed 2016-05-10 20:09:55 -05:00
Thomas Tuegel
cc6a7d5567 plasma-workspace: remove qtquick1 and qtwebkit inputs 2016-05-10 20:09:26 -05:00
Thomas Tuegel
6011898cb5 plasma-desktop: remove qtquick1 input 2016-05-10 20:09:02 -05:00
Thomas Tuegel
094b945b0c libksysguard: remove qtwebkit input 2016-05-10 20:08:51 -05:00
Thomas Tuegel
b98d8b0a52 krunner: remove qtquick1 input 2016-05-10 20:08:37 -05:00
Thomas Tuegel
62c2fcee74 kdesignerplugin: remove kdewebkit input 2016-05-10 20:08:25 -05:00
Thomas Tuegel
7661144ae9 baloo: remove qtquick1 input 2016-05-10 20:08:09 -05:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Franz Pletz
e478b63b27 Merge pull request #14835 from groxxda/libcap 
libcap: 2.24 -> 2.25, replace old split with multi-output
 2016-05-06 03:15:16 +02:00
zimbatm
249dcabb33 Merge pull request #14679 from aneeshusa/add-gnome-shell-extensions 
Add gnome shell extensions
 2016-05-05 23:07:37 +01:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Arseniy Seroka
3e92cbd86e Merge pull request #15215 from romildo/upd.xfce4-cpufreq-plugin 
xfce4-cpufreq-plugin: 1.1.1 -> 1.1.3
 2016-05-04 21:37:33 +03:00
Joachim Fasting
6acf41f9bf Merge pull request #15223 from romildo/new.xfce4-weather-plugin 
xfce4-weather-plugin: init at 0.8.7
 2016-05-04 20:10:43 +02:00
José Romildo Malaquias
7e09858d6e xfce4-weather-plugin: init at 0.8.7 2016-05-04 14:02:13 -03:00
José Romildo Malaquias
3bcaf22dec xfce4-cpufreq-plugin: 1.1.1 -> 1.1.3 2016-05-04 09:11:34 -03:00
José Romildo Malaquias
0bdb8ef7f3 enlightenment: 0.20.6 -> 0.20.7 2016-05-04 06:31:23 -03:00
José Romildo Malaquias
41b5de4773 xfce4-whiskermenu-plugin: 1.5.2 -> 1.5.3 2016-05-03 19:13:09 -03:00
José Romildo Malaquias
518b9abfd5 xfce4-whiskermenu-plugin: the xfce4-panel binary is in ${xfce4panel.out} 2016-05-03 19:03:46 -03: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
José Romildo Malaquias
f0da9ff412 gtk-xfce-engine: add support to Gtk3 2016-05-03 15:18:23 -03:00
José Romildo Malaquias
f72a2faa28 gtk-xfce-engine: 2.10.1 -> 3.2.0 2016-05-03 15:14:50 -03:00
Alexander Ried
5c295a4925 libcap: Replace occurences of libcap_progs with libcap.out 2016-05-03 19:52:53 +02:00
Alexander Ried
6ca5c3667b kde: cleanup from closure-size merge (#15179) 
part of 98d8e1a160 and
7049bde4d5 got lost
 2016-05-03 08:59:18 +02:00
Thomas Tuegel
f90a7bf354 kde5.oxygen-icons5: no dev output 2016-04-30 14:46:31 -05:00
Thomas Tuegel
609a251ee9 kde5.breeze-icons: no dev output 2016-04-30 14:46:12 -05:00
Thomas Tuegel
bad36556fe kde5.plasma-workspace: update import path patch 2016-04-30 12:20:50 -05:00
Thomas Tuegel
ccd46cc4b5 Revert "kde5_latest.plasma-workspace: remove patches" 
This reverts commit ffc217883c.
 2016-04-30 12:20:50 -05:00
Thomas Tuegel
7027f7df7c kde5.spectacle: propagate all buildInputs 2016-04-30 12:20:49 -05:00
Thomas Tuegel
fa410d5ba1 kde5.print-manager: propagate all buildInputs 2016-04-30 12:20:49 -05:00
Thomas Tuegel
a5aaea3fb5 kde5.libkipi: propagate all buildInputs 2016-04-30 12:20:49 -05:00
Thomas Tuegel
3c6065bc5b kde5.libkexiv2: propagate all buildInputs 2016-04-30 12:20:48 -05:00
Thomas Tuegel
6d74e3a619 kde5.libkdcraw: propagate all buildInputs 2016-04-30 12:20:48 -05:00
Thomas Tuegel
6c721ce849 kde5.konsole: propagate all buildInputs 2016-04-30 12:20:48 -05:00
Thomas Tuegel
1e5bee0b23 kde5.kio-extras: propagate all buildInputs 2016-04-30 12:20:47 -05:00
Thomas Tuegel
303071c14c kde5.kdenetwork-filesharing: propagate all buildInputs 2016-04-30 12:20:47 -05:00
Thomas Tuegel
e14c14e6b9 kde5.kdegraphics-thumbnailers: propagate all buildInputs 2016-04-30 12:20:47 -05:00
Thomas Tuegel
6cef508a39 kde5.kcolorchooser: propagate all buildInputs 2016-04-30 12:20:47 -05:00
Thomas Tuegel
d3b1d5740e kde5.kcalc: propagate buildInputs 2016-04-30 12:20:46 -05:00
Thomas Tuegel
fa758af5d8 kde5.kate: propagate all buildInputs 2016-04-30 12:20:46 -05:00
Thomas Tuegel
fd129bd97a kde5.gwenview: propagate all buildInputs 2016-04-30 12:20:46 -05:00
Thomas Tuegel
fc6606adaf kde5.gpgmepp: propagate all buildInputs 2016-04-30 12:20:45 -05:00
Thomas Tuegel
1ebcb5f67f kde5.filelight: propagate all buildInputs 2016-04-30 12:20:45 -05:00
Thomas Tuegel
d4819465d8 kde5.ffmpegthumbs: propagate all buildInputs 2016-04-30 12:20:45 -05:00
Thomas Tuegel
aa8d8addeb kde5.dolphin-plugins: propagate all buildInputs 2016-04-30 12:20:44 -05:00
Thomas Tuegel
a742a3e98f kde5.dolphin: propagate all buildInputs 2016-04-30 12:20:44 -05:00
Thomas Tuegel
a2e4821311 kde5.baloo-widgets: propagate all buildInputs 2016-04-30 12:20:44 -05:00
Thomas Tuegel
16ab749298 kde5.ark: propagate all buildInputs 2016-04-30 12:20:44 -05:00
Thomas Tuegel
fd272ea970 kde5.systemsettings: propagate all buildInputs 2016-04-30 12:20:43 -05:00
Thomas Tuegel
a196901566 pkgs/desktops/kde-5/plasma-5.6: remove obsolete setup-hook.sh 2016-04-30 12:20:43 -05:00
Thomas Tuegel
d4842648ce kde5.powerdevil: propagate buildInputs 2016-04-30 12:20:43 -05:00
Thomas Tuegel
758e28728e kde5.polkit-kde-agent: propagate all buildInputs 2016-04-30 12:20:42 -05:00
Thomas Tuegel
ee5cc8f5ce kde5.plasma-pa: propagate all buildInputs 2016-04-30 12:20:42 -05:00
Thomas Tuegel
a022895db1 kde5.plasma-nm: propagate all buildInputs 2016-04-30 12:20:42 -05:00
Thomas Tuegel
9f0feebeeb kde5.plasma-mediacenter: propagate all buildInputs 2016-04-30 12:20:42 -05:00
Thomas Tuegel
747daca407 kde5.plasma-desktop: propagate all buildInputs 2016-04-30 12:20:41 -05:00
Thomas Tuegel
cfc28505b5 kde5.oxygen: propagate all buildInputs 2016-04-30 12:20:41 -05:00
Thomas Tuegel
8fb25cb4c2 kde5.milou: propagate all buildInputs 2016-04-30 12:20:41 -05:00
Thomas Tuegel
5addd165de kde5.libksysguard: propagate all buildInputs 2016-04-30 12:20:40 -05:00
Thomas Tuegel
56dd0c2541 kde5.libkscreen: propagate all buildInputs 2016-04-30 12:20:40 -05:00
Thomas Tuegel
0dc8b5f32c kde5.kwrited: propagate all buildInputs 2016-04-30 12:20:40 -05:00
Thomas Tuegel
e4d3699976 kde5.kwin: propagate all buildInputs 2016-04-30 12:20:39 -05:00
Thomas Tuegel
27aca6670c kde5.kwayland: propagate all buildInputs 2016-04-30 12:20:39 -05:00
Thomas Tuegel
bb74e9afa5 kde5.ksysguard: propagate all buildInputs 2016-04-30 12:20:39 -05:00
Thomas Tuegel
b63b3485a0 kde5.ksshaskpass: propagate all buildInputs 2016-04-30 12:20:38 -05:00
Thomas Tuegel
483ed9427f kde5.kscreen: propagate all buildInputs 2016-04-30 12:20:38 -05:00
Thomas Tuegel
21710ee012 kde5.kscreenlocker: propagate all buildInputs 2016-04-30 12:20:38 -05:00
Thomas Tuegel
289e0bab8e kde5.kmenuedit: propagate all buildInputs 2016-04-30 12:20:38 -05:00
Thomas Tuegel
a9c93158f2 kde5.kinfocenter: propagate all buildInputs 2016-04-30 12:20:37 -05:00
Thomas Tuegel
e3e387f5bd kde5.khotkeys: propagate buildInputs 2016-04-30 12:20:37 -05:00
Thomas Tuegel
188ad5dbb6 kde5.khelpcenter: propagate all buildInputs 2016-04-30 12:20:37 -05:00
Thomas Tuegel
b6aeb8e011 kde5.kdeplasma-addons: propagate all buildInputs 2016-04-30 12:20:36 -05:00
Thomas Tuegel
a43ef07c72 kde5.kde-gtk-config: propagate all buildInputs 2016-04-30 12:20:36 -05:00
Thomas Tuegel
9b5161e3aa kde5.kde-cli-tools: propagate all buildInputs 2016-04-30 12:20:36 -05:00