Commit Graph

142 Commits

Author SHA1 Message Date
Anders Kaseorg
3cd8ce3bce treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted.  (See #67234, for
example.)  Fix this throughout the tree.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-15 09:47:03 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
Quoting from the splitString docstring:

   NOTE: this function is not performant and should never be used.

This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Nikolay Amiantov
ccbb08ed88 dwarf-fortress-packages.dwarf-therapist-original: expose to package set
Needed for it to be built on Hydra.
2019-06-10 18:52:52 +03:00
TrevtheForthDev
3fcd66cce8 Added EnableTextMode Dwarf Fortress for playing CLI 2019-05-08 04:07:21 +09: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
lassulus
0d57159eca dwarf-fortress: fix build error 2018-10-08 22:21:09 +02: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
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