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.

Sign up for GitHub

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

Jump to bottom

anki: 2.0.52 -> 2.1.6-beta1, fixes #46599, fixes #45726 #50379

Merged
merged 1 commit into from
Nov 15, 2018
Merged

anki: 2.0.52 -> 2.1.6-beta1, fixes #46599, fixes #45726 #50379

merged 1 commit into from
Nov 15, 2018
+19 −145

Conversation

ptrhlm
Copy link
Contributor

@ptrhlm ptrhlm commented Nov 15, 2018

Motivation for this change

Previous pull request (#46599) has been inactive for last 2 months and meanwhile new version of Anki came out.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

worldofpeace
worldofpeace suggested changes Nov 15, 2018
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you squash these two commits together?

And make the commit msg:

anki: 2.0.52 -> 2.1.5

@worldofpeace
Copy link
Contributor

Also if you put fixes #46599 in the pr title, it'll automatically close that pr when this gets merged.

@ptrhlm ptrhlm force-pushed the anki branch 2 times, most recently from 13d73d2 to 5ecf623 Compare November 15, 2018 02:41
@ptrhlm ptrhlm changed the title anki: 2.0.52 -> 2.1.5 anki: 2.0.52 -> 2.1.5, fixes #46599 Nov 15, 2018
@ptrhlm ptrhlm changed the title anki: 2.0.52 -> 2.1.5, fixes #46599 anki: 2.0.52 -> 2.1.5, fixes #46599, fixes #45726 Nov 15, 2018
@ptrhlm
Copy link
Contributor Author

ptrhlm commented Nov 15, 2018

I've squashed the commits as you asked

Also, this update fixes the issue #45726

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 15, 2018 •
edited
Loading

Also if you put fixes #46599 in the pr title, it'll automatically close that pr when this gets merged.

Fixes #issue or Closes #otherPR also works if placed in a PR description.

Mic92
Mic92 reviewed Nov 15, 2018
View reviewed changes
Mic92
Mic92 reviewed Nov 15, 2018
View reviewed changes
@ptrhlm ptrhlm changed the title anki: 2.0.52 -> 2.1.5, fixes #46599, fixes #45726 anki: 2.0.52 -> 2.1.6-beta1, fixes #46599, fixes #45726 Nov 15, 2018
@Mic92
Copy link
Member

Mic92 commented Nov 15, 2018

@GrahamcOfBorg build anki

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: anki

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: anki

Partial log (click to expand)

tests/test_schedv1.py ...............................                    [ 66%]
tests/test_schedv2.py ...................................                [ 95%]
tests/test_stats.py ...                                                  [ 97%]
tests/test_undo.py ..                                                    [ 99%]
tests/test_utils.py .                                                    [100%]

========================= 122 passed in 15.99 seconds ==========================
pytestcachePhase
postPatchMkspecs
/nix/store/pl7ny7dxwn71cqn73wg0j3rgdvqzz641-anki-2.1.6-beta1

@Mic92 Mic92 merged commit 9d53806 into NixOS:master Nov 15, 2018
@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: anki

Partial log (click to expand)

  CMakeLists.txt:137 (include)


-- Configuring incomplete, errors occurred!
See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeOutput.log".
See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeError.log".
builder for '/nix/store/vyy4bhr3qvy2ydwksvz2kc8wm4m78ni4-qtwebkit-5.212-alpha-01-26-2018.drv' failed with exit code 1
cannot build derivation '/nix/store/pf617h0z25khrnxpklpgzj22rk688vfs-python3.6-PyQt-5.10.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/j8i9v3r9p95yfhz8rppmibnbjh6pvldl-anki-2.1.6-beta1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/j8i9v3r9p95yfhz8rppmibnbjh6pvldl-anki-2.1.6-beta1.drv' failed

@ptrhlm ptrhlm deleted the anki branch November 15, 2018 22:40
@binarin binarin mentioned this pull request Nov 30, 2018
Merged
10 tasks
@averelld averelld mentioned this pull request Aug 30, 2019
Merged
10 tasks
@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92

@worldofpeace worldofpeace

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ptrhlm @worldofpeace @c0bw3b @Mic92 @GrahamcOfBorg @Janik-Haag