Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: b6d657adbef9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e2b09f42ba61
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Aug 21, 2020

  1. dfhack: 0.47.04-alpha0 -> 0.47.04-r2 

    As of
DFHack/dfhack@56e43a0,
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.
    @cole-h
    cole-h authored and Jon committed Aug 21, 2020
    Copy the full SHA
    5db4a65 View commit details
    Browse the repository at this point in the history

  2. 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.
    @cole-h
    cole-h authored and Jon committed Aug 21, 2020
    Copy the full SHA
    50bf686 View commit details
    Browse the repository at this point in the history

  3. 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).
    @cole-h
    cole-h authored and Jon committed Aug 21, 2020
    Copy the full SHA
    e2b09f4 View commit details
    Browse the repository at this point in the history