Dwarf Fortress refactors #43085

matthewbauer · 2018-07-05T21:26:07Z

This avoids creating a second derivation to copy things from the original. The new themes are now fixed output.

GrahamcOfBorg · 2018-07-05T22:03:30Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-05T22:03:36Z

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-05T22:03:49Z

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

xeji · 2018-07-06T09:30:19Z

pkgs/games/dwarf-fortress/game.nix

+  baseVersion = elemAt dfVersionTriple 1;
+  patchVersion = elemAt dfVersionTriple 2;
+
+  games = fromJSON (readFile ./game.json);


builtins.fromJSON to fix eval

GrahamcOfBorg · 2018-07-06T15:16:32Z

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-06T15:16:33Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-06T15:19:44Z

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-06T15:21:53Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-06T15:22:17Z

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-06T15:25:18Z

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

numinit · 2018-07-08T06:18:42Z

Should this take into account the correct versions of unfuck and dfhack to use for each DF version?

Generally their releases follow DF versions, except for the build bug we found that prevented unfuck from loading when dfhack was enabled, so we'd actually use 0.44.11.1 for version 0.44.11 (ugh):

0.44.11: https://github.com/svenstaro/dwarf_fortress_unfuck/releases/tag/0.44.11.1
(ignore, this is the one I had to patch on build) https://github.com/svenstaro/dwarf_fortress_unfuck/releases/tag/0.44.11
0.44.10: https://github.com/svenstaro/dwarf_fortress_unfuck/releases/tag/0.44.10

So, maybe a structure like this would work for the JSON:

"0.44.11": {
    "linux": "<linux hash>",
    "linux32": "<linux32 hash>",
    "osx": "<osx hash>",
    "osx32": "<osx32 (people still use that?) hash>",
    "dfhackVersion": "0.44.11-beta2.1",
    "unfuckVersion": "0.44.11.1"
}

And, that way, if we wanted to do an experimental release without dfhack, it'd look something like this:

"0.44.12": {
    "linux": "<linux hash>",
    "linux32": "<linux32 hash>",
    "osx": "<osx hash>",
    "osx32": "<osx32 (people still use that?) hash>",
    "dfhackVersion": null,
    "unfuckVersion": "0.44.12"
}

Also, 0.44.12 is out as of today, so here we go again. Want to avoid submitting any changes to the package until this is merged, since this looks like a better structure for picking the version to install.

matthewbauer · 2018-07-08T18:32:24Z

Yeah will update for 0.44.12

I think putting more info in the .json format is probably not good. This is just meant to select the right source format for you. The dfhackVersion & unfuckVersion logic should be done in the dfhack & unfuck expressions. That is what the 'compatible' thing is supposed to be doing already.

GrahamcOfBorg · 2018-07-08T20:15:45Z

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-08T20:15:49Z

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-08T20:15:58Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-09T16:33:03Z

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-09T16:33:17Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-09T16:33:38Z

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

Baughn · 2018-07-09T17:27:54Z

Given there are multiple PRs pending on this one, wouldn't it be best to merge the refactor as-is and add the version bump separately? Or is something still broken?

game.json now contains a dictionary of old game hashes. I have added them for the last 3 releases. - add script to generate hashes Makes it much easier to update game.json file. - add updateScript meta This adds some info on the ./update.sh updateScript now available. - cleanup updateScript - Add some more systems - Correctly detect source extensions (.zip or .tar.bz2) - Proper bash quoting - fix update.sh - correctly detect latest df version - append to game.json instead of overwriting it - update hashes for 44.12

This will make it easier for people to access old versions. You can now access attributes like: - dwarf-fortress_0_44_11 - dwarf-fortress_0_43_05 - etc.

Now the output of “nix-env” should be: $ nix-env -qa -f . -A dwarf-fortress-packages afro-graphics-44.10 autoreiv-44.03 cla-44.xx-v25 dwarf-fortress-0.43.05 dwarf-fortress-0.44.05 dwarf-fortress-0.44.09 dwarf-fortress-0.44.10 dwarf-fortress-0.44.11 dwarf-fortress-0.44.12 dwarf-therapist-40.1.0 gemset-44.10a ironhand-44.10 jolly-bastion-44.10 legends-browser-1.17.1 mayday-44.10 obsidian-44.10 phoebus-44.10 rally-ho-44.10 soundsense-2016-1_196 spacefox-44.10a taffer-44.10a tergel-44.03 wanderlust-44.10

GrahamcOfBorg · 2018-07-09T20:36:21Z

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-09T20:42:23Z

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-09T20:48:24Z

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-09T20:48:37Z

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

matthewbauer · 2018-07-09T21:40:44Z

Yeah that makes sense.

matthewbauer · 2018-07-09T21:43:28Z

Note that this is still on 0.44.11. It should be a one line diff to switch to the newest though:

https://github.com/NixOS/nixpkgs/blob/master/pkgs/games/dwarf-fortress/default.nix#L16

GrahamcOfBorg · 2018-07-09T22:08:51Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-07-09T22:09:04Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dwarf-fortress

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

Mic92 · 2018-10-15T19:01:52Z

pkgs/games/dwarf-fortress/game.json

@@ -0,0 +1,86 @@
+{


How many of these versions do we need in nixpkgs? And what is the criteria to, which versions we add?

We can probably delete some... Last 1-2 are usually compatible with all of the tools. Sometimes people play on older ones because new versions break save files.

jtojnar · 2019-06-01T21:39:26Z

Running nix-shell maintainers/scripts/update.nix --argstr path dwarf-fortress does not work:

/nix/store/2knjz3r0cj05j6714jgmzhclrri4canp-update.sh: line 41: $(dirname "$0")/game.json: No such file or directory
/nix/store/2knjz3r0cj05j6714jgmzhclrri4canp-update.sh: line 42: $(dirname "$0")/game.json: Read-only file system

see #61935 (comment)

jtojnar · 2019-06-01T23:03:05Z

Hmm. Apparently, he failure comes from the JSONification in https://github.com/NixOS/nixpkgs/pull/50977/files#diff-068de29b3fc79aa673d4a7f25f8ee9fbR142

dwarf-fortress: use fetchFromGitHub directly

aba6a3d

This avoids creating a second derivation to copy things from the original. The new themes are now fixed output.

matthewbauer force-pushed the dwarf-fortress branch 2 times, most recently from a1892e0 to f6b4f01 Compare July 5, 2018 21:38

matthewbauer mentioned this pull request Jul 5, 2018

dwarf-fortress: TWBT & Lazy Pack #43081

Merged

9 tasks

GrahamcOfBorg added 8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Jul 5, 2018

xeji reviewed Jul 6, 2018

View reviewed changes

matthewbauer changed the title ~~Dwarf fortress tweaks~~ Dwarf Fortress refactors Jul 8, 2018

GrahamcOfBorg added 8.has: package (new) 10.rebuild-darwin: 1-10 and removed 10.rebuild-darwin: 0 labels Jul 8, 2018

matthewbauer force-pushed the dwarf-fortress branch from 02e101f to b9839e8 Compare July 9, 2018 16:18

matthewbauer requested review from the-kenny, roconnor and abbradar July 9, 2018 16:20

matthewbauer added 2 commits July 9, 2018 16:13

dwarf-fortress: refactors

530427c

This will make it easier for people to access old versions. You can now access attributes like: - dwarf-fortress_0_44_11 - dwarf-fortress_0_43_05 - etc.

matthewbauer force-pushed the dwarf-fortress branch from b9839e8 to 530427c Compare July 9, 2018 20:16

GrahamcOfBorg added 10.rebuild-linux: 11-100 and removed 10.rebuild-linux: 1-10 labels Jul 9, 2018

GrahamcOfBorg added 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 11-100 labels Jul 9, 2018

matthewbauer merged commit 97605d3 into NixOS:master Jul 9, 2018

numinit mentioned this pull request Oct 15, 2018

dwarf-fortress: Refactor, round 2: let the user pick which version of the lazy pack to install #43470

Merged

9 tasks

Mic92 reviewed Oct 15, 2018

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dwarf Fortress refactors #43085

Dwarf Fortress refactors #43085

matthewbauer commented Jul 5, 2018

GrahamcOfBorg commented Jul 5, 2018

GrahamcOfBorg commented Jul 5, 2018

GrahamcOfBorg commented Jul 5, 2018

xeji Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

numinit commented Jul 8, 2018 •

edited

matthewbauer commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

Baughn commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

matthewbauer commented Jul 9, 2018 •

edited

matthewbauer commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

Mic92 Oct 15, 2018

matthewbauer Oct 15, 2018

jtojnar commented Jun 1, 2019

jtojnar commented Jun 1, 2019

Dwarf Fortress refactors #43085

Dwarf Fortress refactors #43085

Conversation

matthewbauer commented Jul 5, 2018

GrahamcOfBorg commented Jul 5, 2018

GrahamcOfBorg commented Jul 5, 2018

GrahamcOfBorg commented Jul 5, 2018

xeji Jul 6, 2018

Choose a reason for hiding this comment

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

GrahamcOfBorg commented Jul 6, 2018

numinit commented Jul 8, 2018 • edited

matthewbauer commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

Baughn commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

matthewbauer commented Jul 9, 2018 • edited

matthewbauer commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

GrahamcOfBorg commented Jul 9, 2018

Mic92 Oct 15, 2018

Choose a reason for hiding this comment

matthewbauer Oct 15, 2018

Choose a reason for hiding this comment

jtojnar commented Jun 1, 2019

jtojnar commented Jun 1, 2019

numinit commented Jul 8, 2018 •

edited

matthewbauer commented Jul 9, 2018 •

edited