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

numix-cursor-theme: patch inkscape command #102007

Merged

Conversation

@stephaneyfx
Copy link
Contributor

@stephaneyfx stephaneyfx commented Oct 29, 2020

Motivation for this change

The generated cursor files were previously empty due to inkscape rejecting the command line argument. See #98481.

Things done

The theme is patched with a pending PR to upstream to use the long flags that are supported by both inkscape 0.x and 1.x.

Before this change, the generated cursor files have a size of zero. After this change, the cursors are valid and appear when selecting the theme.

  • 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.
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 29, 2020

Result of nixpkgs-review pr 102007 run on x86_64-darwin 1

1 package failed to build:
  • numix-cursor-theme
hash mismatch in fixed-output derivation '/nix/store/1wbjd2lglw8c8van7sbkzplixfdf077m-support-inkscape-1-in-numix-cursor-theme.patch':
  wanted: sha256:1cv6sj7jaf459p195x2brjwyim1j61586jywvgw4y3m37yv3ipa2
  got:    sha256:174kmhlvv76wwvndkys78aqc32051sqg3wzc0xg6b7by4agrbg76
@stephaneyfx stephaneyfx force-pushed the stephaneyfx:fix-numix-cursor-theme-generation branch from bf703ff to d1cf7bd Oct 29, 2020
The generated cursor files were previously empty due to inkscape rejecting the command line argument. See #98481.
@stephaneyfx
Copy link
Contributor Author

@stephaneyfx stephaneyfx commented Oct 29, 2020

Sorry for the mistake with the hashes. I was bitten by #41401 (comment). Hopefully it's fixed now.

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 30, 2020

Result of nixpkgs-review pr 102007 run on x86_64-linux 1

1 package built:
  • numix-cursor-theme
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 30, 2020

Result of nixpkgs-review pr 102007 run on x86_64-darwin 1

1 package built:
  • numix-cursor-theme
@romildo
Copy link
Contributor

@romildo romildo commented Nov 3, 2020

LGTM.

@romildo romildo merged commit 4dc4b62 into NixOS:master Nov 3, 2020
19 checks passed
19 checks passed
@github-actions
tests
Details
@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="d1cf7bd"; rev="d1cf7bd44ebf7dd8f0c889f56e5095ee0953df0b"; } ./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="d1cf7bd"; rev="d1cf7bd44ebf7dd8f0c889f56e5095ee0953df0b"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d1cf7bd"; rev="d1cf7bd44ebf7dd8f0c889f56e5095ee0953df0b"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d1cf7bd"; rev="d1cf7bd44ebf7dd8f0c889f56e5095ee0953df0b"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d1cf7bd"; rev="d1cf7bd44ebf7dd8f0c889f56e5095ee0953df0b"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d1cf7bd"; rev="d1cf7bd44ebf7dd8f0c889f56e5095ee0953df0b"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d1cf7bd"; rev="d1cf7bd44ebf7dd8f0c889f56e5095ee0953df0b"; } ./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
numix-cursor-theme, numix-cursor-theme.passthru.tests on aarch64-linux Success
Details
@ofborg
numix-cursor-theme, numix-cursor-theme.passthru.tests on x86_64-linux Success
Details
@stephaneyfx
Copy link
Contributor Author

@stephaneyfx stephaneyfx commented Nov 6, 2020

Thank you!

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