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

wpsoffice: 10.1.0.5672 -> 11.1.0.8865 #74769

Merged
merged 2 commits into from Dec 2, 2019
Merged

wpsoffice: 10.1.0.5672 -> 11.1.0.8865 #74769

merged 2 commits into from Dec 2, 2019

Conversation

@Ninlives
Copy link
Contributor

Ninlives commented Dec 1, 2019

Motivation for this change

update wpsoffice to latest version.

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 nix-review --run "nix-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.
Notify maintainers

cc @dguibert @fpletz
Are you still insterested in maintaining this package?

@Ninlives

This comment has been minimized.

Copy link
Contributor Author

Ninlives commented Dec 1, 2019

@Ninlives

This comment has been minimized.

Copy link
Contributor Author

Ninlives commented Dec 1, 2019

@GrahamcOfBorg build wpsoffice

@FRidh

This comment has been minimized.

Copy link
Member

FRidh commented Dec 1, 2019

@Ninlives would you like to be the maintainer of this package? It seems its without a maintainer currently.

@FRidh

This comment has been minimized.

Copy link
Member

FRidh commented Dec 1, 2019

Please squash your commits.

@Ninlives

This comment has been minimized.

Copy link
Contributor Author

Ninlives commented Dec 2, 2019

@FRidh I'd love to. What do you mean "squash" the commits? Merge them into one single commit? Sorry I'm not familiar with the pull request process.

@Mic92

This comment has been minimized.

Copy link
Contributor

Mic92 commented Dec 2, 2019

@Ninlives Yes, squashing makes one commit out of many - This websites explains it: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html. You can also just add yourself as a maintainer in the meta attribute set of this package and I can squash on merge through the github interface.

commit 846746f
Author: mlatus <wqseleven@gmail.com>
Date:   Sun Dec 1 15:25:42 2019 +0800

    fix ofborg eval

commit cde269d
Author: mlatus <wqseleven@gmail.com>
Date:   Sun Dec 1 15:00:47 2019 +0800

    wpsoffice: 10.1.0.5672 -> 11.1.0.8865

add maintainers
@Ninlives Ninlives force-pushed the Ninlives:master branch from 5e80b96 to ee91a63 Dec 2, 2019
@Ninlives

This comment has been minimized.

Copy link
Contributor Author

Ninlives commented Dec 2, 2019

Hi @FRidh @Mic92 , I think I figured it out, please correct me if I made any mistakes.

@Mic92 Mic92 merged commit 9974c07 into NixOS:master Dec 2, 2019
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
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
@FRidh

This comment has been minimized.

Copy link
Member

FRidh commented Dec 2, 2019

In the future, don't merge master. Instead, squash and rebase.

@Mic92

This comment has been minimized.

Copy link
Contributor

Mic92 commented Dec 2, 2019

I squashed when merging the PR.

dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Dec 3, 2019
(cherry picked from commit 9974c07)
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.