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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b6db1b9edff5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ccbb08ed8819
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 10, 2019

  1. dwarf-fortress-packages.dwarf-therapist-original: expose to package set 

    Needed for it to be built on Hydra.
    @abbradar
    abbradar committed Jun 10, 2019
    Copy the full SHA
    ccbb08e View commit details
Showing with 8 additions and 5 deletions.
  1. +8 −5 pkgs/games/dwarf-fortress/default.nix
13 changes: 8 additions & 5 deletions pkgs/games/dwarf-fortress/default.nix
View file
Original file line number Diff line number Diff line change
@@ -45,6 +45,12 @@ let
# Converts a version to a package name.
versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";

dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
texlive = pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
};
};

# A map of names to each Dwarf Fortress package we know about.
df-games = lib.listToAttrs (map (dfVersion: {
name = versionToName dfVersion;
@@ -70,11 +76,7 @@ let

dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
inherit dwarf-fortress;
dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
texlive = pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
};
};
dwarf-therapist = dwarf-therapist-original;
};
in
callPackage ./wrapper {
@@ -93,6 +95,7 @@ let

# Aliases for the latest Dwarf Fortress and the selected Therapist install
dwarf-fortress = getAttr (versionToName latestVersion) df-games;
inherit dwarf-therapist-original;
dwarf-therapist = dwarf-fortress.dwarf-therapist;
dwarf-fortress-original = dwarf-fortress.dwarf-fortress;