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: 1f50fc2bc516
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c15e342304a0
Choose a head ref
  • 10 commits
  • 10 files changed
  • 3 contributors

Commits on Oct 15, 2018

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

    (cherry picked from commit 4ada74e)
    @numinit @Lassulus
    numinit authored and Lassulus committed Oct 15, 2018
    Copy the full SHA
    d66a253 View commit details
    Browse the repository at this point in the history

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

    (cherry picked from commit f14d3b4)
    @numinit @Lassulus
    numinit authored and Lassulus committed Oct 15, 2018
    Copy the full SHA
    5f56347 View commit details
    Browse the repository at this point in the history

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

    (cherry picked from commit 7a55215)
    @numinit @Lassulus
    numinit authored and Lassulus committed Oct 15, 2018
    Copy the full SHA
    aa12b85 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 

    (cherry picked from commit fe847fc)
    @numinit @Lassulus
    numinit authored and Lassulus committed Oct 15, 2018
    Copy the full SHA
    99b1a44 View commit details
    Browse the repository at this point in the history

  5. Fix dangling DFHack "Git:" version text 

    (cherry picked from commit 870f05c)
    @numinit @Lassulus
    numinit authored and Lassulus committed Oct 15, 2018
    Copy the full SHA
    811d527 View commit details
    Browse the repository at this point in the history

  6. Use stdenv.mkDerivation for Therapist wrapper 

    (cherry picked from commit 5f1013d)
    @numinit @Lassulus
    numinit authored and Lassulus committed Oct 15, 2018
    Copy the full SHA
    982080d View commit details
    Browse the repository at this point in the history

  7. Update twbt to 6.54 

    (cherry picked from commit 2cd2571)
    @numinit @Lassulus
    numinit authored and Lassulus committed Oct 15, 2018
    Copy the full SHA
    0f3b98a View commit details
    Browse the repository at this point in the history

  8. Inline JSON files 

    (cherry picked from commit 213b545)
    @numinit @Lassulus
    numinit authored and Lassulus committed Oct 15, 2018
    Copy the full SHA
    35becce View commit details
    Browse the repository at this point in the history

  9. dwarf-fortress: fix build error 

    (cherry picked from commit 0d57159)
    @Lassulus
    Lassulus committed Oct 15, 2018
    Copy the full SHA
    12847b9 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #48469 from Lassulus/df-18.09 

    [18.09] fix dwarf fortress package
    @Mic92
    Mic92 committed Oct 15, 2018
    Copy the full SHA
    c15e342 View commit details
    Browse the repository at this point in the history