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.

Sign up for GitHub

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

Jump to bottom

vscode: 1.6.1 -> 1.7.2 #21033

Merged
merged 3 commits into from Dec 15, 2016
Merged

vscode: 1.6.1 -> 1.7.2 #21033

merged 3 commits into from Dec 15, 2016

Conversation

d-xo
Copy link
Contributor

@d-xo d-xo commented Dec 10, 2016 •
edited

Motivation for this change

Update vscode to the latest stable version

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

@mention-bot
Copy link

@xwvvvvwx, thanks for your PR! By analyzing the history of the files in this pull request, we identified @uralbash, @mucaho and @jgillich to be potential reviewers.

matthewbauer
matthewbauer requested changes Dec 10, 2016
View reviewed changes
Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

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

I am getting:

output path ‘/nix/store/sf7wb7i30hd94d4qpx3z43cff75kmvk9-VSCode-darwin-stable.zip’ has sha256 hash ‘1chl84scngpxdmcmzbciiz50j459xdcjbpcv4vpm5061gfp5qnh9’ when ‘1a1mxmvai2yz0gzmac6nrm5mqrxa2ypwrhf0k8qjim4cbv1cj5h2’ was expected

on OS X.

@d-xo
Copy link
Contributor Author

d-xo commented Dec 10, 2016 •
edited

ow 😞

I'm sorry for that I don't have an osx system here to test with.

How come the CI passed if it fails for you?
I used nix-hash --base32 --sha256 <tar_file> to generate the hashes for 32bit linux and osx, was that wrong?

Should I just update the commit with the expected hash you got on osx?

@uralbash
Copy link
Member

Linux32: 0n49c6m53vbmhvrb8q0lxqa77r7kivn4n542k8y62bii8hi19ixc
Linux64: 0l3n20rvgrxk2j9962wqmprjz7lnvldkp0yw26yfxl99yvrph68f
Darwin: 1chl84scngpxdmcmzbciiz50j459xdcjbpcv4vpm5061gfp5qnh9

@d-xo
Copy link
Contributor Author

d-xo commented Dec 11, 2016

@uralbash thanks!

So I can avoid the same mistake in the future, how should I generate these hashes?

@uralbash
Copy link
Member

@xwvvvvwx I use nix-prefetch-url like this:

$ nix-prefetch-url 'https://az764295.vo.msecnd.net/stable/07d663dc1bd848161edf4cd4ce30cce410d3d877/code-stable-code_1.5.1-1473369468_i386.tar.gz'

uralbash
uralbash approved these changes Dec 12, 2016
View reviewed changes
pkgs/applications/editors/vscode/default.nix
else if stdenv.system == "x86_64-linux" then
urlBase + "code-stable-code_${version}-1476373175_amd64.tar.gz"
urlBase + "code-stable-code_${version}-1479766213_amd64.tar.gz"

Copy link
Member

Choose a reason for hiding this comment

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

extra line not needed

pkgs/applications/editors/vscode/default.nix
else if stdenv.system == "x86_64-darwin" then "00p2m8b0l3pkf5k74szw6kcql3j1fjnv3rwnhy24wfkg4b4ah2x9"
sha256 = if stdenv.system == "i686-linux" then "0cjjqs40f81h2j3n7sd2g0jj8gfji1kzhbdmdibk2dkr243bs87p"
else if stdenv.system == "x86_64-linux" then "0l3n20rvgrxk2j9962wqmprjz7lnvldkp0yw26yfxl99yvrph68f"
else if stdenv.system == "x86_64-darwin" then "1a1mxmvai2yz0gzmac6nrm5mqrxa2ypwrhf0k8qjim4cbv1cj5h2"
Copy link
Member

Choose a reason for hiding this comment

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

Hash for darwin:

$ nix-prefetch-url https://az764295.vo.msecnd.net/stable/7ba55c5860b152d999dda59393ca3ebeb1b5c85f/VSCode-darwin-stable.zip
1chl84scngpxdmcmzbciiz50j459xdcjbpcv4vpm5061gfp5qnh9

pkgs/applications/editors/vscode/default.nix
sha256 = if stdenv.system == "i686-linux" then "1aks84siflpjbd2s9y1f0vvvf3nas4f50cimjf25lijxzjxrlivy"
else if stdenv.system == "x86_64-linux" then "05kbi081ih64fadj4k74grkk9ca3wga6ybwgs5ld0bal4ilw1q6i"
else if stdenv.system == "x86_64-darwin" then "00p2m8b0l3pkf5k74szw6kcql3j1fjnv3rwnhy24wfkg4b4ah2x9"
sha256 = if stdenv.system == "i686-linux" then "0cjjqs40f81h2j3n7sd2g0jj8gfji1kzhbdmdibk2dkr243bs87p"
Copy link
Member

Choose a reason for hiding this comment

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

Hash for 32bit Linux:

$ nix-prefetch-url https://az764295.vo.msecnd.net/stable/7ba55c5860b152d999dda59393ca3ebeb1b5c85f/code-
0n49c6m53vbmhvrb8q0lxqa77r7kivn4n542k8y62bii8hi19ixc

pkgs/applications/editors/vscode/default.nix
else if stdenv.system == "x86_64-darwin" then "00p2m8b0l3pkf5k74szw6kcql3j1fjnv3rwnhy24wfkg4b4ah2x9"
sha256 = if stdenv.system == "i686-linux" then "0cjjqs40f81h2j3n7sd2g0jj8gfji1kzhbdmdibk2dkr243bs87p"
else if stdenv.system == "x86_64-linux" then "0l3n20rvgrxk2j9962wqmprjz7lnvldkp0yw26yfxl99yvrph68f"
else if stdenv.system == "x86_64-darwin" then "1a1mxmvai2yz0gzmac6nrm5mqrxa2ypwrhf0k8qjim4cbv1cj5h2"
Copy link
Member

Choose a reason for hiding this comment

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

Hash for 64bit Linux:

$ nix-prefetch-url https://az764295.vo.msecnd.net/stable/7ba55c5860b152d999dda59393ca3ebeb1b5c85f/code-
0l3n20rvgrxk2j9962wqmprjz7lnvldkp0yw26yfxl99yvrph68f

@d-xo
Copy link
Contributor Author

d-xo commented Dec 12, 2016

@uralbash thanks for all the help! ☺️

@joachifm joachifm mentioned this pull request Dec 12, 2016
Closed
7 tasks
@Mic92 Mic92 merged commit 35399f9 into NixOS:master Dec 15, 2016
@Mic92
Copy link
Member

Mic92 commented Dec 15, 2016

Thanks!

@d-xo d-xo deleted the pkgs/update_vscode branch December 15, 2016 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer requested changes

@uralbash uralbash uralbash approved these changes

Assignees
No one assigned
Labels
8.has: package (update)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@d-xo @mention-bot @uralbash @Mic92 @matthewbauer @vcunat