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 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";

This comment has been minimized.

@Profpatsch

Profpatsch Jun 17, 2020 Member

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

I do hope that slipped into this commit by mistake.

This comment has been minimized.

@Ekleog

Ekleog Jun 17, 2020 Member

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)

This comment has been minimized.

@bhipple

bhipple Jun 18, 2020 Author Contributor

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?

This comment has been minimized.

@Profpatsch

Profpatsch Jun 18, 2020 Member

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

This comment has been minimized.

@bhipple

bhipple Jun 20, 2020 Author Contributor

Done


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

This comment has been minimized.

@Profpatsch

Profpatsch Jun 17, 2020 Member

Is this not relevant anymore?

This comment has been minimized.

@bhipple

bhipple Jun 18, 2020 Author Contributor

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

@bhipple bhipple force-pushed the bhipple:clean/anki branch from bb0ca4e to 94574f5 Jun 18, 2020
@ofborg ofborg bot requested a review from Profpatsch Jun 18, 2020
bhipple added 2 commits Jun 20, 2020
The original repo has been transferred on github, so the URL is a redirect to here.
@bhipple bhipple force-pushed the bhipple:clean/anki branch from 94574f5 to fb7defb Jun 20, 2020
@Profpatsch Profpatsch merged commit 0e2d755 into NixOS:master Jul 1, 2020
16 checks passed
16 checks passed
anki, anki.passthru.tests on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
anki, anki.passthru.tests on x86_64-linux Success
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="fb7defb"; rev="fb7defb752c6eb8b9e18ed24c56ceeb0529d7a85"; } ./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="fb7defb"; rev="fb7defb752c6eb8b9e18ed24c56ceeb0529d7a85"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb7defb"; rev="fb7defb752c6eb8b9e18ed24c56ceeb0529d7a85"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb7defb"; rev="fb7defb752c6eb8b9e18ed24c56ceeb0529d7a85"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb7defb"; rev="fb7defb752c6eb8b9e18ed24c56ceeb0529d7a85"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb7defb"; rev="fb7defb752c6eb8b9e18ed24c56ceeb0529d7a85"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="fb7defb"; rev="fb7defb752c6eb8b9e18ed24c56ceeb0529d7a85"; } ./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.