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-packages.dwarf-fortress_0_47_01: init #78901

Merged
merged 3 commits into from Feb 3, 2020

Conversation

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 30, 2020

Motivation for this change

until dfhack has support for the latest release, I'm not going to bump dwarf-fortress default.

However, you should be able to do dwarf-fortress-packages.dwarf-fortress_0_47_01 and play the game.

closes: #78791

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 added 3 commits Jan 30, 2020
@shazow
Copy link
Contributor

@shazow shazow commented Jan 31, 2020

Confirmed that this works for me (on NixOS). Thank you!

@shazow
Copy link
Contributor

@shazow shazow commented Jan 31, 2020

Btw, we could also update some of the themes. Here's pheobus which I use:

diff --git a/pkgs/games/dwarf-fortress/themes/themes.json b/pkgs/games/dwarf-fortress/themes/themes.json
index f2cc4ed3ac7..f4c47cce372 100644
--- a/pkgs/games/dwarf-fortress/themes/themes.json
+++ b/pkgs/games/dwarf-fortress/themes/themes.json
@@ -26,8 +26,8 @@
   },
   {
       "name": "phoebus",
-      "version": "44.10",
-      "sha256": "1fvl5251wzjns159snhw01p214k53vpdlyj7piv545r23q7wg2ji"
+      "version": "47.01",
+      "sha256": "1rf47p6a4f6scpzlmy9q3v1pakdjs06f9aingajpaia44lmjdfn6"
   },
   {
       "name": "obsidian",

Happy to make a separate PR if that's easier, let me know.

Copy link
Contributor

@tomberek tomberek left a comment

Builds and runs on NixOS. Losing is fun.

@shazow shazow mentioned this pull request Feb 2, 2020
6 of 10 tasks complete
@jonringer
Copy link
Contributor Author

@jonringer jonringer commented Feb 3, 2020

I was able to build and run the programs, and it appears others have tested.

@jonringer jonringer merged commit e293cf9 into NixOS:master Feb 3, 2020
16 checks passed
16 checks passed
dwarf-fortress-packages.dwarf-fortress_0_47_01, dwarf-fortress-packages.dwarf-therapist on aarch64-linux No attempt
Details
dwarf-fortress-packages.dwarf-fortress_0_47_01, dwarf-fortress-packages.dwarf-therapist on x86_64-darwin No attempt
Details
dwarf-fortress-packages.dwarf-fortress_0_47_01, dwarf-fortress-packages.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
Copy link
Contributor Author

@jonringer jonringer commented Feb 3, 2020

@shazow @tomberek thanks for the reviews!

@jonringer jonringer deleted the jonringer:bump-dwarf-fortress branch Feb 3, 2020
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.

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