Commit Graph

208 Commits

Author SHA1 Message Date
Naïm Favier
c95192b996
jq: 1.6 -> 1.7
https://github.com/jqlang/jq/releases/tag/jq-1.7
2023-09-10 12:13:29 +02:00
Naïm Favier
2343d23c44
dwarf-fortress: unfuck unfuck 2023-02-22 13:03:53 +01:00
Naïm Favier
ac0d4f035f
dwarf-fortress: set PRINT_MODE:STANDARD on macOS
Fixes https://github.com/NixOS/nixpkgs/issues/204851
2023-01-24 13:55:01 +01:00
Naïm Favier
b33a7fa3fa
Merge pull request #201568 from ncfavier/df 2022-12-01 11:34:11 +01:00
Naïm Favier
34e0667b74
dwarf-fortress.dfhack: use CXXFLAGS instead of NIX_CFLAGS_COMPILE
See https://github.com/NixOS/nixpkgs/issues/79303.

Avoids warnings about -fpermissive not being a valid C flag.
2022-11-18 10:29:41 +01:00
Naïm Favier
a515239b52
dwarf-fortress,dwarf-fortress.dfhack: add ncfavier as maintainer 2022-11-17 09:50:53 +01:00
Naïm Favier
ab693c7592
dwarf-fortress.dfhack: drop broken versions
These versions don't build because their submodules use `git://` URLs,
which are no longer supported by GitHub.

I don't think there's a reasonable way to work around that since
`fetchgit` doesn't allow patching the source *before* fetching
submodules.
2022-11-17 09:50:53 +01:00
Naïm Favier
e786b3ec21
dwarf-fortress.dfhack: updates and fixes
Updates the release number for the latest two DF versions, and fixes some
older ones.

Notable change from 0.47.05-r7: dfhack.init was moved into
dfhack-config/init.

https://github.com/DFHack/dfhack/releases/tag/0.47.05-r7

https://github.com/DFHack/dfhack/releases/tag/0.47.04-r5
2022-11-17 09:50:52 +01:00
Naïm Favier
cff44486bc
dwarf-fortress: add settings
Adds a `settings` argument to the wrapper allowing to override settings
in `data/init/*.txt`.
2022-11-17 09:50:52 +01:00
Naïm Favier
839fdd101c
dwarf-fortress.dfhack: make overridable
Currently, it is quite hard to override anything about dfhack (for
example, to add plugins at build time), because

1. it is not exposed anywhere, so you have to do something like
   `dwarf-fortress.override (oldArgs: { dfhack = oldArgs.dfhack.override...; })`
2. the final `dfhack` derivation is a `buildEnv`, so `overrideAttrs`
   doesn't work as expected.

This fixes 1 by adding `dfhack` to the wrapper's `passthru`, and 2 by
moving `twbt.lib` (which is the only reason for the dfhack `buildEnv`)
into the wrapper.

Also adds an `extraPackages` argument to the wrapper, and copies `*.init`
files from the env to the DF directory so that we can easily add a
`dfhack.init`.

With these changes, I was able to build dfhack with the dfplex plugin.
2022-11-17 00:06:31 +01:00
Naïm Favier
22b96bfb35
dwarf-therapist: pass through meta 2022-11-16 12:21:34 +01:00
Naïm Favier
67aacbb937
dwarf-therapist: restrict platforms to x86
Avoid trying to build for aarch64 on Hydra. Dwarf Fortress only runs on x86.
2022-11-16 11:59:39 +01:00
Sandro Jäckel
bacd02c315
dwarf-fortress: misc cleanup 2022-10-27 18:57:12 +02:00
Sandro Jäckel
1d67cf2daf
dwarf-fortress-packages.dwarf-fortress: set meta for versioned packages 2022-10-27 18:56:34 +02:00
Sandro Jäckel
5b291004c5
dwarf-fortress: make meta.homepage independent from download page 2022-10-27 18:55:36 +02:00
Sandro Jäckel
cdfd73026a
dwarf-fortress-unfuck: don't overwrite to null on none linux platforms 2022-10-27 18:55:04 +02:00
Josef Kemetmüller
bcd7045998 treewide: Remove now-unneeded LD_LIBRARY_PATH in cmake derivations
Since the setting DCMAKE_SKIP_BUILD_RPATH was disabled, we can now run
the checkPhase of cmake derivations without having to tweak the
LD_LIBRARY_PATH anymore.
2022-07-04 03:49:01 +03:00
Robert Scott
3b6bc4b69c treewide: set sourceProvenance for packages containing downloaded jars
these are the easily identifiable cases and will not be comprehensive
2022-06-04 19:47:57 +01:00
Jonathan Ringer
075f25eb98 dwarf-fortress/dfhack: fix build with gcc 11 2022-04-30 11:00:41 -07:00
Artturin
0f3e905834 dwarf-fortress.themes: add -theme suffix to name 2022-03-25 22:56:26 +02:00
Felix Buehler
4a403f9e33 treewide: rename name to pname&version 2022-01-17 19:09:37 +01:00
Victor Engmark
57b496ea98 misc: Replace tab indentation with spaces
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13:00
Sandro Jäckel
8547db919a
treewide: switch `builtins.fromJSON(builtins.readFile ./file.json)` to lib.importJSON ./file.json 2021-11-03 14:43:52 +01:00
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