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

add `enableSound` parameter to `dwarf-fortress` derivation #87915

Merged
merged 1 commit into from May 23, 2020

Conversation

@matthew-piziak
Copy link
Contributor

matthew-piziak commented May 16, 2020

Motivation for this change

The init file for this derivation can include [SOUND:NO] or [SOUND:YES]. This adds a parameter to control it.

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.
@@ -67,7 +68,8 @@ let
substituteInPlace $out/data/init/init.txt \
--replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
--replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
--replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
--replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' \
--replace '[SOUND:YES]' '[SOUND:NO]'

This comment has been minimized.

Copy link
@Baughn

Baughn May 16, 2020

Contributor

I do believe you need to call unBool here.

This comment has been minimized.

Copy link
@matthew-piziak

matthew-piziak May 18, 2020

Author Contributor

Oh, how embarrassing, I squashed my test commit into the contribution. Thank you @Baughn, I've fixed it.

try hardcoding

add back whitespace
@matthew-piziak matthew-piziak force-pushed the matthew-piziak:dwarf-fortress-enable-sound branch from e3fd840 to 879778c May 18, 2020
@ofborg ofborg bot requested a review from Baughn May 18, 2020
@Baughn
Baughn approved these changes May 18, 2020
@matthew-piziak
Copy link
Contributor Author

matthew-piziak commented May 18, 2020

Thanks for the approval! I'm new to nixpkgs. How should I merge these in? Do I ask a bot or a maintainer, or what?

@Baughn
Copy link
Contributor

Baughn commented May 19, 2020

We need someone with write access to merge it. To be honest, I'm not sure how to attract their attention from this side... let's give it a day and see what happens.

@adisbladis
Copy link
Member

adisbladis commented May 23, 2020

I haven't tested this myself, but since I see nothing wrong with the diff and it has approval by the package maintainer I'm merging.

@adisbladis adisbladis merged commit d8435f6 into NixOS:master May 23, 2020
14 checks passed
14 checks passed
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="879778c"; rev="879778c5837c9d5df420806491669e1a6db3bd87"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="879778c"; rev="879778c5837c9d5df420806491669e1a6db3bd87"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="879778c"; rev="879778c5837c9d5df420806491669e1a6db3bd87"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="879778c"; rev="879778c5837c9d5df420806491669e1a6db3bd87"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="879778c"; rev="879778c5837c9d5df420806491669e1a6db3bd87"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="879778c"; rev="879778c5837c9d5df420806491669e1a6db3bd87"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="879778c"; rev="879778c5837c9d5df420806491669e1a6db3bd87"; } ./pkgs/t
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
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

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