3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

187 commits

Author SHA1 Message Date
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Nikolay Amiantov c0f79b44ee dwarf-fortress-packages.dwarf-therapist: 39.2.0 -> 39.2.1 2018-02-25 22:24:09 +03:00
Nikolay Amiantov 00ad7c0c7b dwarf-fortress-packages.dfhack: 0.44.05-alpha1 -> 0.44.05-r2 2018-02-25 22:24:09 +03:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev 8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Herwig Hochleitner 8924e84daa dwarf-fortress: 0.44.03 -> 0.44.05 2018-01-22 02:16:47 +01:00
Herwig Hochleitner c36ebca240 dwarf-fortress: 0.44.02 -> 0.44.03 2017-12-30 14:52:50 +01:00
Herwig Hochleitner d29cee773c dwarf-fortress: 0.43.05 -> 0.44.02
dwarf-therapist: 37.0.0-Hello71 -> 39.0.0
dfhack: 0.43.05-r1 -> 0.44.02-alpha1
cla-theme: 43.05-v23 -> 44.01-v24
phoebus-theme: 43.05c -> 44.02a

There is a new maintained repository for
dwarf-therapist: http://www.bay12forums.com/smf/index.php?topic=168411

dfhack is still in alpha, so make backups, if you use it.

cc @the-kenny @abbradar
2017-12-11 20:41:38 +01:00
Herwig Hochleitner bccd410e78 dwarf-fortress-packages.stoneSense: remove vestigial package
To use stonesense, build dwarf-fortress with `enableDFHack=true` and
`enableStoneSense=true`, then type `ssense` into the dfhack console.

This partially reverts commit 85056ee698
2017-12-03 12:22:13 +01:00
Herwig Hochleitner 85056ee698 dwarf-fortress-packages.dfhack: add stoneSense support 2017-10-28 14:55:25 +02:00
Herwig Hochleitner 24ea093806 dwarf-fortress-packages.soundSense: init 2016-1_196 2017-10-28 14:55:20 +02:00
Herwig Hochleitner d6ee81e912 dwarf-fortress-packages.dwarf-therapist: update for df 43.05
Similar to the LNP, we use Hello71's fork, which features support for
the (first 64bit) version 43.05 of Dwarf Fortress.

http://dffd.bay12games.com/file.php?id=12762
2017-10-28 14:55:16 +02:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Nikolay Amiantov 342b987b19 dwarf-fortress-packages.dfhack: 0.43.05-r1 -> 0.43.05-r2 2017-07-27 17:07:44 +03:00
Nick Hu 24156c64b4 dfhack: 0.43.05-alpha4 -> 0.43.05-r1 2017-06-26 10:18:55 +01:00
Thomas Tuegel 210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Nikolay Amiantov 1809cb56e1 dwarf-fortress-packages.dfhack: 0.43.05-alpha2 -> 0.43.05-alpha4 2017-01-31 03:27:10 +03:00
Nikolay Amiantov db99892817 treewide: quote homepages in my packages 2017-01-31 03:27:10 +03:00
Nikolay Amiantov 8f63cc6d25 dwarf-fortress: remove unused oldAbiStdenv 2016-11-24 03:11:48 +03:00
Nikolay Amiantov 714cf7803c dwarf-fortress.dfhack: enable 64-bit build, fix segfault 2016-11-24 03:10:43 +03:00
Nikolay Amiantov ccaec3a88b dwarf-fortress-packages.phoebus-theme: 43.03 -> 43.05c 2016-11-24 01:17:57 +03:00
Nikolay Amiantov 809c6f0c98 dwarf-fortress-packages.cla-theme: 43.04-v23 -> 43.05-v23 2016-11-24 01:17:56 +03:00
Nikolay Amiantov a6fd30822f dwarf-fortress-packages.dfhack: 0.43.03-r1 -> 0.43.05-alpha2 2016-11-24 01:17:56 +03:00
Nikolay Amiantov be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
Nikolay Amiantov 7783862700 dwarf-fortress-packages.dwarf-fortress-unfuck: fix build 2016-08-22 07:43:12 +03:00
Nikolay Amiantov df063d8b46 dwarf-fortress-packages.phoebus-theme: 42.06a -> 43.03 2016-08-14 22:37:09 +03:00
Nikolay Amiantov b510492d99 dwarf-fortress-packages.cla-theme: 42.06-v22 -> 43.04-v23 2016-08-14 22:37:09 +03:00
Nikolay Amiantov d0bee3aeec dwarf-fortress-packages.dfhack: 0.42.06-r1 -> 0.43.03-r1 2016-08-14 22:37:09 +03:00
Nikolay Amiantov b940a098ec dwarf-fortress-packages.dwarf-fortress-original: 0.42.06 -> 0.43.05 2016-08-14 22:37:08 +03:00
Nikolay Amiantov 0f3da54924 dwarf-fortress-packages.dwarf-fortress-unfuck: 2016-04-22 -> 2016-07-13 2016-08-14 22:37:08 +03:00
Vladimír Čunát 97c484a10f treewide: fix #include errors after gcc-5.4
They were mostly missing <cmath> or <math.h>.
2016-06-19 10:18:30 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Nikolay Amiantov 919db46afd dwarf-therapist: remove useless symlink 2016-06-02 15:30:42 +03:00
Nikolay Amiantov 52f6c0cfb8 dwarf-fortress-packages.phoebus-theme: 20160128 -> 42.06a 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 91563e23e3 dwarf-fortress-packages.cla-theme: 20160128 -> 42.06-v22 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 3c627be4be dwarf-fortress-packages.dfhack: 2016-03-03 -> 0.42.06-r1 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 938d64f1f3 quote URLs in my packages to ease opening them from urxvt 2016-04-30 03:12:32 +03:00
Nikolay Amiantov aa1a40b63d dwarf-therapist: add version to derivation, use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov 953c51f65e dwarf-fortress-unfuck: use mesa_noglu instead of mesa 2016-04-24 16:33:11 +03:00
Nikolay Amiantov 7f32a05baa dwarf-therapist: fix build 2016-04-23 22:25:34 +03:00
Ricardo Ardissone bdf714c303 dwarf-fortress-unfuck: 2016-02-11 -> 2016-04-22 and zlib dependency 2016-04-22 19:34:11 -03:00
Nikolay Amiantov 37d641ff3d dfhack: use protobuf compiled with old ABI 2016-04-14 17:30:40 +03:00
Nikolay Amiantov 0ffd6d16b6 dwarf-therapist: fix build (see #14670) 2016-04-14 04:17:56 +03:00
Nikolay Amiantov 755e4633c7 mass-replace glib and gtk lib/*/include paths 2016-04-14 04:13:54 +03:00
Nikolay Amiantov d8ed77d96d dwarf-fortress-packages.dfhack: 20160118 -> 2016-03-03 2016-03-04 14:42:38 +03:00
Nikolay Amiantov 415c2edbbe dwarf-fortress-packages.phoebus-theme: bump dfVersion 2016-03-04 14:42:37 +03:00
Nikolay Amiantov 973d31196c dwarf-fortress-packages.cla-theme: bump dfVersion 2016-03-04 14:42:37 +03:00
Nikolay Amiantov 414dbc6dd9 dwarf-fortress-packages.dwarf-therapist: 36.0.0 -> 37.0.0 2016-03-04 14:42:37 +03:00
Nikolay Amiantov 9ec2fda2c2 dwarf-fortress-packages.dwarf-fortress-unfuck: 0.42.05 -> 0.42.06 2016-03-04 14:42:37 +03:00
Nikolay Amiantov 224c24f030 dwarf-fortress-packages.dwarf-fortress-original: 0.42.05 -> 0.42.06 2016-03-04 14:42:37 +03: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
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 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
Adam Russell a3ec50791f dwarf-fortress: add dfhack 2015-11-08 22:46:17 +01:00
Vladimír Čunát dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Moritz Ulrich 171bb614f2 Dwarf Fortress: Update to 0.40.24. 2015-01-26 00:00:31 +01:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Vladimír Čunát 3dfd87d7af fixup "git-export" directory names
All tested to build.
For freetalk the hash change seems unrelated to fetchgit changes.

FIXME: it might be suitable to adapt nix-prefetch-git.
2015-01-13 17:46:09 +01:00
Moritz Ulrich f43d67d43a Dwarf Fortress: Update to 0.40.23. 2014-12-30 22:14:02 +01:00
Shea Levy 05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
Moritz Ulrich 54f3587549 dwarf-{fortress,therapist}: Update
DwarfTherapist does some ugly stuff by matching the first 8 characters
of the md5sum of the game binary to match its binary content. This patch
adds support to automatically patch the ini files.
2014-12-15 22:13:51 +01:00
Moritz Ulrich a175776477 dwarf-fortress: Update to 0.40.18. 2014-11-23 21:30:14 +01:00
Moritz Ulrich bc03398930 dwarf-fortress: Clean up expression & config file handling. 2014-11-23 21:30:14 +01:00
Moritz Ulrich 253c54e411 Dwarf Fortress: Update to 0.40.16. 2014-11-18 11:24:09 +01:00
Moritz Ulrich 35ea4085bc dwarf-fortress: delete old 34.11 package. 2014-11-07 17:22:29 +01:00
Moritz Ulrich 9c301c1fa1 dwarf-fortress: Update to 40.15. 2014-11-07 17:22:29 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Moritz Ulrich 7f7505c620 dwarf-fortress: Bump to 0.40.13. 2014-09-18 20:41:54 +02:00
Andrew Morsillo 8dbe652739 Bump DF version to 40_10 2014-08-28 21:12:05 -04:00
Andrew Morsillo de8a2e1433 Bump version of Dwarf Fortress to 40_09. Build graphics library for dwarf fortress instead of using provided one for more reliability. 2014-08-20 21:50:09 -04:00
Andrew Morsillo 911eb8d934 bump version to 0.40.05 2014-07-28 09:01:45 -04:00
Andrew Morsillo 7c84e3b785 Add dwarf fortress 2014 (unstable) version 2014-07-23 22:41:30 -04:00
Moritz Ulrich b98ae36d32 dwarf-fortress: Update to 0.34.11.
Somehow Dwarf Fortress suddenly started failing to use our libpng (or
zlib). I tried all possible combinations (supplying them via
LD_LIBRARY_PATH in the script) but it just won't work.

This solution was found in the Archlinux bug tracker: It just symlinks
all problematic .png files to their .bmp counterparts. It's ugly and
*sadly* breaks tileset support (unless you convert them to bmp) but I
think it's acceptable, as the whole expression is pretty problematic
in terms of purity.

Let's hope the next release of Dwarf Fortress will be easier to
support.

(fixes #710)
2013-10-10 01:21:55 +02:00
Yury G. Kudryashov 03875e0bce Make nixpkgs ready to gtkLibs attrset removal
svn path=/nixpkgs/trunk/; revision=33091
2012-03-14 22:44:41 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Russell O'Connor 7bb3f91731 updating dwarf-fortress
svn path=/nixpkgs/trunk/; revision=29853
2011-10-15 14:46:05 +00:00
Russell O'Connor 497a1476ae Dwarf Fortress files in dipscript are again opened in read-write mode and need to be hacked around.
It's almost tempting to copy the whole data dirctory and put every file in read-write mode.

svn path=/nixpkgs/trunk/; revision=24550
2010-10-31 04:08:14 +00:00
Russell O'Connor d32b86837b Dwarf Fortress help files are also opened in read-write mode, so they too need to be hacked around.
svn path=/nixpkgs/trunk/; revision=24543
2010-10-30 14:58:14 +00:00
Russell O'Connor cb72dd1ba8 Dwarf Fortress
The wrapper script works by creating an image of the distribution in the users home directory
(defaulting to $HOME/.config/df_linux).  This is done because the program expects to write
state into it's own distribution.

Better ideas are welcome!

What further is needed is to allow users to configure the init.  One way is to use nix-config
to apply patches to the init.txt file, though this would break sharing of the package between
different users.


svn path=/nixpkgs/trunk/; revision=24538
2010-10-30 06:00:44 +00:00