Commit graph

185 commits

Author SHA1 Message Date
Felix Buehler a7d44252c3 dwarf-fortress: remove phases 2021-08-03 10:47:55 +02:00
Kevin Cox d4d9dd61a1 dwarf-fortress-packages.twbt: Fix twbt version to match tfhack version.
Otherwise you get an error upon starting the game:

```
Plugin twbt was not built for this version of DFHack.
Plugin: 0.47.05-beta1, DFHack: 0.47.05-r1
```
2021-07-31 22:05:44 -04:00
Jonathan Ringer 93524fa876 dwarf-fortress/themes: update 2021-07-11 21:03:43 -07:00
Jonathan Ringer a4ebde8064 dwarf-fortress/twbt: add 0.47.05 support 2021-07-11 21:03:43 -07:00
Jonathan Ringer a280713665 dwarf-fortress/dfhack: add 0.47.05-r1 2021-07-11 21:03:43 -07:00
Jonathan Ringer ea10f44327 dwarf-fortress/unfuck: add 0.47.05 2021-07-11 21:03:43 -07:00
Jonathan Ringer 4cc7482b21 dwarf-fortress: 0.47.04 -> 0.47.05 2021-07-11 21:03:43 -07:00
Artturin cd3ed54f6e dwarf-fortress: refactor 2021-06-30 00:10:57 -07:00
Jonathan Ringer 08581dc64c
dwarf-therapist: 41.1.5 -> 41.2.2 2021-06-16 13:36:04 -07:00
Jan Tojnar 6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00
Ben Siraphob 98f26993f2 treewide: remove stdenv where not needed 2021-03-04 19:54:50 +07:00
Ben Siraphob 127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
Ben Siraphob e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Thomas Tuegel 5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
zowoq 31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
Ben Siraphob ca7f39f987 pkgs/data, pkgs/games: [sS]tdenv.*lib -> lib 2021-01-17 20:59:16 +07:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob 3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Mario Rodas 7c7ee58775
Merge pull request #98229 from bbigras/df
dwarf-fortress: update themes.json
2020-09-20 19:42:18 -05:00
Gabriel Ebner cdcdeb63b2 dwarf-fortress: use jdk8 2020-09-19 14:06:15 +02:00
Bruno Bigras 5427e43b08 dwarf-fortress: update themes.json 2020-09-18 13:44:06 -04:00
Cole Helbling e2b09f42ba dwarf-fortress: TWBT: use fork for dfhack 0.47.04 support
The original mifki TWBT hasn't been updated since April 2019, while
thurin's fork has added support for dfhack 0.47.04-r2. Thus, switch to
thurin's fork when Dwarf Fortress 0.47.04 is used (and ever-so-slightly
special case the url attribute).
2020-08-21 14:45:53 -07:00
Cole Helbling 50bf68669a dfhack: fix ruby plugin
dfhack expects an unversioned libruby.so to be present in the hack
subdirectory for ruby plugins to function. The glob is necessary,
because the ruby package's library names are formatted as
ruby-${version}.so for whatever reason. The glob makes it possible for
ruby to update without manual intervention being needed here.
2020-08-21 14:45:53 -07:00
Cole Helbling 5db4a65384 dfhack: 0.47.04-alpha0 -> 0.47.04-r2
As of
56e43a0dde,
dfhack gets its goodies from the directory above the Dwarf_Fortress
executable, which leads to stock Dwarf Fortress and not the built
environment where all the dfhack resources are symlinked to (typically
~/.local/share/df_linux). This causes errors like `tweak is not a
recognized command` to be reported and dfhack to lose some of its
functionality.
2020-08-21 14:45:53 -07:00
Matthew Piziak 879778c583 add enableSound parameter to dwarf-fortress derivation
try hardcoding

add back whitespace
2020-05-17 22:18:39 -04:00
Jörg Thalheim 887295fd2d
treewide: remove the-kenny from maintainers
@the-kenny did a good job in the past and is set as maintainer in many package,
however since 2017-2018 he stopped contributing. To create less confusion
in pull requests when people try to request his feedback, I removed him as
maintainer from all packages.
2020-05-09 10:28:57 +01:00
Pavol Rusnak 7b0167204d treewide: use https for nixos.org and hydra.nixos.org
tarballs.nixos.org is omitted from the change because urls from there
are always hashed and checked
2020-05-03 22:14:21 -07:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jonathan Ringer c9f216d5d5 dwarf-fortress: 0.47.02 -> 0.47.04 2020-03-13 14:46:55 -07:00
Jonathan Ringer 29f7f3037e dwarf-therapist: 41.1.3 -> 41.1.5 2020-03-13 14:46:55 -07:00
Jonathan Ringer d2b745d617 dwarf-fortress: 0.44.12 -> 0.47.02 2020-02-14 12:50:12 -08:00
Jonathan Ringer 381e86a782 dwarf-fortress.dfhack: add 0.47.02-alpha0 release 2020-02-14 12:50:12 -08:00
Jonathan Ringer 71af0ea361 dwarf-fortress.twbt: add 6.61 release
This is just the latest release, there hasn't been
a release for a few months.
2020-02-14 12:50:12 -08:00
Jonathan Ringer 016dcfe514 dwarf-therapist: 41.1.2 -> 41.1.3 2020-02-14 12:50:12 -08:00
Andrey Petrov be32c3caac dwarf-fortress-packages.unfuck: 0.47.01 -> 0.47.02 release
Temporarily using 0.47.01 release for 0.47.02, since there's no
corresponding unfuck release yet and it seems to work.
2020-02-09 17:46:19 -08:00
Andrey Petrov d51838db20 dwarf-fortress: fix update.sh script for games.json 2020-02-09 17:46:19 -08:00
Andrey Petrov b865fb3573 dwarf-fortress-packages.dwarf-fortress_0_47_02: init 2020-02-09 17:46:19 -08:00
Andrey Petrov 0a4265c077 dwarf-fortress: update themes.json 2020-02-09 17:46:19 -08:00
Andrey Petrov 1a0f594981 dwarf-fortress: Update themes.json 2020-02-03 00:57:53 -08:00
Andrey Petrov 662589574b dwarf-fortress: Add update script for themes 2020-02-03 00:57:53 -08:00
Jonathan Ringer e293cf9117 dwarf-fortress-packages.dwarf-therapist: 41.0.2 -> 41.1.2 2020-02-02 16:04:30 -08:00
Jonathan Ringer 349bf18212 dwarf-fortress-packages.unfuck: add 0.47.0.1 release 2020-02-02 16:04:30 -08:00
Jonathan Ringer fc82682d3a dwarf-fortress-packages.dwarf-fortress_0_47_01: init 2020-02-02 16:04:30 -08:00
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