Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dwarf-fortress-packages.dwarf-fortress_0_47_02: init #79630

Merged
merged 4 commits into from Feb 10, 2020
Merged

dwarf-fortress-packages.dwarf-fortress_0_47_02: init #79630

merged 4 commits into from Feb 10, 2020

Conversation

shazow
Copy link
Contributor

@shazow shazow commented Feb 9, 2020 •
edited

Motivation for this change

Bugfix release for Dwarf Fortress came out. This PR updates the themes.json and games.json (and the update script that updates games.json).

Unfortunately there's no corresponding unfuck release yet, so it's still using the 0.47.01 version of unfuck for 0.47.02 which seems to work fine (as it's a minor bugfix release).

Currently playing this version with:

nix-env -f . -iE 'p: (p {}).dwarf-fortress-packages.dwarf-fortress_0_47_02.override { enableTruetype = true; theme = "phoebus"; }'
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@shazow
Copy link
Contributor Author

shazow commented Feb 9, 2020

Hm, I might have missed something with unfuck, but not quite sure what.

@shazow shazow requested a review from abbradar February 9, 2020 16:53
@shazow
Copy link
Contributor Author

shazow commented Feb 9, 2020

Ah looks like unfuck breaks on trying to install the older dwarf-fortress_0_47_01. Hm, my nix-fu is not quite good enough to figure out what's going on, pointers appreciated.

jonringer
jonringer approved these changes Feb 9, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

pkgs/games/dwarf-fortress/update.sh Show resolved Hide resolved
@jonringer
Copy link
Contributor

unfortunately, this is does fail without a compatible version of unfuck:

while evaluating the attribute 'dfInit' of the derivation 'dwarf-fortress-0.47.01' at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix:84:3:
while evaluating the attribute 'env' of the derivation 'dwarf-fortress-init' at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix:87:5:
while evaluating the attribute 'passAsFile' of the derivation 'dwarf-fortress-env-0.47.01' at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/pkgs/build-support/trivial-builders.nix:7:14:
while evaluating the attribute 'buildCommand' of the derivation 'fixup' at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/pkgs/build-support/trivial-builders.nix:7:14:
while evaluating the attribute 'installPhase' of the derivation 'dwarf-fortress-0.47.01' at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/pkgs/games/dwarf-fortress/game.nix:46:3:
while evaluating 'optionalString' at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/lib/strings.nix:180:5, called from /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/pkgs/games/dwarf-fortress/game.nix:63:8:
while evaluating 'makeSearchPathOutput' at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/lib/strings.nix:142:5, called from /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/pkgs/games/dwarf-fortress/game.nix:13:13:
while evaluating 'makeSearchPath' at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/lib/strings.nix:122:5, called from /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/lib/strings.nix:142:11:
while evaluating anonymous function at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/lib/strings.nix:123:32, called from undefined position:
while evaluating the derivation attribute 'name' at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/pkgs/games/dwarf-fortress/unfuck.nix:51:3:
attribute 'unfuckRelease' missing, at /home/jon/.cache/nixpkgs-review/pr-79630/nixpkgs/pkgs/games/dwarf-fortress/unfuck.nix:51:35

@shazow
Copy link
Contributor Author

shazow commented Feb 9, 2020

Yea, as I mentioned too. Works fine for .02 but no longer for .01. Any ideas how to work around this?

@shazow
dwarf-fortress-packages.unfuck: 0.47.01 -> 0.47.02 release
9bf177e 
Temporarily using 0.47.01 release for 0.47.02, since there's no
corresponding unfuck release yet and it seems to work.
@shazow
Copy link
Contributor Author

shazow commented Feb 10, 2020

Pushed the update, looks better now.

jonringer
jonringer approved these changes Feb 10, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM
commits LGTM

[25 built, 12 copied (392.9 MiB), 324.2 MiB DL]
https://github.com/NixOS/nixpkgs/pull/79630
15 package built:
dwarf-fortress-packages.cla-theme dwarf-fortress-packages.dwarf-fortress-full dwarf-fortress-packages.dwarf-fortress_0_47_02 dwarf-fortress-packages.phoebus-theme dwarf-fortress-packages.themes.afro-graphics dwarf-fortress-packages.themes.autoreiv dwarf-fortress-packages.themes.gemset dwarf-fortress-packages.themes.ironhand dwarf-fortress-packages.themes.jolly-bastion dwarf-fortress-packages.themes.obsidian dwarf-fortress-packages.themes.rally-ho dwarf-fortress-packages.themes.spacefox dwarf-fortress-packages.themes.taffer dwarf-fortress-packages.themes.tergel dwarf-fortress-packages.themes.wanderlust

@jonringer
Copy link
Contributor

merging once ofborg is done with eval

@jonringer jonringer merged commit be32c3c into NixOS:master Feb 10, 2020
@shazow shazow mentioned this pull request Mar 12, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@tomberek tomberek Awaiting requested review from tomberek

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@shazow @jonringer