1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Commit graph

128 commits

Author SHA1 Message Date
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
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
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
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth 87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00: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
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
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
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
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
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
Orivej Desh 24786e1249 dwarf-therapist: fix build
Update for dfc4744afd.
2018-06-07 09:09:25 +00:00
Matthew Bauer dfc4744afd dwarf-fortress: 44.09 → 44.10 2018-06-06 19:19:29 -04:00
Matthew Bauer 91184d159d dwarf-fortress: move themes to .json file
This will make it easier to automate.
2018-06-06 19:19:29 -04:00
Matthew Bauer 2dc8831591 dwarf-fortress: revert to 44.09
Was at 44.10 but i have no way to test it on linux (and unsure how to
update dwarf-fortress-unfucked).
2018-05-11 00:00:40 -05:00
Matthew Bauer 236b89afeb dwarf-fortress: supports darwin 2018-05-10 23:58:12 -05:00
Herwig Hochleitner 23aaf1cf97 dwarf-fortress: 0.44.05 -> 0.44.09 2018-04-21 14:57:44 +02:00
Nikolay Amiantov 2dfbef2764 dfhack: fix checksum
Fixes #36819.
2018-03-13 01:06:47 +03:00
Nikolay Amiantov 986ea06036 dwarf-fortress-packages.dwarf-therapist: disable on AArch64
The game works only on x86 anyway.
2018-03-09 16:35:10 +03:00
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