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

rstudio: 1.1.414 -> 1.1.423 #34709

Merged
merged 1 commit into from
Feb 9, 2018
Merged

Conversation

sifmelcara
Copy link
Member

@sifmelcara sifmelcara commented Feb 7, 2018

Motivation for this change

Fixes #34606 , the version number display issue.
Also update the package version.

Things done
  • Use ${ginSrc} instead of $ginSrc in the script, where ginSrc is a key defined in a set, which is the argument of mkDerivation. Not sure if this modification is good or not.
  • Use hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); instead of simple hunspellDictionaries = builtins.attrValues hunspellDicts because I found that besides derivations, there is a boolean attribute in hunspellDicts.
  • Remove rmarkdownSrc and rsconnectSrc because they are no longer bundled with rstudio. (rstudio/rstudio@3198140#diff-a5cf8527025032071e38a684d4b25d01)
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

Also fixes the version number displayed in GUI.
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.

3 participants