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

anki: more no-op exp cleanup #90368

Merged
merged 2 commits into from Jul 1, 2020
Merged

anki: more no-op exp cleanup #90368

merged 2 commits into from Jul 1, 2020

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Jun 14, 2020

Continued progress towards #89745; just simplifying a bit.

Motivation for this change
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.

pkgs/games/anki/default.nix Outdated Show resolved Hide resolved
@@ -42,7 +42,7 @@ let
pname = "anki-manual";
inherit version;
src = fetchFromGitHub {
owner = "dae";
owner = "ankitects";
Copy link
Member

Choose a reason for hiding this comment

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

That’s not a no-op holy f heck.

I do hope that slipped into this commit by mistake.

Copy link
Member

Choose a reason for hiding this comment

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

This being said, it looks like ankisrs.net now points to the ankitects repo, so IMO this is not a problem (even though it doesn't match the commit name). (Also, the build will probably not be affected, as the reference and hash stay the same)

Copy link
Contributor Author

@bhipple bhipple Jun 18, 2020

Choose a reason for hiding this comment

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

https://github.com/dae/ankidocs is a URL redirect to https://github.com/ankitects/anki-docs now, so it is a no-op.

I can change the sha256 to garbage and nix will re-fetch and tell me the same hash. Am I missing something?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, please put it in a different commit explaining that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done


postPatch = ''
# Remove unused starter. We'll create our own, minimalistic,
# starter.
# rm anki/anki
Copy link
Member

Choose a reason for hiding this comment

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

Is this not relevant anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was commented out back in 2018 and we seem to have been fine without it, so I'd say so:
a30e304

The original repo has been transferred on github, so the URL is a redirect to here.
@Profpatsch Profpatsch merged commit 0e2d755 into NixOS:master Jul 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants