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: d74da4fe5273
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8b6e9818a507
Choose a head ref
  • 15 commits
  • 15 files changed
  • 2 contributors

Commits on Jul 18, 2020

  1. Copy the full SHA
    d6863de View commit details
    Browse the repository at this point in the history
  2. cataclysm-dda{,-git}: apply locale patch dynamically

    Each time src/translations.cpp is modified, we have to update the locale
    patch. Using sed to patch dynamically should be handy.
    mnacamura committed Jul 18, 2020
    Copy the full SHA
    bf71f12 View commit details
    Browse the repository at this point in the history
  3. cataclysmDDA: add very basic framework for packaging mods

    Add new namespace 'cataclysmDDA', in which package builders, games, and
    mods are listed.
    mnacamura committed Jul 18, 2020
    Copy the full SHA
    ac85554 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    bc88844 View commit details
    Browse the repository at this point in the history
  5. cataclysmDDA: make pkgs extensible

    Example:
    
    let
      customMods = self: super: lib.recursiveUpdate super {
        soundpack.AwesomeSounds = cataclysmDDA.buildSoundPack { ... };
      };
    in
    cataclysm-dda.withMods (mods: with mods.extend customMods; [
      tileset.UndeadPeople
      soundpack.AwesomeSounds
    ])
    mnacamura committed Jul 18, 2020
    Copy the full SHA
    90c2652 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    de56294 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    ecf7b57 View commit details
    Browse the repository at this point in the history
  8. cataclysm-dda-git: make it overridable with git revision

    'cataclysm-dda-git.overrideAttrs (_: { version = ...; src = fetchFromGitHub { ... }; })'
    did not update VERSION make flag correctly.
    
    With this change, one can override 'cataclysm-dda-git' correctly and
    more easily:
    
    cataclysm-dda-git.override { version = ...; rev = ...; sha256 = ...; }
    mnacamura committed Jul 18, 2020
    Copy the full SHA
    633f211 View commit details
    Browse the repository at this point in the history
  9. cataclysmDDA: add README

    mnacamura committed Jul 18, 2020
    Copy the full SHA
    d472eed View commit details
    Browse the repository at this point in the history
  10. Copy the full SHA
    bbe7b86 View commit details
    Browse the repository at this point in the history
  11. cataclysmDDA: update README

    Add description about `useXdgDir` flag
    mnacamura committed Jul 18, 2020
    Copy the full SHA
    fbf4b4f View commit details
    Browse the repository at this point in the history
  12. cataclysmDDA: update mods

    mnacamura committed Jul 18, 2020
    Copy the full SHA
    cf0e2d5 View commit details
    Browse the repository at this point in the history
  13. doc: fix MD_TARGETS

    globstar (**) does not work in Makefile
    mnacamura committed Jul 18, 2020
    Copy the full SHA
    c9c6f5f View commit details
    Browse the repository at this point in the history
  14. Copy the full SHA
    f2b2347 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. Merge pull request #84873 from mnacamura/cdda-mods

    cataclysmDDA: add modding interface
    worldofpeace committed Jul 22, 2020
    Copy the full SHA
    8b6e981 View commit details
    Browse the repository at this point in the history