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

2729 Commits

Author SHA1 Message Date
Michael Raskin
adf41ed942
Merge pull request #49864 from oxij/pkgs/tiny-things 
trivial: tiny cleanups and fixes
 2018-11-08 06:28:10 +00:00
Jan Malakhovski
67a5c0da41 tree-wide: fix all revs of fetchsvn 2018-11-08 05:29:47 +00:00
lassulus
0cd1e6732d dwarf-fortress: fix theme override 2018-11-08 01:59:56 +01:00
lassulus
290dd06d14 dwarf-fortress: fix most of customization options 
see #49779
close #49803
 2018-11-06 01:00:17 +01:00
Piotr Bogdan
ddb35fe47b steamPackages.steam-runtime-wrapped: don't include all of gcc 2018-11-05 22:46:53 +00:00
Alexander V. Nikolaev
b0d470061f openarena: fix loading libGL.so with libglvnd 2018-11-05 19:51:52 +02:00
Matthew Bauer
0923607ff7
gemrb: add libiconv 
https://hydra.nixos.org/build/83508053/
 2018-11-02 20:39:40 -05:00
Aaron Andersen
51b661be2c speed_dreams: fix compilation issues 2018-11-01 18:18:25 -04:00
Aaron Andersen
bdc293caba flightgear & simgear: 2017.3.1 -> 2018.2.2 2018-11-01 18:17:34 -04:00
Silvan Mosberger
ba0aea3593
Merge pull request #49095 from Synthetica9/steam-update 
steam: ran update-runtime.py
 2018-10-28 21:43:50 +01:00
Patrick Hilhorst
714b6e3d17
steam: ran update-runtime.py 2018-10-25 10:34:00 +02:00
Patrick Hilhorst
7c2b6b0afe
steam: made update-runtime.py nicer 2018-10-25 10:33:37 +02:00
R. RyanTM
69349cce7f rocksndiamonds: 4.1.0.0 -> 4.1.1.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rocksndiamonds/versions
 2018-10-24 15:30:38 +02:00
Renaud
d88d0127f7
Merge pull request #48148 from peterhoeg/p/scummvm_games 
scummvm: add several ScummVM supported games
 2018-10-21 09:50:13 +02:00
Yegor Timoshenko
7731f70045
Merge pull request #46920 from urkud/pokerth-1.1.2 
pokerth: 1.1.1 -> 1.1.2, refactor, Qt 5
 2018-10-20 09:11:51 +00:00
Renaud
f641099792
warmux: 11.04.1 -> unstable-2017-10-20 (#48277) 
Gna.org forge is closed but someone was kind
enough to clone the repo on GitHub and even
add some fixes on top of it
 2018-10-20 00:25:22 +02:00
Jan Malakhovski
141eb8b843 anki: update meta 2018-10-19 21:59:47 +00:00
Jan Malakhovski
0779d71915 anki: use send2trash from nixpkgs 2018-10-19 18:20:35 +00:00
Yegor Timoshenko
031083b564
pokerth: clean up 2018-10-19 17:01:32 +00:00
Yury G. Kudryashov
f923187c20
pokerth: 1.1.1 -> 1.1.2 2018-10-19 17:01:29 +00:00
Frederik Rietdijk
821a3beb10
Merge pull request #48306 from NixOS/staging-next 
Merge staging-next into master
 2018-10-18 11:23:04 +02:00
Jörg Thalheim
9aa43737f0
Merge pull request #48510 from r-ryantm/auto-update/gzdoom 
gzdoom: 3.5.1 -> 3.6.0
 2018-10-17 09:13:41 +01:00
Frederik Rietdijk
18fcc337af Merge master into staging-next 2018-10-17 08:04:22 +02:00
Will Dietz
18258bae34 teeworlds: 0.6.4 -> 0.6.5 
This release adds support for building with cmake!
So switch to that eagerly instead of fighting with bam.

(if nothing else cmake is the devil we know...)

Also:

* fixup 'DATA_DIR' so programs can find resources
  (without need for wrappers)
* install readme+license as previously done ("docs")
* don't install tools since not built or installed by default
  * esp since doesn't appear to have non-adhoc method for installation
  * other distros don't seem to include
 2018-10-16 01:42:14 -05:00
R. RyanTM
b6cfaf1d9f gzdoom: 3.5.1 -> 3.6.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gzdoom/versions
 2018-10-15 21:35:20 -07:00
Joachim F
0c7103b131
Merge pull request #48074 from Lassulus/dwarf-fortress 
dwarf-fortress: fix build error
 2018-10-13 15:24:27 +00:00
Joachim F
30008a1cda
Merge pull request #48084 from corngood/steam-glx-fix 
steam: add libxcb to steamrt overrides
 2018-10-13 15:19:56 +00:00
Frederik Rietdijk
6f5142e48e Merge master into staging 2018-10-13 09:48:20 +02:00
Thilo Uttendorfer
340c76263d openxcom: 1.0.0.2018.01.28 -> 1.0.0.2018.10.08 (#48290) 2018-10-13 00:03:44 +02:00
Gabriel Ebner
c555a076e7
Merge pull request #47995 from erictapen/47709-fallout 
fix broken packages from #47709
 2018-10-10 19:50:50 +02:00
rys ostrovid
fc29f68e3f openra: 20180307 -> 20180923 (#47545) 2018-10-10 18:01:29 +01:00
Peter Hoeg
a75b3205d0 scummvm: add several ScummVM supported games 
- Beneath a Steel Sky: v1.2
 - Drascula: The Vampire Strikes Back: v2.0
 - Flight of the Amazon Queen: v1.1
 - Lure of the Temptress: v1.1
 2018-10-10 17:15:22 +08:00
Free Potion
b10940cd23
boohu: leave one package 
There will be only one version of the package with
the fewest external dependencies.
 2018-10-10 04:45:38 +03:00
Matthew Bauer
504953ed08
Merge pull request #47381 from freepotion/boohu-init 
boohu: init at 0.10.0
 2018-10-09 19:06:06 -05:00
Cray Elliott
04d2af6b1a urbanterror: 4.3.3 -> 4.3.4 2018-10-09 12:05:37 -07:00
David McFarland
c7fa58f6b3 steam: add libxcb to steamrt overrides 
This fixes 'glXChooseVisual failed' when starting steam on mesa after
the libxcb 1.12 -> 1.13 upgrade.
 2018-10-08 20:04:36 -03:00
lassulus
0d57159eca dwarf-fortress: fix build error 2018-10-08 22:21:09 +02:00
Justin Humm
226f31b3a2
ja2-stracciatella: fix build due to #47709 2018-10-07 12:52:05 +02:00
Free Potion
171752daee ivan: 053 -> 054 (#47950) 2018-10-06 16:59:26 +02:00
R. RyanTM
360054f417 brogue: 1.7.4 -> 1.7.5 (#47830) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/brogue/versions
 2018-10-05 15:15:13 +02:00
R. RyanTM
bd51db9bf2 bzflag: 2.4.14 -> 2.4.16 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bzflag/versions
 2018-10-03 23:13:39 -07:00
Free Potion
af08956950
boohu: init at 0.10.0 2018-10-03 03:23:23 +03:00
Jörg Thalheim
bc0d87a4f1
Merge pull request #47455 from nyanloutre/steamPackages.steam-udev 
steamPackages.steam: add udev rules and update to 1.0.0.56
 2018-10-02 00:55:41 +01:00
R. RyanTM
d25ce11fbc springLobby: 0.264 -> 0.267 (#46948) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/springlobby/versions
 2018-10-02 00:03:09 +02:00
rys ostrovid
3ac175e61f EmptyEpsilon: fix version numbering (#47546) 2018-10-01 08:09:28 +01:00
Peter Hoeg
f8e758a465
Merge pull request #47551 from peterhoeg/p/snipes 
snipes: init at 20180930
 2018-10-01 10:26:43 +08:00
Peter Hoeg
d3ada967ae snipes: init at 20180930 2018-10-01 10:11:00 +08:00
R. RyanTM
01754b7ab2 gzdoom: 3.5.0 -> 3.5.1 (#46276) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
gzdoom
 2018-09-29 20:26:18 +02:00
Jörg Thalheim
6a6b3b48bc
Merge pull request #47023 from lheckemann/nethack-cross 
Nethack cross
 2018-09-29 19:00:50 +01:00
nyanloutre
7af3a85d8d
steamPackages.steam: 1.0.0.51 -> 1.0.0.56 2018-09-29 09:38:36 +02:00
xeji
75fd708391
Merge pull request #47366 from LnL7/darwin-broken-f 
broken darwin packages (f)
 2018-09-28 22:32:45 +02:00
Will Dietz
3f0ae25538
Merge pull request #47444 from dtzWill/fix/patchelf-chrome-virtualbox-and-treewide 
google-chrome, treewide: fix patchelf usages to not crash constantly, patchelf as native
 2018-09-28 14:25:05 -05:00
R. RyanTM
b96e52565d crawl: 0.22.0 -> 0.22.1 (#46952) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/crawl/versions
 2018-09-28 20:54:49 +02:00
Will Dietz
eb91037e7b tree-wide: patchelf used during build -> nativeBuildInputs 
In a few cases it wasn't clear so I left them as-is.

While visiting these moved other things to nativeBuildInputs
when it was clear they were one of these cases:

* makeWrapper
* archive utilities (in order to unpack src)
  * a few of these might no longer be needed but leaving for another day
 2018-09-28 11:43:16 -05:00
nyanloutre
30240a59fe steamPackages.steam: add udev rules 2018-09-28 09:34:37 +02:00
Daiderd Jordan
9b99819283
freedroidrpg: don't build on hydra 
Similar to some other builds, sdl-config gets stuck and times out.

    checking for sdl-config... /nix/store/q2hm1ka0qxs2gv5bmrxj7j80lygk4b5z-SDL-1.2.15-dev/bin/sdl-config
    building of '/nix/store/m2d7v0n5hd2498vfxp18i37p7r1lf76p-freedroidrpg-0.16.1' timed out after 7200 seconds of silence

/cc ZHF #45961
 2018-09-25 22:34:30 +02:00
Joachim F
9fee74d616
Merge pull request #46586 from elitak/factorio 
factorio: download using token, not password
 2018-09-22 19:57:12 +00:00
Joachim F
62366489cd
Merge pull request #46935 from r-ryantm/auto-update/wesnoth 
wesnoth: 1.14.4 -> 1.14.5
 2018-09-22 13:59:09 +00:00
R. RyanTM
3ac97c054f lgogdownloader: 3.3 -> 3.4 (#47039) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lgogdownloader/versions
 2018-09-21 20:45:07 +02:00
xeji
2c5ae2ae61
liquidwar: fix build (#47064) 
- add missing dependencies readline and libtool that used to be
  propagated by guile but aren't anymore
- build with guile 2.0 instead of 1.8
 2018-09-21 00:19:01 +02:00
Linus Heckemann
6776bc7678 nethack: only install dlb for text-mode 2018-09-20 19:04:36 +01:00
Linus Heckemann
ec42304022 nethack: add bdftopcf for GUIs 2018-09-20 19:04:36 +01:00
Linus Heckemann
c9728a4dcf nethack: document cross-compilation fix 2018-09-20 18:47:13 +01:00
Linus Heckemann
86b1f5c710 nethack: enable cross-compilation 
also parallel building
 2018-09-20 19:32:36 +02:00
Eric Litak
8ed49d7ec8 factorio: experimental=true includes stable builds, when newer 2018-09-20 02:27:42 -07:00
Eric Litak
ff22306255 factorio: download using token, not password 
Downloads were broken by upstream devs' addition of CAPTCHA to the login
form. We now need only a slightly modified fetchurl to retrieve the
binary distribution.
 2018-09-20 02:27:42 -07:00
R. RyanTM
be4db7a6a9 wesnoth: 1.14.4 -> 1.14.5 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wesnoth/versions
 2018-09-19 23:24:42 -07:00
Linus Heckemann
6af4a8e6d7 nethack: remove build-time dependency on qt 
Unless qtMode is enabled :)
 2018-09-19 20:26:31 +02:00
xeji
c2c9c6adfe
Merge pull request #46385 from xeji/p/broken 
mark long-failing packages broken for 18.09
 2018-09-15 00:54:49 +02:00
Uli Baum
ba757ffdc9 btanks: mark as broken 
no successful hydra build since 2018-03-16, last upstream release 2009.
 2018-09-13 02:45:53 +02:00
Michele Guerini Rocco
5cb824f4c4 arx-libertatis: 2017-10-30 -> 2018-08-26 (#46039) 2018-09-10 22:08:48 +02:00
Matthew Bauer
e4db8a903a
Merge pull request #43470 from numinit/df 
dwarf-fortress: Refactor, round 2: let the user pick which version of the lazy pack to install
 2018-09-09 13:27:12 -05:00
Jörg Thalheim
7069eb7d47
Merge pull request #46391 from tadfisher/vkquake 
vkquake: fix build
 2018-09-09 15:48:22 +01:00
Morgan Jones
213b5457fc Inline JSON files 2018-09-09 07:15:59 +00:00
Morgan Jones
2cd2571edd Update twbt to 6.54 2018-09-09 07:03:59 +00:00
Morgan Jones
5f1013d875 Use stdenv.mkDerivation for Therapist wrapper 2018-09-09 06:59:58 +00:00
Morgan Jones
870f05c975 Fix dangling DFHack "Git:" version text 2018-09-09 06:59:58 +00:00
Morgan Jones
fe847fcc92 Therapist needs to depend on the DF version, since it uses its MD5 2018-09-09 06:59:58 +00:00
Morgan Jones
7a5521537a Let the user override dfVersion in dwarf-fortress-full 2018-09-09 06:59:58 +00:00
Morgan Jones
f14d3b4795 Fix dfhack's Dwarf Fortress MD5 in the correct environment 2018-09-09 06:59:41 +00:00
Morgan Jones
4ada74e293 dwarf-fortress: Support multiple unfuck/dfhack/TWBT versions 2018-09-09 06:59:41 +00:00
Matthew Bauer
a0dc4854af
Merge pull request #38878 from tadfisher/steamcmd 
steamcmd: init at 20180104
 2018-09-08 17:55:56 -05:00
Tad Fisher
0b2b7b2d53 steamcmd: init at 20180104 2018-09-08 13:39:32 -07:00
Tad Fisher
b19cdc31c1 vkquake: fix build 2018-09-08 13:13:23 -07:00
Maximilian Bosch
37032db583 chessx: fix build (#46359) 
See https://hydra.nixos.org/build/80998335.

Upstream doesn't support QT 5.11 ATM which broke compilation:

```
src/dialogs/savedialog.cpp: In constructor ‘SaveDialog::SaveDialog(QWidget*, Qt::WindowFlags)’:
src/dialogs/savedialog.cpp:37:34: error: invalid use of incomplete type ‘class QButtonGroup’
     group = new QButtonGroup(this);
```

The Arch community recommends to use an older QT version to fix
this (https://aur.archlinux.org/packages/chessx/).

Furthermore the `QT_PLUGIN_PATH` wasn't set properly which broke the
runtime since QT coudln't find the `xcb` plugin:

```
qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
This application failed to start because no Qt platform plugin could be initialized.
Reinstalling the application may fix this problem.
```

Finally, some minor style fixes were made for consistent indentation.

Addresses #45960
 2018-09-08 14:19:24 +02:00
geistesk
22deabca39 openrct2: 0.2.0 -> 0.2.1 2018-09-07 20:31:27 +02:00
xeji
91cc864c3c
Merge pull request #46081 from samueldr/fix/solarus 
solarus[-quest-editor]: 1.4.5 -> 1.5.3
 2018-09-05 08:53:51 +02:00
Samuel Dionne-Riel
83a0d5d013 solarus: 1.4.5 -> 1.5.3 2018-09-04 22:03:56 -04:00
xeji
c23ec2794d
Merge pull request #46011 from markuskowa/homepages-2 
Cleanup homepage links
 2018-09-03 23:32:52 +02:00
Markus Kowalewski
ee8b87a359
urbanterror: update homepage 2018-09-03 22:36:55 +02:00
Markus Kowalewski
6600a405c2
rogue: add license 2018-09-03 22:36:55 +02:00
Markus Kowalewski
2fefff2fba
gnugo: fix homepage 2018-09-03 22:36:55 +02:00
Milan Svoboda
ae76e51f86 FreeOrion 0.4.7.1 -> 0.4.8 (#45943) 2018-09-02 21:42:47 +02:00
Pascal Wittmann
bae886a951
instead: 3.2.1 -> 3.2.2 2018-09-01 18:35:52 +02:00
Sarah Brofeldt
b57350e6d8
Merge pull request #45855 from pstn/steam-python3 
steam: Add python3 to runtime for steam play / proton
 2018-09-01 10:51:20 +02:00
Philipp Steinpass
f563a3b2a9 steam: Add python3 to runtime for steam play / proton 2018-08-31 12:43:08 +02:00
John Ericson
0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff 
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
 2018-08-30 17:20:32 -04:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system 
It is deprecated and will be removed after 18.09.
 2018-08-30 17:20:32 -04:00
Raitis Veinbahs
1ae5f05d16 vitetris: init at 0.57.2 (#45672) 2018-08-27 20:30:18 +02:00
Francesco Gazzetta
ff583d8114 endgame-singularity: init at 0.30c (#45057) 2018-08-26 19:38:52 +02:00
Francesco Gazzetta
0fd58ed099 20kly: init at 1.4 (#45056) 2018-08-26 02:23:32 +02:00
Matthew Bauer
f7bc33abf0 Revert "treewide: fixup breakage due to absolute compiler path" 
This reverts commit d0888d1503.
 2018-08-22 01:14:53 +02:00
R. RyanTM
d72617d0a6 crispyDoom: 5.2 -> 5.3 (#45248) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/crispy-doom/versions.
 2018-08-21 19:27:37 +02:00
Michael Raskin
12940685c3 fsg: fix src 2018-08-21 17:27:39 +03:00
Vladimír Čunát
765d695b89
Merge branch 'staging-next' 
Security fixes for a few packages are included.
 2018-08-21 15:36:02 +02:00
Vladimír Čunát
d0888d1503
treewide: fixup breakage due to absolute compiler path 
Some packages just can't handle them #44767.  It was tempting to try
to abstract this in some way, but I didn't do that ATM.
 2018-08-21 12:34:33 +02:00
Markus Kowalewski
39d7a557d4
gl117: add license + homepage 2018-08-20 21:15:15 +02:00
R. RyanTM
b5cd99c4ab mnemosyne: 2.6 -> 2.6.1 (#45184) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mnemosyne/versions.
 2018-08-19 22:51:46 +02:00
Samuel Dionne-Riel
eb9aa4bbcf
Merge pull request #44779 from r-ryantm/auto-update/freeciv 
freeciv: 2.5.11 -> 2.6.0
 2018-08-17 21:46:37 -04:00
R. RyanTM
553f96f360 gnubg: 1.06.001 -> 1.06.002 (#45228) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnubg/versions.
 2018-08-17 21:17:14 +02:00
Vladimír Čunát
209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Vladimír Čunát
cbabebcc2e
Merge branch 'master' into staging-next 
Hydra: ?compare=1473892
 2018-08-17 13:45:21 +02:00
Herwig Hochleitner
da9da8defd dwarf-fortess: make 0.44.12 the default version 
all necessary support packages seem to have caught up

cc  @matthewbauer @Baughn @volth
 2018-08-17 12:48:59 +02:00
Samuel Dionne-Riel
b25893e6c7
Merge pull request #43567 from selaux/ja2-stracciatella-0.16.1 
ja2-stracciatella: 0.15.1 -> 0.16.1
 2018-08-16 18:27:17 -04:00
Free Potion
a6781fabc1 ivan: add myself as maintainer 2018-08-13 21:52:32 +03:00
Vladimír Čunát
5b0398dc36
Merge branch 'master' into staging-next 
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
 2018-08-13 20:43:59 +02:00
Samuel Dionne-Riel
d08d9b9dc8
Merge pull request #44955 from nonfreeblob/fix 
Delete outdated info
 2018-08-12 19:53:50 -04:00
nonfreeblob
a6add56730 Delete outdated info 2018-08-13 02:38:27 +03:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next 
Hydra: ?compare=1472947
 2018-08-12 10:33:41 +02:00
Timo Kaufmann
c85748baaf
Merge pull request #44882 from nonfreeblob/crawl-0.22.0 
crawl: 0.21.1 -> 0.22.0
 2018-08-11 18:22:49 +02:00
nonfreeblob
3d56684d95 crawl: 0.21.1 -> 0.22.0 2018-08-11 18:10:19 +03:00
Frederik Rietdijk
d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Pascal Wittmann
af8cd3c74e
Merge branch 'master' into add-missing-licenses 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2018-08-09 13:10:27 +02:00
Pascal Wittmann
789ae747dc
newtonwars: add license 
see issue #43716
 2018-08-09 12:57:42 +02:00
R. RyanTM
46c84f3847 wesnoth: 1.14.3 -> 1.14.4 (#44671) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wesnoth/versions.
 2018-08-09 09:20:26 +02:00
R. RyanTM
fcc187b480 angband: 4.1.2 -> 4.1.3 (#44801) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/angband/versions.
 2018-08-09 08:52:11 +02:00
R. RyanTM
ef662bb5f7 freeciv: 2.5.11 -> 2.6.0 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/freeciv/versions.
 2018-08-08 16:45:36 -07:00
Matthew Bauer
29b5ca82ee nethack: remove debug symbols 
These were adding gcc to the closure
 2018-08-08 11:37:34 -04:00
Sage
2038ac39f5 crispy-doom: init at 5.2 (#44536) 
crispy-doom: init at 5.2
 2018-08-08 09:34:32 +02:00
Drakonis
296c520920 gzdoom: g3.4.1 -> g3.5.0 (#44590) 2018-08-07 21:27:45 +02:00
adisbladis
ae2288be69
Merge pull request #44591 from Drakonis/update/quakespasm 
quakespasm: 0.92.1 -> 0.93.1
 2018-08-07 15:24:09 +08:00
Unknown
353091da79 vkquake: 0.97.3 -> 1.00.0 2018-08-07 02:07:44 -03:00
Unknown
012203ecee quakespasm: 0.92.1 -> 0.93.1 2018-08-07 02:01:07 -03:00
Jörg Thalheim
3a609282a7
Merge pull request #44569 from xeji/p/drop-vimNox 
vimNox: drop
 2018-08-07 01:26:47 +01:00
Uli Baum
d0a2767e60 ezquake: replace vimNox with vim 
this was the only package depending on the outdated vimNox
 2018-08-06 21:37:29 +02:00
Pascal Wittmann
f7be21f4c9
Merge branch 'master' into add-missing-licenses 
Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus
 2018-08-06 12:04:52 +02:00
Pascal Wittmann
85afc926d8
exult: add license 
see issue #43716
 2018-08-05 16:46:45 +02:00
Pascal Wittmann
7b4f037a91
construo: add license 
see issue #43716
 2018-08-05 16:12:46 +02:00
Pascal Wittmann
731b4f4bb5
trackballs: add license 
see issue #43716
 2018-08-04 16:35:11 +02:00
Tuomas Tynkkynen
008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
Robert Schütz
57b6eb6514 EmptyEpsilon: use python3 2018-08-03 16:56:46 +02:00
Mitsuhiro Nakamura
c77e4de58e cataclysm-dda-git: fix desktop launcher installation (#44364) 2018-08-02 21:36:18 +02:00
Matthew Bauer
8fe1620513
Merge pull request #43080 from mnacamura/cdda 
cataclysm-dda{,-git}: move common attributes to common.nix
 2018-08-01 21:45:26 -04:00
Peter Hoeg
2428f5dda1 scummvm: fix compilation 2018-08-01 22:32:51 +08:00
Lluís Batlle i Rossell
f54b387b63 Merge remote-tracking branch 'central/master' into viric_clean 2018-07-28 19:25:14 +02:00
Carles Pagès
4ccaa7de8e
Merge pull request #43774 from Infinisil/fix/minecraft 
minecraft: clean and fix up
 2018-07-25 12:32:00 +02:00
John Ericson
ef93b82d43 prboom: Don't use crossAttrs 2018-07-24 17:53:56 -04:00
John Ericson
3470fa196d scumvm: Don't use crossAttrs 2018-07-24 17:51:20 -04:00
Ryan Mulligan
e7be6e0d00 arena: fix more evaluation blockers 2018-07-24 10:00:12 -07:00
Ryan Mulligan
bc52706a04 arena: fix evaluation blocking typo 2018-07-24 09:35:10 -07:00
Peter Simons
373541234a stockfish: update to version 9 2018-07-24 15:52:00 +02:00
Peter Simons
2c72d70970 arena: package initial version 1.1 of the Chess GUI 2018-07-24 15:40:58 +02:00
Matthew Bauer
f03238525c
Merge pull request #43596 from Kmeakin/runelite 
runelite: init at 1.6.0
 2018-07-23 12:25:38 -04:00
Lluís Batlle i Rossell
66d7126255 Take me (viric) out of most maintenance 
Since years I'm not maintaining anything of the list below other
than some updates when I needed them for some reason. Other people
is doing that maintenance on my behalf so I better take me out but
for very few packages. Finally!
 2018-07-22 21:50:19 +02:00
Pascal Wittmann
4c9d8d4c3f
xmoto: add license 
see issue #43716
 2018-07-22 17:09:02 +02:00
Frederik Rietdijk
6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
Frederik Rietdijk
a87f698c39
Merge pull request #43946 from r-ryantm/auto-update/cutemaze 
cutemaze: 1.2.3 -> 1.2.4
 2018-07-22 08:22:04 +02:00
R. RyanTM
35425daec2 cutemaze: 1.2.3 -> 1.2.4 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cutemaze/versions.
 2018-07-21 19:48:12 -07:00
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872) 
fixes build with disallowed aliases
 2018-07-21 22:03:24 -04:00
Frederik Rietdijk
ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Silvan Mosberger
effbf001b9
dxx-rebirth: Fix build 
See also 8414fa2d6b
 2018-07-21 11:15:44 +02:00
Frederik Rietdijk
20bc614680
Merge pull request #43783 from r-ryantm/auto-update/commandergenius 
commandergenius: 2.2.0 -> 2.2.2
 2018-07-21 10:54:50 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Frederik Rietdijk
1a6af9f88e
Merge pull request #43857 from volth/unused 
[bot] treewide: remove unreferenced code
 2018-07-20 21:06:32 +02:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Frederik Rietdijk
8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer
26cd7bb90b
Merge pull request #43558 from herberteuler/nethack-qt 
nethack: add qt support on linux
 2018-07-19 00:34:24 -04:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs 
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
 2018-07-18 23:25:20 -04:00
Mitsuhiro Nakamura
030cbaff7f cataclysm-dda{,-git}: add mnacamura as maintainer 2018-07-19 11:40:56 +09:00
R. RyanTM
8139663f66 commandergenius: 2.2.0 -> 2.2.2 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commandergenius/versions.
 2018-07-18 16:36:09 -07:00
Silvan Mosberger
47f78cd36a
minecraft: clean and fix up 
The launcher now downloads almost all required libraries itself into
~/.minecraft and there's nothing one can do about it. Sound only works
with libpulseaudio though
 2018-07-19 00:05:53 +02:00
Mitsuhiro Nakamura
206e271e32 cataclysm-dda{,-git}: move common attributes to common.nix 2018-07-18 00:33:42 +09:00
Frederik Rietdijk
6d339e5863 Merge staging-next into staging 2018-07-16 17:14:44 +02:00
Karl Meakin
bae01e0348 runelite: init at 1.6.0 2018-07-16 03:12:17 +01:00
Franz Pletz
a2eb1703e1
Merge pull request #43578 from rardiol/cdda 
cataclysm dda 2018-07-15
 2018-07-15 21:10:05 +00:00
Franz Pletz
de24fd7525
nethack: add qt plugin wrapper 2018-07-15 23:06:59 +02:00
Ricardo Ardissone
5901dae673 cataclysm-dda-git: debug flag 2018-07-15 13:59:28 -03:00
Ricardo Ardissone
05c2aa212e cataclysm-dda-git: 2017-12-09 -> 2018-07-15 2018-07-15 13:59:20 -03:00
Stefan Lau
e013a50568 ja2-stracciatella: 0.15.1 -> 0.16.1 2018-07-15 13:24:37 +02:00
Robert Schütz
18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
Guanpeng Xu
935332d648 nethack: add qt support on linux 2018-07-15 14:18:55 +08:00
Herwig Hochleitner
5c2ccd13a3 dwarf-fortress: re-include stonesense fix 
This partially reverts commit dfc4744afd.

cc @matthewbauer
 2018-07-14 14:24:35 +02:00
Herwig Hochleitner
9125e448df dwarf-fortress.dwarf-therapist: restore DwarfTherapist program 2018-07-14 14:24:35 +02:00
Alvar
b12597d128 openrct2: 0.1.2 -> 0.2.0 (#43386) 2018-07-14 00:51:03 +02:00
leenaars
d6899cf8b9 orthorobot: 1.0 -> 1.1.1 (#43495) 2018-07-14 00:22:48 +02:00
Frederik Rietdijk
3e31d23d99 Merge master into staging 2018-07-13 19:34:19 +02:00
lewo
05d273a45e
Merge pull request #43302 from rardiol/hyperrogue 
hyperrogue: init at 10.4j
 2018-07-11 09:07:33 +02:00
Ricardo Ardissone
96a6e1f5b5 hyperrogue: init at 10.4j 2018-07-10 18:36:26 -03:00
Frederik Rietdijk
f8701caafc Merge master into staging 2018-07-10 15:51:20 +02:00
Jan Tojnar
28b6f74c3f
gnome3.gconf: remove 2018-07-10 12:14:40 +02:00
Matthew Bauer
2bb4088f51 Merge pull request #43081 into master 
Closes #43081
 2018-07-09 17:46:10 -04:00
Matthew Bauer
97605d3e57
Merge pull request #43085 from matthewbauer/dwarf-fortress 
Dwarf Fortress refactors
 2018-07-09 17:40:16 -04:00
Matthew Bauer
3108f1eeaf Merge remote-tracking branch 'Baughn/nix-df' into dwarf-fortress 2018-07-09 16:24:21 -04:00
Matthew Bauer
812b0ec62e dwarf-fortress: recurse into themes 
Now the output of “nix-env” should be:

$ nix-env -qa -f . -A dwarf-fortress-packages
afro-graphics-44.10
autoreiv-44.03
cla-44.xx-v25
dwarf-fortress-0.43.05
dwarf-fortress-0.44.05
dwarf-fortress-0.44.09
dwarf-fortress-0.44.10
dwarf-fortress-0.44.11
dwarf-fortress-0.44.12
dwarf-therapist-40.1.0
gemset-44.10a
ironhand-44.10
jolly-bastion-44.10
legends-browser-1.17.1
mayday-44.10
obsidian-44.10
phoebus-44.10
rally-ho-44.10
soundsense-2016-1_196
spacefox-44.10a
taffer-44.10a
tergel-44.03
wanderlust-44.10
 2018-07-09 16:18:17 -04:00
Matthew Bauer
530427c7ab dwarf-fortress: refactors 
This will make it easier for people to access old versions.

You can now access attributes like:

- dwarf-fortress_0_44_11
- dwarf-fortress_0_43_05
- etc.
 2018-07-09 16:13:52 -04:00
Matthew Bauer
cdd0ac7e54 dwarf-fortress: support older versions as well 
game.json now contains a dictionary of old game hashes. I have added
them for the last 3 releases.

- add script to generate hashes

  Makes it much easier to update game.json file.

- add updateScript meta

  This adds some info on the ./update.sh updateScript now available.

- cleanup updateScript

  - Add some more systems
  - Correctly detect source extensions (.zip or .tar.bz2)
  - Proper bash quoting

- fix update.sh

  - correctly detect latest df version
  - append to game.json instead of overwriting it

- update hashes for 44.12
 2018-07-09 16:13:53 -04:00
Ryan Mulligan
7937f82665 treewide: http -> https 2018-07-05 18:35:28 -07:00
Matthew Bauer
aba6a3d7f4 dwarf-fortress: use fetchFromGitHub directly 
This avoids creating a second derivation to copy things from the
original. The new themes are now fixed output.
 2018-07-05 17:25:07 -04:00
Svein Ove Aas
b0c7245ee5 dwarf-fortress: Add "lazy pack", config flags and some comments. 2018-07-05 20:48:52 +01:00
Svein Ove Aas
5012ce727a dwarf-fortress: Init TWBT at 6.46 2018-07-05 20:21:59 +01:00
Matthew Bauer
a4c9492217
Merge pull request #43057 from Baughn/nix-df 
dwarf-fortress: Run legends-browser with a suitable working directory
 2018-07-05 00:10:13 -04:00
Svein Ove Aas
472d8dcb91 dwarf-fortress: Run legends-browser with a suitable working directory 2018-07-05 00:39:28 +01:00
Matthew Bauer
ea6b31b496
Merge pull request #43043 from Baughn/nix-df 
dwarf-fortress: Fix themes & package Legends Browser
 2018-07-04 17:41:06 -04:00
Svein Ove Aas
c8095af0cd dwarf-fortress: Init Legends Browser at 1.17.1 2018-07-04 22:26:23 +01:00
Matthew Bauer
75e2aca6ca
Merge pull request #42554 from numinit/df 
dwarf-fortress: 0.44.10 -> 0.44.11
 2018-07-04 16:56:20 -04:00
Svein Ove Aas
8c7461a348 dwarf-fortress: Don't check for dfVersion compatability on themes, which lack them. 2018-07-04 20:19:24 +01:00
Orivej Desh
1a76bd5552 ezquake: fix build after #41902 2018-07-03 12:44:57 +00:00
Orivej Desh
9641ab9a27 ivan: fix build after #41902 2018-07-03 12:41:18 +00:00
Orivej Desh
48272ebb6c liberal-crime-squad: fix darwin build after #41902 2018-07-03 12:37:58 +00:00
ikervagyok
8e5de9e200 warzone2100: fix build after #41902 (#42908) 2018-07-03 12:27:06 +00:00
Matthew Bauer
dcea211084 dwarf-fortress: cleanup 2018-07-02 11:59:36 -04:00
Morgan Jones
8d5b5fa68e Patch dwarf-fortress-unfuck to build in debug (pending upstream fix) 2018-07-01 20:28:59 +00:00
Morgan Jones
9a2898c6d1 bump dwarf-therapist and dfhack versions; fix theme issue 2018-06-30 23:29:29 +00:00
Morgan Jones
24f4711705 dwarf-fortress: 0.44.10 -> 0.44.11 
Update everything but dfhack and dwarf-therapist, which
have not been updated yet.
 2018-06-30 23:25:27 +00:00
nonfreeblob
1627b6fc09 nethack: nethack-x11 package created 
If x11Mode is false, ncurses NetHack version will be built (nethack).
If x11Mode is true, x11 NetHack version will be built (nethack-x11).
NetHack DevTeam provide x11 version support only for Linux.
 2018-06-30 14:48:20 +03:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676) 
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
 2018-06-28 20:43:35 +02:00
adisbladis
0c96b7099e
hedgewars: 0.9.23 -> 0.9.24.1 2018-06-28 13:58:28 +08:00
Ryan Mulligan
fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
R. RyanTM
b5337b357f gzdoom: 3.4.0 -> 3.4.1 (#42499) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gzdoom/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/2imdm0m7wchvwgg3r2m3xm5115iq681w-gzdoom-3.4.1/bin/gzdoom had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.4.1 with grep in /nix/store/2imdm0m7wchvwgg3r2m3xm5115iq681w-gzdoom-3.4.1
- directory tree listing: https://gist.github.com/af5b88ddc00326642398bae9d65d3714
- du listing: https://gist.github.com/e85a153098c517727519102b6c1134a8
 2018-06-27 19:03:42 +02:00
Yegor Timoshenko
889bb6873d
Merge pull request #42453 from mkaito/update-factorio 
factorio: 0.16.36 -> 0.16.51
 2018-06-26 01:17:25 +03:00
xeji
e0918b2550
Merge pull request #42432 from Pneumaticat/multimc 
multimc: fix build with Qt 5.11, fix desktop icon
 2018-06-25 11:53:02 +02:00
Grigory Chereshnev
3428b44610 ivan: 052 -> 053 (#42413) 2018-06-25 00:12:54 +02:00
xeji
c51ac5eb33
Merge pull request #42423 from ryantm/repology-problems 
treewide: http -> https
 2018-06-24 20:44:50 +02:00
Profpatsch
9c1edbddee unvanquished: remove 
Hasn’t been building or upgraded since 2015:
https://github.com/NixOS/nixpkgs/issues/9781
 2018-06-24 01:51:16 +02:00
Matthew Justin Bauer
bee228d9b4
exult: only build on linux 
It currently times out on finding sdl-config:

https://hydra.nixos.org/job/nixpkgs/staging/exult.x86_64-darwin
 2018-06-23 19:08:32 -04:00
Matthew Bauer
6127ec1665 treewide: disable sdl-config darwin time outs 
sdl-config has an issue on hydra where it will hang when run on
Darwin. This is probably related to the headless mode that is set up &
the sdl-config program waiting for a graphical to finish.
 2018-06-23 17:50:00 -04:00
Matthew Justin Bauer
92f0bec7c4
chocolate-doom: only build on linux 
darwin build times out on sdl-config
 2018-06-23 17:35:01 -04:00
Michishige Kaito
60ed533188 factorio: 0.16.36 -> 0.16.51 2018-06-23 18:40:29 +01:00
Kevin Liu
be47f95083
multimc: create compatibility symlink to fix desktop icon 2018-06-23 09:37:29 -04:00
Kevin Liu
28ff1f7565
multimc: 0.6.2 → unstable-2018-06-04 
Fixes #42387. See also #42351 for information on Qt breakage.
 2018-06-23 09:37:20 -04:00
Ryan Mulligan
0d5eb901ad treewide: http -> https 2018-06-23 04:34:55 -07:00
R. RyanTM
98eefba190 wesnoth: 1.14.2 -> 1.14.3 (#42195) 2018-06-19 23:24:05 +00:00
R. RyanTM
f6c0588c97 gzdoom: 3.3.2 -> 3.4.0 (#42011) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gzdoom/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/f4bpkw3bk3p8ca0vcxdi17hc5lm2r3jz-gzdoom-3.4.0/bin/gzdoom had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.4.0 with grep in /nix/store/f4bpkw3bk3p8ca0vcxdi17hc5lm2r3jz-gzdoom-3.4.0
- directory tree listing: https://gist.github.com/1d92d331e8c24929e998260ca9018ddb
- du listing: https://gist.github.com/ba47c37ae7b73d3fb85a14b537b6c270
 2018-06-18 22:53:32 +02:00
lewo
51cab4eddd
Merge pull request #42013 from r-ryantm/auto-update/gcompris 
gcompris: 0.90 -> 0.91
 2018-06-16 08:57:35 +02:00
Jörg Thalheim
e82a0345ef micropolis: remove 
Old package without maintainer that no longer compiles.
 2018-06-16 01:33:17 +01:00
R. RyanTM
a7937612bf gcompris: 0.90 -> 0.91 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gcompris/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/di4sm1nsx7zshk1n6njvnd07m0abj6cc-gcompris-0.91/bin/gcompris-qt had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/di4sm1nsx7zshk1n6njvnd07m0abj6cc-gcompris-0.91/bin/.gcompris-qt-wrapped had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.91 with grep in /nix/store/di4sm1nsx7zshk1n6njvnd07m0abj6cc-gcompris-0.91
- directory tree listing: https://gist.github.com/0ac8ed77cca8102d4b32b9b9361464f4
- du listing: https://gist.github.com/5f6daf6f26bdc5d5e1c4f4f4359ae0fa
 2018-06-14 07:21:29 -07:00
Simon Lackerbauer
6fb9d1121a gshogi: init at 0.5.1 (#41840) 2018-06-12 12:11:40 +02:00
Matthew Bauer
f522c9c3b9 dxx-rebirth: disable format hardening 2018-06-10 20:32:31 -04:00
Matthew Bauer
97e8bcc925 dwarf-therapist: supports darwin 2018-06-10 19:23:11 -04:00
Matthew Bauer
7170ab8433 dfhack: add SDL to buildInputs 2018-06-10 19:23:11 -04:00
Matthew Bauer
8f89f81b62 dfhack: add submodules 2018-06-10 19:23:11 -04:00
Yegor Timoshenko
18971dc6bb
Merge pull request #41778 from rayhogenson/nethack 
nethack: 3.6.0 -> 3.6.1
 2018-06-10 21:12:03 +03:00
R. RyanTM
985aea6b55 anki: 2.0.51 -> 2.0.52 (#41582) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/anki/versions.

These checks were done:

- built on NixOS
- /nix/store/2dqw72sffcynzzgcfk0k9mh7jn8sw0kw-anki-2.0.52/bin/anki passed the binary check.
- /nix/store/2dqw72sffcynzzgcfk0k9mh7jn8sw0kw-anki-2.0.52/bin/..anki-wrapped-wrapped passed the binary check.
- /nix/store/2dqw72sffcynzzgcfk0k9mh7jn8sw0kw-anki-2.0.52/bin/.anki-wrapped passed the binary check.
- 3 of 3 passed binary check by having a zero exit code.
- 3 of 3 passed binary check by having the new version present in output.
- found 2.0.52 with grep in /nix/store/2dqw72sffcynzzgcfk0k9mh7jn8sw0kw-anki-2.0.52
- directory tree listing: https://gist.github.com/1a53026ee3eea78708113c1b6e9d857f
- du listing: https://gist.github.com/c8dcabda5b46155a959b86843ee24ddd
 2018-06-10 10:22:47 +02:00
Raymond Hogenson
ed628fb74e nethack: 3.6.0 -> 3.6.1 2018-06-09 19:33:13 -07:00
R. RyanTM
492f1649f8 springLobby: 0.255 -> 0.264 (#41508) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/springlobby/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/i6g7iand22k99ry0hjda1gs71amk9q11-springlobby-0.264/bin/springlobby had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/i6g7iand22k99ry0hjda1gs71amk9q11-springlobby-0.264/bin/.springlobby-wrapped had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.264 with grep in /nix/store/i6g7iand22k99ry0hjda1gs71amk9q11-springlobby-0.264
- directory tree listing: https://gist.github.com/4d077ab682c9643337f22bf2bd75f51c
- du listing: https://gist.github.com/f215b8788c2ea5ebb286f3dddc34fdf9
 2018-06-09 23:37:07 +02:00
Michał Janiszewski
094efaa31d
openrct2: Update homepage 2018-06-08 15:49:33 +02:00
Sarah Brofeldt
41cdec2e51
Merge pull request #41621 from orivej/dwarf-therapist 
dwarf-therapist: fix build
 2018-06-07 11:42:33 +02:00
Orivej Desh
24786e1249 dwarf-therapist: fix build 
Update for dfc4744afd.
 2018-06-07 09:09:25 +00:00