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: a1e2f2a3390d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8924e84daa5a
Choose a head ref
  • 3 commits
  • 9 files changed
  • 1 contributor

Commits on Jan 22, 2018

  1. patchelfUnstable: 0.10-pre-20160920 -> 0.10-pre-20180108

    @bendlas
    bendlas committed Jan 22, 2018
    Copy the full SHA
    7706f38 View commit details

  2. winetricks: 20171018 -> 20171222

    @bendlas
    bendlas committed Jan 22, 2018
    Copy the full SHA
    6cc8541 View commit details

  3. dwarf-fortress: 0.44.03 -> 0.44.05

    @bendlas
    bendlas committed Jan 22, 2018
    Copy the full SHA
    8924e84 View commit details
6 changes: 3 additions & 3 deletions pkgs/development/tools/misc/patchelf/unstable.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:

stdenv.mkDerivation rec {
name = "patchelf-0.10-pre-20160920";
name = "patchelf-0.10-pre-20180108";

src = fetchFromGitHub {
owner = "NixOS";
repo = "patchelf";
rev = "327d80443672c397970738f9e216a7e86cbf3ad7";
sha256 = "0nghzywda4jrj70gvn4dnrzasafgdp0basj04wfir1smvsi047zr";
rev = "48452cf6b4ccba1c1f47a09f4284a253634ab7d1";
sha256 = "07vx75f2r1bh58qj4b6bl27v39srs2rfr1jrif7syspfhkn4qzw4";
};

setupHook = [ ./setup-hook.sh ];
8 changes: 4 additions & 4 deletions pkgs/games/dwarf-fortress/dfhack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
}:

let
dfVersion = "0.44.03";
version = "${dfVersion}-beta1";
dfVersion = "0.44.05";
version = "${dfVersion}-alpha1";
rev = "refs/tags/${version}";
sha256 = "1gyaq6krm0cvccyw7rdy6afh9vy983dl86d0wnpr25dl3jky27xw";
sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52";

# revision of library/xml submodule
xmlRev = "7e23a328fd81e3d6db794c0c18b8b2e7bd235649";
xmlRev = "3a9f401d196ee8ebc53edb9e15a13bfcb0879b4e";

arch =
if stdenv.system == "x86_64-linux" then "64"
4 changes: 2 additions & 2 deletions pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "dwarf-therapist-original-${version}";
version = "39.1.2";
version = "39.2.0";

src = fetchFromGitHub {
owner = "Dwarf-Therapist";
repo = "Dwarf-Therapist";
rev = "v${version}";
sha256 = "0j5pldc184xv1mhdrhsmp23g58cy9a2bba27djigkh2sd5rksgji";
sha256 = "1ddy9b9ly1231pnjs43gj7pvc77wjvs4j2rlympal81vyabaphmy";
};

outputs = [ "out" "layouts" ];
6 changes: 3 additions & 3 deletions pkgs/games/dwarf-fortress/game.nix
View file
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@

let
baseVersion = "44";
patchVersion = "03";
patchVersion = "05";
dfVersion = "0.${baseVersion}.${patchVersion}";
libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];
platform =
if stdenv.system == "x86_64-linux" then "linux"
else if stdenv.system == "i686-linux" then "linux32"
else throw "Unsupported platform";
sha256 =
if stdenv.system == "x86_64-linux" then "0bgrkwcdghwch96krqdwq8lcjwr6svw0xl53d2jysyszfy7nfl88"
else if stdenv.system == "i686-linux" then "1mvnbkjvm68z2q7h81jrh70qy9458b1spv0m3nlc680fm19hpz40"
if stdenv.system == "x86_64-linux" then "18bjyhjp5458bfbizm8vq4s00pqpfs097qp6pv76m84kgbc4ghg3"
else if stdenv.system == "i686-linux" then "1b9i4kf4c8s6bhqwn8jx100mg7fqp8nmswrai5w8dsma01py4amr"
else throw "Unsupported platform";

in
2 changes: 1 addition & 1 deletion pkgs/games/dwarf-fortress/soundsense.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@

stdenv.mkDerivation rec {
version = "2016-1_196";
dfVersion = "0.44.03";
dfVersion = "0.44.05";
inherit soundPack;
name = "soundsense-${version}";
src = fetchzip {
6 changes: 3 additions & 3 deletions pkgs/games/dwarf-fortress/themes/cla.nix
View file
Original file line number Diff line number Diff line change
@@ -5,21 +5,21 @@

stdenv.mkDerivation rec {
name = "cla-theme-${version}";
version = "44.01-v24";
version = "44.xx-v25";

src = fetchFromGitHub {
owner = "DFgraphics";
repo = "CLA";
rev = version;
sha256 = "1lyazrls2vr8z58vfk5nvaffyv048j5xkr4wjvp6vrqxxvrxyrfd";
sha256 = "1h8nwa939qzqklbi8vwsq9p2brvv7sc0pbzzrdjnb221lr9p58zk";
};

installPhase = ''
mkdir $out
cp -r data raw $out
'';

passthru.dfVersion = "0.44.03";
passthru.dfVersion = "0.44.05";

preferLocalBuild = true;

6 changes: 3 additions & 3 deletions pkgs/games/dwarf-fortress/themes/phoebus.nix
View file
Original file line number Diff line number Diff line change
@@ -5,21 +5,21 @@

stdenv.mkDerivation rec {
name = "phoebus-theme-${version}";
version = "44.03";
version = "44.05";

src = fetchFromGitHub {
owner = "DFgraphics";
repo = "Phoebus";
rev = version;
sha256 = "0jpklikg2bf315m45kdkhd1n1plzb4jwzsg631gqfm9dwnrcs4w3";
sha256 = "06mhr6dpbvwp9dxn70kyr6dwyql2k6x5zba2zf6awjah7idys0xr";
};

installPhase = ''
mkdir $out
cp -r data raw $out
'';

passthru.dfVersion = "0.44.03";
passthru.dfVersion = "0.44.05";

preferLocalBuild = true;

4 changes: 2 additions & 2 deletions pkgs/games/dwarf-fortress/unfuck.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
, ncurses, glib, gtk2, libsndfile, zlib
}:

let dfVersion = "0.44.03"; in
let dfVersion = "0.44.05"; in

stdenv.mkDerivation {
name = "dwarf_fortress_unfuck-${dfVersion}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "svenstaro";
repo = "dwarf_fortress_unfuck";
rev = dfVersion;
sha256 = "0rd8d2ilhhks9kdi9j73bpyf8j56fhmmsj21yzdc0a4v2hzyxn2w";
sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b";
};

cmakeFlags = [
4 changes: 2 additions & 2 deletions pkgs/misc/emulators/wine/sources.nix
View file
Original file line number Diff line number Diff line change
@@ -54,8 +54,8 @@ in rec {
};

winetricks = fetchFromGitHub rec {
version = "20171018";
sha256 = "0qlnxyaydpqx87kfyrkkmwg0jv9dfh3mkq27g224a8v1kf9z3r3h";
version = "20171222";
sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9";
owner = "Winetricks";
repo = "winetricks";
rev = version;