mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues Wiki Activity
129698 commits 233 branches 124 tags 7 GiB
Commit graph

21488 commits

Author SHA1 Message Date
Frederik Rietdijk 452958f498
Merge pull request #35235 from dotlambda/ddar 
ddar: move out of pythonPackages and fix tests
 2018-02-20 20:41:21 +00:00
Will Dietz ce3de0399b
Merge pull request #30057 from dtzWill/feature/webos-novacomd 
webos: init novacom, novacomd, cmake-modules; add nixos service
 2018-02-20 13:49:06 -06:00
Vladimír Čunát 1d15dadbec
Merge branch 'master' into staging 
Larger rebuilds from master.
 2018-02-20 20:33:40 +01:00
Vladimír Čunát fbe38c7c44
rustc: build with gcc6 on i686 
Probably due to the bundled LLVM, so the same error.
 2018-02-20 20:31:23 +01:00
Joachim F b30fae01cd
Merge pull request #32761 from xvapx/crashplan-small-business 
crashplan-small-business: init at 6.6.0
 2018-02-20 19:19:22 +00:00
Joachim F af37d08381
Merge pull request #33143 from mbode/flink_1_4_0 
flink: 1.3.2 -> 1.4.0
 2018-02-20 19:11:03 +00:00
Joachim F a85ad94897
Merge pull request #33996 from pmahoney/acme-client 
acme-client: init at 0.1.6
 2018-02-20 19:03:51 +00:00
Nikolay Amiantov 430e0f4a80 buildBazelPackage: init 
A separate function for building Bazel-bazed packages. Internally it splits the
build into two phases, fetching and building.

Users are expected to provide `fetchArgs.sha256` -- checksum of fetched
dependencies. Local dependencies should be removed in `fetchArgs.preInstall`.
Overall `fetchArgs` and `buildArgs` can be used to add specific steps to fetch
and build.
 2018-02-20 20:39:49 +03:00
lewo a1526e52b1
Merge pull request #35045 from bignaux/idsk 
idsk : init at unstable-2018-02-11
 2018-02-20 18:04:47 +01:00
Robert Schütz 80f84ceda2 ddar: move out of pythonPackages 2018-02-20 17:42:34 +01:00
Will Dietz e5e29284a9 webos: init novacom, novacomd, cmake-modules; add nixos service 2018-02-20 10:34:19 -06:00
Robert Schütz 08fdc973d4 roundup: init at 0.0.6 2018-02-20 17:19:23 +01:00
Robert Schütz 3996b91cb1 shocco: init at 1.0 2018-02-20 16:58:57 +01:00
Shea Levy f8b5b93b88
linux_riscv: Add patches for initrd support 2018-02-20 09:18:17 -05:00
Joachim F 9095f02876
Merge pull request #35103 from michalrus/watchexec 
watchexec: init at 1.8.6
 2018-02-20 13:24:12 +00:00
Joachim F 1aa37773c3
Merge pull request #35104 from izuk/dart 
dart: 1.16.1 -> 1.24.3
 2018-02-20 13:23:29 +00:00
Hugo Tavares Reis 27ce04207f nixnote2: init at 2.0.2 2018-02-20 13:46:44 +01:00
Jörg Thalheim 825ff649b5
Merge pull request #34161 from leenaars/asn2quickder 
pythonPackages update: asn1ate and asn2quickder
 2018-02-20 12:27:10 +00:00
lewo 040fb6c1a0
Merge pull request #35117 from suvash/add-docker-credential-gcr 
docker-credential-gcr: init at 1.4.3
 2018-02-20 12:32:46 +01:00
Jörg Thalheim 263a8c721d
Merge pull request #35180 from dotlambda/attic 
attic: uninit
 2018-02-20 10:38:54 +00:00
Robert Schütz 663d6e8f9d attic: uninit 
Attic is currently broken on master.
The Attic git repo has not been updated since May 2015.
Arch Linux also does not have an Attic package anymore.
Borg should be able to read Attic backups using
http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x.
 2018-02-20 11:32:35 +01:00
Jan Malakhovski 4997ac681d mono: add 5.8.108 (current stable) 2018-02-20 11:25:54 +01:00
Michael Raskin e46553bc72
Merge pull request #34706 from P-E-Meunier/xjump 
Xjump: init at 2.9.3
 2018-02-20 09:57:29 +00:00
lewo 507a3a9a39
Merge pull request #35131 from AndersonTorres/upload/ecm-tools 
ecm-tools: init at 1.0.3
 2018-02-20 07:57:51 +01:00
Shea Levy 7ce1f0b8ae
linuxManualConfig: Fix build on non-modular kernels 2018-02-19 15:16:29 -05:00
Kosyrev Serge f0d2baad08 sayonara: init at 1.0.0-git5-20180115 (#35046) 2018-02-19 19:16:37 +00:00
Jon Banafato 4704514dbc gnomeExtensions.battery-status: init at v6 
Add the Battery Status GNOME Shell extension.
 2018-02-19 13:41:11 -05:00
Daiderd Jordan b5aabb698e
Merge pull request #35167 from dtzWill/fix/clang-libcxx-4-5-tests 
cc-wrapper tests: 4 and 5 regardless of default
 2018-02-19 19:01:17 +01:00
Shea Levy fd2f2bbe6f
riscv-pk: Add a variant with a kernel 2018-02-19 12:37:46 -05:00
Shea Levy 6173f2f945
linux_riscv: Add 4.16-rc1. 
Fixes #35148.
 2018-02-19 12:14:22 -05:00
Jon Banafato 05d9196f7b gnomeExtensions.taskwhisperer: init at v11 
Add the TaskWhisperer GNOME Shell extension.
 2018-02-19 10:55:36 -05:00
Vladimír Čunát be8062d34b
Merge branch 'staging' into gcc-7 2018-02-19 16:21:55 +01:00
Shea Levy 43522dc851
riscv: Use gnumake42HEAD. 2018-02-19 09:36:53 -05:00
Shea Levy fb8a09e8f0
gnumake: Add 4.2.90pre2491_38c8a11 for proper glibc 2.27 support. 2018-02-19 09:33:34 -05:00
Vladimír Čunát 0c8939b5fb
Merge branch 'master' into gcc-7 
Hydra: ?compare=1434487
 2018-02-19 15:24:13 +01:00
Michael Raskin e37b756b91
Merge pull request #35110 from oxij/pkgs/pretty-fetchurl 
fetchurl: cleanup, better errors
 2018-02-19 14:05:12 +00:00
Shea Levy c10288c171
riscv: Use binutils 2.30 for linker fixes. 2018-02-19 07:59:40 -05:00
Shea Levy ca6710b2e6
binutils: Add 2.30. 2018-02-19 07:57:32 -05:00
Will Dietz 98215e10e0 cc-wrapper tests: 4 and 5 regardless of default 2018-02-18 22:37:38 -06:00
Joachim F b4b8f4e445
Merge pull request #33198 from dtzWill/feature/r2-cutter-1.1 
r2-cutter: init at 1.1(.0), radare2 qt gui
 2018-02-18 23:59:21 +00:00
Shea Levy 7f3c97ae9e
riscv-pk: Init at 01.pre438_e5846a2. 2018-02-18 18:11:03 -05:00
Shea Levy fd0f15f11c
linuxHeaders: Bump default to 4.15. 2018-02-18 16:59:29 -05:00
Shea Levy 32ce7012f0
Merge branch 'master' into gcc-7 2018-02-18 16:27:22 -05:00
Shea Levy a96886863a
Merge branch 'riscv-initial-cross-support' of git://github.com/shlevy/nixpkgs 2018-02-18 16:16:48 -05:00
AndersonTorres d532615dfc cue2pops: init at git-2018-01-04 2018-02-18 18:01:53 -03:00
Michiel Leenaars 4f53b77889 asn2quickder: 0.7RC1 -> 1.2-6 2018-02-18 22:01:52 +01:00
xeji 6e9bc081b1 mfcl2720dwcupswrapper: init at 3.2.0-1 
Brother MFC-L2720DW CUPS wrapper driver
 2018-02-18 19:47:05 +01:00
xeji 380d759659 mfcl2720dwlpr: init at 3.2.0-1 
Brother MFC-L2720DW lpr driver
 2018-02-18 19:37:19 +01:00
Benjamin Hipple 5ab428799e conda: init at miniconda3 4.3.31 (#34872) 
* conda: init at miniconda3 4.3.31
 2018-02-18 18:21:25 +00:00
AndersonTorres 09836bcf0d ecm-tools: init at 1.0.3 2018-02-18 15:06:11 -03:00
Itai Zukerman 3efb9698d6 dart: 1.16.1 -> 1.24.3 
Also, added support for the "dev" channel.
 2018-02-18 09:09:48 -08:00
Vladimír Čunát 666e7cafc6
k3d: fix by building with gcc6 2018-02-18 17:59:55 +01:00
Vladimír Čunát c7d298a7df
arx-libertatis: fix by building with gcc6 2018-02-18 17:44:40 +01:00
Michal Rus 64bfe643f6
watchexec: init at 1.8.6 2018-02-18 15:54:00 +01:00
Suvash Thapaliya c7e01acef2
docker-credential-gcr: init at 1.4.3 
Docker authentication helper for Google Cloud (gcr.io) repositories
 2018-02-18 15:48:30 +01:00
Jan Malakhovski a89899ce4e fetchurl: cleanup, better errors 
Also fix what seems like bugs in uncommon `stdenv`s.
 2018-02-18 14:24:53 +00:00
Vladimír Čunát 5beae8347a
blender, openimageio: build with gcc6 again 
I tried upgrading openimagio instead, but that didn't fix the blender
build (blender is the only non-broken dependency ATM).
This way blender starts.
 2018-02-18 15:02:54 +01:00
Michael Raskin 1098c071e5
Merge pull request #35108 from michalrus/arping 
arping: init at 2.19
 2018-02-18 13:21:52 +00:00
Michal Rus 986ab982b5
arping: init at 2.19 2018-02-18 14:10:53 +01:00
Michael Raskin 57062da954
Merge pull request #35105 from michalrus/catdocx 
catdocx: init at 20170102
 2018-02-18 12:46:49 +00:00
Michal Rus 0552147a34
catdocx: init at 20170102 2018-02-18 13:44:31 +01:00
Vladimír Čunát 9a2914a4f3
icu: build with gcc6 on i686 2018-02-18 11:21:27 +01:00
Vladimír Čunát e202018d1f
glm: only override to gcc6 if using gcc by default 
Otherwise we have a regression on Darwin.
 2018-02-18 10:13:27 +01:00
Shea Levy 4f8a9ff1ac
Use glibc-2.27 for RISC-V support. 2018-02-18 00:13:17 -05:00
Shea Levy 1d493f6171
Use Linux 4.15 kernel headers for RISC-V support. 2018-02-18 00:12:40 -05:00
Shea Levy 3bec781288
Use gcc 7 for RISC-V support. 2018-02-18 00:11:28 -05:00
Shea Levy 5be93a5883
glibc: Add 2.27 2018-02-17 23:08:05 -05:00
Shea Levy 890c0b9654
qemu-riscv: Init at 2.11.50pre57991_713f2c1164. 
Fixes #35087
 2018-02-17 20:29:11 -05:00
Vladimír Čunát a84844de03
Merge branch 'master' into gcc-7 
... to fix lispPackages.*
 2018-02-17 22:45:50 +01:00
Joachim F 5b98e8e231
Merge pull request #35001 from NinjaTrappeur/excelsior 
fixedsys-excelsior: init at 3.00.
 2018-02-17 18:35:51 +00:00
Yuri Aisaka 49b0760b3b cpp-gsl: init at unstable-2018-02-15 (#34998) 2018-02-17 18:27:57 +00:00
Michael Raskin 280d51b574
Merge pull request #35076 from oxij/pkgs/apulse 
apulse: 0.1.10 -> 0.1.11, add pressureaudio
 2018-02-17 18:02:10 +00:00
Jan Malakhovski 2f4eb68241 libpressureaudio: init at apulse.version 2018-02-17 17:51:07 +00:00
Vladimír Čunát e96741cdb1
treewide: remove explicit overrides to gcc7 
They're not needed on this branch.
 2018-02-17 16:29:31 +01:00
Matthew Bauer ba6be7293b flock: init at 0.2.3 2018-02-17 09:16:00 -06:00
Anderson Torres ef5860db3e
Merge pull request #33446 from AndersonTorres/upload-jwasm 
Jwasm: init at git-2017-11-22
 2018-02-17 13:13:26 -02:00
Vladimír Čunát c6d26b7f72
glm: "build" with gcc6 again 
It seems to be a hack, as the compiler apparently doesn't influence the
output and it's only used for some checks.  Still, LibreOffice seems to
run OK with this...
 2018-02-17 16:12:51 +01:00
Vladimír Čunát b31d598b42
gfortran: use 7 by default, so we match gcc 2018-02-17 14:47:48 +01:00
Vladimír Čunát 1274db63c6
webkitgtk: build with gcc6 for now 
Some reverse dependencies will get two libstdc++ versions into the
closure by this, but I think that's still relatively safe.
 2018-02-17 14:45:03 +01:00
Luke Sandell 635011f219 wsjtx: init at 1.8.0 (#33247) 2018-02-17 11:06:27 +00:00
Joachim F 828b635bd9
Merge pull request #34997 from rick68/softether 
softether: 4.20 -> 4.25
 2018-02-17 11:06:02 +00:00
Félix Baylac-Jacqué 91744fc76f
fixedsys-excelsior: init at 3.00. 2018-02-17 12:04:12 +01:00
Joachim F 1c7fa5b421
Merge pull request #33253 from geistesk/hash_extender-2017-04-10 
hash_extender: init at 2017-04-10
 2018-02-17 10:48:37 +00:00
Joachim F 3e2614702b
Merge pull request #33591 from puffnfresh/package/sunvox 
SunVox: init at 1.9.3b
 2018-02-17 10:45:22 +00:00
Vladimír Čunát 7a1462c04a
Merge branch 'master' into gcc-7 
A few thousand rebuilds.
Hydra: ?compare=1433915
 2018-02-17 10:27:21 +01:00
Joachim F f010a68260
Merge pull request #34729 from mnacamura/cdda-misc-updates 
cataclysm-dda{,-git}: miscellaneous updates
 2018-02-17 09:16:26 +00:00
Tuomas Tynkkynen 5a332cc18f ministat: Init at 20150715-1 2018-02-17 11:12:30 +02:00
José Romildo Malaquias 87f6e05dd4 connman-ncurses: init at 2015-07-21 (#25448) 2018-02-17 08:38:37 +00:00
Joachim F 352519fced
Merge pull request #33431 from vdemeester/init-gotests 
gotests: init at 1.5.2
 2018-02-17 06:35:55 +00:00
Jan Tojnar 327a84749e
Merge pull request #35028 from jtojnar/tex-gyre 
tex-gyre: init at ~2.005
 2018-02-17 01:38:11 +01:00
Joachim F 0b091361fe
Merge pull request #35053 from nicknovitski/reflex-init 
reflex: init at 0.2.0
 2018-02-17 00:07:41 +00:00
Yurii Rashkovskii 4eb5711706
simplehttp2server: init at 3.1.3 2018-02-17 06:35:35 +07:00
Nick Novitski 2173402624 reflex: init at 0.2.0 2018-02-16 14:18:29 -08:00
Joachim F 3b9874452d
Merge pull request #34564 from StijnDW/master 
Add new package "ncpamixer"
 2018-02-16 22:09:04 +00:00
Stijn DW 22df03f39e ncpamixer: init at version 1.2 2018-02-16 22:50:45 +01:00
Joachim F 2db1b59028
Merge pull request #34947 from puffnfresh/package/stride 
stride: init at 1.8.18
 2018-02-16 21:25:02 +00:00
Nick Novitski 8c7af333df govc: init at 0.16.0 2018-02-16 11:59:07 -08:00
Bignaux Ronan ab1a1c621b idsk : init at 0.16-1846729 2018-02-16 16:37:10 +01:00
Joachim F 2b2a678a6f
Merge pull request #34950 from earldouglas/mp3blaster 
mp3blaster: init at 3.2.6
 2018-02-16 15:15:07 +00:00
Joachim F 1628e40069
Merge pull request #33957 from seanparsons/add-factorio-experimental-support 
Added support for Factorio's experimental branch.
 2018-02-16 15:14:44 +00:00
Yuri Aisaka f8c48908f7 caffe2: init at 0.8.1 (#34956) 2018-02-16 15:09:40 +00:00
Jon Banafato d7b85321d9
gnomeExtensions.appindicator: init at v22 
Add the AppIndicator Support GNOME Shell extension.
 2018-02-16 12:36:30 +01:00
Vladimír Čunát b5aaaf87a7
Merge staging and PR #35021 
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
 2018-02-16 09:13:12 +01:00
Jan Tojnar 7775e9fcec
tex-gyre: init at ~2.005 2018-02-16 07:15:06 +01:00
Herwig Hochleitner e47e45c4ca Revert "zcashNh: init 0.4b" 
This reverts commit d3ea26dc45.

wrong commit, sorry
 2018-02-15 23:36:21 +01:00
Herwig Hochleitner d3ea26dc45 zcashNh: init 0.4b 2018-02-15 23:35:18 +01:00
Herwig Hochleitner 5bede1a252 cask: init 
cask is a build tool for emacs packages

cc @ttuegel @mdorman
 2018-02-15 23:33:49 +01:00
Nikolay Amiantov 56e0943b08 makeModulesClosure: support firmware 
Link it in stage 1.
 2018-02-16 00:11:07 +02:00
Sean Parsons 722906669d factorio: refactor derivation to add experimental branch and upgrade to 0.16.24. 
Supports the experimental and stable branches of Factorio with a new configuration option "experimental".
 2018-02-15 22:05:53 +00:00
Tad Fisher 9b7467eecb acpica-tools: init at 20180209 (#34883) 2018-02-15 20:50:57 +00:00
Austin Seipp 33cfad9a11 hyperfine: init at 0.4.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-02-15 13:54:03 -06:00
Austin Seipp acd80e4725 h2o: init at 2.2.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-02-15 13:46:48 -06:00
Frederik Rietdijk 64a4a69929
Merge pull request #35002 from layus/bazel-update 
bazel: 0.9 -> 0.10.1
 2018-02-15 18:26:58 +00:00
Joachim F 34fa5d2d80
Merge pull request #34903 from jensbin/graph-easy_0.76 
graph-easy: init at 0.76
 2018-02-15 14:56:54 +00:00
Tuomas Tynkkynen b1916b45a3 Merge remote-tracking branch 'upstream/staging' into gcc-7 
Conflicts:
	pkgs/development/libraries/libidn/default.nix
	pkgs/top-level/all-packages.nix
 2018-02-15 15:45:37 +02:00
Guillaume Maudoux f6b6d72d06 bazel: 0.9 -> 0.10.1 2018-02-15 12:31:21 +01:00
Rick Yang 2e45234acf softether: 4.20 -> 4.25 2018-02-15 16:52:30 +08:00
Andrew Dunham 394a8818e4 syncthing: Add discovery/relay servers, improve build (#34831) 
- Fix GOPATH checks
- Install manpages
- Also build and install discovery and relay servers + cli 
- Make the build more pure by explicitly setting the build username/host
 2018-02-15 16:16:22 +08:00
Jan Tojnar f118d2be67
fwupd: clean up 2018-02-15 01:11:14 +01:00
Jan Tojnar 201cc158cb
nixos/fwupd: add test 2018-02-15 01:11:13 +01:00
Sam Parkinson 8f316ff398
plotinus: init at 0.2.0 2018-02-14 22:25:11 +01:00
Frederik Rietdijk 672bb6b4ab Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
Jan Tojnar c878414363
gnome-desktop-testing: init at 2016.1 2018-02-14 21:02:58 +01:00
Frederik Rietdijk 9b9eeb53e8
Merge pull request #32799 from dotlambda/mnemosyne 
mnemosyne: 2.3.2 -> 2.6
 2018-02-14 19:48:29 +00:00
Jens Binkert 3dacdf1dfd graph-easy: init at 0.76 2018-02-14 19:53:05 +01:00
Jörg Thalheim 6ec8fe0408 z3: also needs setuptools 2018-02-14 10:01:25 +00:00
Peter Hoeg dabcccce3f
Merge pull request #34726 from adisbladis/plasma-5_12_0 
plasma: 5.11.5 -> 5.12.1
 2018-02-14 17:58:41 +08:00
zimbatm e8194c2c5b
ruby: remove unsupported versions (#34927) 
* remove EOL ruby versions for security and maintenance reasons.
* only expose ruby_MAJOR_MINOR to the top-level. we don't provide
guarantees for the TINY version.
* mark all related packages as broken
* switch the default ruby version from 2.3.x to 2.4.x
 2018-02-14 09:53:54 +00:00
adisbladis 1de98e8568
plasma: 5.11.5 -> 5.12.1 2018-02-14 17:24:20 +08:00
Peter Hoeg 78c71e81eb xca: 1.3.2 -> 1.4.0 2018-02-14 16:44:44 +08:00
lewo c385a1bda4
Merge pull request #33430 from vdemeester/init-gopkgs 
gopkgs: init at 2017-12-29
 2018-02-14 08:55:50 +01:00
Vincent Demeester 502e32cfeb
gotests: init at 1.5.2 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-02-14 07:46:32 +01:00
Vincent Demeester 8cf5684814
gopkgs: init at 2017-12-29 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-02-14 07:44:08 +01:00
Vincent Demeester 5c410b94b5
go-outline: init at 2017-08-04 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-02-14 07:41:42 +01:00
Alexey Lebedeff 6d442efe99 zsh-autoenv: init at 2017-12-16 (#34932) 2018-02-14 06:31:59 +00:00
James Earl Douglas 035f3363cb
mp3blaster: init at 3.2.6 2018-02-13 20:17:38 -07:00
Samuel Leathers ac8a149e07
Merge pull request #34899 from romildo/upd.catfish 
catfish: 1.4.2 -> 1.4.4
 2018-02-13 21:42:47 -05:00
Jon Banafato 14b3b04c22
gnomeExtensions.remove-dropdown-arrows: init at 9 
Add the Remove Dropdown Arrows GNOME Shell extension.
 2018-02-14 02:36:07 +01:00
Jan Tojnar 44695e7045
Merge pull request #34507 from jtojnar/pipewire 
pipewire: init at 0.1.8
 2018-02-14 02:29:39 +01:00
Tuomas Tynkkynen e4bfe5aac9 treewide: Drop kernelHeadersBaseConfig 
Nothing actually needs this.
 2018-02-14 01:47:28 +02:00
Joachim F a4621c0f68
Merge pull request #34921 from leenaars/getdns 
getdns: init at 1.3.0
 2018-02-13 23:05:02 +00:00
Brian McKenna da7ab85735 stride: init at 1.8.18 2018-02-14 10:02:39 +11:00
Joachim F 6e40e3b652
Merge pull request #34815 from dotlambda/ghostwriter 
ghostwriter: init at 1.5.0
 2018-02-13 22:50:21 +00:00
Profpatsch eef9d363e1 buildah: init at 0.11 2018-02-13 23:04:16 +01:00
Robert Helgesson 49a24afaa9
cloc: 1.74 -> 1.76 2018-02-13 21:14:13 +01:00
lewo 596a03e002
Merge pull request #33429 from vdemeester/init-gomodifytags 
gomodifytags: init at 2017-12-14
 2018-02-13 19:10:28 +01:00
Will Dietz 804ae999f5 getconf: nothing uses glibc.bin for getconf, generalize to cc.libc 2018-02-13 11:53:02 -06:00
Will Dietz d3b59f864a define top-level attrs for getent, getconf 
Note that currently getent is explicitly taken from "glibc.bin",
regardless of build configuration which this preserves for now.
(on non-musl anyway)
 2018-02-13 11:47:16 -06:00
Will Dietz 6c3df22c5a libintlOrEmpty: use actual gettext on non-glibc too (musl) 2018-02-13 11:27:27 -06:00
Shea Levy 9ef5d9c143
nix-plugins: Bump for new nix plugin mechanism 2018-02-13 11:19:31 -05:00