JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
276,516 Commits 2 Branches 0 Tags 13 GiB
83d35749ff
Commit Graph

101185 Commits

Author SHA1 Message Date
Oleksii Filonenko
a58bd74aac
Merge pull request #116227 from r-ryantm/auto-update/wrangler 
wrangler: 1.13.0 -> 1.15.0
 2021-03-14 12:23:12 +02:00
Fabian Affolter
bd5c89a5e4 python3Packages.incomfort-client: init at 0.4.5 2021-03-14 11:09:17 +01:00
R. RyanTM
0a5ef27091 insomnia: 2020.5.2 -> 2021.1.0 2021-03-14 03:24:50 -04:00
Maxine Aubrey
eecacdf3d8 go_1_16: 1.16 -> 1.16.2 
fixes CVE-2021-27918, CVE-2021-27919
 2021-03-14 03:14:28 -04:00
Maxine Aubrey
6a99841c11 go_1_15: 1.15.8 -> 1.15.10 
fixes CVE-2021-27918, CVE-2021-27919
 2021-03-14 03:14:28 -04:00
R. RyanTM
e9022849e6 gofumpt: 0.1.0 -> 0.1.1 2021-03-14 00:32:04 -05:00
R. RyanTM
b94530c576 armadillo: 10.2.2 -> 10.3.0 2021-03-14 00:01:36 -05:00
Anderson Torres
0948de92e0
Merge pull request #116221 from AndersonTorres/new-jasper 
Jasper is back
 2021-03-14 00:31:24 -03:00
Anderson Torres
0f13c4c5d3
Merge pull request #116117 from AndersonTorres/new-zxing-cpp 
zxing-cpp: init at 1.1.1
 2021-03-14 00:29:38 -03:00
Jan Tojnar
ab4767964e
Merge pull request #116118 from maxeaubrey/gupnp-igd_1.2.0 
gupnp-igd: 0.2.5 -> 1.2.0
 2021-03-14 02:31:43 +01:00
Sandro
24b3e0cd78
Merge pull request #116262 from fabaff/bump-xknx 
python3Packages.xknx: 0.17.1 -> 0.17.2
 2021-03-14 02:27:36 +01:00
Jan Tojnar
91574a3a39
Merge pull request #115123 from Pacman99/phone-evolution 
evolution-data-server: enable phone number support
 2021-03-14 02:27:20 +01:00
Maxine Aubrey
4693291f62
gupnp-igd: 0.2.5 -> 1.2.0 2021-03-14 02:14:58 +01:00
Fabian Affolter
d6742106a0
Merge pull request #109448 from fabaff/pynetdicom 
python3Packages.pynetdicom: init at 1.5.5
 2021-03-14 02:04:53 +01:00
Mario Rodas
bf0ae59408
Merge pull request #116066 from Julow/ocamlformat-0-17-0 
ocamlformat: 0.16.0 -> 0.17.0
 2021-03-13 19:52:34 -05:00
Fabian Affolter
89ca7d44c0 python3Packages.adguardhome: 0.4.2 -> 0.5.0 2021-03-14 01:35:33 +01:00
Fabian Affolter
4e701b586a python3Packages.xknx: 0.17.1 -> 0.17.2 2021-03-14 01:05:54 +01:00
Jan Tojnar
be6d79d83f folks: Fix tests with e-d-s linked with libphonenumber support 2021-03-13 15:53:04 -08:00
Fabian Affolter
dcbfa026a3 python3Packages.convertdate: 2.3.1 -> 2.3.2 2021-03-14 00:51:49 +01:00
Fabian Affolter
c47eacf4cc python3Packages.hass-nabucasa: 0.41.0 -> 0.42.0 2021-03-14 00:41:01 +01:00
Maximilian Bosch
68e00abfcb
Merge pull request #116047 from r-ryantm/auto-update/powerline 
powerline: 2.8.1 -> 2.8.2
 2021-03-13 23:10:09 +01:00
Robert Scott
0703334f6e
Merge pull request #116166 from r-ryantm/auto-update/orcania 
orcania: 2.1.1 -> 2.2.0
 2021-03-13 21:38:16 +00:00
AndersonTorres
3d15fa8ae6 jasper: init at 2.0.26 2021-03-13 17:06:30 -03:00
Sandro
12de0d4c91
Merge pull request #115974 from siraben/darwin-mass-fix-buildInputs=0-alt 2021-03-13 19:42:55 +01:00
Eric Bailey
c30a9fd946 renderizer: 2.0.9 -> 2.0.12 
Also enable tests, and fix the version output.
 2021-03-13 12:10:22 -06:00
Doron Behar
5e367ecef9
Merge pull request #106599 from doronbehar/pkg/gnuradio/pkgs 2021-03-13 17:27:40 +00:00
Doron Behar
fb024f50e5 gnuradio: 3.8 -> 3.9 
Add some "3.9" attributes to srcs in gnuradio packages And update
packages using GR3.8 and that are incompatible yet with GR3.9 to use
GR3.8 explicitly.
 2021-03-13 19:07:34 +02:00
Doron Behar
650ee258fd gnuradio3_{7,8}: Use external volk 
Now that volk is packaged, we can use our build and save some closure
space for those that have more then 1 version of gnuradio installed.
Also, simplify a bit how attributes are inherited in the expression.
 2021-03-13 19:07:20 +02:00
Jan Tojnar
4f6919dcc7
Merge pull request #116200 from dotlambda/libhandy-1.2.0 
libhandy: 1.0.3 -> 1.2.0
 2021-03-13 18:00:30 +01:00
R. RyanTM
8ef19ab88d wrangler: 1.13.0 -> 1.15.0 2021-03-13 16:52:27 +00:00
Michael Weiss
2721f407e5
Merge pull request #116146 from Emantor/pkgconfig/iniparser 
iniparser: add pkgconfig file
 2021-03-13 17:48:29 +01:00
Mario Rodas
3f8c898068
Merge pull request #116211 from r-ryantm/auto-update/terraform-ls 
terraform-ls: 0.14.0 -> 0.15.0
 2021-03-13 10:55:14 -05:00
Mario Rodas
891636cf25
Merge pull request #116214 from r-ryantm/auto-update/tfsec 
tfsec: 0.39.5 -> 0.39.6
 2021-03-13 10:52:42 -05:00
Sandro
f2846df823
Merge pull request #116128 from marcus7070/marcus7070/rtree-fix 
python3Packages.Rtree: fix build
 2021-03-13 16:44:56 +01:00
R. RyanTM
c02bf97227 tfsec: 0.39.5 -> 0.39.6 2021-03-13 15:29:46 +00:00
Benjamin Hipple
721daaff82
Merge pull request #116163 from r-ryantm/auto-update/oneDNN 
oneDNN: 2.1 -> 2.1.2
 2021-03-13 10:18:02 -05:00
R. RyanTM
dae8503172 terraform-ls: 0.14.0 -> 0.15.0 2021-03-13 15:15:05 +00:00
Frederik Rietdijk
2edf46ca6a pypy3.pkgs.cryptography: fix build 
setuptools-rust was accidentally added to the wrong list.
 2021-03-13 15:59:58 +01:00
R. RyanTM
305267aacb python37Packages.convertdate: 2.3.0 -> 2.3.1 2021-03-13 15:51:54 +01:00
R. RyanTM
99286f2640 liblinear: 2.42 -> 2.43 2021-03-13 15:50:46 +01:00
R. RyanTM
148b1387e1 libdigidocpp: 3.14.4 -> 3.14.5 2021-03-13 15:49:25 +01:00
R. RyanTM
b417a8aca3 libofx: 0.10.0 -> 0.10.1 2021-03-13 15:49:04 +01:00
R. RyanTM
ac49f2ff81 libisoburn: 1.5.2 -> 1.5.4 2021-03-13 15:48:14 +01:00
R. RyanTM
a3b614e78d svls: 0.1.25 -> 0.1.27 2021-03-13 14:44:31 +00:00
Robert Schütz
00286f1b1b libhandy: 1.0.3 -> 1.2.0 2021-03-13 15:23:23 +01:00
R. RyanTM
1c6fd902f4 sd-local: 1.0.24 -> 1.0.26 2021-03-13 13:28:32 +00:00
andys8
0a02e569a6 elmPackages.elm-{language-server,tooling,review}: Update versions 
elm-language-server: 2.0.2 -> 2.0.3
elm-tooling: 1.1.0 -> 1.3.0
elm-review: 2.4.1 -> 2.4.6
 2021-03-13 13:37:21 +01:00
Frederik Rietdijk
e131f22f50 pythonPackages.cadquery: wrap pythonocc-core-cadquery with toPythonModule 
Otherwise it won't be kept track of with the Python infra.
 2021-03-13 12:54:05 +01:00
Doron Behar
7df0fa108a volk: init at 2.4.1 2021-03-13 13:28:07 +02:00
lewo
444357e3d3
Merge pull request #116164 from r-ryantm/auto-update/open-policy-agent 
open-policy-agent: 0.27.0 -> 0.27.1
 2021-03-13 12:02:50 +01:00
Doron Behar
2d08e55e9b gnuradio.pkgs: init 
- Write a `mkDerivation` and `mkDerivationWith` function for gnuradio,
  like qt5.
- qradiolink, gqrx: Use gnuradio's callPackage and mkDerivation.
- Use gnuradio.callPackage to define all gnuradio.pkgs.
- Move all gnuradio packages expressions to pkgs/development/gnuradio-modules/ -
  modeled after Python's.
- Add more paths to gnuradio's wrapper - add the extra packages as
  python modules, and add their executables with proper env vars
  wrapping.

Co-authored-by: Frederik Rietdijk <fridh@fridh.nl>
 2021-03-13 12:46:59 +02:00
Frederik Rietdijk
782afeb11c python3Packages.pythran: init at 0.9.8post3 2021-03-13 11:33:31 +01:00
Frederik Rietdijk
6e452303a7 pythonPackages.beniget: init at 0.3.0 2021-03-13 11:33:01 +01:00
R. RyanTM
94098f9d49 orcania: 2.1.1 -> 2.2.0 2021-03-13 10:24:21 +00:00
R. RyanTM
ac5d22c579 open-policy-agent: 0.27.0 -> 0.27.1 2021-03-13 10:01:41 +00:00
R. RyanTM
9fdad32b57 oneDNN: 2.1 -> 2.1.2 2021-03-13 09:57:08 +00:00
Elis Hirwing
a0e5076c5e
Merge pull request #115973 from etu/php-updates 
php74, php80: 7.4.15 -> 7.4.16, 8.0.2 -> 8.0.3
 2021-03-13 10:09:34 +01:00
Jörg Thalheim
35f2535353
Merge pull request #116152 from r-ryantm/auto-update/lazygit 
lazygit: 0.25.1 -> 0.26
 2021-03-13 08:54:10 +00:00
R. RyanTM
712768610f python38Packages.casbin: 0.18.2 -> 0.18.3 2021-03-13 00:44:09 -08:00
R. RyanTM
3c9f3fafb7 python38Packages.fluent-logger: 0.9.6 -> 0.10.0 2021-03-13 00:42:57 -08:00
R. RyanTM
6c8b581877 lazygit: 0.25.1 -> 0.26 2021-03-13 07:59:29 +00:00
Stefan Frijters
12e3046a59
pythonPackages.xmldiff: init at 2.4 2021-03-13 08:58:25 +01:00
Rouven Czerwinski
c77f71b6dc iniparser: add pkgconfig file 
The upstream pkgconfig file is not contained in any release, add our own
based on it.
 2021-03-13 08:12:56 +01:00
Marcus Boyd
a063e76966 python3Packages.Rtree: fix build 
Patching broke on recent version bump, this fixes and re-enables tests.
Also corrects license.
 2021-03-13 14:29:31 +10:30
Martin Weinelt
18dc1cbdda
Merge pull request #116111 from r-ryantm/auto-update/python3.8-ciscomobilityexpress 2021-03-13 03:42:57 +01:00
Martin Weinelt
63f77002b9
python3Packages.ciscomobilityexpress: enable tests, add imports check 2021-03-13 03:40:22 +01:00
Martin Weinelt
c2738e5ada
Merge pull request #116113 from r-ryantm/auto-update/python3.8-broadlink 2021-03-13 03:33:10 +01:00
Martin Weinelt
84b304348e
python3Packages.broadlink: add imports check, remove unused inputs 2021-03-13 03:31:14 +01:00
Martin Weinelt
5d80032e50
Merge pull request #116116 from r-ryantm/auto-update/python3.8-caldav 2021-03-13 03:20:56 +01:00
Martin Weinelt
f5453b91a7
python3Packages.caldav: run tests, update homepage 2021-03-13 03:10:05 +01:00
Aaron Andersen
4786ad9059
Merge pull request #115965 from etu/php-init-swoole 
php.extensions.swoole: init at 4.6.4
 2021-03-12 20:38:08 -05:00
Sandro
e7d53d1ccf
Merge pull request #116122 from mweinelt/home-assistant 2021-03-13 02:25:40 +01:00
Sandro
8141d3160d
Merge pull request #116112 from dotlambda/ddt-1.4.2 
pythonPackages.ddt: 1.4.1 -> 1.4.2
 2021-03-13 01:54:12 +01:00
Sandro
b3ea24a414
Merge pull request #116093 from mweinelt/python/ntc-templates 
python3Packages.ntc-templates: 1.6.0 -> 2.0.0
 2021-03-13 01:45:18 +01:00
AndersonTorres
2770611a24 zxing-cpp: init at 1.1.1 2021-03-12 21:20:46 -03:00
Martin Weinelt
f68066f9f0
python3Packages.plexapi: 4.4.0 -> 4.4.1 2021-03-13 01:16:33 +01:00
Sandro
2a2df05019
Merge pull request #116094 from mweinelt/python/deepmerge 
python3Packages.deepmerge: 0.1.1 -> 0.2.1
 2021-03-13 01:12:26 +01:00
R. RyanTM
3a8e7c26c6 liblouis: 3.16.1 -> 3.17.0 2021-03-13 00:46:18 +01:00
R. RyanTM
ddc52d4a0d python38Packages.caldav: 0.7.1 -> 0.8.0 2021-03-12 22:51:05 +00:00
R. RyanTM
6774bddaea python38Packages.broadlink: 0.16.0 -> 0.17.0 2021-03-12 22:47:40 +00:00
R. RyanTM
8cba5f7c06 python38Packages.ciscomobilityexpress: 1.0.0 -> 1.0.2 2021-03-12 22:17:40 +00:00
Robert Schütz
b0494cc3e9 pythonPackages.ddt: 1.4.1 -> 1.4.2 2021-03-12 22:12:31 +01:00
Sandro
e5deabe68b
Merge pull request #116080 from Mindavi/libwebsockets/maintainer 
libwebsockets: add myself as maintainer
 2021-03-12 21:33:57 +01:00
Martin Weinelt
51cfea6e6c
python3Packages.deepmerge: 0.1.1 -> 0.2.1 2021-03-12 21:05:29 +01:00
Sandro
338197702f
Merge pull request #116060 from sternenseemann/defcon-0.8.1 
pythonPackages.defcon: 0.8.0 -> 0.8.1
 2021-03-12 21:01:32 +01:00
Martin Weinelt
bbd64139f6
python3Packages.ntc-templates: 1.6.0 -> 2.0.0 2021-03-12 20:55:38 +01:00
Peter Simons
795ef4f46f
Merge pull request #115256 from NixOS/haskell-updates 
Update Haskell package set to Stackage Nightly 2021-03-06 (plus other fixes)
 2021-03-12 20:53:42 +01:00
Peter Simons
5966fa1845 base64-bytestring: disable broken test suite 2021-03-12 20:35:11 +01:00
Peter Simons
de657f6a2a cabal-install: fix build with ghc-8.8.x 2021-03-12 20:34:28 +01:00
John Ericson
7ba904b85e
Merge pull request #115296 from samueldr/ruby/fix-cross-target 
ruby: Use appropriate targetPlatform
 2021-03-12 14:10:33 -05:00
Rick van Schijndel
51d401fec4 libwebsockets: add myself as maintainer 2021-03-12 19:21:12 +01:00
Pavol Rusnak
ff8563402f
Merge pull request #116065 from r-ryantm/auto-update/python3.8-bip_utils 
python38Packages.bip_utils: 1.6.0 -> 1.7.0
 2021-03-12 17:43:00 +01:00
Jan Tojnar
4b6373aa2e
Merge pull request #115837 from r-ryantm/auto-update/flatpak 
flatpak: 1.10.1 -> 1.10.2
 2021-03-12 16:59:37 +01:00
Malte Brandy
47edbe5d39
haskellPackages: Add maralorn as shake-bench maintainer 
It’s a dependency of hls development. But because it’s a benchmark dep I
wouldn‘t notice it breaking otherwise.
 2021-03-12 16:57:26 +01:00
Malte Brandy
69faa4c451
haskellPackages.prune-juice: Unbreak 2021-03-12 16:57:26 +01:00
Peter Simons
9eb6160427 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.16.0-13-gefcfbb2 from Hackage revision
6df578c11a.
 2021-03-12 16:46:36 +01:00
Jules Aguillon
3bece16153 ocamlformat: 0.16.0 -> 0.17.0 
Adds 'ocamlformat_0_17_0' and update 'ocamlformat'.
 2021-03-12 16:29:02 +01:00
R. RyanTM
7c2ffed6fd python38Packages.bip_utils: 1.6.0 -> 1.7.0 2021-03-12 15:24:02 +00:00
R. RyanTM
b868a483a4 libgdata: 0.18.0 -> 0.18.1 2021-03-12 15:41:15 +01:00
Peter Simons
5f3c0fe603 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.16.0-13-gefcfbb2 from Hackage revision
597fe9ca1c.
 2021-03-12 15:40:30 +01:00
Peter Simons
58f426fd6d hackage2nix: disable broken builds to avoid evaluation errors on Hydra 2021-03-12 15:39:11 +01:00
Peter Simons
519c8a6404 feed: disable test suite to fix the build 
The test suite does not compile.
 2021-03-12 15:38:19 +01:00
Malte Brandy
1798bb77ab
haskellPackages.lsp-test: Remove obsolete dontCheck 
lsp-test does not use hie anymore for tests
 2021-03-12 15:36:20 +01:00
Malte Brandy
f99be37b62
haskellPackages.shake-bench: Fix build 2021-03-12 15:36:20 +01:00
Malte Brandy
e39c29e6e9
haskellPackages.ghcide: Remove obsolete unmarkBroken and update test comment 2021-03-12 15:36:19 +01:00
Malte Brandy
c9ef83b65e
haskellPackages.hiedb: Make comment more explicit 2021-03-12 15:36:19 +01:00
Peter Simons
8dfc1dc05d hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.16.0-13-gefcfbb2 from Hackage revision
282dc91d40.
 2021-03-12 15:35:08 +01:00
Peter Simons
83d011cc89 doctest-driver-gen: disable test suite to fix the build 2021-03-12 15:34:17 +01:00
Peter Simons
a2e674988c git-annex: update SHA256 hash for new version 8.20210310 2021-03-12 15:34:17 +01:00
Peter Simons
d689fa0e08 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.16.0-13-gefcfbb2 from Hackage revision
282dc91d40.
 2021-03-12 15:34:09 +01:00
sternenseemann
b02ff290f4 pythonPackages.defcon: 0.8.0 -> 0.8.1 2021-03-12 15:31:26 +01:00
Peter Simons
6e65f9ae18 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.16.0-13-gefcfbb2 from Hackage revision
07f8d034b4.
 2021-03-12 15:12:36 +01:00
Peter Simons
131fbf7e2b Stackage Nightly 2021-03-12 2021-03-12 15:12:01 +01:00
R. RyanTM
cc61bcb16e python38Packages.databricks-connect: 7.3.9 -> 7.3.10 2021-03-12 13:59:51 +00:00
Elis Hirwing
73af203b7d
Merge pull request #116055 from r-ryantm/auto-update/php-php-cs-fixer 
php73Packages.php-cs-fixer: 2.18.2 -> 2.18.3
 2021-03-12 14:29:05 +01:00
R. RyanTM
d7d99cfef9 php73Packages.php-cs-fixer: 2.18.2 -> 2.18.3 2021-03-12 12:53:26 +00:00
Elis Hirwing
76680cb9a0
Merge pull request #116045 from r-ryantm/auto-update/php-phpstan 
php73Packages.phpstan: 0.12.79 -> 0.12.81
 2021-03-12 13:00:33 +01:00
R. RyanTM
509028ab98 powerline: 2.8.1 -> 2.8.2 2021-03-12 11:57:31 +00:00
R. RyanTM
59d05fc37f php73Packages.phpstan: 0.12.79 -> 0.12.81 2021-03-12 11:36:33 +00:00
Robert Schütz
fdc4f59ef3 python3Packages.agate-sql: use fetchPypi 2021-03-12 11:42:11 +01:00
Sebastian Neubauer
0fdd80b7f7 amdvlk: 2021.Q1.4 -> 2020.Q1.5 2021-03-12 11:25:10 +01:00
Cyril Cohen
163ffe2fe4 coqPackages.mathcomp-analysis: 0.3.1 -> 0.3.6 2021-03-12 10:40:18 +01:00
Vincent Laporte
b20bc9eeb6 ocamlPackages.zarith: 1.11 → 1.12 2021-03-12 08:51:50 +01:00
Vincent Laporte
22d9482360 opa: build with OCaml 4.04 2021-03-12 08:51:50 +01:00
R. RyanTM
87d00e5e8d nexus: 3.29.2-02 -> 3.30.0-01 2021-03-12 07:49:46 +00:00
Ben Siraphob
773c4b840f tidyp: expand platforms to all 2021-03-12 13:05:00 +07:00
Ben Siraphob
87975ef433 spice-protocol: expand platforms to all 2021-03-12 13:05:00 +07:00
Ben Siraphob
73b93f6b9b spglib: expand platforms to all 2021-03-12 13:05:00 +07:00
Ben Siraphob
82a0379d9c shhopt: fix darwin build 2021-03-12 13:04:59 +07:00
Ben Siraphob
5eeece814a shhmsg: fix darwin build 2021-03-12 13:04:59 +07:00
Ben Siraphob
413fbf5b9f safefile: expand platforms to all 2021-03-12 12:32:48 +07:00
Ben Siraphob
7c5efd446a pxlib: expand platforms to all 2021-03-12 12:32:48 +07:00
Ben Siraphob
5c9cb64b43 pwndbg: expand platforms to all 2021-03-12 12:32:48 +07:00
Ben Siraphob
dca4490738 p8-platform: expand platforms to all 2021-03-12 12:32:47 +07:00
Ben Siraphob
503d637bab msgpuck: expand platforms to all 2021-03-12 12:32:47 +07:00
Ben Siraphob
24c065773b minixml: expand platforms to all 2021-03-12 12:32:47 +07:00
Ben Siraphob
597d1c6510 metal: expand platforms to all 2021-03-12 12:32:47 +07:00
Ben Siraphob
53afdd0c80 lrdf: expand platforms to unix 2021-03-12 12:32:47 +07:00
Ben Siraphob
3389afa596 loudmouth: expand platforms to all 2021-03-12 12:32:47 +07:00
Ben Siraphob
27f00d3e08 libxmp: expand platforms to all 2021-03-12 12:32:47 +07:00
Ben Siraphob
fe4574d67c lightning: expand platforms to all 2021-03-12 12:32:47 +07:00
Ben Siraphob
9139e83f6b libxmi: expand platforms to unix 2021-03-12 12:32:46 +07:00
Ben Siraphob
e02d375471 libosip: expand platforms to all 2021-03-12 12:32:46 +07:00
Ben Siraphob
db02458ebb liboauth: expand platforms to all 2021-03-12 12:32:46 +07:00
Ben Siraphob
5f808e1251 libnest2d: expand platforms to all 2021-03-12 12:32:46 +07:00
Ben Siraphob
e8ddcf9db4 libnatpmp: fix darwin build 2021-03-12 12:32:46 +07:00
Ben Siraphob
e5cfd956d8 liblcf: expand platforms to all 2021-03-12 12:32:46 +07:00
Ben Siraphob
d440a94c04 libcsptr: expand platforms to all 2021-03-12 12:32:46 +07:00
Ben Siraphob
ead72e396f libcredis: expand platforms to all 2021-03-12 12:32:46 +07:00
Ben Siraphob
c29546f2e0 libcli: fix darwin build 2021-03-12 12:32:46 +07:00