1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 19:15:39 +00:00
Commit graph

692 commits

Author SHA1 Message Date
Perry Barnoy 3d087ed3b1 Merge remote-tracking branch 'upstream/master' into xfce4-whiskermenu-plugin
Merge upstream.
2015-10-14 16:26:40 -04:00
Perry Barnoy 79321fbecd - Added myself as a maintainer
- Boilerplate whiskermenu expression
2015-10-14 16:25:54 -04:00
Eelco Dolstra 5f077e2296 Factor out option renaming
Option aliases/deprecations can now be declared in any NixOS module,
not just in nixos/modules/rename.nix. This is more modular (since it
allows for example grub-related aliases to be declared in the grub
module), and allows aliases outside of NixOS (e.g. in NixOps modules).

The syntax is a bit funky. Ideally we'd have something like:

  options = {
    foo.bar.newOption = mkOption { ... };
    foo.bar.oldOption = mkAliasOption [ "foo" "bar" "newOption" ];
  };

but that's not possible because options cannot define values in
*other* options - you need to have a "config" for that. So instead we
have functions that return a *module*: mkRemovedOptionModule,
mkRenamedOptionModule and mkAliasOptionModule. These can be used via
"imports", e.g.

  imports = [
    (mkAliasOptionModule [ "foo" "bar" "oldOption" ] [ "foo" "bar" "newOption" ]);
  ];

As an added bonus, deprecation warnings now show the file name of the
offending module.

Fixes #10385.
2015-10-14 18:18:47 +02:00
Desmond O. Chang b41742414e git-crypt: update maintainer 2015-10-14 21:46:27 +08:00
Florian Paul Schmidt 24b375ac06 alsa-tools: update maintainer 2015-10-13 12:48:03 +02:00
Arseniy Seroka 124bca6dc1 Merge pull request #10345 from javaguirre/package-phpcs
phpcs: init at 2.3.4
2015-10-12 16:39:05 +03:00
Javier Aguirre 9522afae2c phpcs: init at 2.3.4
Adding javaguirre to maintainers
2015-10-12 12:11:54 +02:00
= 74a958fec7 non: init at 2015-10-6 2015-10-11 18:37:21 +02:00
Luke Gorrie 42e753f8b3 maintainers.nix: Add lukego 2015-10-08 10:11:06 +00:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Echo Nolan 89931277de flashplayer: add myself to maintainers 2015-10-03 20:54:38 -07:00
Vladimír Čunát f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Arnold Krille bb7eb9829d jackmix: init at version 0.5.2
Add jackmix to the nix pkgs.
2015-10-02 14:56:59 +02:00
lethalman e9d554580c Merge pull request #10066 from michaelpj/p/heatseeker
heatseeker: init at 1.3.0
2015-10-02 11:36:07 +02:00
Thomas Tuegel e92cbb73e4 lib.licenses: add fdl13 2015-09-27 09:45:35 -05:00
Thomas Tuegel f9e5745efa lib: add makeScope 2015-09-27 09:45:23 -05:00
Michael Peyton Jones ef8e002bf0 heatseeker: init at 1.3.0 2015-09-25 16:27:43 +01:00
Vladimír Čunát 0be672ced1 kdevplatform: maintained by @ambrop72, /cc #9981. 2015-09-22 08:44:23 +02:00
David Kleuker 6fc40fada1 add myself to maintainers 2015-09-20 21:16:22 +02:00
Arseniy Seroka 8862188761 Merge pull request #9924 from erikryb/master
perseus: init at 4-beta
2015-09-19 13:21:53 +03:00
Domen Kožar 72ea74b641 Merge pull request #9934 from offlinehacker/nixos/kibana/add
Update kibana, add kibana nixos service
2015-09-19 10:38:45 +02:00
Erik Rybakken 64c1a9a2e2 perseus: init at 4-beta 2015-09-19 00:56:24 +02:00
Jaka Hudoklin 341ac85644 Add lib.filterAttrsRecursive function 2015-09-19 00:33:44 +02:00
Jan Malakhovski 33ae3f2fe4 nixos,lib: move environment generation related copy-paste to lib 2015-09-18 18:48:49 +00:00
Samuel Rivas 40d26f6730 erlang-mode: refactor maintainers (close #9855) 2015-09-14 23:47:20 +02:00
Bryan Gardiner 7d74847471
goatee, goatee-gtk: add myself as maintainer 2015-09-11 20:37:53 -07:00
Rommel M. Martinez 6919533410 devilspie2: init at 0.39 2015-09-10 05:11:56 +08:00
Frederik Rietdijk cd5a9afeac add myself as maintainer 2015-09-09 15:25:49 +02:00
Arseniy Seroka 2017d56edf Merge pull request #9708 from a1russell/playonlinux
Add playonlinux derivation.
2015-09-09 12:28:46 +03:00
Adam Russell 735673bb9f playonlinux: init at 4.2.8 2015-09-09 00:05:02 -05:00
Tim Cuthbertson 9dfef9ff26 gup: init at version 0.5.1 2015-09-08 20:45:20 +10:00
Guillaume Maudoux 96a1539256 python-cgroup-utils: init at 0.6 2015-08-31 18:27:19 +02:00
Andreas Wagner e7a024abc4 urjtag: init at 0.10
[Bjørn: make the function argument lines occupy less vertical space.]
2015-08-30 20:47:24 +02:00
Thomas Tuegel fc0baf0ebe Merge pull request #9343 from akaWolf/qtcreator
qtcreator: refactor for using qt54; qt4SDK, qt5SDK: commented
2015-08-29 18:10:27 -05:00
Jaka Hudoklin ed63e18652 Merge pull request #9384 from jefdaj/bitcoinxt-twopackages
Add BitcoinXT as a separate package
2015-08-29 18:47:48 +02:00
Damien Cassou de3a53f277 Merge pull request #9525 from DamienCassou/update-maintainer-email
Change my email address
2015-08-29 16:59:47 +02:00
Damien Cassou 41507ce415 Change my email address 2015-08-29 16:57:08 +02:00
Sibi 89cec3c895 Add myself as maintainer (close #9495).
Related to https://github.com/NixOS/cabal2nix/pull/196
2015-08-28 16:50:15 +02:00
lethalman 9458bde4c1 Merge pull request #9450 from lebastr/rosegarden
rosegarden: init at 14.12
2015-08-26 11:57:26 +02:00
Alexander ee6140beaa rosegarden: init at 14.12 2015-08-26 09:35:05 +00:00
lethalman a45a0911d4 Merge pull request #9376 from rick68/softether
softether: support SoftEther VPN 4.18
2015-08-26 10:45:46 +02:00
Daniel Fox Franke 617a158e3c libb2: init at 0.97 2015-08-25 14:25:05 -04:00
Kosyrev Serge 61be6847c0 maintainers: add Kosyrev Serge 2015-08-24 22:32:22 +03:00
Artjom Vejsel 9c206b6cf7 qtcreator: refactor for using qt54 2015-08-24 11:34:28 +03:00
Jeffrey David Johnson 17c0af24d2 add bitcoin-xt as a separate package 2015-08-20 23:57:10 -07:00
Wei-Ming Yang efd34824eb softether: support SoftEther VPN 4.18 2015-08-21 13:59:00 +08:00
Thomas Tuegel 8f271a771d Merge pull request #9270 from Mathnerd314/supertux-editor
supertux-editor: init at git-2014-08-20
2015-08-17 17:13:44 -05:00
Mathnerd314 4ff22bd680 supertux-editor: init at git-2014-08-20 2015-08-17 09:00:18 -06:00
Benno Fünfstück 7cd6b3cf76 Revert change of path type
The change caused lots of evaluation errors, since it caused derivations to no longer be valid paths as well.
2015-08-15 15:38:12 +02:00
Benno Fünfstück e6f1e1e5db Merge pull request #6272 from NixOS/types-path-better-error
types.nix: better error message for non-paths
2015-08-15 13:16:00 +02:00
Benno Fünfstück 691f683c8c types.nix: better error message for non-paths
This improves error messages when a set or a list is used where a path
was expected. For an example, if you used a package set (as opposed to a
single package) in systemPackages before this commit, the error was:

```
cannot coerce a list to a string, at "/home/nixpkgs/lib/types.nix":103:37
```

Now, the error message reads:

```
The option value `environment.systemPackages' in `/etc/nixos/configuration.nix' is not a list of paths.
```
2015-08-15 13:05:57 +02:00
Nicolas B. Pierron 77250457bc Merge pull request #9183 from nbp/option-usage
Update option-usages.nix expression to work with newer version of the module system.
2015-08-15 12:29:32 +02:00
Szczyp cbe6badab9 rhc: init at 1.36.4
OpenShift client tools
Add szczyp as a maintainer
2015-08-13 18:02:55 +02:00
Mabry Cervin 0b6a75dc1a bspwm: 0.8.9 -> 0.9 2015-08-12 11:28:36 -04:00
Nicolas B. Pierron c47e89623b Update option-usages.nix expression to work with newer version of the module system. 2015-08-09 17:52:34 +02:00
Arseniy Seroka db22ec1549 Merge pull request #9132 from makefu/awesome-vicious-luaPackage
luaPackages: add vicious module
2015-08-07 12:36:07 +03:00
Eelco Dolstra 214d4fb73c Allow options with type "package" to be store paths
For example, this allows writing

  nix.package = /nix/store/786mlvhd17xvcp2r4jmmay6jj4wj6b7f-nix-1.10pre4206_896428c;

Also, document types.package in the manual.
2015-08-07 03:09:57 +02:00
makefu 86c973d429 luaPackages.vicious: init at 2.1.3
vicious is a module for creating widgets on window managers.
This commit adds the library and a wrapper lua file for easy importing.

I use the library with the awesome window manager via luaModules:

    services.xserver.windowManager.awesome.luaModules = [
      pkgs.luaPackages.vicious
    ];
2015-08-06 12:59:08 +02:00
Eelco Dolstra cbecbd01f9 Module system: Fix ‘definitions’ field
Fixes https://github.com/NixOS/nixops/issues/325.
2015-08-05 14:35:00 +02:00
Oliver Dunkl ad686d3762 Add odi to list of maintainers 2015-07-30 20:59:50 +02:00
Vladimír Čunát 7c291e2e59 super-user-spark: init at 0.1.0.0 (close #8894)
Super-User-Spark is a program for managing dotfiles.
The author is Tom Sydney Kerckhove.

Details on usage can be found on his [blogpost] as well as the [reddit thread].

[blogpost]: http://cs-syd.eu/posts/2015-07-19-super-user-spark.html
[reddit thread]: http://www.reddit.com/r/haskell/comments/3dsdi5/more_than_just_another_symlink_manager_written_in/
2015-07-30 19:14:38 +02:00
Eelco Dolstra f463d24903 Add read-only options
These are options that can have only one definition, regardless of
priority.
2015-07-30 13:44:50 +02:00
Kamil Chmielewski e610f27c43 qtile: init at 0.10.1 2015-07-28 22:55:32 +02:00
Eelco Dolstra b89b6b2a7b Add function callPackagesWith
This is like callPackageWith, except that it expects the supplied
function to return a *set* of packages. It will then make the
individual packages overridable.
2015-07-28 21:42:25 +02:00
Eelco Dolstra 314e8e49ec Remove deepOverride
It's unused, and also a bad idea: because it recursively recomputes
every function argument and there is no sharing, you can get an
exponential (?) blowup in evaluation time. For example, evaluating
‘linuxPackages.kernel’ takes 0.09s and ~13 MiB, but evaluating
‘linuxPackages.kernel.deepOverride {}’ takes 3.6s and ~305 MiB.
2015-07-28 21:42:25 +02:00
lethalman 37e554828d Merge pull request #8878 from 2chilled/master
synapse: init at 0.2.99.1
2015-07-28 18:44:20 +02:00
Eelco Dolstra 395fdaef6c Use builtins.sort 2015-07-28 18:42:22 +02:00
Eelco Dolstra 5976d393fb Use builtins.genList
This fixes the quadratic complexity of functions like imap.
2015-07-28 18:42:22 +02:00
Eelco Dolstra 273d9ffd6a Remove superfluous copy of "min" 2015-07-28 18:42:22 +02:00
Matthias Herrmann 679a941f26 synapse: init at 0.2.99.1 2015-07-28 17:25:28 +02:00
Eelco Dolstra 7c30ce9562 Remove zipTwoLists
This function is redundant (we also have zipLists).
2015-07-28 15:04:18 +02:00
Eelco Dolstra 67b1a20f12 Minor module system evaluation speedups
This gives about a 5% speedup.

Issue #8152.
2015-07-28 15:04:18 +02:00
Eelco Dolstra 0ca10a445a Fix indentation 2015-07-28 15:04:18 +02:00
Arseniy Seroka b5ca5cc0ce Merge pull request #8914 from desiderius/falcon-0.3.0
python-packages: falcon 0.2.0 -> 0.3.0
2015-07-28 14:05:58 +03:00
desiderius f7b283896b python-packages: falcon 0.2.0 -> 0.3.0 2015-07-27 09:14:18 +02:00
Eelco Dolstra c399f94bb3 intersperse: Fix quadratic performance 2015-07-24 15:58:34 +02:00
Eelco Dolstra 2d9885db9e Remove eqStrings
It's no longer needed. Also clean up some comments.
2015-07-24 15:58:34 +02:00
Eelco Dolstra 9cfd128a42 Use replaceStrings primop 2015-07-24 15:58:34 +02:00
Eelco Dolstra 6f6f66ac98 Use concatStringSep primop 2015-07-24 15:58:34 +02:00
Eelco Dolstra 447afef153 Use builtin all and any functions 2015-07-24 15:58:34 +02:00
Eelco Dolstra 4cc6c83477 concatLists (map ...) -> concatMap 2015-07-23 18:31:54 +02:00
Eelco Dolstra 0ae8b365b3 Rename misc.nix -> deprecated.nix 2015-07-23 18:31:54 +02:00
Eelco Dolstra 637e35deb9 Use foldl' instead of fold in some places 2015-07-23 18:31:54 +02:00
Eelco Dolstra f14dab05d6 optionAttrSetToDocList: O(n^2) -> O(n)
This shaves about 10% off memory consumption of NixOS evaluation.
2015-07-23 16:49:13 +02:00
Eelco Dolstra 3cd5fd8bb3 More efficient version of filterAttrs 2015-07-23 16:49:13 +02:00
Brandon Carrell 4f4fa58199 cassandra-1.2: Add package.
- Add myself to maintainers.
- Add package to all-packages.nix.
2015-07-14 19:35:16 -04:00
Nicolas B. Pierron 37dad0ee0b Merge pull request #8814 from nbp/module-arg-context
NixOS modules: Add error context on module arguments evaluation.
2015-07-14 16:35:01 +02:00
Nicolas B. Pierron a6b455bbae NixOS modules: Add error context on module arguments evaluation. 2015-07-14 15:07:54 +02:00
lethalman 6bf51d3a85 Merge pull request #8719 from lancelotsix/add_poezio
Add poezio
2015-07-14 14:56:55 +02:00
Nicolas B. Pierron ff8b35a643 Merge pull request #8806 from nbp/issue-8152
Issue 8152 - Reduce number of attribute sets created by replaceChars.
2015-07-14 12:34:36 +02:00
Nicolas B. Pierron be65ac7c32 Issue 8152 - Reduce number of attribute set created by replaceChars. 2015-07-13 23:46:38 +02:00
James Felix Black 9b863fac6b notion: init at 3-2015061300
The notion (not-ion) window manager [1], plus optional (defaulted to
true) Xft/pango support (via [2]). Defined a license (notion uses a
modified LGPL).

As per [3], changes:

  1. renamed option from pango -> xft, better to reflect the actual
     nature of the patch;
  2. modified the patch to replace the postPatch changes to system-autodeteck.mk;
  3. commited the patch to the nixpkgs repo;
  4. removed 'fallbackFont' as an option. Use a sensible default, instead.

Many stylistic changes, thanks to @lethalman.

[1] http://notion.sourceforge.net
[2] http://sourceforge.net/p/notion/feature-requests/47/
[3] https://github.com/NixOS/nixpkgs/pull/8789
2015-07-13 12:08:05 -04:00
Leonardo Cecchi 532678fa8b bleachbit: init at 1.8 2015-07-12 16:33:59 +02:00
Lancelot SIX e1f2930213 poezio: init at 0.8.1 2015-07-10 22:40:49 +02:00
Robert Irelan f9efcd47a1 subsonic: add telotortium as maintainer 2015-07-08 09:21:27 -07:00
William Casarin 9d85874aeb lmdb: lightning memory-mapped database 2015-07-04 05:06:29 -07:00
Phil Scott 52339c7c70 tome4: add new maintainer 2015-06-28 18:35:26 +01:00
Matthew Maurer 90a4de0f1b ocaml-bitstring: init at 2.0.4 and f1673f8 2015-06-27 16:54:10 +00:00
Andrey Pavlov 5506632473 erlang: add Erlang R18, closes #8515 2015-06-26 16:15:14 +02:00
Alexander V. Nikolaev 46f5efa018 Add myself as maintainer 2015-06-26 00:31:57 +03:00
Simon Vandel Sillesen 9dab1a840c tvheadend: init at 4.0.4 2015-06-24 13:22:09 +00:00
Arseniy Seroka 266531b5b0 Merge pull request #8422 from travisbhartwell/update/atom-shell-to-electron
atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
2015-06-23 18:54:22 +03:00
laMudri f0b4065392 ibus-table: init at 1.9.6 2015-06-22 18:25:45 +02:00
Michael Raitza f10c6bef56 Added entry to maintainers.nix 2015-06-22 18:09:31 +02:00
Travis B. Hartwell 1682bd707a electron: Added myself as maintainer.
Per https://github.com/NixOS/nixpkgs/pull/8422#issuecomment-113695261
2015-06-20 12:43:10 -06:00
Leroy Hopson 5bb9988ce9 maintainers: add myself for upcoming packages 2015-06-20 12:53:04 +12:00
Mateusz Kowalczyk fc26e89159 Merge pull request #8394 from mbakke/maim
Add maim and slop
2015-06-19 15:22:20 +01:00
Marius Bakke 09c505c111 add self to maintainers 2015-06-18 22:55:56 +01:00
Andrew Kelley 8925d17034 add myself as maintainer 2015-06-18 11:52:39 -07:00
Daiderd Jordan f119508140 darwin os-specific: rez and derez packages 2015-06-18 11:34:05 +02:00
Eelco Dolstra c738b309ee types.uniq types.bool -> types.bool 2015-06-15 18:10:26 +02:00
Eelco Dolstra e212e07cf6 Make types.bool complain on conflicting definitions
Previously, conflicting definitions would merge to "true". Now they
give an error, e.g.

  error: The option `hardware.enableAllFirmware' has conflicting definitions, in `/etc/nixos/configurations/misc/eelco/stuff.nix' and `/etc/nixos/configurations/misc/eelco/mandark.nix'.
2015-06-15 18:07:48 +02:00
Eelco Dolstra a4925bcfa8 Remove obsolete stuff 2015-06-15 18:07:44 +02:00
Arseniy Seroka 2e5f4a0152 Merge pull request #8255 from adevress/master
New expression for the davix toolkit
2015-06-12 00:52:37 +02:00
Adrien Devresse f12a466730 New expression for the davix toolkit 2015-06-11 22:57:13 +02:00
Vladimír Čunát 95def7e4f0 lib/maintainers: recommend to re-use github usernames 2015-06-11 22:19:20 +02:00
Daniel Peebles 6e73884c31 Merge pull request #8204 from copumpkin/modulesPath
An importable modulesPath, once again
2015-06-10 12:32:04 -04:00
lethalman f37c81323e Merge pull request #8180 from froozen/master
Add the tewi font
2015-06-08 14:27:57 +02:00
lethalman 850f775a98 Merge pull request #8213 from robbinch/pkg-wavegain
wavegain: show correct maintainer
2015-06-08 14:26:36 +02:00
Anders Papitto 50e9fa5719 dirt: include sound samples (close #8179)
also add self as maintainer
2015-06-08 10:16:03 +02:00
Robbin C 757942ddbf wavegain: show correct maintainer 2015-06-08 10:31:30 +08:00
Dan Peebles b13cb54614 Bring an importable modulesPath back from the dead, in the only way I know 2015-06-08 01:55:49 +00:00
fro_ozen 4ae0815d3b Add the tewi font 2015-06-07 19:05:05 +02:00
Eelco Dolstra 3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
This reverts commit 25a148fa19.
2015-06-04 14:54:48 +02:00
lethalman ea83ebff86 Merge pull request #8115 from Havvy/iojs
Update io.js to v.2.2.1
2015-06-01 16:52:04 +02:00
_1126 98e698fad2 maintainers: change of nickname. 2015-06-01 11:00:57 +02:00
Ryan Scheel (Havvy) b49026ee98 Added: Havvy as maintainer for iojs/nodejs. 2015-06-01 05:17:59 +02:00
Tobias Geerinckx-Rice 87fd373aac lib/licenses: add CC-BY-SA-2.5 2015-05-27 22:00:04 +02:00
lethalman af4d6468b2 Merge pull request #7959 from ikervagyok/darkice
New Package: Darkice
2015-05-27 10:51:59 +02:00
Tobias Geerinckx-Rice 48b7e40f0c licenses: add Vim licence 2015-05-27 00:13:19 +02:00
vbgl 2857d5d7a8 Merge pull request #7823 from ericbmerritt/ocaml-enhancements
Ocaml enhancements
2015-05-26 23:52:32 +02:00
Lengyel Balázs aa1ce46281 Inital commit for Darkice 2015-05-26 15:20:53 +02:00
Alexander Flatter be71c0871c Add meta information to heroku toolbelt 2015-05-26 13:06:34 +02:00
Eric Merritt 9cc8b80c96 add jwilberding as a maintainer 2015-05-25 13:40:32 -07:00
William A. Kennington III 384d8a79d0 Merge pull request #7717 from stephenmw/gcloud
Add the google-cloud-sdk package
2015-05-23 22:14:47 -07:00
Stephen Weinberg da2aef3685 Add the google-cloud-sdk package 2015-05-24 06:20:45 +02:00
William A. Kennington III 25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Eric Merritt ae0e3c8974 add ericbmerritt to the maintainers list 2015-05-22 10:12:21 -07:00
Ozan Sener 97160a8644 Add Thrust 0.7.6 2015-05-20 20:58:03 +02:00
lethalman efed756e67 Merge pull request #7849 from mschristiansen/mongo-tools-2
MongoDB Tools and Go dependencies
2015-05-18 10:52:49 +02:00
Mikkel Christiansen 734bc9f2e5 Add MongoDB tools and build dependencies. 2015-05-18 10:29:22 +02:00
Jascha Geerds a84775e8f6 Merge pull request #7862 from C0DEHERO/fix/supertuxkart-update
supertuxkart: update 0.8.1 -> 0.9
2015-05-17 21:33:54 +02:00
C0DEHERO e505663051 supertuxkart: update 0.8.1 -> 0.9 2015-05-17 14:36:49 -04:00
Arseniy Seroka 78b2afadff Merge pull request #7811 from pmiddend/fcppt
Add fcppt package
2015-05-16 22:37:14 +03:00
Paulus Esterhazy 89a58c9e05 Add Jekyll maintainer 2015-05-16 20:11:41 +02:00
Philipp Middendorf 7f2262e9a8 fcppt: initial import into nixpkgs 2015-05-14 23:54:57 +02:00
lethalman 1103392dd9 Merge pull request #7794 from womfoo/kbdlight
Add kbdlight package and setuid wrapper
2015-05-14 17:09:28 +02:00
Arseniy Seroka c0727fb751 Merge pull request #7788 from Lassulus/charybdis
add charybdis nixos module
2015-05-11 12:57:58 +03:00
Kranium Gikos Mendoza 6f634e3c3a Add kbdlight package and setuid wrapper
update nixos/modules/programs/kbdlight.nix to use mkEnableOption
2015-05-11 13:23:01 +08:00