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

[20.09] trigger: 0.6.6 -> 0.6.6.1 #100492

Merged
merged 2 commits into from Oct 17, 2020
Merged

Conversation

@p-h
Copy link
Contributor

@p-h p-h commented Oct 14, 2020

(cherry picked from commit f85e2e1)

Motivation for this change

backport of: #100449
ZHF: #97479

  • 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.
@ofborg ofborg bot requested a review from viric Oct 14, 2020
@p-h p-h closed this Oct 14, 2020
@p-h p-h deleted the p-h:backport-trigger-0.6.6.1 branch Oct 14, 2020
@p-h p-h restored the p-h:backport-trigger-0.6.6.1 branch Oct 14, 2020
@p-h p-h reopened this Oct 14, 2020
pkgs/games/trigger/default.nix Outdated Show resolved Hide resolved
pkgs/games/trigger/default.nix Outdated Show resolved Hide resolved
pkgs/games/trigger/default.nix Outdated Show resolved Hide resolved
@p-h p-h force-pushed the p-h:backport-trigger-0.6.6.1 branch from 098582e to 55c1c59 Oct 16, 2020
@p-h
Copy link
Contributor Author

@p-h p-h commented Oct 16, 2020

I applied your suggestions. These are not in master right now. Should I open another pr for that?

@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 16, 2020

I applied your suggestions. These are not in master right now. Should I open another pr for that?

Apparently I forgot to hit submit.

I know that a lot of these changes are already in master, please make a new PR against master with the changes and cherry-pick those two commits into this PR please.

@p-h p-h mentioned this pull request Oct 17, 2020
4 of 10 tasks
p-h added 2 commits Oct 13, 2020
fix linker flag for trigger
added tinyxml-2 as dependency as it's not shipped anymore
improved description

(cherry picked from commit f85e2e1)
(cherry picked from commit 85e5e5a)
@p-h p-h force-pushed the p-h:backport-trigger-0.6.6.1 branch from 55c1c59 to c649259 Oct 17, 2020
Copy link
Contributor

@jonringer jonringer left a comment

LGTM

Result of nixpkgs-review pr 100492 1

1 package built:
  • trigger

@jonringer jonringer merged commit 33f067f into NixOS:release-20.09 Oct 17, 2020
18 checks passed
18 checks passed
@github-actions
action
Details
@ofborg
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions
Wait for ofborg
Details
@ofborg
grahamcofborg-eval ^.^!
Details
@ofborg
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c649259"; rev="c649259dce999ea5ea7a1346b2527683abfd71d7"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c649259"; rev="c649259dce999ea5ea7a1346b2527683abfd71d7"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c649259"; rev="c649259dce999ea5ea7a1346b2527683abfd71d7"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c649259"; rev="c649259dce999ea5ea7a1346b2527683abfd71d7"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c649259"; rev="c649259dce999ea5ea7a1346b2527683abfd71d7"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c649259"; rev="c649259dce999ea5ea7a1346b2527683abfd71d7"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c649259"; rev="c649259dce999ea5ea7a1346b2527683abfd71d7"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ofborg
trigger, trigger.passthru.tests on aarch64-linux Success
Details
@ofborg
trigger, trigger.passthru.tests on x86_64-linux Success
Details
@p-h p-h deleted the p-h:backport-trigger-0.6.6.1 branch Oct 17, 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.

None yet

2 participants