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

spl: use correct version to fix binary substitution #45514

Merged
merged 1 commit into from Aug 23, 2018

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

During the recent refactoring of SPL, the version attribute was mistakenly removed, causing SPL to inherit a version attribute from somewhere in the nixpkgs lib. This version is included in the derivation name, and since it differs between Hydra (18.09pre-git) and normal NixOS machines (something like 18.09pre149424.ce522e4ad27), the SPL is not substituted from the binary cache. Also it should be fixed because this version has nothing to do with SPL.

Things done

This PR adds a correct version attribute to the derivation.

  • 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.

@Mic92 Mic92 merged commit 714ef2f into NixOS:master Aug 23, 2018
@Mic92
Copy link
Member

Mic92 commented Aug 23, 2018

My bad.

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