diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:32:23 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:34:57 +0100 |
| commit | dbae4f109f0ab3f676c8aa104d1f9bebcee85324 (patch) | |
| tree | 18c61fd667b95bf3a3322e5f40161d2028b3e42c /pkgs/games/dwarf-fortress | |
| parent | 5dab625862a5690a35c122f3749eee31879a2415 (diff) | |
| parent | b50cabf2d4c1175da48af4df3132b246aa1c8d12 (diff) | |
| download | nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.gz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.bz2 nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.lz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.xz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.zst nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.zip | |
Merge branch 'master' into staging
Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/games/dwarf-fortress')
| -rw-r--r-- | pkgs/games/dwarf-fortress/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 015ca2fca9d2..4e34453a1e8a 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -4,17 +4,17 @@ let baseVersion = "40"; - patchVersion = "23"; + patchVersion = "24"; srcs = { df_unfuck = fetchgit { url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; - rev = "c6ec52520c44ba09d0d14c1688d2e9d70354fd01"; - sha256 = "0pp602ykyrq4rhyrf3pyy9vplxlkl256lw8bcfmgh0mqzzap9wq9"; + rev = "39742d64d2886fb594d79e7cc4b98fb917f26811"; + sha256 = "19vwx6kpv1sf93bx5v8x47f7x2cgxsqk82v6j1a72sa3q7m5cpc7"; }; df = fetchurl { url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2"; - sha256 = "12gjb19scdgsz7zgk9s01qjxqrvh7z0xr68svwgxxqn4wf8kppcl"; + sha256 = "0d4jrs45qj89vq9mjg7fxxhis7zivvb0vzjpmkk274b778kccdys"; }; }; |