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: 9dc661aa72e2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e4db8a903a0c
Choose a head ref
  • 9 commits
  • 10 files changed
  • 2 contributors

Commits on Sep 9, 2018

  1. dwarf-fortress: Support multiple unfuck/dfhack/TWBT versions

    @numinit
    numinit committed Sep 9, 2018
    Copy the full SHA
    4ada74e View commit details
    Browse the repository at this point in the history

  2. Fix dfhack's Dwarf Fortress MD5 in the correct environment

    @numinit
    numinit committed Sep 9, 2018
    Copy the full SHA
    f14d3b4 View commit details
    Browse the repository at this point in the history

  3. Let the user override dfVersion in dwarf-fortress-full

    @numinit
    numinit committed Sep 9, 2018
    Copy the full SHA
    7a55215 View commit details
    Browse the repository at this point in the history

  4. Therapist needs to depend on the DF version, since it uses its MD5

    @numinit
    numinit committed Sep 9, 2018
    Copy the full SHA
    fe847fc View commit details
    Browse the repository at this point in the history

  5. Fix dangling DFHack "Git:" version text

    @numinit
    numinit committed Sep 9, 2018
    Copy the full SHA
    870f05c View commit details
    Browse the repository at this point in the history

  6. Use stdenv.mkDerivation for Therapist wrapper

    @numinit
    numinit committed Sep 9, 2018
    Copy the full SHA
    5f1013d View commit details
    Browse the repository at this point in the history

  7. Update twbt to 6.54

    @numinit
    numinit committed Sep 9, 2018
    Copy the full SHA
    2cd2571 View commit details
    Browse the repository at this point in the history

  8. Inline JSON files

    @numinit
    numinit committed Sep 9, 2018
    Copy the full SHA
    213b545 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #43470 from numinit/df 

    dwarf-fortress: Refactor, round 2: let the user pick which version of the lazy pack to install
    @matthewbauer
    matthewbauer committed Sep 9, 2018
    Copy the full SHA
    e4db8a9 View commit details
    Browse the repository at this point in the history