mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 09:02:46 +00:00
Code Issues Wiki Activity
128888 commits 255 branches 124 tags 7.8 GiB
Commit graph

14583 commits

Author SHA1 Message Date
dywedir d0501e96ba ripgrep: 0.7.1 -> 0.8.0, install shell completions 2018-02-13 15:58:13 +02:00
José Luis Lafuente ecfafc4fbd
autojump: install fish shell completions 2018-02-13 11:52:47 +01:00
José Luis Lafuente 0e09abd9c4
fd: install fish shell completions 2018-02-13 11:52:02 +01:00
Andrew Dunham 504321761a massren: init at 1.5.4 2018-02-12 21:38:43 +01:00
Graham Christensen 567a72a161
perl.FileRename: fixup meta 2018-02-12 10:30:27 -05:00
Peter Hoeg 8016f9b4c9
Merge pull request #34611 from peterhoeg/p/descent 
descent 1 & 2: use assets from gog.com with the dxx-rebirth project
 2018-02-12 22:31:41 +08:00
Peter Hoeg 646abe9b29 perl.FileRename: init at 0.20 2018-02-12 22:28:02 +08:00
Profpatsch 53e790e7a8 maintainers: capitalize the Profpatsch attribute (vanity) 
Since I’m already at it, this has been bothering me for a while.
 2018-02-12 07:24:50 +01:00
Profpatsch 2922bee722 remove profpatsch from maintainer list of a few packages 2018-02-12 06:24:38 +01:00
adisbladis 0fb2ac4e20
Merge pull request #34830 from andrew-d/adunham/lego 
lego: init at unstable-2018-02-02
 2018-02-12 11:32:43 +08:00
adisbladis 96ce689bcb
Merge pull request #34865 from catern/master 
supervise: 1.2.0 -> 1.3.0
 2018-02-12 10:06:07 +08:00
adisbladis daaa594aa5
vips: 8.3.1 -> 8.6.2 2018-02-12 09:50:31 +08:00
DarkScythe97 b22883c9a4 oxipng: init at 1.0.0 2018-02-12 01:14:02 +00:00
Spencer Baugh a694e89be4 supervise: 1.2.0 -> 1.3.0 2018-02-12 00:34:15 +00:00
Andrew Dunham ac5e4d4990 lego: init at unstable-2018-02-02 2018-02-11 12:17:25 -08:00
Jörg Thalheim 78ab1b0a17
Merge pull request #34845 from yesbox/bfs_init 
bfs: init at 1.2.1
 2018-02-11 17:37:06 +00:00
Jesper Geertsen Jonsson 0312fe4882 bfs: init at 1.2.1 2018-02-11 16:19:02 +01:00
Frederik Rietdijk 9d69ebe5a8 Merge staging at '256ba86' into master 2018-02-11 08:54:49 +01:00
dywedir 90c7ce023f fd: 6.2.0 -> 6.3.0 2018-02-10 21:55:03 +02:00
Eric Wolf e2859068b1 pythonPackages.msgpack: renamed to msgpack-python 2018-02-10 14:47:19 +01:00
Jörg Thalheim df0fe7aa56
Merge pull request #34510 from sorki/nixops-dns 
nixops-dns: init at f6c3f79
 2018-02-10 10:47:25 +00:00
Frederik Rietdijk d8d8a0a00f
Merge pull request #34761 from nico202/papis 
papis: init at 0.5.2 + dependencies
 2018-02-10 08:32:52 +00:00
Nicolò Balzarotti dd4144ed62 papis: init at 0.5.2 2018-02-10 09:23:02 +01:00
Jörg Thalheim 3b8bb02f68
Merge pull request #34792 from dywedir/bcachefs 
linux_testing_bcachefs: 4.11.2017.08.23 -> 4.15.2018.02.09
 2018-02-10 08:20:35 +00:00
Robert Schütz eaf55b1946 eschalot: init at 2018-01-19 (#34773) 2018-02-10 01:07:31 +00:00
Graham Christensen 573c52036c
Merge pull request #34793 from oxij/pkg/fetchurl-securely 
trivial: fetchurl more securely
 2018-02-09 19:44:12 -05:00
SLNOS 40bceae84e curl: fetchurl more securely 2018-02-10 00:25:37 +00:00
SLNOS 3be3c2906e stunnel: fetchurl more securely 2018-02-10 00:24:20 +00:00
Jörg Thalheim 2941217227 Revert "squashfuse: init at 0.1.101" 
This reverts commit 17210fee46.
 2018-02-10 01:03:42 +01:00
Jörg Thalheim b37fd0aa3a
Merge pull request #34770 from dotlambda/abcmidi 
abcmidi: 2018.01.25 -> 2018.02.07
 2018-02-09 22:52:06 +00:00
dywedir 2f0e3327ea bcachefs-tools: 2017-08-28 -> 2018-02-08 2018-02-10 00:40:03 +02:00
Jörg Thalheim 8d99502669
Merge pull request #34788 from dywedir/exfat 
exfat: 1.2.7 -> 1.2.8
 2018-02-09 22:11:31 +00:00
dywedir 29160973a7 exfat: 1.2.7 -> 1.2.8 2018-02-09 23:59:16 +02:00
Will Dietz 9696add026 figlet: simplify, enable tests, fix for cross and musl 2018-02-09 13:16:17 -06:00
Frederik Rietdijk 9c105bdf8f Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-09 20:02:53 +01:00
Frederik Rietdijk 8754d64185
Merge pull request #34640 from knedlsepp/reduce-graphviz-impurity 
graphviz: Explicitly specify libltdl directories
 2018-02-09 19:01:19 +00:00
Robert Schütz 334dd9cbf5 abcmidi: 2018.01.25 -> 2018.02.07 2018-02-09 18:04:23 +01:00
Jörg Thalheim 2e86479790
Merge pull request #34627 from dtzWill/update/rhash-git 
rhash: 1.3.3 -> 2018-02-05
 2018-02-09 17:01:06 +00:00
Jörg Thalheim 465d7c55d9
Merge pull request #34763 from zimbatm/asciidoctor-pdf-fix 
asciidoctor: expose all the bins
 2018-02-09 15:59:09 +00:00
José Luis Lafuente 3b6f8b5b15 youtube-dl: 2018.01.27 -> 2018.02.08 (#34762) 2018-02-09 15:17:22 +00:00
zimbatm 6f56749b07 asciidoctor: expose all the bins 
asciidoctor has multiple binaries, expose them all to the user
 2018-02-09 14:40:22 +00:00
Peter Hoeg 0cdc0ac3a1 screenfetch: 2016-10-11 -> 3.8.0 2018-02-09 18:05:10 +08:00
Jörg Thalheim 9e39a7b4e0
Merge pull request #34652 from mbrgm/upgrade-keepalived 
keepalived: 1.3.6 -> 1.4.1
 2018-02-09 09:47:44 +00:00
Jörg Thalheim 5b247f741d
Merge pull request #34677 from dtzWill/feature/busybox-sandbox-shell 
busybox-sandbox-shell: extract basic shell to new attribute
 2018-02-09 09:32:55 +00:00
Jörg Thalheim a0a3298091
Merge pull request #34663 from bignaux/squashfuse 
squashfuse: init at 0.1.101
 2018-02-09 09:23:23 +00:00
Jörg Thalheim d0bac026ec
Merge pull request #34695 from woffs/uudeview 
uudeview: init at 0.5.20
 2018-02-09 09:11:08 +00:00
Matthieu Chevrier 00970f76f9 theharvester: init at 2.7.1 (#34704) 2018-02-09 09:00:15 +00:00
mkgvt f41eb52bc9 rename: init at 1.9 (#34719) 2018-02-09 08:05:11 +00:00
Ryan Mulligan aefaab9516 biosdevname: 0.7.2 -> 0.7.3 2018-02-08 17:58:20 -08:00
Dan Peebles dfd300c81d treewide: s/pkgs.fedoraproject.org/src.fedoraproject.org/ 
Upstream killed the pkgs server but src continues to serve up the exact
same content, so we can just point there and all hashes should be unchanged.
 2018-02-08 16:38:08 -05:00
Frederik Rietdijk 50a9d51a09 Merge commit '30d031b5d8d05422586043c3f105f4d9110e4f59' into HEAD 2018-02-08 12:14:07 +01:00
Ruben Maher 84f30286d2 awsebcli: 3.12.1 -> 3.12.2 2018-02-08 09:37:12 +10:30
Graham Christensen c46c2e281b
Merge pull request #33237 from jluttine/add-diskrsync 
diskrsync: init at 20170927
 2018-02-07 08:15:20 -05:00
Frank Doepper ef727716cf uudeview: init at 0.5.20 2018-02-07 11:38:58 +01:00
Peter Hoeg 237ae9a0d1
Merge pull request #34659 from peterhoeg/p/nmapsi4 
nmapsi4: init at 0.5-alpha1
 2018-02-07 10:14:53 +08:00
Daniel Frank bfa1390b47
burp: 2.0.54 -> 2.1.28 2018-02-07 10:01:42 +08:00
Tuomas Tynkkynen 4c6c919a31 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	pkgs/os-specific/linux/kernel/generic.nix
 2018-02-07 03:41:24 +02:00
Joachim F e9dd9967ef
Merge pull request #34395 from jonafato/keybase-1.0.40 
keybase: 1.0.39 -> 1.0.40
 2018-02-06 21:25:30 +00:00
Michael Raskin 1137ba5a73
Merge pull request #27734 from jfrankenau/add-desktop-entries 
Add desktop entry files for FreeCAD and ddccontrol
 2018-02-06 21:21:04 +00:00
Peter Hoeg d4df7aadf9 cryfs: 0.9.8 -> 0.9.9 2018-02-07 00:29:04 +08:00
adisbladis 2ee827ec8b
Merge pull request #34667 from ryantm/archivemount 
archivemount: 0.8.3 -> 0.8.7
 2018-02-06 23:16:12 +08:00
adisbladis 4c7374617a
Merge pull request #34665 from ryantm/augeas 
augeas: 1.10.0 -> 1.10.1
 2018-02-06 23:15:41 +08:00
adisbladis 5f17cd4c0b
Merge pull request #34669 from ryantm/bcunit 
bcunit: 3.0 -> 3.0.2
 2018-02-06 23:13:33 +08:00
Ryan Mulligan 104551ed0b bcunit: 3.0 -> 3.0.2 2018-02-06 06:47:12 -08:00
Joachim F 8d466f7ae9
Merge pull request #34575 from jonafato/keybase-gui-icon 
keybase-gui: fix missing desktop file
 2018-02-06 14:44:50 +00:00
Bignaux Ronan e2bf162f04 remove platforms.darwin support 2018-02-06 15:34:51 +01:00
Ryan Mulligan 94e449b699 archivemount: 0.8.3 -> 0.8.7 2018-02-06 06:27:25 -08:00
Ryan Mulligan a48222b3e1 augeas: 1.10.0 -> 1.10.1 2018-02-06 06:19:01 -08:00
Bignaux Ronan 17210fee46 squashfuse: init at 0.1.101 2018-02-06 15:03:39 +01:00
Marius Bergmann 448fdc221c keepalived: 1.3.6 -> 1.4.1 2018-02-06 08:37:00 +01:00
Peter Hoeg ae604faabb nmapsi4: init at 0.5-alpha1 2018-02-06 14:41:21 +08:00
Ryan Mulligan 9801326d32 autorandr: 1.1 -> 1.4 2018-02-05 20:56:47 -08:00
Tuomas Tynkkynen 9548028a22 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/os-specific/linux/cpupower/default.nix
 2018-02-06 04:11:23 +02:00
Josef Kemetmueller ceeacd5205 graphviz: Explicitly specify libltdl directories 
This should prevent the build from picking up /usr/lib/libltdl.so in
non-chroot builds on non-nixOS.
 2018-02-05 20:41:22 +00:00
Will Dietz 6ec60e8c44 busybox-sandbox-shell: extract basic shell to new attribute 
Nix will use this shell if the attribute is present,
avoiding duplicating changes in the future.
 2018-02-05 11:26:01 -06:00
Will Dietz 74d928cf8b nix: enable more features in busybox shell to resolve build failures 2018-02-05 09:19:54 -06:00
Will Dietz 4faac207bc nix: fix config for echo/test on newer busybox 
Matches
2f1a1c5a49
 2018-02-05 09:18:39 -06:00
Will Dietz 9ccbb2aa37 rhash: Remove unused darwin patch 2018-02-05 09:06:24 -06:00
Will Dietz 088274bf2c rhash: 1.3.5 -> 2018-02-05 
Latest git is much more build-friendly.
 2018-02-05 08:55:05 -06:00
Bart Brouns 8a72d2a322 htop: 2.02 -> 2.1.0 2018-02-05 15:07:19 +01:00
adisbladis 9accca260e
Merge pull request #34617 from calvertvl/upd_fanficfare_2.22.0 
fanficfare: 2.16.0 -> 2.22.0
 2018-02-05 21:52:10 +08:00
adisbladis 50387619b0
Merge pull request #34612 from enumatech/fastlane 
fastlane: 2.75.1 -> 2.80.0
 2018-02-05 21:44:13 +08:00
Andreas Rammhold 1030042492
edid-decode: fixed missing version in name attribute 2018-02-05 14:31:43 +01:00
Andreas Rammhold 03a13a2f0b
Merge pull request #34599 from Chiiruno/master 
edid-decode: init at git-2017-09-18
 2018-02-05 13:29:31 +00:00
Will Dietz f565274fe5 rhash: 1.3.3 -> 1.3.5 
1.3.5: https://github.com/rhash/RHash/releases/tag/v1.3.5
1.3.4: https://github.com/rhash/RHash/releases/tag/v1.3.4

* still need makefile bug workarounds
* cleanup a bit
* port darwin patch--
  don't believe still needed but shouldn't hurt.
 2018-02-05 07:17:50 -06:00
Franz Pletz c135ecd7ef
Merge remote-tracking branch 'origin/master' into gcc-7 2018-02-05 13:11:33 +01:00
Victor Calvert df133ea27a fanficfare: 2.16.0 -> 2.22.0 2018-02-05 05:45:01 -05:00
Peter Romfeld bbebd26b13
fastlane: 2.75.1 -> 2.80.0 2018-02-05 16:50:53 +08:00
adisbladis 3adc9897ec
Merge pull request #34598 from markuskowa/freeipmi-pr 
freeipmi: 1.5.7 -> 1.6.1
 2018-02-05 13:53:43 +08:00
Tuomas Tynkkynen 5d2b4a5dc8 picocom: 3.0 -> 3.1 2018-02-05 01:02:50 +02:00
Okina Matara e35ca9af50 edid-decode: init at git-2017-09-18 2018-02-04 16:49:16 -06:00
Frederik Rietdijk f0e404b1de
Merge pull request #34591 from womfoo/bump/facter-3.9.3 
facter: 3.9.0 -> 3.9.3 and dependency libwhereami: 0.1.1 -> 0.1.3
 2018-02-04 20:03:24 +00:00
Frederik Rietdijk 5967321b27
Merge pull request #34590 from womfoo/bump/pick-2.0.1 
pick: 1.9.0 -> 2.0.1
 2018-02-04 18:58:13 +00:00
Markus Kowalewski ca1a55cabd
freeipmi: 1.5.7 -> 1.6.1 2018-02-04 10:41:36 -08:00
John Ericson de243f244f
Merge pull request #34312 from lopsided98/cpupower-pciutils-cross 
cpupower, pciutils: enable cross compiling
 2018-02-04 11:51:48 -05:00
Michael Weiss 4db7c04160 fim: 0.5rc3 -> 0.6 2018-02-04 16:15:55 +01:00
Frederik Rietdijk c1d79509a0
Merge pull request #34553 from NixOS/python-unstable 
Python package updates
 2018-02-04 13:29:23 +00:00
Kranium Gikos Mendoza 99aab3dd56 facter: 3.9.0 -> 3.9.3 2018-02-05 00:29:06 +11:00
Kranium Gikos Mendoza db40ca8d0a pick: 1.9.0 -> 2.0.1 2018-02-05 00:20:04 +11:00
Jaakko Luttinen 07edef3dd3
diskrsync: unstable-2017-09-27 -> unstable-2018-02-03 2018-02-04 12:20:52 +02:00
Jaakko Luttinen 9a5b545e86
diskrsync: init at unstable-2017-09-27 2018-02-04 12:02:30 +02:00
Jon Banafato 7e714bda87 keybase-gui: 1.0.39 -> 1.0.40 2018-02-03 19:49:23 -05:00
Jon Banafato 16ac5eb7f0 kbfs: 20171004.40555d -> 1.0.40 2018-02-03 19:49:23 -05:00
Jon Banafato ac1abbf4fc keybase: 1.0.39 -> 1.0.40 2018-02-03 19:49:23 -05:00
Jon Banafato 4bef2fbc4f keybase-gui: fix missing desktop file 
The keybase-gui package doesn't currently include the `.desktop` file
and supporting icons. This change fixes that.
 2018-02-03 19:44:22 -05:00
Tobias Pflug 32d4b018a7 grobi: init at 0.3.0 2018-02-03 22:54:18 +01:00
John Wiegley 0ef512fe7a ditaa: 0.9 -> 0.11 (adds --svg support) 2018-02-03 21:00:17 +01:00
Frederik Rietdijk 763a372911 awscli: 1.4.29 -> 1.4.32 2018-02-03 17:43:30 +01:00
Frederik Rietdijk 55e0f12761 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-03 09:48:42 +01:00
Frederik Rietdijk 14480a9288
Merge pull request #34542 from womfoo/fix/bonfire-deps 
bonfire: bump arrow dependency (fixes build)
 2018-02-03 08:30:54 +00:00
Frederik Rietdijk 274d4eaa00
Merge pull request #34493 from Gricad/udocker 
udocker: init at 1.1.1
 2018-02-03 08:07:35 +00:00
Richard Marko da6b85be51 nixops-dns: init at 1.0 2018-02-03 07:28:28 +01:00
Tuomas Tynkkynen 10c8e6d0c5 Merge remote-tracking branch 'upstream/master' into staging 2018-02-03 02:50:21 +02:00
Kranium Gikos Mendoza d135d14214 bonfire: bump arrow dependency 2018-02-03 10:35:14 +11:00
Tuomas Tynkkynen 0bfa9a9dc2 ethtool: 4.13 -> 4.15 2018-02-02 18:15:18 +02:00
Joachim F 374d6dcf2a
Merge pull request #34509 from dotlambda/ttwatch 
ttwatch: 2017-12-31 -> 2018-02-01
 2018-02-02 15:40:39 +00:00
Bruno Bzeznik b2cf8cff7d udocker: init at 1.1.1 2018-02-02 13:59:59 +01:00
Jörg Thalheim 9a5fe79d07
Merge pull request #34397 from griff/fix/awstats-tools 
awstats: add tools directory
 2018-02-02 12:48:07 +00:00
adisbladis 65170e9404
Merge pull request #34504 from dywedir/tlp 
tlp: 1.0 -> 1.1
 2018-02-02 12:28:18 +08:00
Jan Tojnar 2f98747cf7
Merge remote-tracking branch 'catern/upsup' 2018-02-02 01:12:19 +01:00
Tuomas Tynkkynen 583af89fc0 ncdu: 1.12 -> 1.13 2018-02-02 01:33:43 +02:00
dywedir 4311bebd45 tlp: 1.0 -> 1.1 2018-02-01 23:09:20 +02:00
Brian Olsen e9559e6b09
awstats: add tools directory 2018-02-01 18:18:28 +01:00
Vladimír Čunát ec99a3de1b
texlive: add comments, whitespace cleanup 
Fixes #34490.  The FIXME has been long obsolete.
 2018-02-01 15:55:52 +01:00
Robert Schütz 8377958fdd ttwatch: 2017-12-31 -> 2018-02-01 2018-02-01 10:27:50 +01:00
Vladimír Čunát 2fb4606f38
Merge branch 'master' into staging 
Haskell rebuild.
Hydra: ?compare=1430378
 2018-02-01 09:36:23 +01:00
Andreas Rammhold 76da69e355
Merge pull request #34478 from dotlambda/spectre-meltdown-checker 
spectre-meltdown-checker: 0.33 -> 0.34
 2018-02-01 01:42:49 +00:00
Herwig Hochleitner f29b993825 i2p: 0.9.32 -> 0.9.33 2018-02-01 00:43:03 +01:00
Robert Schütz 6f3e450bdf spectre-meltdown-checker: 0.33 -> 0.34 2018-02-01 00:27:46 +01:00
John Ericson b8e8265db0 moreutils: Fix eval 
Was broken in 561b9ca8ac.
 2018-01-31 17:20:09 -05:00
Eelco Dolstra 75a20284f4 nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731 2018-01-31 22:24:50 +01:00
Eelco Dolstra ef351646ba Revert "Restore "nixUnstable: rename to nix-unstable"" 
This reverts commit 695027f61c.

We really can't have "nix-env -i nix" *not* upgrade nixUnstable to a
newer nixStable. For instance, it would cause "nix upgrade-nix" to
produce a user environment with collisions.
 2018-01-31 22:24:24 +01:00
Pascal Wittmann 561b9ca8ac
moreutils: 0.61 -> 0.62 2018-01-31 21:56:01 +01:00
Pascal Wittmann 505cebebd3
pdf2djvu: 0.9.7 -> 0.9.8 2018-01-31 21:43:20 +01:00
Edward Tjörnhammar 0307a1acf6
i2pd: 2.17.0 -> 2.18.0 2018-01-31 21:28:08 +01:00
Spencer Baugh 729cf93ffb supervise: 1.1.0 -> 1.2.0 2018-01-31 04:56:08 +00:00
aszlig 2e4aded366
beets-alternatives: Fix tests against beets 1.4.6 
Since the bump of beets to version 1.4.6 in e5fab33efd
the tests no longer run successfully because beets 1.4.6 introduces a
breaking API change for the Item.move() method which now instead of just
passing copy=True the operation is now passed using a different
"operation" keyword argument.

Unfortunately the original repository of beets-alternatives is
unmaintained since 3 years and thus there is no upstream fix available
at the moment.

However, there is a fork maintained by @wisp3rwind, which addresses this
problem (wisp3rwind/beets-alternatives@33c6525ed4)
and a bunch of other fixes.

The reason why I'm not using the patch from @wisp3rwind is that it
simply doesn't apply against beets-alternatives 0.8.2, but my patch here
essentially does the same.

Signed-off-by: aszlig <aszlig@nix.build>
Upstream issue: geigerzaehler/beets-alternatives#13
Cc: @Profpatsch
 2018-01-31 04:39:21 +01:00
Vladimír Čunát c9171e5a4c
Merge branch 'master' into staging 
Hydra: ?compare=1430035
 2018-01-30 19:51:33 +01:00
Tuomas Tynkkynen ab5357b80d eternal-terminal: init at 4.1.2 2018-01-30 13:01:58 +02:00
André-Patrick Bubel fe0a15eaca btrbk: install to bin 2018-01-29 20:15:43 +01:00
WilliButz 62ad671a80
highlight: 3.41 -> 3.42 2018-01-29 17:43:13 +01:00
Michael Weiss b05ad671fb signing-party: 2.6 -> 2.7 2018-01-29 16:14:44 +01:00
Franz Pletz 60331e6e90
curl: 7.57.0 -> 7.58.0 (security) 
Fixes: CVE-2018-1000005, CVE-2018-1000007
 2018-01-29 14:15:56 +01:00
dywedir 44ebac05fe exfat: 1.2.4 -> 1.2.7 2018-01-29 13:02:13 +02:00
adisbladis 9e830ed45b
Merge pull request #34374 from 4z3/urlwatch-2.8 
urlwatch: 2.7 -> 2.8
 2018-01-29 18:07:52 +08:00
Franz Pletz eaaca14c30
p7zip: add patch to fix CVE-2017-17969 2018-01-29 10:54:45 +01:00
tv c945f64454 urlwatch: 2.7 -> 2.8 2018-01-29 09:15:23 +01:00
Ben Wolsieffer 259b9ff6b0 pciutils: enable cross compilation 2018-01-28 18:47:22 -05:00
Franz Pletz e2c1c76fd0
Merge remote-tracking branch 'origin/master' into gcc-7 2018-01-28 23:17:32 +01:00
Graham Christensen e2a54266c4
openssh: Build with Kerberos by default 
This reverts commit 09696e32c390c232ec7ac506df6457fb93c1f536.
which reverted f596aa0f4a
to move it to staging
 2018-01-28 16:36:01 -05:00