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: 50.13 -> 51.05; dwarf-therapist: 42.1.6 -> 42.1.9 #356659

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

numinit
Copy link
Contributor

@numinit numinit commented Nov 17, 2024

From Dwarf Therapist 42.1.7 onward, dfhack-generated memory maps work in place of Therapist's builtin memory maps. Allow this to happen so we don't have to wait for Dwarf Therapist to update in order to update Dwarf Fortress and dfhack.

Fix some bugs with the wrapper scripts.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Nov 17, 2024
@ofborg ofborg bot requested review from abbradar, Baughn and bendlas November 17, 2024 19:00
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Nov 17, 2024
@numinit numinit force-pushed the dwarf-fortress-50.14 branch from 70c83c9 to 74468a9 Compare November 17, 2024 22:20
@numinit numinit force-pushed the dwarf-fortress-50.14 branch from 74468a9 to 0457aa1 Compare December 29, 2024 21:12
@numinit numinit changed the title dwarf-fortress: 50.13 -> 50.14; dwarf-therapist: 42.1.6 -> 42.1.7 dwarf-fortress: 50.13 -> 50.15; dwarf-therapist: 42.1.6 -> 42.1.8 Dec 29, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/5077

@numinit numinit force-pushed the dwarf-fortress-50.14 branch from f457a9a to 02a537c Compare January 12, 2025 03:38
@bbigras
Copy link
Contributor

bbigras commented Jan 25, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 356659


x86_64-linux

✅ 20 packages built:
  • dwarf-fortress (dwarf-fortress-packages.dwarf-fortress ,dwarf-fortress-packages.dwarf-fortress_50_15)
  • dwarf-fortress-packages.dwarf-fortress-full
  • dwarf-fortress-packages.dwarf-fortress-original
  • dwarf-fortress-packages.dwarf-fortress_0_43_05
  • dwarf-fortress-packages.dwarf-fortress_0_44_05
  • dwarf-fortress-packages.dwarf-fortress_0_44_09
  • dwarf-fortress-packages.dwarf-fortress_0_44_10
  • dwarf-fortress-packages.dwarf-fortress_0_44_11
  • dwarf-fortress-packages.dwarf-fortress_0_44_12
  • dwarf-fortress-packages.dwarf-fortress_0_47_01
  • dwarf-fortress-packages.dwarf-fortress_0_47_02
  • dwarf-fortress-packages.dwarf-fortress_0_47_04
  • dwarf-fortress-packages.dwarf-fortress_0_47_05
  • dwarf-fortress-packages.dwarf-fortress_50_10
  • dwarf-fortress-packages.dwarf-fortress_50_11
  • dwarf-fortress-packages.dwarf-fortress_50_12
  • dwarf-fortress-packages.dwarf-fortress_50_13
  • dwarf-fortress-packages.dwarf-fortress_50_14
  • dwarf-therapist (dwarf-fortress-packages.dwarf-therapist)
  • dwarf-fortress-packages.legends-browser

@numinit
Copy link
Contributor Author

numinit commented Jan 25, 2025

Thanks for the review. Should be easy to add the new Adventure Mode version in a separate PR.

From Dwarf Therapist 42.1.7 onward, dfhack-generated memory maps work
in place of Therapist's builtin memory maps. Allow this to happen.

Fix some bugs with the wrapper scripts.
@numinit numinit changed the title dwarf-fortress: 50.13 -> 50.15; dwarf-therapist: 42.1.6 -> 42.1.8 dwarf-fortress: 50.13 -> 51.05; dwarf-therapist: 42.1.6 -> 42.1.9 Feb 24, 2025
@numinit numinit force-pushed the dwarf-fortress-50.14 branch from 02a537c to cc7fb43 Compare February 24, 2025 03:48
@numinit
Copy link
Contributor Author

numinit commented Feb 24, 2025

Updated to add Adventure Mode support.

@nix-owners nix-owners bot requested review from roconnor, ncfavier and shazow February 24, 2025 03:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: games 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants