commit d29cee773c09b770ad04e625f30b24f604cf7829 · pyrox.dev/nixpkgs

+4 -4

pkgs/games/dwarf-fortress/dfhack/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
       -
         dfVersion = "0.43.05";

     

       8
       8
       -
         version = "${dfVersion}-r2";

     

       7
       7
       +
         dfVersion = "0.44.02";

     

       8
       8
       +
         version = "${dfVersion}-alpha1";

     

       9
       9
        
         rev = "refs/tags/${version}";

     

       10
       10
       -
         sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c";

     

       10
       10
       +
         sha256 = "1cdp2jwhxl54ym92jm58xyrz942ajp6idl31qrmzcqzawp2fl620";

     

       11
       11
        
       

     

       12
       12
        
         # revision of library/xml submodule

     

       13
       13
       -
         xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9";

     

       13
       13
       +
         xmlRev = "e2e256066cc4a5c427172d9d27db25b7823e4e86";

     

       14
       14
        
       

     

       15
       15
        
         arch =

     

       16
       16
        
           if stdenv.system == "x86_64-linux" then "64"

+6 -8

pkgs/games/dwarf-fortress/dwarf-therapist/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "dwarf-therapist-original-${version}";

     

       5
       5
       -
         version = "37.0.0-Hello71";

     

       5
       5
       +
         version = "39.0.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
       -
           ## We use `Hello71`'s fork for 43.05 support

     

       9
       9
       -
           # owner = "splintermind";

     

       10
       10
       -
           owner = "Hello71";

     

       8
       8
       +
           owner = "Dwarf-Therapist";

     

       11
       9
        
           repo = "Dwarf-Therapist";

     

       12
       12
       -
           rev = "42ccaa71f6077ebdd41543255a360c3470812b97";

     

       13
       13
       -
           sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz";

     

       10
       10
       +
           rev = "8ae293a6b45333bbf30644d11d1987651e53a307";

     

       11
       11
       +
           sha256 = "0p1127agr2a97gp5chgdkaa0wf02hqgx82yid1cvqpyj8amal6yg";

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       14
        
         outputs = [ "out" "layouts" ];

     
···

       33
       31
        
       

     

       34
       32
        
         meta = with stdenv.lib; {

     

       35
       33
        
           description = "Tool to manage dwarves in in a running game of Dwarf Fortress";

     

       36
       36
       -
           maintainers = with maintainers; [ the-kenny abbradar ];

     

       34
       34
       +
           maintainers = with maintainers; [ the-kenny abbradar bendlas ];

     

       37
       35
        
           license = licenses.mit;

     

       38
       36
        
           platforms = platforms.linux;

     

       39
       39
       -
           homepage = https://github.com/splintermind/Dwarf-Therapist;

     

       37
       37
       +
           homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist;

     

       40
       38
        
         };

     

       41
       39
        
       }

+4 -2

pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix

···

       1
       1
       -
       { symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:

     

       1
       1
       +
       { stdenv, symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         df = dwarf-fortress-original;

     

       5
       5
        
         dt = dwarf-therapist-original;

     

       6
       6
       -
         inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini";

     

       6
       6
       +
         platformSlug = if stdenv.targetPlatform.is32bit then

     

       7
       7
       +
           "linux32" else "linux64";

     

       8
       8
       +
         inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}_${platformSlug}.ini";

     

       7
       9
        
         dfHashFile = "${df}/hash.md5";

     

       8
       10
        
       

     

       9
       11
        
       in symlinkJoin {

+4 -4

pkgs/games/dwarf-fortress/game.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         baseVersion = "43";

     

       7
       7
       -
         patchVersion = "05";

     

       6
       6
       +
         baseVersion = "44";

     

       7
       7
       +
         patchVersion = "02";

     

       8
       8
        
         dfVersion = "0.${baseVersion}.${patchVersion}";

     

       9
       9
        
         libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];

     

       10
       10
        
         platform =

     
···

       12
       12
        
           else if stdenv.system == "i686-linux" then "linux32"

     

       13
       13
        
           else throw "Unsupported platform";

     

       14
       14
        
         sha256 =

     

       15
       15
       -
           if stdenv.system == "x86_64-linux" then "1r0b96yrdf24m9476k5x7rmp3faxr0kfwwdf35agpvlb1qbi6v45"

     

       16
       16
       -
           else if stdenv.system == "i686-linux" then "16l1lydpkbnl3zhz4i2snmjk7pps8vmw3zv0bjgr8dncbsrycd03"

     

       15
       15
       +
           if stdenv.system == "x86_64-linux" then "1w2b6sxjxb5cvmv15fxmzfkxvby4kdcf4kj4w35687filyg0skah"

     

       16
       16
       +
           else if stdenv.system == "i686-linux" then "1yqzkgyl1adwysqskc2v4wlp1nkgxc7w6m37nwllghgwfzaiqwnh"

     

       17
       17
        
           else throw "Unsupported platform";

     

       18
       18
        
       

     

       19
       19
        
       in

+1 -1

pkgs/games/dwarf-fortress/soundsense.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         version = "2016-1_196";

     

       15
       15
       -
         dfVersion = "0.43.05";

     

       15
       15
       +
         dfVersion = "0.44.02";

     

       16
       16
        
         inherit soundPack;

     

       17
       17
        
         name = "soundsense-${version}";

     

       18
       18
        
         src = fetchzip {

+3 -3

pkgs/games/dwarf-fortress/themes/cla.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "cla-theme-${version}";

     

       8
       8
       -
         version = "43.05-v23";

     

       8
       8
       +
         version = "44.01-v24";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "DFgraphics";

     

       12
       12
        
           repo = "CLA";

     

       13
       13
        
           rev = version;

     

       14
       14
       -
           sha256 = "1i74lyz7mpfrvh5g7rajxldhw7zddc2kp8f6bgfr3hl5l8ym5ci9";

     

       14
       14
       +
           sha256 = "1lyazrls2vr8z58vfk5nvaffyv048j5xkr4wjvp6vrqxxvrxyrfd";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         installPhase = ''

     
···

       19
       19
        
           cp -r data raw $out

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
       -
         passthru.dfVersion = "0.43.05";

     

       22
       22
       +
         passthru.dfVersion = "0.44.02";

     

       23
       23
        
       

     

       24
       24
        
         preferLocalBuild = true;

     

       25
       25

+3 -3

pkgs/games/dwarf-fortress/themes/phoebus.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "phoebus-theme-${version}";

     

       8
       8
       -
         version = "43.05c";

     

       8
       8
       +
         version = "44.02a";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "DFgraphics";

     

       12
       12
        
           repo = "Phoebus";

     

       13
       13
        
           rev = version;

     

       14
       14
       -
           sha256 = "0wiz9rd5ypibgh8854h5n2xwksfxylaziyjpbp3p1rkm3r7kr4fd";

     

       14
       14
       +
           sha256 = "10qd8fbn75fvhkyxqljn4w52kbhfp9xh1ybanjzc57bz79sdzvfp";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         installPhase = ''

     
···

       19
       19
        
           cp -r data raw $out

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
       -
         passthru.dfVersion = "0.43.05";

     

       22
       22
       +
         passthru.dfVersion = "0.44.02";

     

       23
       23
        
       

     

       24
       24
        
         preferLocalBuild = true;

     

       25
       25

+6 -4

pkgs/games/dwarf-fortress/unfuck.nix

···

       3
       3
        
       , ncurses, glib, gtk2, libsndfile, zlib

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       +
       let dfVersion = "0.44.02"; in

     

       7
       7
       +
       

     

       6
       8
        
       stdenv.mkDerivation {

     

       7
       7
       -
         name = "dwarf_fortress_unfuck-2016-07-13";

     

       9
       9
       +
         name = "dwarf_fortress_unfuck-${dfVersion}";

     

       8
       10
        
       

     

       9
       11
        
         src = fetchFromGitHub {

     

       10
       12
        
           owner = "svenstaro";

     

       11
       13
        
           repo = "dwarf_fortress_unfuck";

     

       12
       12
       -
           rev = "d6a4ee67e7b41bec1caa87548640643db35a6080";

     

       13
       13
       -
           sha256 = "17p7jzmwd5z54wn6bxmic0i8y8mma3q359zcy3r9x2mp2wv1yd7p";

     

       14
       14
       +
           rev = dfVersion;

     

       15
       15
       +
           sha256 = "0gfchfqrzx0h59mdv01hik8q2a2yx170q578agfck0nv39yhi6i5";

     

       14
       16
        
         };

     

       15
       17
        
       

     

       16
       18
        
         cmakeFlags = [

     
···

       33
       35
        
         # Breaks dfhack because of inlining.

     

       34
       36
        
         hardeningDisable = [ "fortify" ];

     

       35
       37
        
       

     

       36
       36
       -
         passthru.dfVersion = "0.43.05";

     

       38
       38
       +
         passthru = { inherit dfVersion; };

     

       37
       39
        
       

     

       38
       40
        
         meta = with stdenv.lib; {

     

       39
       41
        
           description = "Unfucked multimedia layer for Dwarf Fortress";

+2 -2

pkgs/games/dwarf-fortress/wrapper/default.nix

···

       38
       38
        
         };

     

       39
       39
        
       in

     

       40
       40
        
       

     

       41
       41
       -
       assert lib.all (x: x.dfVersion == dwarf-fortress-original.dfVersion) pkgs;

     

       42
       42
       -
       

     

       43
       41
        
       stdenv.mkDerivation rec {

     

       44
       42
        
         name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}";

     

       43
       43
       +
       

     

       44
       44
       +
         compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress-original.dfVersion); true) pkgs;

     

       45
       45
        
       

     

       46
       46
        
         dfInit = substituteAll {

     

       47
       47
        
           name = "dwarf-fortress-init";