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

dwarf-fortress: 0.44.12 -> 0.47.02 #80072

Merged
merged 4 commits into from Feb 14, 2020
Merged

Conversation

@jonringer
Copy link
Contributor

@jonringer jonringer commented Feb 13, 2020

Motivation for this change

The rest of the ecosystem is slowly catching up.

This adds:

  • 0.47.02 compatible dwarf-therapist
  • 0.47.02 compatible df-hack, even if pre-release
  • latest twbt

Then sets the default df package to be the latest.

There might be some instability with the df-hack prelease and an outdated twbt

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.
@jonringer
Copy link
Contributor Author

@jonringer jonringer commented Feb 14, 2020

@shazow

@shazow
shazow approved these changes Feb 14, 2020
Copy link
Contributor

@shazow shazow left a comment

Confirmed nix-env -f . -i dwarf-fortress-full builds as expected on NixOS, dfhack launches with the correct versions.

@shazow
Copy link
Contributor

@shazow shazow commented Feb 14, 2020

Bonus: Might be worth re-running the cd themes && ./update.sh if you get a chance, just to keep things fresh. :)

@jonringer
Copy link
Contributor Author

@jonringer jonringer commented Feb 14, 2020

did another update, doesn't seem to be any new releases

@shazow
Copy link
Contributor

@shazow shazow commented Feb 14, 2020

Awesome, thanks!

@jonringer jonringer merged commit d2b745d into NixOS:master Feb 14, 2020
16 checks passed
16 checks passed
dwarf-fortress, dwarf-therapist on aarch64-linux No attempt
Details
dwarf-fortress, dwarf-therapist on x86_64-darwin No attempt
Details
dwarf-fortress, dwarf-therapist on x86_64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@jonringer jonringer deleted the jonringer:dwarf-fortress branch Feb 14, 2020
@ghost
Copy link

@ghost ghost commented Mar 12, 2020

There've been 2 new minor releases, I tried updating them manually but the process is a bit convoluted for me. Any plans on updating the packages?

@shazow
Copy link
Contributor

@shazow shazow commented Mar 12, 2020

It's not as hard as it looks. :) If you want to open a PR and ping us for help, I'm happy to help.

#79630 is maybe a better reference. Also https://nixos.wiki/wiki/Nixpkgs/Update_a_package

Otherwise I'm sure one of us will get to it next time we play it. :D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.