3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1233 commits

Author SHA1 Message Date
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Nikolay Amiantov 99913c2820 dwarf-fortress-wrapper: make data/dipscript writable 2016-02-11 00:54:10 +03:00
Nikolay Amiantov 813d45663c dwarf-fortress-packages.cla-theme: fix comment 2016-02-10 17:02:46 +03:00
Eelco Dolstra aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Nikolay Amiantov 99f4f1d7ef dwarf-fortress-packages.cla-theme: init at 20160128 2016-02-10 16:56:41 +03:00
Nikolay Amiantov 6352bb51f9 dwarf-fortress-packages.phoebus-theme: 20160118 -> 20160128 2016-02-10 16:56:09 +03:00
Nikolay Amiantov f91f99aff8 dwarf-fortress: fix help 2016-02-07 15:55:06 +03:00
Nikolay Amiantov 428d2dc658 Merge pull request #12861 from avnik/upgrade/wesnoth
wesnoth: 1.12.4 -> 1.12.5
2016-02-07 12:41:46 +03:00
Alexander V. Nikolaev 05b1b14083 wesnoth: 1.12.4 -> 1.12.5 2016-02-07 10:27:16 +02:00
Nikolay Amiantov 20af4b8287 arx-libertatis: use our DevaVu fonts, set proper data directory, enable parallel building 2016-02-05 02:07:33 +03:00
rnhmjoj 621a9ac46c arx-libertatis: init at version 2016-02-02 2016-02-04 20:36:02 +01:00
Nikolay Amiantov 4f3a6d8ee2 zandronum-bin: fix argv0, add license 2016-02-04 19:27:44 +03:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Luca Bruno eeb3600e55 Merge pull request #12562 from tvestelind/vassal
vassal: new package
2016-02-01 23:56:12 +01:00
Tomas Vestelind 42627b7d59
remove period from description 2016-02-01 14:02:24 +01:00
Robin Gloster 2ac5b56135 zagband: use mkDerivation 2016-01-30 20:31:05 +00:00
Robin Gloster a44d003502 lincity: use mkDerivation 2016-01-30 20:31:04 +00:00
Robin Gloster e8f260e40a jamp: remove, source is offline and pkg dead 2016-01-30 20:31:04 +00:00
Nikolay Amiantov 5bbf10409e steam: actually propagate flags to the runtime, now from chrootenv wrapper
Example: instead of

(steamPackages.override { newStdcpp = true; }).steam-chrootenv

(which wasn't working anyway) you now do just:

steam.override { newStdcpp = true; }
2016-01-27 00:58:23 +03:00
Nikolay Amiantov fc51e4f7dc Merge pull request #12339 from abbradar/df-new
Dwarf Fortress updates
2016-01-26 03:07:54 +03:00
Nikolay Amiantov 82a0dde83c dwarf-fortress: remove short md5 sums 2016-01-26 03:06:57 +03:00
Nikolay Amiantov d3b642ce9a dwarf-fortress-wrapper: add themes support
Theme can be specified either as a derivation or as a string, in which
case it will be taken by name from a pre-defined set of themes available in
nixpkgs.
2016-01-26 03:06:07 +03:00
Nikolay Amiantov 7fe01a7279 phoebus-theme: update for 0.42.05, make a derivation
Also specify license, see https://github.com/fricy/Phoebus/issues/5
2016-01-26 03:05:50 +03:00
Adam Russell 6c9dd96377 dwarf-fortress: add phoebus 2016-01-26 03:05:49 +03:00
Nikolay Amiantov fdae86fb4e dwarf-therapist: 31.0.0 -> 36.0.0 2016-01-26 03:05:38 +03:00
Nikolay Amiantov 92cda7a6bb dwarf-fortress: 0.40.24 -> 0.42.05, split derivations
This is a massive rework of the current dwarf_fortress package.
The main reason for rework is to split game, its libraries and wrappers,
enabling builds on Hydra and general maintainability.

dfhack, dwarf-fortress-unfuck, dwarf-fortress-original and dwarf-fortress
are now all separate derivations. All were updated to the latest versions
supporting DF 0.42.04 (some things taken from development branches):

dfhack: 20150927 -> 20160118
dwarf-fortress-unfuck: 0.40.24 -> 20160118
dwarf-fortress-original: 0.40.24 -> 0.42.05

dfhack got a patch for using more system libraries.

Wrapper scripts were also redone -- now they support DF_DIR variable (for
setting another data directory) and try to save more space by means of
symlinking. They now try to be more smart, updating those directories that were
not touched by user automatically.

All the new packages now reside in dwarf-fortress-packages. dwarf_fortress was
renamed into dwarf-fortress per our conventions, old name is deprecated. Also
duplicate dfhack derivation is removed.

Also drop dwarfFortress.enableDFHack config option; it can be re-added later
but now is deemed controversial.
2016-01-26 03:03:12 +03:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Arseniy Seroka 988fcf8890 Merge pull request #12561 from Baughn/factorio
factorio: init at 0.12.20
2016-01-24 23:13:49 +03:00
Tuomas Tynkkynen fdae7816e3 openttd: Fixup static zlib path 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen a1909d7380 treewide: Mass replace 'glibc}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Tuomas Tynkkynen b56b24f729 treewide: Mass replace 'freetype}/lib' to refer the 'out' output 2016-01-24 10:03:34 +02:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Tomas Vestelind 2eab353a4a license lgpg21 -> lgpl21 2016-01-23 17:36:57 +01:00
Svein Ove Aas ef582b2805 factorio: init at 0.12.20 2016-01-23 13:15:18 +00:00
Tomas Vestelind 5284416c14 vassal: new package 2016-01-23 02:42:51 +01:00
Vladimír Čunát 0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
Domen Kožar 255a49cb7b sdlmame: mark as broken due to URL cc @lovek323 2016-01-22 13:11:28 +01:00
Vladimír Čunát 9763e6bf89 zeroad: fix 0ad.desktop after #12421 2016-01-20 11:28:13 +01:00
Vladimír Čunát c860e27ef2 zeroad: do not build on Hydra
It should be possible to build binaries without data and then compose by
a wrapper, e.g. similarly to what simutrans does.
2016-01-19 12:16:18 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Slawomir Gonet 2ad985f3ed pioneer: nixpkg added 2016-01-18 19:03:35 +01:00
Robin Gloster 53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Robin Gloster 11468de4a1 Merge pull request #12421 from otwieracz/0ad_0.18_to_0.19
0ad: 0.18 -> 0.19
2016-01-17 16:55:24 +01:00
Slawomir Gonet 5dbf70b924 0ad: binary renamed from 'pyrogenesis' to '0ad' 2016-01-17 14:15:59 +01:00
Franz Pletz 1bac185dae openttd: Add OpenGFX, OpenSFX, OpenMSX
Closes #12400.
2016-01-16 15:58:09 +01:00
Slawomir Gonet 1e0434ebe0 0ad: 0.18 -> 0.19 2016-01-16 15:09:47 +01:00
Nikolay Amiantov f4d71737a8 steam: propagate runtime-wrapped flags for more convenient overrides 2016-01-15 15:01:55 +03:00
Nikolay Amiantov 9a07a8505e steam-runtime-wrapped: add optional override of libstdc++ 2016-01-15 15:01:55 +03:00